22w42a

build.gradle

@@ -26,7 +26,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "1.19.2"
+def minecraft_version = "22w42a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

mappings/net/minecraft/MinecraftVersion.mapping

@@ -6,7 +6,6 @@ CLASS net/minecraft/class_3797 net/minecraft/MinecraftVersion
 	FIELD field_16737 stable Z
 	FIELD field_16738 id Ljava/lang/String;
 	FIELD field_16739 buildTime Ljava/util/Date;
-	FIELD field_16740 releaseTarget Ljava/lang/String;
 	FIELD field_16741 LOGGER Lorg/slf4j/Logger;
 	FIELD field_25319 CURRENT Lnet/minecraft/class_6489;
 	FIELD field_27843 resourcePackVersion I

mappings/net/minecraft/SharedConstants.mapping

@@ -15,7 +15,6 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants
 	FIELD field_29731 COMMAND_MAX_LENGTH I
 	FIELD field_29732 WORLD_VERSION I
 	FIELD field_29733 VERSION_NAME Ljava/lang/String;
-	FIELD field_29734 RELEASE_TARGET Ljava/lang/String;
 	FIELD field_29735 RELEASE_TARGET_PROTOCOL_VERSION I
 	FIELD field_29737 SNBT_TOO_OLD_THRESHOLD I
 	FIELD field_29738 RESOURCE_PACK_VERSION I

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -1016,7 +1016,6 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_25184 toolRequired Z
 		FIELD field_38862 offsetType Lnet/minecraft/class_4970$class_2250;
 		METHOD <init> (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V
-			ARG 1 block
 			ARG 2 propertyMap
 			ARG 3 codec
 		METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z

mappings/net/minecraft/block/AbstractButtonBlock.mapping

@@ -9,7 +9,6 @@ CLASS net/minecraft/class_2269 net/minecraft/block/AbstractButtonBlock
 	FIELD field_10722 FLOOR_X_PRESSED_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10723 FLOOR_X_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10724 SOUTH_PRESSED_SHAPE Lnet/minecraft/class_265;
-	FIELD field_10725 wooden Z
 	FIELD field_10726 CEILING_Z_PRESSED_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10727 CEILING_Z_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10728 NORTH_SHAPE Lnet/minecraft/class_265;
@@ -17,14 +16,10 @@ CLASS net/minecraft/class_2269 net/minecraft/block/AbstractButtonBlock
 	FIELD field_10730 FLOOR_Z_PRESSED_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10731 WEST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10732 WEST_PRESSED_SHAPE Lnet/minecraft/class_265;
-	METHOD <init> (ZLnet/minecraft/class_4970$class_2251;)V
-		ARG 1 wooden
-		ARG 2 settings
 	METHOD method_21845 powerOn (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_26153 getPressTicks ()I
 	METHOD method_9712 getClickSound (Z)Lnet/minecraft/class_3414;
 		ARG 1 powered
 	METHOD method_9713 updateNeighbors (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V

mappings/net/minecraft/block/DoorBlock.mapping

@@ -8,20 +8,15 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock
 	FIELD field_10944 EAST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_10945 OPEN Lnet/minecraft/class_2746;
 	FIELD field_10946 HALF Lnet/minecraft/class_2754;
-	METHOD method_10032 getOpenSoundEventId ()I
 	METHOD method_10033 setOpen (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V
 		ARG 1 entity
 		ARG 2 world
 		ARG 3 state
 		ARG 4 pos
 		ARG 5 open
-	METHOD method_10034 getCloseSoundEventId ()I
 	METHOD method_10035 getHinge (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2750;
 		ARG 1 ctx
-	METHOD method_10036 playOpenCloseSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V
+	METHOD method_10036 playOpenCloseSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V
-		ARG 1 world
-		ARG 2 pos
-		ARG 3 open
 	METHOD method_24795 isWoodenDoor (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/block/PressurePlateBlock.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_2440 net/minecraft/block/PressurePlateBlock
 	FIELD field_11358 POWERED Lnet/minecraft/class_2746;
 	FIELD field_11359 type Lnet/minecraft/class_2440$class_2441;
-	METHOD <init> (Lnet/minecraft/class_2440$class_2441;Lnet/minecraft/class_4970$class_2251;)V
+	METHOD <init> (Lnet/minecraft/class_2440$class_2441;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
 		ARG 1 type
 		ARG 2 settings
 	CLASS class_2441 ActivationRule

mappings/net/minecraft/block/SculkSensorBlock.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock
-	FIELD field_28110 FREQUENCIES Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_28111 SCULK_SENSOR_PHASE Lnet/minecraft/class_2754;
 	FIELD field_28112 POWER Lnet/minecraft/class_2758;
 	FIELD field_28113 WATERLOGGED Lnet/minecraft/class_2746;
@@ -26,8 +25,6 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity
-	METHOD method_32906 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V
-		ARG 0 map
 	METHOD method_32907 getRange ()I
 	METHOD method_32908 getPhase (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5705;
 		ARG 0 state

mappings/net/minecraft/block/StoneButtonBlock.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_2517 net/minecraft/block/StoneButtonBlock

mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_2557 net/minecraft/block/WeightedPressurePlateBlock
 	FIELD field_11738 weight I
 	FIELD field_11739 POWER Lnet/minecraft/class_2758;
-	METHOD <init> (ILnet/minecraft/class_4970$class_2251;)V
+	METHOD <init> (ILnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
 		ARG 1 weight
 		ARG 2 settings

mappings/net/minecraft/block/WoodenButtonBlock.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_2571 net/minecraft/block/WoodenButtonBlock

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

@@ -29,8 +29,6 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 	METHOD method_42259 canIncreaseWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_42260 (Lnet/minecraft/class_7262;)I
-		ARG 0 manager
 	METHOD method_42261 increaseWarningLevel ()V
 	METHOD method_42263 (Lnet/minecraft/class_7262;)Ljava/lang/Integer;
 		ARG 0 manager

mappings/net/minecraft/class_7755.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_7755
+	METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630;

mappings/net/minecraft/class_7757.mapping

@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_7757
+	CLASS class_7632 IndexedMessageConsumer
+		METHOD accept (ILnet/minecraft/class_7557$class_7558;)V
+			ARG 1 index
+			ARG 2 message

mappings/net/minecraft/class_7764.mapping

@@ -0,0 +1,41 @@
+CLASS net/minecraft/class_7764
+	CLASS class_4728 Interpolation
+		FIELD field_21758 images [Lnet/minecraft/class_1011;
+		METHOD method_24128 apply (IILnet/minecraft/class_7764$class_7765;)V
+			COMMENT Linearly interpolate between the current and next frame on all mip levels
+			COMMENT based on the tick position within the current frame,
+			COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0).
+		METHOD method_24129 lerp (DII)I
+			COMMENT Purely mathematical single-value linear interpolation.
+			COMMENT {@code lerp(0, a, b) == b}, {@code lerp(1, a, b) == a}.
+			ARG 1 delta
+			ARG 3 to
+			ARG 4 from
+		METHOD method_24130 getPixelColor (Lnet/minecraft/class_7764$class_5790;IIII)I
+			COMMENT {@return the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates}
+			ARG 1 animation
+			ARG 2 frameIndex
+			ARG 3 layer
+			ARG 4 x
+			ARG 5 y
+	CLASS class_5790 Animation
+		FIELD field_28472 frames Ljava/util/List;
+		FIELD field_28473 frameCount I
+		METHOD <init> (Lnet/minecraft/class_7764;Ljava/util/List;IZ)V
+			ARG 2 frames
+			ARG 3 frameCount
+		METHOD method_33445 upload (II)V
+		METHOD method_33446 getFrameX (I)I
+			ARG 1 frame
+		METHOD method_33449 (Lnet/minecraft/class_7764$class_5791;)I
+			ARG 0 frame
+		METHOD method_33450 getDistinctFrameCount ()Ljava/util/stream/IntStream;
+		METHOD method_33451 getFrameY (I)I
+			ARG 1 frame
+		METHOD method_33455 upload (III)V
+	CLASS class_5791 AnimationFrame
+		FIELD field_28475 index I
+		FIELD field_28476 time I
+		METHOD <init> (II)V
+			ARG 1 index
+			ARG 2 time

mappings/net/minecraft/class_7784.mapping

@@ -0,0 +1,17 @@
+CLASS net/minecraft/class_7784
+	CLASS class_7489 PathResolver
+		FIELD field_39365 rootPath Ljava/nio/file/Path;
+		FIELD field_39366 directoryName Ljava/lang/String;
+		METHOD <init> (Lnet/minecraft/class_7784;Lnet/minecraft/class_7784$class_7490;Ljava/lang/String;)V
+			ARG 1 dataGenerator
+			ARG 2 outputType
+			ARG 3 directoryName
+		METHOD method_44107 resolveJson (Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
+			ARG 1 id
+		METHOD method_44108 resolve (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path;
+			ARG 1 id
+			ARG 2 fileExtension
+	CLASS class_7490 OutputType
+		FIELD field_39370 path Ljava/lang/String;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
+			ARG 3 path

mappings/net/minecraft/class_7791.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_7791
+	METHOD method_10399 generate (Ljava/util/function/BiConsumer;)V

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -56,7 +56,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_1697 runDirectory Ljava/io/File;
 		COMMENT The directory that stores options, worlds, resource packs, logs, etc.
 	FIELD field_1698 running Z
-	FIELD field_1699 currentServerEntry Lnet/minecraft/class_642;
 	FIELD field_1700 instance Lnet/minecraft/class_310;
 	FIELD field_1701 openProfilerSection Ljava/lang/String;
 	FIELD field_1702 toastManager Lnet/minecraft/class_374;
@@ -75,7 +74,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_1719 cameraEntity Lnet/minecraft/class_1297;
 	FIELD field_1720 versionType Ljava/lang/String;
 	FIELD field_1721 isDemo Z
-	FIELD field_1722 builtinPackProvider Lnet/minecraft/class_1066;
 	FIELD field_1723 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	FIELD field_1724 player Lnet/minecraft/class_746;
 		COMMENT Represents the client's own player.
@@ -119,7 +117,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		COMMENT
 		COMMENT @see MinecraftClient#setScreen(Screen)
 	FIELD field_1756 blockRenderManager Lnet/minecraft/class_776;
-	FIELD field_1757 resourcePackDir Ljava/io/File;
+	FIELD field_1757 resourcePackDir Ljava/nio/file/Path;
 	FIELD field_1758 tutorialManager Lnet/minecraft/class_1156;
 	FIELD field_1759 integratedServerRunning Z
 	FIELD field_1760 itemColors Lnet/minecraft/class_325;
@@ -184,7 +182,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 1 args
 	METHOD method_1476 checkIs64Bit ()Z
 	METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300;
-	METHOD method_1479 getResourcePackDir ()Ljava/io/File;
+	METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path;
 	METHOD method_1480 getItemRenderer ()Lnet/minecraft/class_918;
 	METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V
 		ARG 1 world
@@ -295,8 +293,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 0 tooltip
 	METHOD method_1582 getSkinProvider ()Lnet/minecraft/class_1071;
 	METHOD method_1583 doItemUse ()V
-	METHOD method_1584 setCurrentServerEntry (Lnet/minecraft/class_642;)V
-		ARG 1 serverEntry
 	METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32;
 	METHOD method_1587 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128;
 		ARG 1 report
@@ -340,22 +336,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 4 report
 	METHOD method_22683 getWindow ()Lnet/minecraft/class_1041;
 	METHOD method_22940 getBufferBuilders ()Lnet/minecraft/class_4599;
-	METHOD method_24038 createResourcePackProfile (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
-		ARG 0 name
-		ARG 1 displayName
-		ARG 2 alwaysEnabled
-		ARG 3 packFactory
-		ARG 4 metadata
-		ARG 5 insertionPosition
-		ARG 6 source
 	METHOD method_24040 (Ljava/util/Optional;)V
 		ARG 1 throwable
 	METHOD method_24041 setMipmapLevels (I)V
 		ARG 1 mipmapLevels
-	METHOD method_24042 createV3ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier;
-		ARG 0 packFactory
-	METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier;
-		ARG 0 packFactory
 	METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V
 		ARG 1 throwable
 	METHOD method_24228 (Ljava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V
@@ -497,9 +481,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_44256 getServicesSignatureVerifier ()Lnet/minecraft/class_7500;
 	METHOD method_44352 (Z)V
 		ARG 1 confirmed
-	METHOD method_44375 setCurrentServerEntry (Lnet/minecraft/class_4877;Ljava/lang/String;)V
-		ARG 1 server
-		ARG 2 address
 	METHOD method_44376 ensureAbuseReportContext (Lnet/minecraft/class_7569;)V
 		COMMENT Recreates and resets {@link #abuseReportContext} if {@code environment} has
 		COMMENT changed.

mappings/net/minecraft/client/RunArgs.mapping

@@ -20,7 +20,6 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs
 			ARG 2 resPackDir
 			ARG 3 assetDir
 			ARG 4 assetIndex
-		METHOD method_2788 getResourceIndex ()Lnet/minecraft/class_1064;
 	CLASS class_545 Game
 		FIELD field_25061 multiplayerDisabled Z
 		FIELD field_25062 onlineChatDisabled Z

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

@@ -21,8 +21,6 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 		ARG 1 id
 	METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327;
 	CLASS 1
-		METHOD method_18633 (Lnet/minecraft/class_2960;)Z
-			ARG 0 id
 		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/TextHandler.mapping

@@ -132,9 +132,6 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler
 		ARG 1 text
 		ARG 2 maxWidth
 		ARG 3 style
-	METHOD method_44918 getStyleMatchResults (Lnet/minecraft/class_5481;Ljava/util/function/Predicate;)Ljava/util/List;
-		ARG 1 text
-		ARG 2 stylePredicate
 	CLASS 1
 		FIELD field_24219 collector Lnet/minecraft/class_5222;
 	CLASS class_5226 LineWrappingCollector
@@ -202,15 +199,3 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler
 		METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2583;)V
 			ARG 1 literal
 			ARG 2 style
-	CLASS class_7623 MatchResult
-	CLASS class_7624 StylePredicateVisitor
-		FIELD field_39840 stylePredicate Ljava/util/function/Predicate;
-		FIELD field_39841 totalWidth F
-		FIELD field_39842 results Lcom/google/common/collect/ImmutableList$Builder;
-		FIELD field_39843 styleStartWidth F
-		FIELD field_39844 lastTestResult Z
-		METHOD <init> (Lnet/minecraft/class_5225;Ljava/util/function/Predicate;)V
-			ARG 2 stylePredicate
-		METHOD method_44919 getResults ()Ljava/util/List;
-		METHOD method_44920 onStyleMatchStart ()V
-		METHOD method_44921 onStyleMatchEnd ()V

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

@@ -1,17 +1,12 @@
 CLASS net/minecraft/class_391 net/minecraft/client/font/UnicodeTextureFont
-	FIELD field_2299 images Ljava/util/Map;
-	FIELD field_2300 template Ljava/lang/String;
 	FIELD field_2301 sizes [B
-	FIELD field_2302 resourceManager Lnet/minecraft/class_3300;
 	FIELD field_2303 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_3300;[BLjava/lang/String;)V
 		ARG 1 resourceManager
 		ARG 2 sizes
 		ARG 3 template
-	METHOD method_2041 getImageId (I)Lnet/minecraft/class_2960;
+	METHOD method_2041 getImageId (Ljava/lang/String;I)Lnet/minecraft/class_2960;
 		ARG 1 codePoint
-	METHOD method_2042 getGlyphImage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1011;
-		ARG 1 glyphId
 	METHOD method_2043 getStart (B)I
 		ARG 0 size
 	METHOD method_2044 getEnd (B)I

mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_766 net/minecraft/client/gui/RotatingCubeMapRenderer
 	FIELD field_4139 client Lnet/minecraft/class_310;
-	FIELD field_4140 time F
 	FIELD field_4141 cubeMap Lnet/minecraft/class_751;
 	METHOD <init> (Lnet/minecraft/class_751;)V
 		ARG 1 cubeMap

mappings/net/minecraft/client/gui/hud/ChatHud.mapping

@@ -12,13 +12,11 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud
 	FIELD field_2067 hasUnreadNewMessages Z
 	FIELD field_32180 MAX_MESSAGES I
 	FIELD field_39771 MISSING_MESSAGE_INDEX I
-	METHOD <init> (Lnet/minecraft/class_310;)V
-		ARG 1 client
 	METHOD method_1802 scroll (I)V
 		ARG 1 scroll
 	METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V
 		ARG 1 message
-	METHOD method_1805 render (Lnet/minecraft/class_4587;I)V
+	METHOD method_1805 render (Lnet/minecraft/class_4587;III)V
 		ARG 1 matrices
 		ARG 2 currentTick
 	METHOD method_1806 getWidth (D)I
@@ -53,7 +51,6 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud
 		ARG 1 mouseX
 		ARG 3 mouseY
 	METHOD method_41831 getDefaultUnfocusedHeight ()D
-	METHOD method_44047 getChatScreen ()Lnet/minecraft/class_408;
 	METHOD method_44718 isXInsideIndicatorIcon (DLnet/minecraft/class_303$class_7590;Lnet/minecraft/class_7591;)Z
 		ARG 1 x
 		ARG 3 line
@@ -72,12 +69,10 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud
 		ARG 3 mouseY
 	METHOD method_44724 toChatLineY (D)D
 		ARG 1 y
-	METHOD method_44725 getMessageIndex (D)I
+	METHOD method_44725 getMessageIndex (DD)I
-		ARG 1 y
 	METHOD method_44752 getLineHeight ()I
 	METHOD method_44811 addMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7469;Lnet/minecraft/class_7591;)V
 		ARG 1 message
-		ARG 2 signature
 		ARG 3 indicator
 	METHOD method_44812 hideMessage (Lnet/minecraft/class_7469;)V
 		ARG 1 signature

mappings/net/minecraft/client/gui/hud/InGameHud.mapping

@@ -78,9 +78,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	METHOD method_1750 getPlayerListHud ()Lnet/minecraft/class_355;
 	METHOD method_1751 (Lnet/minecraft/class_267;)Z
 		ARG 0 score
-	METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_4587;I)V
+	METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_4587;I)V
-		ARG 1 matrices
-		ARG 2 x
 	METHOD method_1753 render (Lnet/minecraft/class_4587;F)V
 		ARG 1 matrices
 		ARG 2 tickDelta

mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping

@@ -5,14 +5,11 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator
 	FIELD field_39758 NOT_SECURE_COLOR I
 	FIELD field_39759 MODIFIED_COLOR I
 	FIELD field_39761 CHAT_TAGS_TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_39788 SYSTEM_COLOR I
-	FIELD field_39922 FILTERED_TEXT Lnet/minecraft/class_2561;
 	METHOD comp_902 loggedName ()Ljava/lang/String;
 	METHOD method_44709 notSecure ()Lnet/minecraft/class_7591;
 	METHOD method_44710 modified (Ljava/lang/String;)Lnet/minecraft/class_7591;
 		ARG 0 originalText
 	METHOD method_44751 system ()Lnet/minecraft/class_7591;
-	METHOD method_45071 filtered ()Lnet/minecraft/class_7591;
 	CLASS class_7592 Icon
 		FIELD field_39764 u I
 		FIELD field_39765 v I

mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping

@@ -5,12 +5,10 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud
 	COMMENT
 	COMMENT <p>The current instance used by the client can be obtained by {@code
 	COMMENT MinecraftClient.getInstance().inGameHud.getPlayerListHud()}.
-	FIELD field_2152 showTime J
-		COMMENT The time, in milliseconds, when this HUD was last set to visible.
 	FIELD field_2153 header Lnet/minecraft/class_2561;
 	FIELD field_2154 footer Lnet/minecraft/class_2561;
 	FIELD field_2155 client Lnet/minecraft/class_310;
-	FIELD field_2156 ENTRY_ORDERING Lcom/google/common/collect/Ordering;
+	FIELD field_2156 ENTRY_ORDERING Ljava/util/Comparator;
 	FIELD field_2157 inGameHud Lnet/minecraft/class_329;
 	FIELD field_2158 visible Z
 	FIELD field_32205 MAX_ROWS I
@@ -23,7 +21,6 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud
 	FIELD field_32212 BLINKING_HEART_U I
 	FIELD field_32213 BLINKING_HALF_HEART_U I
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_329;)V
-		ARG 1 client
 		ARG 2 inGameHud
 	METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561;
 		COMMENT {@return the player name rendered by this HUD}
@@ -36,13 +33,10 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud
 	METHOD method_1920 clear ()V
 	METHOD method_1921 setVisible (Z)V
 		ARG 1 visible
-	METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILnet/minecraft/class_640;Lnet/minecraft/class_4587;)V
+	METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILjava/util/UUID;Lnet/minecraft/class_4587;)V
 		ARG 1 objective
 		ARG 2 y
 		ARG 3 player
-		ARG 4 startX
-		ARG 5 endX
-		ARG 6 entry
 		ARG 7 matrices
 	METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_640;)V
 		ARG 1 matrices
@@ -59,7 +53,3 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud
 		COMMENT the given player is in {@linkplain net.minecraft.world.GameMode#SPECTATOR spectator mode}.
 		ARG 1 entry
 		ARG 2 name
-	CLASS class_356 EntryOrderComparator
-		METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I
-			ARG 1 a
-			ARG 2 b

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

@@ -71,12 +71,6 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto
 		ARG 1 suggestions
 	METHOD method_30505 formatException (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;)Lnet/minecraft/class_5481;
 		ARG 0 exception
-	METHOD method_44277 getNodeAt (I)Lcom/mojang/brigadier/tree/CommandNode;
-		COMMENT {@return the command node at {@code cursor}}
-		ARG 1 cursor
-	METHOD method_44278 getNodeAt (ILcom/mojang/brigadier/context/CommandContextBuilder;)Lcom/mojang/brigadier/tree/CommandNode;
-		ARG 0 cursor
-		ARG 1 builder
 	METHOD method_44931 clearWindow ()V
 	METHOD method_44932 renderMessages (Lnet/minecraft/class_4587;)V
 		ARG 1 matrices
@@ -84,7 +78,6 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto
 		ARG 1 matrices
 		ARG 2 mouseX
 		ARG 3 mouseY
-	METHOD method_45028 getParse ()Lcom/mojang/brigadier/ParseResults;
 	CLASS class_464 SuggestionWindow
 		FIELD field_21630 lastNarrationIndex I
 		FIELD field_25709 suggestions Ljava/util/List;

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

@@ -1,19 +0,0 @@
-CLASS net/minecraft/class_7625 net/minecraft/client/gui/screen/ChatPreviewBackground
-	FIELD field_39845 MAX_FADE_TIME J
-	FIELD field_39846 previewText Lnet/minecraft/class_2561;
-	FIELD field_39847 currentFadeTime J
-	FIELD field_39848 lastRenderTime J
-	METHOD method_44922 init (J)V
-		ARG 1 currentTime
-	METHOD method_44923 computeRenderData (JLnet/minecraft/class_2561;)Lnet/minecraft/class_7625$class_7626;
-		ARG 1 currentTime
-		ARG 3 previewText
-	METHOD method_44924 computeRenderDataWithoutText (J)Lnet/minecraft/class_7625$class_7626;
-		ARG 1 timeDelta
-	METHOD method_44925 computeRenderDataWithText (JLnet/minecraft/class_2561;)Lnet/minecraft/class_7625$class_7626;
-		ARG 1 timeDelta
-		ARG 3 previewText
-	METHOD method_44926 toAlpha (J)F
-		ARG 0 timeDelta
-	CLASS class_7626 RenderData
-		FIELD field_39849 EMPTY Lnet/minecraft/class_7625$class_7626;

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

@@ -12,20 +12,7 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen
 	FIELD field_2389 chatLastMessage Ljava/lang/String;
 	FIELD field_32237 SHIFT_SCROLL_AMOUNT D
 	FIELD field_33953 USAGE_TEXT Lnet/minecraft/class_2561;
-	FIELD field_39341 PREVIEW_LEFT_MARGIN I
-	FIELD field_39342 PREVIEW_RIGHT_MARGIN I
-	FIELD field_39343 PREVIEW_BOTTOM_MARGIN I
-	FIELD field_39344 CHAT_PREVIEW_WARNING_TOAST_TITLE Lnet/minecraft/class_2561;
-	FIELD field_39345 CHAT_PREVIEW_WARNING_TOAST_TEXT Lnet/minecraft/class_2561;
-	FIELD field_39347 chatPreviewer Lnet/minecraft/class_7479;
 	FIELD field_39774 MAX_INDICATOR_TOOLTIP_WIDTH I
-	FIELD field_39850 chatPreviewMode Lnet/minecraft/class_7628;
-	FIELD field_39851 missingPreview Z
-	FIELD field_39852 chatPreviewBackground Lnet/minecraft/class_7625;
-	FIELD field_39853 PREVIEW_PENDING_COLOR I
-	FIELD field_39854 PREVIEW_CONSUMABLE_COLOR I
-	FIELD field_39855 CHAT_PREVIEW_INPUT_TEXT Lnet/minecraft/class_2561;
-	FIELD field_39856 EVENT_HIGHLIGHT_COLOR I
 	METHOD <init> (Ljava/lang/String;)V
 		ARG 1 originalChatText
 	METHOD method_2108 setText (Ljava/lang/String;)V
@@ -34,57 +21,12 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen
 		ARG 1 offset
 	METHOD method_23945 onChatFieldUpdate (Ljava/lang/String;)V
 		ARG 1 chatText
-	METHOD method_44050 getPreviewLeft ()I
-	METHOD method_44051 getPreviewRight ()I
 	METHOD method_44052 getTextStyleAt (DD)Lnet/minecraft/class_2583;
 		ARG 1 x
 		ARG 3 y
-	METHOD method_44053 renderChatPreview (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FZ)V
-		ARG 1 matrices
-		ARG 2 previewText
-		ARG 3 alpha
-		ARG 4 signable
 	METHOD method_44054 normalize (Ljava/lang/String;)Ljava/lang/String;
 		COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces}
 		ARG 1 chatText
-	METHOD method_44055 getPreviewTop (I)I
-		ARG 1 previewHeight
 	METHOD method_44056 sendMessage (Ljava/lang/String;Z)Z
 		ARG 1 chatText
 		ARG 2 addToHistory
-	METHOD method_44057 getPreviewHeight (Ljava/util/List;)I
-		ARG 1 lines
-	METHOD method_44058 getPreviewTextStyleAt (DD)Lnet/minecraft/class_2583;
-		ARG 1 x
-		ARG 3 y
-	METHOD method_44059 updatePreviewer (Ljava/lang/String;)V
-		ARG 1 chatText
-	METHOD method_44060 getChatPreviewer ()Lnet/minecraft/class_7479;
-	METHOD method_44061 shouldPreviewChat ()Z
-		COMMENT {@return whether the client and the server both allow chat previews}
-		COMMENT
-		COMMENT <p>To check if the client allows chat previews, check {@linkplain
-		COMMENT net.minecraft.client.option.GameOptions#getChatPreview the chat preview option}.
-		COMMENT To check if the server allows chat previews, check {@link
-		COMMENT net.minecraft.client.network.ServerInfo#shouldPreviewChat}.
-	METHOD method_44063 getPreviewWidth ()I
-	METHOD method_44064 getPreviewBottom ()I
-	METHOD method_44279 tryRequestPreview (Ljava/lang/String;)V
-		ARG 1 chatText
-	METHOD method_44280 tryRequestChatPreview (Ljava/lang/String;)V
-		ARG 1 chatText
-	METHOD method_44281 tryRequestCommandPreview (Ljava/lang/String;)V
-		ARG 1 chatText
-	METHOD method_44934 drawEventHighlight (Lnet/minecraft/class_4587;Lnet/minecraft/class_5481;II)V
-		ARG 1 matrices
-		ARG 2 text
-		ARG 3 y
-		ARG 4 alpha
-	METHOD method_44935 wrapPreviewText (Lnet/minecraft/class_2561;)Ljava/util/List;
-		ARG 1 preview
-	METHOD method_44936 (Lnet/minecraft/class_2583;)Z
-		ARG 0 style
-	METHOD method_44937 getPreviewText ()Lnet/minecraft/class_2561;
-	METHOD method_45029 getPreviewScreenText ()Lnet/minecraft/class_2561;
-		COMMENT {@return the text to show in the preview screen, or {@code null} if there is
-		COMMENT nothing to show}

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

@@ -18,7 +18,7 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen
 		ARG 1 parent
 	METHOD method_19800 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
-	METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;)V
+	METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V
 		ARG 1 client
 		ARG 2 address
 	METHOD method_2131 setStatus (Lnet/minecraft/class_2561;)V

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_423 net/minecraft/client/gui/screen/SleepingChatScreen
-	FIELD field_39902 stopSleepingButton Lnet/minecraft/class_4185;
 	METHOD method_19819 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_2180 stopSleeping ()V

mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping

@@ -21,7 +21,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	FIELD field_32341 SCROLLBAR_WIDTH I
 	FIELD field_32342 SCROLLBAR_HEIGHT I
 	FIELD field_32343 WHITE I
-	METHOD <init> (Lnet/minecraft/class_1657;)V
+	METHOD <init> (Lnet/minecraft/class_1657;Lnet/minecraft/class_7699;)V
 		ARG 1 player
 	METHOD method_15871 searchForTags (Ljava/lang/String;)V
 		ARG 1 id

mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping

@@ -1,20 +1,5 @@
 CLASS net/minecraft/class_498 net/minecraft/client/gui/screen/ingame/SignEditScreen
 	FIELD field_21525 model Lnet/minecraft/class_837$class_4702;
-	FIELD field_24285 text [Ljava/lang/String;
-	FIELD field_27390 signType Lnet/minecraft/class_4719;
-	FIELD field_3029 currentRow I
-	FIELD field_3030 ticksSinceOpened I
-	FIELD field_3031 sign Lnet/minecraft/class_2625;
-	FIELD field_3032 selectionManager Lnet/minecraft/class_3728;
 	METHOD <init> (Lnet/minecraft/class_2625;Z)V
 		ARG 1 sign
 		ARG 2 filtered
-	METHOD method_16205 (Ljava/lang/String;)V
-		ARG 1 text
-	METHOD method_2526 finishEditing ()V
-	METHOD method_2527 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
-	METHOD method_27611 (Ljava/lang/String;)Z
-		ARG 1 text
-	METHOD method_33890 (Lnet/minecraft/class_2625;ZI)Lnet/minecraft/class_2561;
-		ARG 2 row

mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping

@@ -1,14 +0,0 @@
-CLASS net/minecraft/class_7483 net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen
-	FIELD field_39348 TITLE Lnet/minecraft/class_2561;
-	FIELD field_39350 CHECK_MESSAGE Lnet/minecraft/class_2561;
-	FIELD field_39352 serverInfo Lnet/minecraft/class_642;
-	FIELD field_39433 parent Lnet/minecraft/class_437;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_642;)V
-		ARG 1 parent
-		ARG 2 serverInfo
-	METHOD method_44066 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
-	METHOD method_44067 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
-	METHOD method_44069 acknowledge ()V
-	METHOD method_44938 getWarningContent ()Lnet/minecraft/class_2561;

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/option/SoundOptionsScreen
-	FIELD field_37910 directionalAudioButton Lnet/minecraft/class_339;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 options

mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping

@@ -6,17 +6,16 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen
 	FIELD field_25469 parent Lnet/minecraft/class_437;
 	FIELD field_25472 availablePackList Lnet/minecraft/class_521;
 	FIELD field_25473 selectedPackList Lnet/minecraft/class_521;
-	FIELD field_25474 file Ljava/io/File;
+	FIELD field_25474 file Ljava/nio/file/Path;
 	FIELD field_25475 doneButton Lnet/minecraft/class_4185;
 	FIELD field_25786 UNKNOWN_PACK Lnet/minecraft/class_2960;
 	FIELD field_25787 directoryWatcher Lnet/minecraft/class_5375$class_5426;
 	FIELD field_25788 refreshTimeout J
 	FIELD field_25789 iconTextures Ljava/util/Map;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/io/File;Lnet/minecraft/class_2561;)V
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_2561;)V
 		ARG 1 parent
 		ARG 2 packManager
 		ARG 3 applier
-		ARG 4 file
 		ARG 5 title
 	METHOD method_29669 copyPacks (Lnet/minecraft/class_310;Ljava/util/List;Ljava/nio/file/Path;)V
 		ARG 0 client
@@ -50,10 +49,7 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen
 	CLASS class_5426 DirectoryWatcher
 		FIELD field_25790 watchService Ljava/nio/file/WatchService;
 		FIELD field_25791 path Ljava/nio/file/Path;
-		METHOD <init> (Ljava/io/File;)V
-			ARG 1 file
 		METHOD method_30292 pollForChange ()Z
-		METHOD method_30293 create (Ljava/io/File;)Lnet/minecraft/class_5375$class_5426;
+		METHOD method_30293 create (Ljava/nio/file/Path;)Lnet/minecraft/class_5375$class_5426;
-			ARG 0 file
 		METHOD method_30294 watchDirectory (Ljava/nio/file/Path;)V
 			ARG 1 path

mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping

@@ -92,7 +92,6 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
 	METHOD method_2604 isWide ()Z
 	METHOD method_2605 isOpen ()Z
 	METHOD method_2606 refreshTabButtons ()V
-	METHOD method_2607 close ()V
 	METHOD method_36485 isGuiOpen ()Z
 	METHOD method_37308 (Ljava/util/List;Lnet/minecraft/class_339;)V
 		ARG 1 button

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

@@ -5,7 +5,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	FIELD field_24588 moreOptionsDialog Lnet/minecraft/class_5292;
 	FIELD field_25477 dataPackTempDir Ljava/nio/file/Path;
 	FIELD field_25478 dataPacksButton Lnet/minecraft/class_4185;
-	FIELD field_25479 dataPackSettings Lnet/minecraft/class_5359;
+	FIELD field_25479 dataPackSettings Lnet/minecraft/class_7712;
 	FIELD field_25480 LOGGER Lorg/slf4j/Logger;
 	FIELD field_25792 packManager Lnet/minecraft/class_3283;
 	FIELD field_25898 GAME_MODE_TEXT Lnet/minecraft/class_2561;
@@ -33,9 +33,8 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	FIELD field_3205 createLevelButton Lnet/minecraft/class_4185;
 	FIELD field_32434 TEMP_DIR_PREFIX Ljava/lang/String;
 	FIELD field_37911 PREPARING_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_5359;Lnet/minecraft/class_5292;)V
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_7712;Lnet/minecraft/class_5292;)V
 		ARG 1 parent
-		ARG 2 dataPackSettings
 		ARG 3 moreOptionsDialog
 	METHOD method_19416 (Ljava/lang/String;)V
 		ARG 1 levelName
@@ -75,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_29691 (Z)V
-		ARG 1 confirmed
 	METHOD method_29692 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_29693 getDataPackTempDir ()Ljava/nio/file/Path;
@@ -103,33 +100,14 @@ 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_7193;)V
+	METHOD method_40212 create (Lnet/minecraft/class_437;Lnet/minecraft/class_1940;Lnet/minecraft/class_7193;Ljava/nio/file/Path;)Lnet/minecraft/class_525;
-		ARG 2 generatorOptionsHolder
-	METHOD method_37089 (Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object;
-		ARG 1 v
-		ARG 2 throwable
-	METHOD method_40209 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-		ARG 1 resourceManager
-		ARG 2 dataPackSettings
-	METHOD method_40211 (Lcom/mojang/serialization/DynamicOps;Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult;
-		ARG 1 json
-	METHOD method_40212 create (Lnet/minecraft/class_437;Lnet/minecraft/class_6904;Ljava/nio/file/Path;)Lnet/minecraft/class_525;
-		ARG 0 parent
-		ARG 1 source
-		ARG 2 path
 	METHOD method_40213 createLevelInfo (Z)Lnet/minecraft/class_1940;
 		ARG 1 debugWorld
-	METHOD method_41847 startServer ()V
+	METHOD method_41847 startServer (Lnet/minecraft/class_31$class_7729;Lnet/minecraft/class_7780;Lcom/mojang/serialization/Lifecycle;)V
 	METHOD method_41848 createSession ()Ljava/util/Optional;
-	METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;)Lnet/minecraft/class_7237$class_6906;
+	METHOD method_41849 createServerConfig (Lnet/minecraft/class_3283;Lnet/minecraft/class_7712;)Lnet/minecraft/class_7237$class_6906;
 		ARG 0 resourcePackManager
-		ARG 1 dataPackSettings
+	METHOD method_41851 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_525$class_7749;)Lnet/minecraft/class_7193;
-	METHOD method_41850 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_7193;
-		ARG 0 resourceManager
-		ARG 1 dataPackContents
-		ARG 2 dynamicRegistryManager
-		ARG 3 pair
-	METHOD method_41851 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_7193;
 		ARG 0 resourceManager
 		ARG 1 dataPackContents
 		ARG 2 dynamicRegistryManager
@@ -139,9 +117,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 		ARG 1 text
 	METHOD method_41853 (Ljava/nio/file/Path;)Z
 		ARG 1 path
-	METHOD method_41854 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-		ARG 0 resourceManager
-		ARG 1 dataPackSettings
 	METHOD method_41855 (Ljava/nio/file/Path;Ljava/nio/file/Path;)V
 		ARG 2 path
 	CLASS class_4539 Mode

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

@@ -5,9 +5,6 @@ CLASS net/minecraft/class_5293 net/minecraft/client/gui/screen/world/LevelScreen
 		ARG 2 generatorOptionsHolder
 	METHOD method_41856 createModifier (Lnet/minecraft/class_3232;)Lnet/minecraft/class_7193$class_7195;
 		ARG 0 config
-	METHOD method_41857 (Lnet/minecraft/class_3232;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285;
-		ARG 1 dynamicRegistryManager
-		ARG 2 generatorOptions
 	METHOD method_41858 (Lnet/minecraft/class_525;Lnet/minecraft/class_3232;)V
 		ARG 1 config
 	METHOD method_41859 (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437;
@@ -17,9 +14,6 @@ CLASS net/minecraft/class_5293 net/minecraft/client/gui/screen/world/LevelScreen
 		ARG 1 biomeEntry
 	METHOD method_41861 createModifier (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7193$class_7195;
 		ARG 0 biomeEntry
-	METHOD method_41862 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285;
-		ARG 1 dynamicRegistryManager
-		ARG 2 generatorOptions
 	METHOD method_41863 (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437;
 		ARG 0 parent
 		ARG 1 generatorOptionsHolder

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

@@ -30,7 +30,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions
 		ARG 1 parent
 		ARG 2 client
 		ARG 3 textRenderer
-	METHOD method_28096 getGeneratorOptionsHolder (Z)Lnet/minecraft/class_7193;
+	METHOD method_28096 getGeneratorOptionsHolder (ZZ)Lnet/minecraft/class_5285;
 		ARG 1 hardcore
 	METHOD method_28100 (Ljava/lang/String;)V
 		ARG 1 seedText
@@ -38,8 +38,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions
 		ARG 1 visible
 	METHOD method_29071 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lnet/minecraft/class_4185;)V
 		ARG 3 button
-	METHOD method_29073 importOptions (Lnet/minecraft/class_5285;)V
+	METHOD method_29073 importOptions (Lnet/minecraft/class_5285;Lnet/minecraft/class_7723;)V
-		ARG 1 generatorOptions
 	METHOD method_29700 getRegistryManager ()Lnet/minecraft/class_5455;
 	METHOD method_30510 seedToString (Ljava/util/OptionalLong;)Ljava/lang/String;
 		ARG 0 seed
@@ -60,7 +59,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions
 	METHOD method_37090 tickSeedTextField ()V
 	METHOD method_39664 (Lnet/minecraft/class_5676;)Lnet/minecraft/class_5250;
 		ARG 0 button
-	METHOD method_41867 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5285;)V
+	METHOD method_41867 (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7726;)V
 		ARG 1 result
 	METHOD method_41868 apply (Lnet/minecraft/class_7193$class_7194;)V
 		ARG 1 modifier
@@ -73,7 +72,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions
 		ARG 1 key
 	METHOD method_41872 isAmplified (Lnet/minecraft/class_6880;)Z
 		ARG 0 presetEntry
-	METHOD method_41873 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285;
+	METHOD method_41873 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7723;
 		ARG 1 generatorOptions
 	METHOD method_41874 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/List;
 		ARG 0 entryList
@@ -84,8 +83,6 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions
 		ARG 0 entries
 	METHOD method_41878 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561;
 		ARG 0 key
-	METHOD method_41879 (ZLjava/util/OptionalLong;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285;
-		ARG 2 generatorOptions
 	METHOD method_41882 getText (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561;
 		ARG 0 presetEntry
 	METHOD method_41883 (Lnet/minecraft/class_5321;)Z

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

@@ -3,13 +3,12 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl
 	FIELD field_3232 DIMENSION_COLORS Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;
 	FIELD field_3234 updater Lnet/minecraft/class_1257;
-	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_5285;)V
+	METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_2378;)V
 		ARG 1 callback
 		ARG 2 dataFixer
 		ARG 3 storageSession
 		ARG 4 levelInfo
 		ARG 5 eraseCache
-		ARG 6 generatorOptions
 	METHOD method_19938 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527;

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

@@ -57,8 +57,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid
 			ARG 2 levelList
 			ARG 3 level
 		METHOD method_20164 play ()V
-		METHOD method_20165 (Lnet/minecraft/class_6904;Ljava/nio/file/Path;Z)V
-			ARG 3 confirmed
 		METHOD method_20167 (ZZ)V
 			ARG 1 backup
 			ARG 2 eraseCache

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

@@ -1,8 +0,0 @@
-CLASS net/minecraft/class_444 net/minecraft/client/gui/widget/SoundSliderWidget
-	FIELD field_2622 category Lnet/minecraft/class_3419;
-	METHOD <init> (Lnet/minecraft/class_310;IILnet/minecraft/class_3419;I)V
-		ARG 1 client
-		ARG 2 x
-		ARG 3 y
-		ARG 4 category
-		ARG 5 width

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

@@ -5,10 +5,9 @@ CLASS net/minecraft/class_742 net/minecraft/client/network/AbstractClientPlayerE
 	FIELD field_3899 elytraYaw F
 	FIELD field_3900 elytraPitch F
 	FIELD field_3901 playerListEntry Lnet/minecraft/class_640;
-	METHOD <init> (Lnet/minecraft/class_638;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V
+	METHOD <init> (Lnet/minecraft/class_638;Lcom/mojang/authlib/GameProfile;)V
 		ARG 1 world
 		ARG 2 profile
-		ARG 3 publicKey
 	METHOD method_3117 getSkinTexture ()Lnet/minecraft/class_2960;
 	METHOD method_3118 getFovMultiplier ()F
 	METHOD method_3119 getCapeTexture ()Lnet/minecraft/class_2960;

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

@@ -1,69 +0,0 @@
-CLASS net/minecraft/class_7516 net/minecraft/client/network/ChatPreviewRequester
-	COMMENT Chat preview requester requests the server to preview a message.
-	COMMENT
-	COMMENT <p>A <strong>query</strong> is a request to the server to send the chat message preview.
-	COMMENT The previewer only sends the query if there is no query that is waiting for the response,
-	COMMENT or if the last query took more than {@value #LATEST_NEXT_QUERY_DELAY} milliseconds to
-	COMMENT respond. A query can be sent at most every {@value #EARLIEST_NEXT_QUERY_DELAY} milliseconds.
-	COMMENT
-	COMMENT @see ChatPreviewer
-	FIELD field_39423 EARLIEST_NEXT_QUERY_DELAY J
-		COMMENT How long the previewer should wait at a minimum before sending the next
-		COMMENT query in milliseconds. Is {@value}.
-	FIELD field_39424 LATEST_NEXT_QUERY_DELAY J
-		COMMENT How long the previewer can wait for the response at most before sending the next
-		COMMENT query in milliseconds. Is {@value}.
-	FIELD field_39425 client Lnet/minecraft/class_310;
-	FIELD field_39426 idIncrementor Lnet/minecraft/class_7516$class_7482;
-	FIELD field_39427 pendingResponseQuery Lnet/minecraft/class_7516$class_7480;
-		COMMENT The query that is waiting for the server to respond (i.e. the last query).
-		COMMENT Can be {@code null} if there is no such query.
-	FIELD field_39428 queryTime J
-		COMMENT The last time a query was sent.
-		COMMENT
-		COMMENT <p>The next query will be sent after {@value #EARLIEST_NEXT_QUERY_DELAY} to
-		COMMENT {@value #LATEST_NEXT_QUERY_DELAY} milliseconds; the actual delay depends on
-		COMMENT when the server responds to the query.
-	METHOD <init> (Lnet/minecraft/class_310;)V
-		ARG 1 client
-	METHOD method_44269 clear ()V
-	METHOD method_44270 handleResponse (I)Ljava/lang/String;
-		COMMENT {@return the response's original queried message, or {@code null} if the response
-		COMMENT is not for {@linkplain #pendingResponseQuery the current pending request}}
-		COMMENT
-		COMMENT <p>If the response is valid, this will also clear {@link #pendingResponseQuery}.
-		ARG 1 id
-	METHOD method_44271 shouldRequest (J)Z
-		COMMENT {@return whether the delay for querying has passed}
-		COMMENT
-		COMMENT <p>The previewer only sends the query if there is no query that is waiting for the response,
-		COMMENT or if the last query took more than {@value #LATEST_NEXT_QUERY_DELAY} milliseconds to
-		COMMENT respond. A query can be sent at most every {@value #EARLIEST_NEXT_QUERY_DELAY} milliseconds.
-		ARG 1 currentTime
-	METHOD method_44272 tryRequest (Ljava/lang/String;J)Z
-		COMMENT Sends the request to preview {@code message}, if there isn't already one and
-		COMMENT if the delay has passed.
-		COMMENT
-		COMMENT @return {@code false} if the request could not be sent due to the delay, otherwise
-		COMMENT {@code true}
-		ARG 1 message
-		ARG 2 currentTime
-	METHOD method_44273 hasPendingResponseQuery ()Z
-		COMMENT {@return whether the requester has a query that is waiting for the server to respond}
-	CLASS class_7480 Query
-		COMMENT A query, or a request, to the server to send the chat message preview.
-		FIELD comp_825 message Ljava/lang/String;
-			COMMENT the queried message to preview
-		METHOD comp_825 message ()Ljava/lang/String;
-		METHOD method_44043 idEquals (I)Z
-			ARG 1 id
-		METHOD method_44044 messageEquals (Ljava/lang/String;)Z
-			COMMENT {@return whether the query's queried message equals {@code message}}
-			ARG 1 message
-	CLASS class_7482 IdIncrementor
-		COMMENT A utility class that increments the ID by a random number from 0 to 99.
-		FIELD field_39335 MAX_INCREMENT I
-		FIELD field_39336 random Lnet/minecraft/class_5819;
-		FIELD field_39337 current I
-		METHOD method_44046 next ()I
-			COMMENT {@return the next ID}

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

@@ -1,95 +0,0 @@
-CLASS net/minecraft/class_7479 net/minecraft/client/network/ChatPreviewer
-	COMMENT Chat previewer manages the chat preview. Chat previewer is created per
-	COMMENT {@link net.minecraft.client.gui.screen.ChatScreen}, so closing the chat screen and
-	COMMENT reopening it would create a new chat previewer. {@link ChatPreviewRequester}
-	COMMENT handles the actual requesting.
-	COMMENT
-	COMMENT <p>The response to the query can be "consumed" by calling {@link #tryConsumeResponse}.
-	COMMENT If the response is still valid (i.e. the input has not changed since the query was sent),
-	COMMENT consuming the response will return the response and clear it. Note that to prevent race
-	COMMENT condition between the player sending the chat message and the response's arrival, responses
-	COMMENT can only be consumed after the cooldown (by default, {@value #CONSUME_COOLDOWN} milliseconds)
-	COMMENT has passed. It is also possible to get the response text without consuming by calling
-	COMMENT {@link #getPreviewText}.
-	FIELD field_39328 CONSUME_COOLDOWN J
-		COMMENT How long the previewer should wait before consuming the response since the response
-		COMMENT arrived at the client in milliseconds. Is {@value}.
-		COMMENT
-		COMMENT @see #tryConsumeResponse
-	FIELD field_39334 lastResponse Lnet/minecraft/class_7479$class_7481;
-	FIELD field_39430 lastPreviewedMessage Ljava/lang/String;
-	FIELD field_39431 pendingRequestMessage Ljava/lang/String;
-		COMMENT The message that is waiting for the previewer to request (i.e. the next query to be sent).
-		COMMENT Can be {@code null} if there is no such query.
-		COMMENT
-		COMMENT @implNote If the message is sent instantly, this field is not set.
-	FIELD field_39432 requester Lnet/minecraft/class_7516;
-	METHOD <init> (Lnet/minecraft/class_310;)V
-		ARG 1 client
-	METHOD method_44031 tryRequestPending ()V
-		COMMENT Sends the message that was waiting for its request delay to pass, if it is able to.
-	METHOD method_44032 onResponse (ILnet/minecraft/class_2561;)V
-		COMMENT Called when the preview response was received.
-		COMMENT
-		COMMENT @implNote This sets the last response if the requester {@linkplain
-		COMMENT ChatPreviewRequester#handleResponse successfully handled} the response.
-		ARG 1 id
-		ARG 2 previewText
-	METHOD method_44036 clear ()V
-		COMMENT Clears the last response and the requester's state.
-	METHOD method_44037 tryConsumeResponse (Ljava/lang/String;)Lnet/minecraft/class_7479$class_7481;
-		COMMENT {@return the consumed response text, or {@code null} if the server responded as such, or
-		COMMENT if the response could not be consumed}
-		COMMENT
-		COMMENT <p>If the response is still valid (i.e. the input has not changed since the query was sent),
-		COMMENT consuming the response will return the response and clear it. Note that to prevent race
-		COMMENT condition between the player sending the chat message and the response's arrival, responses
-		COMMENT can only be consumed after the cooldown (by default, {@value #CONSUME_COOLDOWN} milliseconds)
-		COMMENT has passed. It is also possible to get the response text without consuming by calling
-		COMMENT {@link #getPreviewText}.
-		ARG 1 message
-	METHOD method_44038 getPreviewText ()Lnet/minecraft/class_7479$class_7481;
-		COMMENT {@return the preview text (also known as the last response text), or {@code null}
-		COMMENT if the server responded as such}
-		COMMENT
-		COMMENT <p>This does not consume the response.
-	METHOD method_44039 normalize (Ljava/lang/String;)Ljava/lang/String;
-		COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces}
-		ARG 0 message
-	METHOD method_44274 tryRequest (Ljava/lang/String;)V
-		COMMENT Tries to send the request to preview {@code message}. If the delay has passed,
-		COMMENT it will send instantly; otherwise, it will set {@link #pendingRequestMessage} which
-		COMMENT can be requested by calling {@link #tryRequestPending()}.
-		ARG 1 message
-	METHOD method_44275 disablePreview ()V
-		COMMENT Clears this previewer.
-	METHOD method_44276 tryRequestInternal (Ljava/lang/String;)V
-		ARG 1 message
-	METHOD method_44927 equalsLastPreviewed (Ljava/lang/String;)Z
-		COMMENT {@return whether normalized {@code text} equals the last previewed text}
-		ARG 1 text
-	METHOD method_44928 cannotConsumePreview ()Z
-		COMMENT {@return whether the previewer cannot consume the preview (because the preview
-		COMMENT response hasn't arrived or because of the cooldown)}
-	CLASS class_7481 Response
-		COMMENT A response to the preview query.
-		FIELD comp_826 receptionTimestamp J
-		FIELD comp_827 Ljava/lang/String;
-			COMMENT the message that was queried to preview
-		FIELD comp_828 previewText Lnet/minecraft/class_2561;
-		METHOD comp_826 receptionTimestamp ()J
-		METHOD comp_828 previewText ()Lnet/minecraft/class_2561;
-		METHOD method_44045 canConsume (Ljava/lang/String;)Z
-			COMMENT {@return whether the response can be consumed for the {@code message}}
-			COMMENT
-			COMMENT <p>This returns {@code true} if the {@code message} equals the queried message and
-			COMMENT the cooldown has passed.
-			ARG 1 message
-		METHOD method_44929 queryEquals (Ljava/lang/String;)Z
-			COMMENT {@return whether normalized {@code query} equals the response query}
-			ARG 1 query
-		METHOD method_44930 hasCooldownPassed ()Z
-			COMMENT {@return the cooldown for consuming the preview has passed}
-			COMMENT
-			COMMENT @see #canConsume
-			COMMENT @see ChatPreviewer#tryConsumeResponse

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

@@ -5,11 +5,9 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan
 	FIELD field_3709 profile Lcom/mojang/authlib/GameProfile;
 	FIELD field_3710 LOGGER Lorg/slf4j/Logger;
 	FIELD field_3711 statusConsumer Ljava/util/function/Consumer;
-	METHOD <init> (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_437;Ljava/util/function/Consumer;)V
+	METHOD <init> (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_7818;Lnet/minecraft/class_642;Lnet/minecraft/class_437;Ljava/util/function/Consumer;)V
 		ARG 1 connection
 		ARG 2 client
-		ARG 3 parentGui
-		ARG 4 statusConsumer
 	METHOD method_2891 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	METHOD method_2892 joinServerSession (Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 1 serverId

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

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_16771 sessionId Ljava/util/UUID;
 	FIELD field_19144 chunkLoadDistance I
 	FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271;
-	FIELD field_25063 registryManager Lnet/minecraft/class_5455$class_6890;
+	FIELD field_25063 registryManager Lnet/minecraft/class_7780;
 	FIELD field_25273 worldKeys Ljava/util/Set;
 	FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561;
 	FIELD field_34963 telemetrySender Lnet/minecraft/class_6628;
@@ -21,21 +21,12 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_3700 advancementHandler Lnet/minecraft/class_632;
 	FIELD field_3701 loginScreen Lnet/minecraft/class_437;
 	FIELD field_39808 messagePacker Lnet/minecraft/class_7610$class_7612;
-	FIELD field_39857 MAX_PENDING_ACKNOWLEDGMENTS I
 	FIELD field_39858 lastSeenMessagesCollector Lnet/minecraft/class_7637;
-	FIELD field_39859 lastReceivedMessage Ljava/util/Optional;
-	FIELD field_39860 pendingAcknowledgments I
-		COMMENT The number of messages whose acknowledgments aren't sent to the server yet.
-		COMMENT They are sent when the count reaches {@value #MAX_PENDING_ACKNOWLEDGMENTS}
-		COMMENT or when the client sends a message, and this count is reset to zero in those cases.
 	FIELD field_39916 UNSECURE_SERVER_TOAST_TITLE Lnet/minecraft/class_2561;
 	FIELD field_39917 UNSECURE_SERVER_TOAST_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lnet/minecraft/class_7818;Lnet/minecraft/class_642;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V
-		ARG 1 client
 		ARG 2 screen
 		ARG 3 connection
-		ARG 4 profile
-		ARG 5 telemetrySender
 	METHOD method_16690 getSessionId ()Ljava/util/UUID;
 	METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
 		ARG 0 player
@@ -121,17 +112,10 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 1 entity
 	METHOD method_43331 resolveUrl (Ljava/lang/String;)Ljava/net/URL;
 		ARG 0 url
-	METHOD method_44071 (Lnet/minecraft/class_642;Ljava/lang/String;)V
+	METHOD method_44071 (Ljava/lang/String;)V
 		ARG 1 favicon
-	METHOD method_44072 (Lnet/minecraft/class_642;Lnet/minecraft/class_2561;)V
+	METHOD method_44072 (Lnet/minecraft/class_2561;)V
 		ARG 1 description
-	METHOD method_44816 getMessagePacker ()Lnet/minecraft/class_7610$class_7612;
 	METHOD method_44940 acknowledge (Lnet/minecraft/class_7471;Z)V
 		ARG 1 message
 		ARG 2 displayed
-	METHOD method_44941 consumeAcknowledgment ()Lnet/minecraft/class_7635$class_7636;
-		COMMENT {@return the consumed acknowledgment}
-		COMMENT
-		COMMENT <p>This resets {@link #pendingAcknowledgments} to {@code 0}.
-		COMMENT
-		COMMENT @see #pendingAcknowledgments

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

@@ -64,7 +64,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 	METHOD method_30674 wouldCollideAt (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
 	METHOD method_3130 getRecipeBook ()Lnet/minecraft/class_299;
-	METHOD method_3131 hasJumpingMount ()Z
 	METHOD method_3132 openRidingInventory ()V
 	METHOD method_3133 startRidingJump ()V
 	METHOD method_3134 isCamera ()Z
@@ -96,67 +95,5 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 	METHOD method_3149 isAutoJumpEnabled ()Z
 	METHOD method_3151 getMountJumpStrength ()F
 	METHOD method_33689 init ()V
-	METHOD method_43609 signChatMessage (Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7469;
-		COMMENT Signs the chat message. If the chat message cannot be signed, this will return
-		COMMENT {@link MessageSignatureData#EMPTY}.
-		ARG 1 metadata
-		ARG 2 content
-		ARG 3 lastSeenMessages
-	METHOD method_43786 signArguments (Lnet/minecraft/class_7470;Lcom/mojang/brigadier/ParseResults;Lnet/minecraft/class_2561;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7450;
-		COMMENT Signs the command arguments. If the arguments cannot be signed or if there is no
-		COMMENT arguments to sign, this will return {@link ArgumentSignatureDataMap#EMPTY}.
-		ARG 1 signer
-		ARG 2 parseResults
-		ARG 3 preview
-			COMMENT the previewed argument value; if supplied, will be used for all signed arguments
-		ARG 4 lastSeenMessages
-	METHOD method_43787 sendCommandInternal (Ljava/lang/String;Lnet/minecraft/class_2561;)V
-		COMMENT Signs and sends {@code command} to the server.
-		ARG 1 command
-		ARG 2 preview
-	METHOD method_44096 sendChatMessage (Ljava/lang/String;Lnet/minecraft/class_2561;)V
-		COMMENT Sends a chat message with the preview to the server. If the server could not
-		COMMENT reproduce the preview based on {@code message}, the server rejects the message.
-		COMMENT
-		COMMENT <p>The message will be truncated to at most 256 characters before
-		COMMENT sending to the server.
-		COMMENT
-		COMMENT <p>If the message contains an invalid character (see {@link
-		COMMENT net.minecraft.SharedConstants#isValidChar}), the server will
-		COMMENT reject the message and disconnect the client.
-		COMMENT
-		COMMENT @apiNote This method is used to send a message typed in {@linkplain
-		COMMENT net.minecraft.client.gui.screen the chat screen} that has a preview.
-		ARG 1 message
-		ARG 2 preview
-	METHOD method_44097 sendChatMessageInternal (Ljava/lang/String;Lnet/minecraft/class_2561;)V
-		ARG 1 message
-		ARG 2 preview
-	METHOD method_44098 sendCommand (Ljava/lang/String;Lnet/minecraft/class_2561;)V
-		COMMENT Signs and sends {@code command} to the server.
-		ARG 1 command
-			COMMENT the command (without the leading slash)
-		ARG 2 preview
-	METHOD method_44099 sendCommand (Ljava/lang/String;)Z
-		COMMENT Sends an unsigned command to the server. This fails for commands that
-		COMMENT {@linkplain #hasSignedArgument have signed arguments}.
-		COMMENT
-		COMMENT @see #sendCommand(String, Text)
-		COMMENT @return whether the command was sent successfully
-		ARG 1 command
-			COMMENT the command (without the leading slash)
-	METHOD method_44297 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7635;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7469;
-		ARG 5 argumentName
-		ARG 6 value
-	METHOD method_44826 createMessageMetadata ()Lnet/minecraft/class_7470;
-	METHOD method_44970 hasSignedArgument (Ljava/lang/String;)Z
-		COMMENT {@return whether {@code command} contains a signed argument}
-		COMMENT
-		COMMENT @see ArgumentSignatureDataMap#hasSignedArgument
-		ARG 1 command
-			COMMENT the command (without the leading slash)
-	METHOD method_45081 toDecoratedContents (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7634;
-		ARG 1 message
-		ARG 2 preview
 	METHOD method_7290 dropSelectedItem (Z)Z
 		ARG 1 entireStack

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

@@ -10,9 +10,6 @@ CLASS net/minecraft/class_1134 net/minecraft/client/network/LanServerQueryManage
 	CLASS class_1136 LanServerEntryList
 		FIELD field_5536 serverEntries Ljava/util/List;
 		FIELD field_5537 dirty Z
-		METHOD method_4823 needsUpdate ()Z
 		METHOD method_4824 addServer (Ljava/lang/String;Ljava/net/InetAddress;)V
 			ARG 1 announcement
 			ARG 2 address
-		METHOD method_4825 markClean ()V
-		METHOD method_4826 getServers ()Ljava/util/List;

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

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
-	FIELD field_3736 health I
-	FIELD field_3737 lastHealthTime J
-	FIELD field_3738 lastHealth I
 	FIELD field_3739 latency I
 	FIELD field_3740 texturesLoaded Z
 	FIELD field_3741 profile Lcom/mojang/authlib/GameProfile;
@@ -9,15 +6,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
 	FIELD field_3743 displayName Lnet/minecraft/class_2561;
 	FIELD field_3744 gameMode Lnet/minecraft/class_1934;
 	FIELD field_3745 model Ljava/lang/String;
-	FIELD field_3746 showTime J
-	FIELD field_3747 blinkingHeartTime J
-	FIELD field_39072 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39073 publicKeyData Lnet/minecraft/class_7428;
 	FIELD field_39809 messageVerifier Lnet/minecraft/class_7615;
-	METHOD <init> (Lnet/minecraft/class_2703$class_2705;Lnet/minecraft/class_7500;Z)V
-		ARG 1 playerListPacketEntry
-		ARG 2 servicesSignatureVerifier
-		ARG 3 secureChatEnforced
 	METHOD method_2955 getScoreboardTeam ()Lnet/minecraft/class_268;
 	METHOD method_2956 (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V
 		ARG 1 type
@@ -26,16 +15,10 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
 	METHOD method_2957 getElytraTexture ()Lnet/minecraft/class_2960;
 	METHOD method_2958 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_2959 getLatency ()I
-	METHOD method_2960 getHealth ()I
-	METHOD method_2961 getBlinkingHeartTime ()J
 	METHOD method_2962 setDisplayName (Lnet/minecraft/class_2561;)V
 		ARG 1 displayName
 	METHOD method_2963 setGameMode (Lnet/minecraft/class_1934;)V
 		ARG 1 gameMode
-	METHOD method_2964 setShowTime (J)V
-		ARG 1 showTime
-	METHOD method_2965 setHealth (I)V
-		ARG 1 health
 	METHOD method_2966 getProfile ()Lcom/mojang/authlib/GameProfile;
 	METHOD method_2967 hasSkinTexture ()Z
 		COMMENT Checks if the player represented by this entry has a custom skin.
@@ -46,17 +29,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
 	METHOD method_2970 setLatency (I)V
 		ARG 1 latency
 	METHOD method_2971 getDisplayName ()Lnet/minecraft/class_2561;
-	METHOD method_2972 setLastHealth (I)V
-		ARG 1 lastHealth
-	METHOD method_2973 getLastHealth ()I
-	METHOD method_2974 getLastHealthTime ()J
-	METHOD method_2975 setBlinkingHeartTime (J)V
-		ARG 1 blinkingHeartTime
-	METHOD method_2976 getShowTime ()J
 	METHOD method_2977 getModel ()Ljava/lang/String;
-	METHOD method_2978 setLastHealthTime (J)V
-		ARG 1 lastHealthTime
 	METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960;
 	METHOD method_35757 hasCape ()Z
-	METHOD method_43598 getPublicKeyData ()Lnet/minecraft/class_7428;
 	METHOD method_44817 getMessageVerifier ()Lnet/minecraft/class_7615;

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

@@ -19,9 +19,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo
 	FIELD field_3761 address Ljava/lang/String;
 	FIELD field_3762 playerListSummary Ljava/util/List;
 	FIELD field_3763 local Z
-	FIELD field_39355 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39356 chatPreview Lnet/minecraft/class_642$class_7484;
-	FIELD field_39436 temporaryChatPreviewState Z
 	FIELD field_39918 secureChatEnforced Z
 	METHOD <init> (Ljava/lang/String;Ljava/lang/String;Z)V
 		ARG 1 name
@@ -44,24 +41,10 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo
 		ARG 1 resourcePackPolicy
 	METHOD method_2996 copyWithSettingsFrom (Lnet/minecraft/class_642;)V
 		ARG 1 serverInfo
-	METHOD method_44077 (Lnet/minecraft/class_642;Lnet/minecraft/class_642$class_7484;)V
-		ARG 1 chatPreview
 	METHOD method_44078 parseFavicon (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 favicon
-	METHOD method_44079 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
-		ARG 1 chatPreview
-	METHOD method_44080 setPreviewsChat (Z)V
-		COMMENT Sets whether the chat preview is enabled. This affects the saved server info;
-		COMMENT to disable the chat preview temporarily use {@link #setTemporaryChatPreviewState}.
-		ARG 1 enabled
-	METHOD method_44081 getChatPreview ()Lnet/minecraft/class_642$class_7484;
-	METHOD method_44082 shouldPreviewChat ()Z
 	METHOD method_44292 copyFrom (Lnet/minecraft/class_642;)V
 		ARG 1 serverInfo
-	METHOD method_44293 setTemporaryChatPreviewState (Z)V
-		COMMENT Sets the temporary chat preview state. Unlike {@link #setPreviewsChat}, this
-		COMMENT does not affect the saved server info.
-		ARG 1 temporaryChatPreviewState
 	METHOD method_45055 setSecureChatEnforced (Z)V
 		ARG 1 secureChatEnforced
 	METHOD method_45056 isSecureChatEnforced ()Z
@@ -83,23 +66,3 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
 		METHOD method_2997 getName ()Lnet/minecraft/class_2561;
-	CLASS class_7484 ChatPreview
-		FIELD field_39357 CODEC Lcom/mojang/serialization/Codec;
-		FIELD field_39358 acknowledged Z
-		FIELD field_39359 toastShown Z
-		METHOD <init> (ZZ)V
-			ARG 1 acknowledged
-			ARG 2 toastShown
-		METHOD method_44083 setAcknowledged ()V
-		METHOD method_44084 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-			ARG 0 instance
-		METHOD method_44085 (Lnet/minecraft/class_642$class_7484;)Ljava/lang/Boolean;
-			ARG 0 chatPreview
-		METHOD method_44086 showToast ()Z
-			COMMENT If the chat preview toast is never shown, returns {@code true} and marks that the
-			COMMENT toast was shown; otherwise, returns {@code false}.
-		METHOD method_44087 (Lnet/minecraft/class_642$class_7484;)Ljava/lang/Boolean;
-			ARG 0 chatPreview
-		METHOD method_44088 isAcknowledged ()Z
-			COMMENT {@return whether the player acknowledged the chat preview warning}
-		METHOD method_44089 copy ()Lnet/minecraft/class_642$class_7484;

mappings/net/minecraft/client/network/message/MessageHandler.mapping

@@ -4,14 +4,9 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 	FIELD field_39796 delayedMessages Ljava/util/Deque;
 	FIELD field_39797 chatDelay J
 	FIELD field_39798 lastProcessTime J
-	FIELD field_39904 CHAT_VALIDATION_FAILED_DISCONNECT_REASON Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
-	METHOD method_44731 getPlayerListEntry (Ljava/util/UUID;)Lnet/minecraft/class_640;
+	METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7595;
-		COMMENT {@return the player list entry for {@code sender}, or {@code null} if the sender's
-		COMMENT UUID did not correspond to any known players}
-		ARG 1 sender
-	METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Ljava/time/Instant;)Lnet/minecraft/class_7595;
 		COMMENT {@return the trust status of {@code message}}
 		COMMENT
 		COMMENT <p>This returns {@link MessageTrustStatus#SECURE} for messages that are
@@ -21,17 +16,6 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		COMMENT @see MessageTrustStatus#getStatus
 		ARG 1 message
 		ARG 2 decorated
-		ARG 3 senderEntry
-		ARG 4 receptionTimestamp
-	METHOD method_44733 onChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;)V
-		COMMENT Called when a chat message is received.
-		COMMENT
-		COMMENT <p>This enqueues the message to be processed after the chat delay set in
-		COMMENT options, if any.
-		COMMENT
-		COMMENT @see #processChatMessage
-		ARG 1 message
-		ARG 2 params
 	METHOD method_44734 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID;
 		ARG 1 text
 	METHOD method_44735 addToChatLog (Lnet/minecraft/class_2561;Ljava/time/Instant;)V
@@ -43,10 +27,9 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		COMMENT <p>Game messages ignore chat delay.
 		ARG 1 message
 		ARG 2 overlay
-	METHOD method_44737 addToChatLog (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_640;Lnet/minecraft/class_7595;)V
+	METHOD method_44737 addToChatLog (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7595;)V
 		ARG 1 message
 		ARG 2 params
-		ARG 3 senderEntry
 		ARG 4 trustStatus
 	METHOD method_44738 isAlwaysTrusted (Ljava/util/UUID;)Z
 		COMMENT {@return whether messages from {@code sender} are always trusted}
@@ -60,33 +43,6 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		COMMENT Sets the chat delay to {@code chatDelay} seconds. If the chat delay was changed
 		COMMENT to {@code 0}, this also processes all queued messages.
 		ARG 1 chatDelay
-	METHOD method_44767 processProfilelessMessage (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Z
-		COMMENT Processes a message that is sent as chat message but lacks the sender.
-		COMMENT
-		COMMENT <p>This is usually a message sent via commands executed from {@code /execute}
-		COMMENT command.
-		COMMENT
-		COMMENT <p>This adds the message to the hud, narrates it, and appends it to the
-		COMMENT chat log. The message is not verified.
-		ARG 1 params
-		ARG 2 message
-		ARG 3 decorated
-	METHOD method_44768 processChatMessage (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;ZLjava/time/Instant;)Z
-		COMMENT Processes a chat message and sends acknowledgment to the server.
-		COMMENT
-		COMMENT <p>The message can still end up not being displayed if the verification
-		COMMENT fails and {@code onlyShowSecureChat} is {@code true} or if the sender is
-		COMMENT blocked via the social interactions screen.
-		COMMENT
-		COMMENT @return whether the message was actually displayed
-		COMMENT @see #processChatMessageInternal
-		ARG 1 params
-		ARG 2 message
-		ARG 3 decorated
-		ARG 4 senderEntry
-		ARG 5 onlyShowSecureChat
-		ARG 6 receptionTimestamp
-			COMMENT the timestamp when the message was received by this client
 	METHOD method_44769 process ()V
 		COMMENT Processes one delayed message from the queue's beginning.
 	METHOD method_44772 narrate (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2561;)V
@@ -97,10 +53,9 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		ARG 2 message
 	METHOD method_44775 shouldDelay ()Z
 		COMMENT {@return if the chat delay is set and the message should be delayed}
-	METHOD method_44818 process (Lnet/minecraft/class_7594$class_7627;)V
+	METHOD method_44818 process (Lnet/minecraft/class_7469;Ljava/util/function/BooleanSupplier;)V
 		COMMENT Queues {@code processor} during {@linkplain #shouldDelay the chat delay},
 		COMMENT otherwise runs the processor.
-		ARG 1 message
 	METHOD method_44819 removeDelayedMessage (Lnet/minecraft/class_7469;)Z
 		COMMENT Removes a delayed message whose signature matches {@code signature}.
 		COMMENT If this returns {@code false}, either the message is not received or it it
@@ -108,36 +63,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		COMMENT
 		COMMENT @return whether the message was removed
 		ARG 1 signature
-	METHOD method_44820 onMessageHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V
+	METHOD method_44943 processChatMessageInternal (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lcom/mojang/authlib/GameProfile;ZLjava/time/Instant;)Z
-		COMMENT Called when a message header is received.
-		COMMENT
-		COMMENT <p>Message header is received instead of the full message when a message is censored
-		COMMENT or when the message is originally sent without metadata due to it being originated from
-		COMMENT entities. This is to keep the integrity of the "message chain".
-		ARG 1 header
-		ARG 2 signature
-		ARG 3 bodyDigest
-	METHOD method_44821 processHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Z
-		COMMENT Processes a received message header.
-		COMMENT
-		COMMENT <p>Message header is received instead of the full message when a message is censored
-		COMMENT or when the message is originally sent without metadata due to it being originated from
-		COMMENT entities. This is to keep the integrity of the "message chain".
-		COMMENT
-		COMMENT <p>If the header cannot be verified due to a broken chain, this disconnects
-		COMMENT the client from the server.
-		COMMENT
-		COMMENT <p>This adds the header to the chat log.
-		ARG 1 header
-		ARG 2 signature
-		ARG 3 bodyDigest
-	METHOD method_44822 addToChatLog (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V
-		ARG 1 header
-		ARG 2 signatures
-		ARG 3 bodyDigest
-	METHOD method_44942 (Lnet/minecraft/class_7594$class_7627;)V
-		ARG 0 message
-	METHOD method_44943 processChatMessageInternal (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;ZLjava/time/Instant;)Z
 		COMMENT Processes a chat message.
 		COMMENT
 		COMMENT <p>If the message cannot be verified due to a broken chain, this disconnects
@@ -154,7 +80,6 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		ARG 1 params
 		ARG 2 message
 		ARG 3 decorated
-		ARG 4 senderEntry
 		ARG 5 onlyShowSecureChat
 		ARG 6 receptionTimestamp
 			COMMENT the timestamp when the message was received by this client
@@ -162,22 +87,8 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
 		COMMENT {@return the number of delayed messages that are not processed yet}
 	METHOD method_44945 processAll ()V
 		COMMENT Processes all delayed messages from the queue.
-	METHOD method_45031 disconnect ()V
-		COMMENT Disconnects from the server with reason {@link #CHAT_VALIDATION_FAILED_DISCONNECT_REASON}.
-	CLASS 1
-		FIELD field_39868 processed Z
 	CLASS class_7627 ProcessableMessage
 		COMMENT A message to be processed. An instance is created for each received message.
-		METHOD accept ()Z
+		METHOD method_45750 accept ()Z
 			COMMENT If this is not processed yet, adds the message to the hud; otherwise, processes
 			COMMENT the message header without adding to the hud.
-		METHOD method_44946 markProcessed ()V
-			COMMENT Marks this as processed.
-		METHOD method_44947 removeMatching (Lnet/minecraft/class_7469;)Z
-			COMMENT If {@code signature} equals this message's signature, marks this
-			COMMENT as processed and returns {@code true}. Otherwise, returns {@code false}.
-			COMMENT
-			COMMENT @return whether the passed signature matches the message's signature
-			ARG 1 signature
-		METHOD method_44948 isUnprocessed ()Z
-			COMMENT {@return {@code true} if this is not processed yet}

mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping

@@ -2,8 +2,6 @@ CLASS net/minecraft/class_7595 net/minecraft/client/network/message/MessageTrust
 	METHOD method_44740 isInsecure ()Z
 	METHOD method_44741 createIndicator (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7591;
 		ARG 1 message
-	METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Ljava/time/Instant;)Lnet/minecraft/class_7595;
+	METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7595;
 		ARG 0 message
 		ARG 1 decorated
-		ARG 2 sender
-		ARG 3 receptionTimestamp

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

@@ -1,9 +0,0 @@
-CLASS net/minecraft/class_7628 net/minecraft/client/option/ChatPreviewMode
-	FIELD field_39876 VALUES [Lnet/minecraft/class_7628;
-	FIELD field_39877 id I
-	FIELD field_39878 translationKey Ljava/lang/String;
-	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
-		ARG 3 id
-		ARG 4 translationKey
-	METHOD method_44952 byId (I)Lnet/minecraft/class_7628;
-		ARG 0 id

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

@@ -155,7 +155,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_A the A key} by default.
 	FIELD field_1914 smoothCameraEnabled Z
 	FIELD field_1915 chatWidth Lnet/minecraft/class_7172;
-	FIELD field_1916 soundVolumeLevels Lit/unimi/dsi/fastutil/objects/Object2FloatMap;
+	FIELD field_1916 soundVolumeLevels Ljava/util/Map;
 	FIELD field_19244 discreteMouseScroll Lnet/minecraft/class_7172;
 	FIELD field_20308 rawMouseInput Lnet/minecraft/class_7172;
 	FIELD field_21332 sneakToggled Lnet/minecraft/class_7172;
@@ -205,18 +205,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_38298 HOLD_KEY_TEXT Lnet/minecraft/class_2561;
 	FIELD field_38299 HIDE_MATCHED_NAMES_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_38300 MAX_FRAMERATE I
-	FIELD field_39319 chatPreview Lnet/minecraft/class_7172;
 	FIELD field_39320 ONLY_SHOW_SECURE_CHAT_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_39321 onlyShowSecureChat Lnet/minecraft/class_7172;
-	FIELD field_39835 OFF_CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_39836 LIVE_CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561;
-	FIELD field_39837 CONFIRM_CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
 		ARG 1 client
 		ARG 2 optionsFile
-	METHOD method_1624 setSoundVolume (Lnet/minecraft/class_3419;F)V
-		ARG 1 category
-		ARG 2 volume
 	METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
 		ARG 1 nbt
 	METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V
@@ -261,11 +254,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		ARG 0 value
 	METHOD method_33666 accept (Lnet/minecraft/class_315$class_5823;)V
 		ARG 1 visitor
-	METHOD method_33667 (Lnet/minecraft/class_315$class_5823;Lnet/minecraft/class_3419;Ljava/lang/Float;)Ljava/lang/Float;
-		ARG 1 category
-		ARG 2 currentLevel
-	METHOD method_33668 (Lit/unimi/dsi/fastutil/objects/Object2FloatOpenHashMap;)V
-		ARG 0 map
 	METHOD method_33671 parseList (Ljava/lang/String;)Ljava/util/List;
 		ARG 0 content
 	METHOD method_37293 (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String;
@@ -563,14 +551,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_42728 (Lnet/minecraft/class_2561;Ljava/lang/Double;)Lnet/minecraft/class_2561;
 		ARG 0 optionText
 		ARG 1 value
-	METHOD method_44025 getChatPreview ()Lnet/minecraft/class_7172;
 	METHOD method_44026 getOnlyShowSecureChat ()Lnet/minecraft/class_7172;
-	METHOD method_44915 (Lnet/minecraft/class_310;)Lnet/minecraft/class_7172$class_7277;
-		ARG 0 client
-	METHOD method_44916 (Lnet/minecraft/class_310;Lnet/minecraft/class_7628;)Ljava/util/List;
-		ARG 1 value
-	METHOD method_44917 (Lnet/minecraft/class_7628;)V
-		ARG 0 value
 	CLASS 2
 		METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String;
 			ARG 1 key

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

@@ -20,17 +20,10 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager
 		ARG 1 sheet
 		ARG 2 queue
 	METHOD method_18829 clearAtlas ()V
-	METHOD method_18832 (Lnet/minecraft/class_3695;Lnet/minecraft/class_3300;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_1059$class_4007;
-		ARG 4 v
 	METHOD method_18834 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_702$class_4091;)V
 		ARG 1 type
 		ARG 2 factory
-	METHOD method_18835 (Lnet/minecraft/class_3300;Ljava/util/Map;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2960;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_18836 loadTextureList (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Ljava/util/Optional;
-		ARG 4 id
-	METHOD method_18836 loadTextureList (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/Map;)V
-		ARG 1 resourceManager
-		ARG 2 id
-		ARG 3 result
 	METHOD method_3043 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_707;)V
 		ARG 1 type
 		ARG 2 factory

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

@@ -7,15 +7,11 @@ CLASS net/minecraft/class_5737 net/minecraft/client/particle/VibrationParticle
 		ARG 6 z
 		ARG 8 vibration
 		ARG 9 maxAge
-	METHOD method_33077 (FFLnet/minecraft/class_1158;)V
-		ARG 2 quaternion
 	METHOD method_33078 render (Lnet/minecraft/class_4588;Lnet/minecraft/class_4184;FLjava/util/function/Consumer;)V
 		ARG 1 vertexConsumer
 		ARG 2 camera
 		ARG 3 tickDelta
 		ARG 4 transforms
-	METHOD method_33079 (FFLnet/minecraft/class_1158;)V
-		ARG 2 quaternion
 	CLASS class_5738 Factory
 		FIELD field_28251 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V

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

@@ -230,8 +230,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 		COMMENT RenderSystem#lineWidth}.
 	METHOD method_34536 getRenderTypeCrumblingShader ()Lnet/minecraft/class_5944;
 	METHOD method_34537 clearShaders ()V
-	METHOD method_34538 loadShaders (Lnet/minecraft/class_3300;)V
+	METHOD method_34538 loadShaders (Lnet/minecraft/class_5912;)V
-		ARG 1 manager
 	METHOD method_34539 getPositionShader ()Lnet/minecraft/class_5944;
 	METHOD method_34540 getPositionColorShader ()Lnet/minecraft/class_5944;
 	METHOD method_34541 getPositionColorTexShader ()Lnet/minecraft/class_5944;

mappings/net/minecraft/client/render/block/BlockModels.mapping

@@ -12,12 +12,9 @@ CLASS net/minecraft/class_773 net/minecraft/client/render/block/BlockModels
 	METHOD method_3336 getModelId (Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1091;
 		ARG 0 id
 		ARG 1 state
-	METHOD method_3337 (Lnet/minecraft/class_2680;)V
-		ARG 1 state
 	METHOD method_3338 propertyMapToString (Ljava/util/Map;)Ljava/lang/String;
 		ARG 0 map
 	METHOD method_3339 getModelParticleSprite (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1058;
 		ARG 1 state
 	METHOD method_3340 getModelId (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1091;
 		ARG 0 state
-	METHOD method_3341 reload ()V

mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping

@@ -1,16 +1,12 @@
 CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlockEntityRenderer
 	FIELD field_27754 typeToModel Ljava/util/Map;
 	FIELD field_27755 textRenderer Lnet/minecraft/class_327;
-	FIELD field_32828 MAX_TEXT_WIDTH I
-	FIELD field_32829 TEXT_HEIGHT I
 	FIELD field_32830 STICK Ljava/lang/String;
 	FIELD field_33962 GLOWING_BLACK_COLOR I
 	FIELD field_33963 RENDER_DISTANCE I
 	METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
 		ARG 1 ctx
 	METHOD method_32154 getTexturedModelData ()Lnet/minecraft/class_5607;
-	METHOD method_32155 getSignType (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4719;
-		ARG 0 block
 	METHOD method_32156 (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4719;
 		ARG 0 signType
 	METHOD method_32157 createSignModel (Lnet/minecraft/class_5599;Lnet/minecraft/class_4719;)Lnet/minecraft/class_837$class_4702;
@@ -18,8 +14,6 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock
 		ARG 1 type
 	METHOD method_32158 (Lnet/minecraft/class_5614$class_5615;Lnet/minecraft/class_4719;)Lnet/minecraft/class_837$class_4702;
 		ARG 1 signType
-	METHOD method_32159 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5481;
-		ARG 1 text
 	METHOD method_37311 getColor (Lnet/minecraft/class_2625;)I
 		ARG 0 sign
 	METHOD method_37312 shouldRender (Lnet/minecraft/class_2625;I)Z

mappings/net/minecraft/client/render/entity/BoatEntityRenderer.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_881 net/minecraft/client/render/entity/BoatEntityRende
 	METHOD method_42602 getTexture (Lnet/minecraft/class_1690$class_1692;Z)Ljava/lang/String;
 		ARG 0 type
 		ARG 1 chest
-	METHOD method_42603 createModel (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_1690$class_1692;Z)Lnet/minecraft/class_554;
+	METHOD method_42603 createModel (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_1690$class_1692;Z)Lnet/minecraft/class_4595;
 		ARG 1 ctx
 		ARG 2 type
 		ARG 3 chest

mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping

@@ -53,20 +53,9 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit
 	FIELD field_32465 LEFT Ljava/lang/String;
 		COMMENT The key of the left model part, whose value is {@value}.
 	FIELD field_3326 waterPatch Lnet/minecraft/class_630;
-	FIELD field_38312 CHEST_BOTTOM Ljava/lang/String;
-		COMMENT The key of the chest bottom model part, whose value is {@value}.
-	FIELD field_38313 CHEST_LID Ljava/lang/String;
-		COMMENT The key of the chest lid model part, whose value is {@value}.
-	FIELD field_38314 CHEST_LOCK Ljava/lang/String;
-		COMMENT The key of the chest lock model part, whose value is {@value}.
-	METHOD <init> (Lnet/minecraft/class_630;Z)V
-		ARG 1 root
-		ARG 2 chest
-	METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630;
 	METHOD method_2797 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V
 		ARG 0 entity
 		ARG 1 sigma
 		ARG 2 part
 		ARG 3 angle
-	METHOD method_31985 getTexturedModelData (Z)Lnet/minecraft/class_5607;
+	METHOD method_31985 getTexturedModelData ()Lnet/minecraft/class_5607;
-		ARG 0 chest

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

@@ -2,7 +2,6 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag
 	FIELD field_20277 colorMap Lnet/minecraft/class_324;
 	FIELD field_20278 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	FIELD field_21775 atlasManager Lnet/minecraft/class_4724;
-	FIELD field_21776 textureManager Lnet/minecraft/class_1060;
 	FIELD field_21777 mipmapLevels I
 	FIELD field_5407 missingModel Lnet/minecraft/class_1087;
 	FIELD field_5408 models Ljava/util/Map;

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
-	FIELD field_17907 spriteAtlasData Ljava/util/Map;
 	FIELD field_20272 blockColors Lnet/minecraft/class_324;
 	FIELD field_20273 nextStateId I
 	FIELD field_20274 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap;
@@ -9,8 +8,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	FIELD field_21557 SHIELD_BASE Lnet/minecraft/class_4730;
 	FIELD field_21558 SHIELD_BASE_NO_PATTERN Lnet/minecraft/class_4730;
 	FIELD field_21772 BLOCK_DESTRUCTION_RENDER_LAYERS Ljava/util/List;
-	FIELD field_21773 MISSING_ID_STRING Ljava/lang/String;
-	FIELD field_21774 spriteAtlasManager Lnet/minecraft/class_4724;
 	FIELD field_32986 BUILTIN Ljava/lang/String;
 	FIELD field_32987 BUILTIN_GENERATED Ljava/lang/String;
 	FIELD field_32988 BUILTIN_ENTITY Ljava/lang/String;
@@ -21,8 +18,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	FIELD field_5373 COMMA_SPLITTER Lcom/google/common/base/Splitter;
 	FIELD field_5374 MISSING_ID Lnet/minecraft/class_1091;
 	FIELD field_5376 unbakedModels Ljava/util/Map;
-	FIELD field_5378 DEFAULT_TEXTURES Ljava/util/Set;
-	FIELD field_5379 resourceManager Lnet/minecraft/class_3300;
 	FIELD field_5380 LOGGER Lorg/slf4j/Logger;
 	FIELD field_5381 LAVA_FLOW Lnet/minecraft/class_4730;
 	FIELD field_5383 STATIC_DEFINITIONS Ljava/util/Map;
@@ -39,17 +34,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	FIELD field_5398 bakedModelCache Ljava/util/Map;
 	FIELD field_5399 variantMapDeserializationContext Lnet/minecraft/class_790$class_791;
 	FIELD field_5400 GENERATION_MARKER Lnet/minecraft/class_793;
-	METHOD <init> (Lnet/minecraft/class_3300;Lnet/minecraft/class_324;Lnet/minecraft/class_3695;I)V
-		ARG 1 resourceManager
-		ARG 2 blockColors
-		ARG 3 profiler
-		ARG 4 mipmapLevel
-	METHOD method_15878 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087;
-		ARG 1 id
-		ARG 2 settings
-	METHOD method_18177 upload (Lnet/minecraft/class_1060;Lnet/minecraft/class_3695;)Lnet/minecraft/class_4724;
-		ARG 1 textureManager
-		ARG 2 profiler
 	METHOD method_21597 (ILnet/minecraft/class_2680;)V
 		ARG 2 state
 	METHOD method_21600 (Lnet/minecraft/class_1088$class_4455;)Ljava/util/Set;
@@ -69,10 +53,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 		ARG 0 stage
 	METHOD method_23216 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
 		ARG 0 id
-	METHOD method_24149 (Lcom/mojang/datafixers/util/Pair;)V
-		ARG 0 pair
-	METHOD method_24150 (Ljava/util/HashSet;)V
-		ARG 0 textures
 	METHOD method_4715 loadModel (Lnet/minecraft/class_2960;)V
 		ARG 1 id
 	METHOD method_4716 (Lnet/minecraft/class_2680;)V
@@ -106,13 +86,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader
 	METHOD method_4731 (Lcom/google/common/collect/ImmutableList;Lnet/minecraft/class_2689;Ljava/util/Map;Ljava/util/List;Lnet/minecraft/class_816;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_790;Lnet/minecraft/class_2960;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Lnet/minecraft/class_807;)V
 		ARG 9 key
 		ARG 10 model
-	METHOD method_4732 (Ljava/util/Set;Lnet/minecraft/class_1100;)Ljava/util/stream/Stream;
-		ARG 2 model
-	METHOD method_4733 (Lnet/minecraft/class_2960;)V
-		ARG 1 id
 	METHOD method_4734 getBakedModelMap ()Ljava/util/Map;
-	METHOD method_4737 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lcom/mojang/datafixers/util/Pair;
-		ARG 2 resource
 	METHOD method_4738 (Ljava/util/Map;Lnet/minecraft/class_816;Ljava/util/List;Lnet/minecraft/class_2680;)V
 		ARG 3 state
 	METHOD method_4739 (Lnet/minecraft/class_2248;Ljava/util/Map;Lnet/minecraft/class_2680;)Z

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

@@ -10,8 +10,6 @@ CLASS net/minecraft/class_816 net/minecraft/client/render/model/MultipartUnbaked
 		ARG 0 component
 	METHOD method_3519 getComponents ()Ljava/util/List;
 	METHOD method_3520 getModels ()Ljava/util/Set;
-	METHOD method_3521 (Ljava/util/function/Function;Ljava/util/Set;Lnet/minecraft/class_819;)Ljava/util/stream/Stream;
-		ARG 2 component
 	CLASS class_817 Deserializer
 		FIELD field_4331 context Lnet/minecraft/class_790$class_791;
 		METHOD <init> (Lnet/minecraft/class_790$class_791;)V

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

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_4724 net/minecraft/client/render/model/SpriteAtlasManager
 	FIELD field_21746 atlases Ljava/util/Map;
-	METHOD <init> (Ljava/util/Collection;)V
-		ARG 1 atlases
-	METHOD method_24097 getSprite (Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058;
-		ARG 1 id
 	METHOD method_24098 getAtlas (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1059;
 		ARG 1 id

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

@@ -1,10 +1,6 @@
 CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel
-	METHOD method_4753 bake (Lnet/minecraft/class_1088;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087;
+	METHOD method_4753 bake (Lnet/minecraft/class_7775;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087;
-		ARG 1 loader
 		ARG 2 textureGetter
 		ARG 3 rotationContainer
 		ARG 4 modelId
-	METHOD method_4754 getTextureDependencies (Ljava/util/function/Function;Ljava/util/Set;)Ljava/util/Collection;
-		ARG 1 unbakedModelGetter
-		ARG 2 unresolvedTextureReferences
 	METHOD method_4755 getModelDependencies ()Ljava/util/Collection;

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

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGenerator
 	FIELD field_4270 LAYERS Ljava/util/List;
-	METHOD method_33428 (IILnet/minecraft/class_1058;Ljava/util/List;I)V
+	METHOD method_33428 (IILnet/minecraft/class_7764;Ljava/util/List;I)V
 		ARG 5 frame
-	METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_1058;IIIIIZ)V
+	METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_7764;IIIIIZ)V
 		ARG 1 side
 		ARG 2 cubes
 		ARG 3 sprite
@@ -11,23 +11,23 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe
 		ARG 6 y
 		ARG 7 width
 		ARG 8 height
-	METHOD method_3477 isPixelTransparent (Lnet/minecraft/class_1058;IIIII)Z
+	METHOD method_3477 isPixelTransparent (Lnet/minecraft/class_7764;IIIII)Z
 		ARG 1 sprite
 		ARG 2 frame
 		ARG 3 x
 		ARG 4 y
 		ARG 5 width
 		ARG 6 height
-	METHOD method_3478 getFrames (Lnet/minecraft/class_1058;)Ljava/util/List;
+	METHOD method_3478 getFrames (Lnet/minecraft/class_7764;)Ljava/util/List;
 		ARG 1 sprite
 	METHOD method_3479 create (Ljava/util/function/Function;Lnet/minecraft/class_793;)Lnet/minecraft/class_793;
 		ARG 1 textureGetter
 		ARG 2 blockModel
-	METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_1058;)Ljava/util/List;
+	METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_7764;)Ljava/util/List;
 		ARG 1 layer
 		ARG 2 key
 		ARG 3 sprite
-	METHOD method_3481 addSubComponents (Lnet/minecraft/class_1058;Ljava/lang/String;I)Ljava/util/List;
+	METHOD method_3481 addSubComponents (Lnet/minecraft/class_7764;Ljava/lang/String;I)Ljava/util/List;
 		ARG 1 sprite
 		ARG 2 key
 		ARG 3 layer

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

@@ -33,25 +33,19 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked
 		ARG 1 name
 	METHOD method_3433 getElements ()Ljava/util/List;
 	METHOD method_3434 getOverrides ()Ljava/util/List;
-	METHOD method_3435 (Ljava/util/Set;Ljava/lang/String;)V
-		ARG 2 layer
 	METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793;
 		ARG 0 input
 	METHOD method_3438 getTransformation (Lnet/minecraft/class_809$class_811;)Lnet/minecraft/class_804;
 		ARG 1 renderMode
 	METHOD method_3439 isTextureReference (Ljava/lang/String;)Z
 		ARG 0 reference
-	METHOD method_3440 compileOverrides (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;)Lnet/minecraft/class_806;
+	METHOD method_3440 compileOverrides (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;)Lnet/minecraft/class_806;
-		ARG 1 modelLoader
 		ARG 2 parent
-	METHOD method_3441 (Ljava/util/function/Function;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_799;)V
-		ARG 4 override
 	METHOD method_3442 resolveTexture (Ljava/lang/String;)Lcom/mojang/datafixers/util/Either;
 		ARG 1 name
 	METHOD method_3443 getTransformations ()Lnet/minecraft/class_809;
 	METHOD method_3444 useAmbientOcclusion ()Z
-	METHOD method_3446 bake (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1087;
+	METHOD method_3446 bake (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_1087;
-		ARG 1 loader
 		ARG 2 parent
 		ARG 3 textureGetter
 		ARG 4 settings

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

@@ -2,16 +2,10 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverri
 	FIELD field_28792 overrides [Lnet/minecraft/class_806$class_5827;
 	FIELD field_28793 conditionTypes [Lnet/minecraft/class_2960;
 	FIELD field_4292 EMPTY Lnet/minecraft/class_806;
-	METHOD <init> (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Ljava/util/List;)V
+	METHOD <init> (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;Ljava/util/List;)V
-		ARG 1 modelLoader
 		ARG 2 parent
-		ARG 3 unbakedModelGetter
+	METHOD method_33695 bakeOverridingModel (Lnet/minecraft/class_7775;Lnet/minecraft/class_793;Lnet/minecraft/class_799;)Lnet/minecraft/class_1087;
-		ARG 4 overrides
-	METHOD method_33695 bakeOverridingModel (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Lnet/minecraft/class_799;)Lnet/minecraft/class_1087;
-		ARG 1 loader
 		ARG 2 parent
-		ARG 3 unbakedModelGetter
-		ARG 4 override
 	METHOD method_33696 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_799$class_5826;)Lnet/minecraft/class_806$class_5828;
 		ARG 0 map
 		ARG 1 condition

mappings/net/minecraft/client/report/ChatAbuseReport.mapping

@@ -17,9 +17,7 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport
 	METHOD method_44568 getReportedPlayerUuid ()Ljava/util/UUID;
 	METHOD method_44569 toggleMessageSelection (I)V
 		ARG 1 index
-	METHOD method_44570 toReportChatMessage (ILnet/minecraft/class_7557$class_7558;)Lcom/mojang/authlib/minecraft/report/ReportChatMessage;
+	METHOD method_44570 toReportChatMessage (Lnet/minecraft/class_7557$class_7558;Z)Lcom/mojang/authlib/minecraft/report/ReportChatMessage;
-		ARG 1 index
-		ARG 2 message
 	METHOD method_44571 collectEvidence (Lnet/minecraft/class_7555;)Lcom/mojang/authlib/minecraft/report/ReportEvidence;
 		ARG 1 log
 	METHOD method_44574 setReason (Lnet/minecraft/class_7573;)V
@@ -28,8 +26,6 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport
 		ARG 1 reporter
 	METHOD method_44576 setOpinionComments (Ljava/lang/String;)V
 		ARG 1 opinionComments
-	METHOD method_44577 serializeContent (Lnet/minecraft/class_2561;)Ljava/lang/String;
-		ARG 0 content
 	METHOD method_44579 getSelections ()Lit/unimi/dsi/fastutil/ints/IntSet;
 	METHOD method_44580 hasSelectedMessage (I)Z
 		ARG 1 index
@@ -37,52 +33,9 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport
 	METHOD method_44583 getReason ()Lnet/minecraft/class_7573;
 	METHOD method_44584 validate ()Lnet/minecraft/class_7566$class_7567;
 	METHOD method_44585 copy ()Lnet/minecraft/class_7566;
-	METHOD method_44956 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7555$class_7560;
-		ARG 0 indexedEntry
-	METHOD method_44957 streamSucceedingMessages (Lnet/minecraft/class_7555;II)Ljava/util/stream/Stream;
-		ARG 0 log
-		ARG 1 selectedIndex
-		ARG 2 maxCount
-	METHOD method_44958 collectEvidences (Lnet/minecraft/class_7555;ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-		ARG 0 log
-		ARG 1 selectedIndex
-		ARG 2 abuseReportLimits
-	METHOD method_44959 collectIndicesUntilLastSeen (Lnet/minecraft/class_7555;ILnet/minecraft/class_7471;)Lit/unimi/dsi/fastutil/ints/IntCollection;
-		ARG 0 log
-		ARG 1 selectedIndex
-		ARG 2 message
-	METHOD method_44960 collectPrecedingMessages (Lnet/minecraft/class_7555;ILnet/minecraft/class_7566$class_7632;)V
-		ARG 0 log
-		ARG 1 selectedIndex
-		ARG 2 consumer
-	METHOD method_44961 streamHeadersFrom (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/util/UUID;)Ljava/util/stream/Stream;
-		ARG 1 log
-		ARG 2 evidences
-		ARG 3 senderUuid
-	METHOD method_44962 (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/Int2ObjectSortedMap;I)V
-		ARG 1 selection
-	METHOD method_44963 toReportChatMessage (Lnet/minecraft/class_7630;)Lcom/mojang/authlib/minecraft/report/ReportChatMessage;
-		ARG 1 headerEntry
-	METHOD method_44964 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;IILnet/minecraft/class_7557$class_7558;)Z
-		ARG 0 index
-		ARG 1 message
-	METHOD method_44965 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Lnet/minecraft/class_7555$class_7560;)V
-		ARG 0 message
-	METHOD method_44966 (Lit/unimi/dsi/fastutil/ints/Int2ObjectSortedMap;Lnet/minecraft/class_7555$class_7560;)V
-		ARG 2 entry
-	METHOD method_44967 (Ljava/util/UUID;Lnet/minecraft/class_7555$class_7560;)Z
-		ARG 1 headerEntry
-	METHOD method_44968 (Lnet/minecraft/class_7635$class_7609;)Lcom/mojang/authlib/minecraft/report/ReportChatMessageBody$LastSeenSignature;
-		ARG 0 entry
-	METHOD method_44969 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7555$class_7560;
-		ARG 0 indexedEntry
 	CLASS class_7567 ValidationError
 		FIELD field_39655 NO_REASON Lnet/minecraft/class_7566$class_7567;
 		FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7566$class_7567;
 		FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7566$class_7567;
 		FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7566$class_7567;
 	CLASS class_7568 ReportWithId
-	CLASS class_7632 IndexedMessageConsumer
-		METHOD accept (ILnet/minecraft/class_7557$class_7558;)Z
-			ARG 1 index
-			ARG 2 message

mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping

@@ -1,12 +0,0 @@
-CLASS net/minecraft/class_7535 net/minecraft/client/report/GroupedMessagesCollector
-	FIELD field_39549 reportTypeGetter Ljava/util/function/Function;
-	FIELD field_39550 messages Ljava/util/List;
-	FIELD field_39551 reportType Lnet/minecraft/class_7535$class_7536;
-	METHOD <init> (Ljava/util/function/Function;)V
-		ARG 1 reportTypeGetter
-	METHOD method_44452 collect ()Lnet/minecraft/class_7535$class_7537;
-	METHOD method_44453 add (Lnet/minecraft/class_7555$class_7560;)Z
-		ARG 1 message
-	CLASS class_7536 ReportType
-		METHOD method_44454 isContext ()Z
-	CLASS class_7537 GroupedMessages

mappings/net/minecraft/client/report/MessagesListAdder.mapping

@@ -1,34 +1,10 @@
 CLASS net/minecraft/class_7541 net/minecraft/client/report/MessagesListAdder
-	FIELD field_39580 MAX_CONTIGUOUS_CONTEXT_MESSAGES I
 	FIELD field_39581 log Lnet/minecraft/class_7555;
 	FIELD field_39582 reportablePredicate Ljava/util/function/Predicate;
-	FIELD field_39583 logMaxIndex I
-	FIELD field_39903 collectedMessageClass Ljava/lang/Class;
-	METHOD <init> (Lnet/minecraft/class_7555;Ljava/util/function/Predicate;Ljava/lang/Class;)V
-		ARG 1 log
-		ARG 2 reportablePredicate
-		ARG 3 collectedMessageClass
-	METHOD method_44484 collectGroupedMessages ()Lnet/minecraft/class_7535$class_7537;
-	METHOD method_44485 (II)I
-		ARG 0 acc
-		ARG 1 cur
 	METHOD method_44486 add (ILnet/minecraft/class_7541$class_7542;)V
 		ARG 1 minAmount
-		ARG 2 messagesList
-	METHOD method_44487 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7535$class_7536;
-		ARG 1 message
-	METHOD method_44488 getReportType (Lnet/minecraft/class_7557;)Lnet/minecraft/class_7535$class_7536;
-		ARG 1 message
-	METHOD method_44489 addContextMessages (Ljava/util/List;Lnet/minecraft/class_7541$class_7542;)I
-		ARG 1 messages
-		ARG 2 messagesList
-	METHOD method_44939 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7555$class_7560;
-		ARG 1 entry
 	CLASS class_7542 MessagesList
-		METHOD method_44490 addMessage (ILnet/minecraft/class_7557;)V
+		METHOD method_44490 addMessage (ILnet/minecraft/class_7557$class_7558;)V
 			ARG 1 index
-			ARG 2 message
-		METHOD method_44491 addMessages (Ljava/lang/Iterable;)V
-			ARG 1 messages
 		METHOD method_44492 addText (Lnet/minecraft/class_2561;)V
 			ARG 1 text

mappings/net/minecraft/client/report/log/ChatLog.mapping

@@ -6,117 +6,10 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/log/ChatLog
 	COMMENT <p>There are two types of entries. {@link HeaderEntry} is an entry containing only
 	COMMENT the message's header, and is used for censored messages. {@link ReceivedMessage}
 	COMMENT is an entry for full chat or game messages.
-	FIELD field_39629 MISSING_NEXT_INDEX I
-	METHOD method_44531 getMaxIndex ()I
-		COMMENT {@return the maximum index currently used within the log}
-		COMMENT
-		COMMENT <p>This value changes every time a new entry gets added. The entry
-		COMMENT associated with this index is the newest one in the log.
 	METHOD method_44532 get (I)Lnet/minecraft/class_7629;
 		COMMENT {@return the entry with index {@code index}, or {@code null} if there is no
 		COMMENT such entry in the log}
 		ARG 1 index
-	METHOD method_44533 getOffsetIndex (II)I
-		COMMENT {@return the index offset by {@code offset} if there is an entry with that index, or
-		COMMENT {@value #MISSING_NEXT_INDEX} if there is no entry with the offset index}
-		ARG 1 index
-		ARG 2 offset
-	METHOD method_44534 stream (ILjava/util/function/IntUnaryOperator;)Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the streams starting from {@code startIndex}}
-		COMMENT
-		COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}.
-		ARG 1 startIndex
-		ARG 2 nextIndexGetter
-			COMMENT a function that, when given an index, returns the next index
-			COMMENT or {@value #MISSING_NEXT_INDEX} to indicate the end of the stream
 	METHOD method_44535 add (Lnet/minecraft/class_7629;)V
 		COMMENT Adds {@code entry} to the log.
 		ARG 1 entry
-	METHOD method_44536 getMinIndex ()I
-		COMMENT {@return the minimum index currently used within the log}
-		COMMENT
-		COMMENT <p>This value can change every time a new entry gets added. The entry
-		COMMENT associated with this index is the oldest one in the log.
-	METHOD method_44537 getIndexed (I)Lnet/minecraft/class_7555$class_7560;
-		COMMENT {@return the indexed entry with index {@code index}, or {@code null} if there is no
-		COMMENT such entry in the log}
-		ARG 1 index
-	METHOD method_44539 streamForward ()Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the streams starting from {@linkplain #getMinIndex the smallest index
-		COMMENT in the log} with entires ordered chronologically (in ascending order)}
-	METHOD method_44540 contains (I)Z
-		COMMENT {@return whether the log contains an entry with index {@code index}}
-		ARG 1 index
-	METHOD method_44541 streamForward (II)Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the streams starting from {@code startIndex} with entires ordered
-		COMMENT chronologically (in ascending order) up to and including {@code endIndex}}
-		COMMENT
-		COMMENT @implNote If either {@code startIndex} or {@code endIndex} is not in the log,
-		COMMENT this returns {@link #emptyStreams}.
-		ARG 1 startIndex
-		ARG 2 endIndex
-	METHOD method_44542 emptyStreams ()Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the empty stream}
-	METHOD method_44543 getPreviousIndex (I)I
-		COMMENT {@return the index offset by {@code -1} if there is an entry with that index, or
-		COMMENT {@value #MISSING_NEXT_INDEX} if there is no entry with the offset index}
-		COMMENT
-		COMMENT @see #getOffsetIndex
-		ARG 1 index
-	METHOD method_44544 (II)I
-		ARG 2 currentIndex
-	METHOD method_44545 getNextIndex (I)I
-		COMMENT {@return the index offset by {@code 1} if there is an entry with that index, or
-		COMMENT {@value #MISSING_NEXT_INDEX} if there is no entry with the offset index}
-		COMMENT
-		COMMENT @see #getOffsetIndex
-		ARG 1 index
-	METHOD method_44546 streamForward (I)Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the streams starting from {@code startIndex} with entires ordered
-		COMMENT chronologically (in ascending order)}
-		COMMENT
-		COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}.
-		ARG 1 startIndex
-	METHOD method_44547 streamBackward (I)Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the streams starting from {@code startIndex} with entires ordered
-		COMMENT antichronologically (in descending order)}
-		COMMENT
-		COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}.
-		ARG 1 startIndex
-	METHOD method_44702 streamBackward ()Lnet/minecraft/class_7555$class_7556;
-		COMMENT {@return the streams starting from {@linkplain #getMaxIndex the biggest index
-		COMMENT in the log} with entires ordered antichronologically (in descending order)}
-	CLASS 1
-		FIELD field_39633 nextIndex I
-	CLASS class_7556 Streams
-		COMMENT A set of streams of log entries.
-		FIELD field_39634 CHARACTERISTICS I
-		FIELD field_39635 log Lnet/minecraft/class_7555;
-		FIELD field_39636 indicesIterator Ljava/util/PrimitiveIterator$OfInt;
-		METHOD <init> (Lnet/minecraft/class_7555;Ljava/util/PrimitiveIterator$OfInt;)V
-			ARG 1 log
-			ARG 2 indicesIterator
-		METHOD method_44548 streamIndices ()Ljava/util/stream/IntStream;
-			COMMENT {@return the stream of entry indices}
-		METHOD method_44703 (Lnet/minecraft/class_7629;)Lcom/mojang/authlib/GameProfile;
-			ARG 0 message
-		METHOD method_44704 collectSenderProfiles ()Ljava/util/Collection;
-			COMMENT {@return the collection of profiles of message senders}
-			COMMENT
-			COMMENT <p>This ignores game messages, and the returned collection has no duplicates.
-		METHOD method_44950 streamLogEntries ()Ljava/util/stream/Stream;
-			COMMENT {@return the stream of log entries}
-		METHOD method_44951 streamIndexedEntries ()Ljava/util/stream/Stream;
-			COMMENT {@return the stream of indexed log entries}
-	CLASS class_7560 IndexedEntry
-		COMMENT A pair of the entry's index and the entry itself.
-		COMMENT
-		COMMENT @see ChatLog
-		FIELD comp_873 index I
-		FIELD comp_959 entry Lnet/minecraft/class_7629;
-		METHOD comp_873 index ()I
-		METHOD comp_959 entry ()Lnet/minecraft/class_7629;
-		METHOD method_44949 cast (Ljava/lang/Class;)Lnet/minecraft/class_7555$class_7560;
-			COMMENT {@return the indexed entry with the entry instance cast to {@code clazz},
-			COMMENT or {@code null} if it cannot be cast}
-			ARG 1 clazz

mappings/net/minecraft/client/report/log/ChatLogImpl.mapping

@@ -7,16 +7,5 @@ CLASS net/minecraft/class_7561 net/minecraft/client/report/log/ChatLogImpl
 	COMMENT <p>For example, if the size is {@code 10}, after adding the 10th item, the next index is
 	COMMENT {@code 10} because the log is 0-indexed. However, the next message will be stored at
 	COMMENT {@code messages[0]}. Use {@link #wrapIndex} to calculate the wrapped index.
-	FIELD field_39638 entries [Lnet/minecraft/class_7629;
-	FIELD field_39639 maxIndex I
-	FIELD field_39640 minIndex I
 	METHOD <init> (I)V
 		ARG 1 maxEntries
-	METHOD method_44559 incrementIndex ()I
-		COMMENT {@return the incremented index}
-		COMMENT
-		COMMENT @implNote This always increments {@link #maxIndex}, and increments {@link #minIndex}
-		COMMENT only if the array is already full.
-	METHOD method_44560 wrapIndex (I)I
-		COMMENT {@return the entry {@code index} wrapped for accessing the backing array}
-		ARG 1 index

mappings/net/minecraft/client/report/log/HeaderEntry.mapping

@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_7630 net/minecraft/client/report/log/HeaderEntry
-	COMMENT An entry of {@link ChatLog} containing only the message header.
-	METHOD method_44955 of (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Lnet/minecraft/class_7630$class_7631;
-		ARG 0 header
-		ARG 1 headerSignature
-		ARG 2 bodyDigest
-	CLASS class_7631 Impl

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

@@ -1,36 +1,20 @@
 CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResourcePackProvider
-	FIELD field_16263 index Lnet/minecraft/class_1064;
-	FIELD field_27772 DEFAULT_PACK_METADATA Lnet/minecraft/class_3272;
 	FIELD field_32958 MAX_FILE_SIZE I
 	FIELD field_32959 MAX_SAVED_PACKS I
-	FIELD field_32960 VANILLA Ljava/lang/String;
 	FIELD field_32961 SERVER Ljava/lang/String;
-	FIELD field_32962 PROGRAMER_ART_ID Ljava/lang/String;
-	FIELD field_32963 PROGRAMMER_ART_NAME Ljava/lang/String;
 	FIELD field_33633 APPLYING_PACK_TEXT Lnet/minecraft/class_2561;
 	FIELD field_5292 serverPacksRoot Ljava/io/File;
-	FIELD field_5293 pack Lnet/minecraft/class_3268;
 	FIELD field_5294 downloadTask Ljava/util/concurrent/CompletableFuture;
 	FIELD field_5295 serverContainer Lnet/minecraft/class_3288;
 	FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern;
 	FIELD field_5297 lock Ljava/util/concurrent/locks/ReentrantLock;
 	FIELD field_5298 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Ljava/io/File;Lnet/minecraft/class_1064;)V
+	METHOD <init> (Ljava/io/File;)V
 		ARG 1 serverPacksRoot
-		ARG 2 index
-	METHOD method_16048 getProgrammerArtResourcePackFromZipFile (Ljava/io/File;)Lnet/minecraft/class_3262;
-		ARG 0 zipFile
 	METHOD method_19436 (Ljava/io/File;Lnet/minecraft/class_310;Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage;
 		ARG 3 throwable
 	METHOD method_19437 delete (Ljava/io/File;)V
 		ARG 0 file
-	METHOD method_25453 getProgrammerArtResourcePackProfile (Lnet/minecraft/class_3288$class_5351;Ljava/util/function/Supplier;)Lnet/minecraft/class_3288;
-		ARG 0 factory
-		ARG 1 packSupplier
-	METHOD method_25454 getProgrammerArtResourcePackProfile (Lnet/minecraft/class_3288$class_5351;)Lnet/minecraft/class_3288;
-		ARG 1 factory
-	METHOD method_25455 getProgrammerArtResourcePackFromDirectory (Ljava/io/File;)Lnet/minecraft/class_3259;
-		ARG 0 packDirectory
 	METHOD method_36323 (Lnet/minecraft/class_310;Ljava/lang/Void;)V
 		ARG 1 void_
 	METHOD method_36324 (Lnet/minecraft/class_310;Z)V
@@ -41,7 +25,6 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour
 		ARG 2 void_
 	METHOD method_44603 (Ljava/lang/Void;)V
 		ARG 1 void_
-	METHOD method_4633 getPack ()Lnet/minecraft/class_3268;
 	METHOD method_4636 getDownloadHeaders ()Ljava/util/Map;
 	METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 packZip

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

@@ -1,5 +1 @@
 CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePack
-	FIELD field_5291 index Lnet/minecraft/class_1064;
-	METHOD <init> (Lnet/minecraft/class_3272;Lnet/minecraft/class_1064;)V
-		ARG 1 metadata
-		ARG 2 index

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

@@ -1,10 +0,0 @@
-CLASS net/minecraft/class_1067 net/minecraft/client/resource/DirectResourceIndex
-	FIELD field_5299 assetDir Ljava/io/File;
-	METHOD <init> (Ljava/io/File;)V
-		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_4644 (Ljava/nio/file/Path;)Z
-		ARG 0 path
-	METHOD method_4646 (Ljava/nio/file/Path;)Z
-		ARG 0 path

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

@@ -1,14 +0,0 @@
-CLASS net/minecraft/class_1073 net/minecraft/client/resource/Format3ResourcePack
-	FIELD field_5316 parent Lnet/minecraft/class_3262;
-	FIELD field_5317 NEW_TO_OLD_MAP Ljava/util/Map;
-	FIELD field_5318 idMap Ljava/util/Map;
-	METHOD <init> (Lnet/minecraft/class_3262;Ljava/util/Map;)V
-		ARG 1 parent
-		ARG 2 idMap
-	METHOD method_29712 (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/lang/String;Ljava/lang/String;)V
-		ARG 1 newId
-		ARG 2 oldId
-	METHOD method_4658 getRedirectedId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
-		ARG 1 id
-	METHOD method_4660 getMetadataLocation (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
-		ARG 0 id

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

@@ -1,46 +0,0 @@
-CLASS net/minecraft/class_4729 net/minecraft/client/resource/Format4ResourcePack
-	FIELD field_21759 OLD_SHIELD_BASE_TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_21760 OLD_BANNER_BASE_TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_21761 IRON_GOLEM_TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_21762 NEW_TO_OLD_CHEST_TEXTURES Ljava/util/Map;
-	FIELD field_21763 BANNER_PATTERN_TYPES Ljava/util/List;
-	FIELD field_21764 SHIELD_PATTERN_TEXTURES Ljava/util/Set;
-	FIELD field_21765 BANNER_PATTERN_TEXTURES Ljava/util/Set;
-	FIELD field_21766 parent Lnet/minecraft/class_3262;
-	FIELD field_32969 IRON_GOLEM_TEXTURE_PATH Ljava/lang/String;
-	METHOD <init> (Lnet/minecraft/class_3262;)V
-		ARG 1 parent
-	METHOD method_24132 loadBytes (Lnet/minecraft/class_1011;Lnet/minecraft/class_1011;IIIIIIIZZ)V
-		ARG 0 source
-		ARG 1 target
-		ARG 2 sourceLeft
-		ARG 3 sourceTop
-		ARG 4 left
-		ARG 5 top
-		ARG 6 right
-		ARG 7 bottom
-		ARG 8 multiplier
-		ARG 9 mirrorX
-		ARG 10 mirrorY
-	METHOD method_24133 cropLeftChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream;
-		ARG 0 stream
-	METHOD method_24134 openCroppedStream (Ljava/io/InputStream;Ljava/io/InputStream;IIIII)Ljava/io/InputStream;
-		ARG 0 base
-		ARG 1 overlay
-		ARG 2 width
-		ARG 3 left
-		ARG 4 top
-		ARG 5 right
-		ARG 6 bottom
-	METHOD method_24135 (Ljava/lang/String;)Ljava/lang/String;
-		ARG 0 patternName
-	METHOD method_24136 (Ljava/util/HashMap;)V
-		ARG 0 map
-	METHOD method_24137 cropRightChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream;
-		ARG 0 stream
-	METHOD method_24138 cropSingleChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream;
-		ARG 0 stream
-	METHOD method_24139 (Ljava/lang/String;)Ljava/lang/String;
-		ARG 0 patternName
-	METHOD method_24199 cropConduitTexture (Ljava/io/InputStream;)Ljava/io/InputStream;
-		ARG 0 stream

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

@@ -1,17 +1,2 @@
 CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex
-	FIELD field_21556 namespacedIndex Ljava/util/Map;
-	FIELD field_5289 rootIndex Ljava/util/Map;
 	FIELD field_5290 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Ljava/io/File;Ljava/lang/String;)V
-		ARG 1 directory
-		ARG 2 indexName
-	METHOD method_23843 (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;Lnet/minecraft/class_2960;)Z
-		ARG 3 id
-	METHOD method_4630 getResource (Lnet/minecraft/class_2960;)Ljava/io/File;
-		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;Ljava/util/function/Predicate;)Ljava/util/Collection;
-		ARG 1 prefix
-		ARG 2 namespace
-		ARG 3 allowedPathPredicate

mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping

@@ -15,23 +15,13 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationR
 		ARG 3 height
 		ARG 4 defaultFrameTime
 		ARG 5 interpolate
-	METHOD method_24141 ensureImageSize (II)Lcom/mojang/datafixers/util/Pair;
+	METHOD method_24143 getSize (II)Lnet/minecraft/class_7771;
-		ARG 1 x
-		ARG 2 y
-	METHOD method_24142 isMultipleOf (II)Z
-		ARG 0 dividend
-		ARG 1 divisor
-	METHOD method_24143 getSize (II)Lcom/mojang/datafixers/util/Pair;
 		ARG 1 defaultWidth
 		ARG 2 defaultHeight
 	METHOD method_33460 forEachFrame (Lnet/minecraft/class_1079$class_5792;)V
 		ARG 1 consumer
 	METHOD method_4684 getDefaultFrameTime ()I
 	METHOD method_4685 shouldInterpolate ()Z
-	METHOD method_4686 getHeight (I)I
-		ARG 1 defaultHeight
-	METHOD method_4687 getWidth (I)I
-		ARG 1 defaultWidth
 	CLASS class_5792 FrameConsumer
 		METHOD accept (II)V
 			ARG 1 index

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

@@ -61,8 +61,5 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc
 		ARG 1 pitch
 	METHOD method_4759 music (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1109;
 		ARG 0 sound
-	METHOD method_4760 record (Lnet/minecraft/class_3414;DDD)Lnet/minecraft/class_1109;
+	METHOD method_4760 record (Lnet/minecraft/class_3414;Lnet/minecraft/class_243;)Lnet/minecraft/class_1109;
 		ARG 0 sound
-		ARG 1 x
-		ARG 3 y
-		ARG 5 z

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

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_4237 net/minecraft/client/sound/SoundLoader
-	FIELD field_18943 resourceManager Lnet/minecraft/class_3300;
+	FIELD field_18943 resourceManager Lnet/minecraft/class_5912;
 	FIELD field_18944 loadedSounds Ljava/util/Map;
-	METHOD <init> (Lnet/minecraft/class_3300;)V
-		ARG 1 resourceManager
 	METHOD method_19738 close ()V
 	METHOD method_19740 (Lnet/minecraft/class_1111;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 sound

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

@@ -6,9 +6,6 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager
 	FIELD field_5592 MISSING_SOUND Lnet/minecraft/class_1111;
 	FIELD field_5593 LOGGER Lorg/slf4j/Logger;
 	FIELD field_5594 GSON Lcom/google/gson/Gson;
-	METHOD <init> (Lnet/minecraft/class_3300;Lnet/minecraft/class_315;)V
-		ARG 1 resourceManager
-		ARG 2 gameOptions
 	METHOD method_18670 tick (Z)V
 		ARG 1 paused
 	METHOD method_20305 getDebugString ()Ljava/lang/String;
@@ -22,10 +19,9 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager
 		ARG 2 volume
 	METHOD method_4866 unregisterListener (Lnet/minecraft/class_1145;)V
 		ARG 1 listener
-	METHOD method_4868 isSoundResourcePresent (Lnet/minecraft/class_1111;Lnet/minecraft/class_2960;Lnet/minecraft/class_3300;)Z
+	METHOD method_4868 isSoundResourcePresent (Lnet/minecraft/class_1111;Lnet/minecraft/class_2960;Lnet/minecraft/class_5912;)Z
 		ARG 0 sound
 		ARG 1 id
-		ARG 2 resourceManager
 	METHOD method_4869 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1146;
 		ARG 1 id
 	METHOD method_4870 stop (Lnet/minecraft/class_1113;)V
@@ -50,10 +46,7 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager
 	METHOD method_4882 close ()V
 	CLASS class_4009 SoundList
 		FIELD field_17908 loadedSounds Ljava/util/Map;
-		METHOD method_18186 reload (Ljava/util/Map;Lnet/minecraft/class_1140;)V
+		METHOD method_18186 reload (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1140;)V
 			ARG 1 sounds
-			ARG 2 soundSystem
+		METHOD method_18187 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1110;)V
-		METHOD method_18187 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1110;Lnet/minecraft/class_3300;)V
 			ARG 1 id
-			ARG 2 entry
-			ARG 3 resourceManager

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

@@ -29,10 +29,9 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem
 	FIELD field_5561 UNKNOWN_SOUNDS Ljava/util/Set;
 	FIELD field_5563 started Z
 	FIELD field_5566 startTicks Ljava/util/Map;
-	METHOD <init> (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_3300;)V
+	METHOD <init> (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_5912;)V
 		ARG 1 loader
 		ARG 2 settings
-		ARG 3 resourceManager
 	METHOD method_19748 (FFLnet/minecraft/class_243;Lnet/minecraft/class_4224;)V
 		ARG 3 source
 	METHOD method_19749 (FFLnet/minecraft/class_1113$class_1114;FZZLnet/minecraft/class_243;ZLnet/minecraft/class_4224;)V

mappings/net/minecraft/client/texture/MipmapHelper.mapping

@@ -14,8 +14,7 @@ CLASS net/minecraft/class_4725 net/minecraft/client/texture/MipmapHelper
 		ARG 2 three
 		ARG 3 four
 		ARG 4 checkAlpha
-	METHOD method_24102 getMipmapLevelsImages (Lnet/minecraft/class_1011;I)[Lnet/minecraft/class_1011;
+	METHOD method_24102 getMipmapLevelsImages ([Lnet/minecraft/class_1011;I)[Lnet/minecraft/class_1011;
-		ARG 0 image
 		ARG 1 mipmap
 	METHOD method_24103 ([F)V
 		ARG 0 list

mappings/net/minecraft/client/texture/MissingSprite.mapping

@@ -1,23 +1,6 @@
 CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite
-	FIELD field_21748 INFO Lnet/minecraft/class_1058$class_4727;
 	FIELD field_32952 MISSINGNO_ID Ljava/lang/String;
 	FIELD field_5219 MISSINGNO Lnet/minecraft/class_2960;
 	FIELD field_5220 texture Lnet/minecraft/class_1043;
-	FIELD field_5221 IMAGE Lnet/minecraft/class_3528;
-	METHOD <init> (Lnet/minecraft/class_1059;IIIII)V
-		ARG 1 texture
-		ARG 2 maxLevel
-		ARG 3 atlasWidth
-		ARG 4 atlasHeight
-		ARG 5 x
-		ARG 6 y
-	METHOD method_24104 getMissingInfo ()Lnet/minecraft/class_1058$class_4727;
 	METHOD method_4539 getMissingSpriteId ()Lnet/minecraft/class_2960;
 	METHOD method_4540 getMissingSpriteTexture ()Lnet/minecraft/class_1043;
-	METHOD method_4541 getMissingSprite (Lnet/minecraft/class_1059;IIIII)Lnet/minecraft/class_1047;
-		ARG 0 texture
-		ARG 1 maxLevel
-		ARG 2 atlasWidth
-		ARG 3 atlasHeight
-		ARG 4 x
-		ARG 5 y

mappings/net/minecraft/client/texture/Sprite.mapping

@@ -1,125 +1,29 @@
 CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite
-	FIELD field_21750 atlas Lnet/minecraft/class_1059;
-	FIELD field_28464 LOGGER Lorg/slf4j/Logger;
-	FIELD field_28465 id Lnet/minecraft/class_2960;
-	FIELD field_28466 width I
-	FIELD field_28467 height I
-	FIELD field_28468 animation Lnet/minecraft/class_1058$class_5790;
 	FIELD field_5256 y I
 	FIELD field_5258 x I
-	FIELD field_5262 images [Lnet/minecraft/class_1011;
 	FIELD field_5267 vMax F
 	FIELD field_5268 vMin F
 	FIELD field_5269 uMax F
 	FIELD field_5270 uMin F
-	METHOD <init> (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_7764;IIII)V
-		ARG 1 atlas
 		ARG 2 info
 		ARG 3 maxLevel
 		ARG 4 atlasWidth
 		ARG 5 atlasHeight
 		ARG 6 x
-		ARG 7 y
-		ARG 8 image
 	METHOD method_23841 getFrameDeltaFactor ()F
 	METHOD method_23842 getAnimationFrameDelta ()F
 	METHOD method_24108 getTextureSpecificVertexConsumer (Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588;
 		ARG 1 consumer
-	METHOD method_24119 getAtlas ()Lnet/minecraft/class_1059;
+	METHOD method_33437 createAnimation ()Lnet/minecraft/class_1058$class_7770;
-	METHOD method_33437 createAnimation (Lnet/minecraft/class_1058$class_4727;III)Lnet/minecraft/class_1058$class_5790;
-		ARG 1 info
-		ARG 2 nativeImageWidth
-		ARG 3 nativeImageHeight
-		ARG 4 maxLevel
-	METHOD method_33439 (Lit/unimi/dsi/fastutil/ints/IntSet;I)Z
-		ARG 0 index
-	METHOD method_33440 (Ljava/util/List;II)V
-		ARG 1 index
-		ARG 2 time
-	METHOD method_33442 getDistinctFrameCount ()Ljava/util/stream/IntStream;
-	METHOD method_33443 getAnimation ()Lnet/minecraft/class_1061;
 	METHOD method_35806 getX ()I
 	METHOD method_35807 getY ()I
 	METHOD method_4570 getFrameV (D)F
 		ARG 1 frame
 	METHOD method_4575 getMaxV ()F
 	METHOD method_4577 getMaxU ()F
-	METHOD method_4578 getWidth ()I
-	METHOD method_4579 upload (II[Lnet/minecraft/class_1011;)V
-		ARG 1 frameX
-		ARG 2 frameY
-		ARG 3 output
 	METHOD method_4580 getFrameU (D)F
 		ARG 1 frame
-	METHOD method_4583 isPixelTransparent (III)Z
-		ARG 1 frame
-		ARG 2 x
-		ARG 3 y
 	METHOD method_4584 upload ()V
-	METHOD method_4592 getFrameCount ()I
 	METHOD method_4593 getMinV ()F
 	METHOD method_4594 getMinU ()F
-	METHOD method_4595 getHeight ()I
-	METHOD method_4598 getId ()Lnet/minecraft/class_2960;
-	CLASS class_4727 Info
-		FIELD field_21753 id Lnet/minecraft/class_2960;
-		FIELD field_21754 width I
-		FIELD field_21755 height I
-		FIELD field_21756 animationData Lnet/minecraft/class_1079;
-		METHOD <init> (Lnet/minecraft/class_2960;IILnet/minecraft/class_1079;)V
-			ARG 1 id
-			ARG 2 width
-			ARG 3 height
-			ARG 4 animationData
-		METHOD method_24121 getId ()Lnet/minecraft/class_2960;
-		METHOD method_24123 getWidth ()I
-		METHOD method_24125 getHeight ()I
-	CLASS class_4728 Interpolation
-		FIELD field_21758 images [Lnet/minecraft/class_1011;
-		METHOD <init> (Lnet/minecraft/class_1058;Lnet/minecraft/class_1058$class_4727;I)V
-			ARG 2 info
-			ARG 3 maxLevel
-		METHOD method_24128 apply (Lnet/minecraft/class_1058$class_5790;)V
-			COMMENT Linearly interpolate between the current and next frame on all mip levels
-			COMMENT based on the tick position within the current frame,
-			COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0).
-			ARG 1 animation
-		METHOD method_24129 lerp (DII)I
-			COMMENT Purely mathematical single-value linear interpolation.
-			COMMENT {@code lerp(0, a, b) == b}, {@code lerp(1, a, b) == a}.
-			ARG 1 delta
-			ARG 3 to
-			ARG 4 from
-		METHOD method_24130 getPixelColor (Lnet/minecraft/class_1058$class_5790;IIII)I
-			COMMENT {@return the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates}
-			ARG 1 animation
-			ARG 2 frameIndex
-			ARG 3 layer
-			ARG 4 x
-			ARG 5 y
-	CLASS class_5790 Animation
-		FIELD field_28470 frameIndex I
-		FIELD field_28471 frameTicks I
-		FIELD field_28472 frames Ljava/util/List;
-		FIELD field_28473 frameCount I
-		FIELD field_28474 interpolation Lnet/minecraft/class_1058$class_4728;
-		METHOD <init> (Lnet/minecraft/class_1058;Ljava/util/List;ILnet/minecraft/class_1058$class_4728;)V
-			ARG 2 frames
-			ARG 3 frameCount
-			ARG 4 interpolation
-		METHOD method_33445 upload ()V
-		METHOD method_33446 getFrameX (I)I
-			ARG 1 frame
-		METHOD method_33449 (Lnet/minecraft/class_1058$class_5791;)I
-			ARG 0 frame
-		METHOD method_33450 getDistinctFrameCount ()Ljava/util/stream/IntStream;
-		METHOD method_33451 getFrameY (I)I
-			ARG 1 frame
-		METHOD method_33455 upload (I)V
-			ARG 1 frameIndex
-	CLASS class_5791 AnimationFrame
-		FIELD field_28475 index I
-		FIELD field_28476 time I
-		METHOD <init> (II)V
-			ARG 1 index
-			ARG 2 time

mappings/net/minecraft/client/texture/SpriteAtlasHolder.mapping

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_4075 net/minecraft/client/texture/SpriteAtlasHolder
 		ARG 1 textureManager
 		ARG 2 atlasId
 		ARG 3 pathPrefix
-	METHOD method_18665 getSprites ()Ljava/util/stream/Stream;
 	METHOD method_18667 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058;
 		ARG 1 objectId
 	METHOD method_24140 toSpriteId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;

mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping

@@ -2,64 +2,17 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture
 	FIELD field_17898 PARTICLE_ATLAS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_17899 maxTextureSize I
 	FIELD field_21749 id Lnet/minecraft/class_2960;
-	FIELD field_32957 PNG_EXTENSION Ljava/lang/String;
 	FIELD field_5275 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_5276 animatedSprites Ljava/util/List;
-	FIELD field_5277 spritesToLoad Ljava/util/Set;
+	FIELD field_5277 spritesToLoad Ljava/util/List;
 	FIELD field_5278 LOGGER Lorg/slf4j/Logger;
 	FIELD field_5280 sprites Ljava/util/Map;
 	METHOD <init> (Lnet/minecraft/class_2960;)V
 		ARG 1 id
-	METHOD method_18159 upload (Lnet/minecraft/class_1059$class_4007;)V
-		ARG 1 data
-	METHOD method_18161 loadSprites (Lnet/minecraft/class_3300;Lnet/minecraft/class_1055;I)Ljava/util/List;
-		ARG 1 resourceManager
-		ARG 2 textureStitcher
-		ARG 3 maxLevel
-	METHOD method_18163 stitch (Lnet/minecraft/class_3300;Ljava/util/stream/Stream;Lnet/minecraft/class_3695;I)Lnet/minecraft/class_1059$class_4007;
-		ARG 1 resourceManager
-		ARG 2 idStream
-		ARG 3 profiler
-		ARG 4 mipmapLevel
-	METHOD method_18164 loadSprites (Lnet/minecraft/class_3300;Ljava/util/Set;)Ljava/util/Collection;
-		ARG 1 resourceManager
-		ARG 2 ids
-	METHOD method_18165 (Lnet/minecraft/class_2960;)V
-		ARG 0 id
-	METHOD method_21688 (Lnet/minecraft/class_1058$class_4727;)Ljava/lang/String;
-		ARG 0 sprite
-	METHOD method_24105 (ILjava/util/Queue;Ljava/util/List;Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIII)V
-		ARG 5 info
-		ARG 6 atlasWidth
-		ARG 7 atlasHeight
-		ARG 8 x
-		ARG 9 y
 	METHOD method_24106 getId ()Lnet/minecraft/class_2960;
-	METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_1059$class_4007;)V
+	METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_7766$class_7767;)V
 		ARG 1 data
 	METHOD method_4601 clear ()V
-	METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
-		ARG 1 id
-	METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIIII)Lnet/minecraft/class_1058;
-		ARG 1 container
-		ARG 2 info
-		ARG 3 atlasWidth
-		ARG 4 atlasHeight
-		ARG 5 maxLevel
-		ARG 6 x
-		ARG 7 y
 	METHOD method_4608 getSprite (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1058;
 		ARG 1 id
 	METHOD method_4612 tickAnimatedSprites ()V
-	CLASS class_4007 Data
-		FIELD field_17900 spriteIds Ljava/util/Set;
-		FIELD field_17901 width I
-		FIELD field_17902 height I
-		FIELD field_17903 sprites Ljava/util/List;
-		FIELD field_21795 maxLevel I
-		METHOD <init> (Ljava/util/Set;IIILjava/util/List;)V
-			ARG 1 spriteIds
-			ARG 2 width
-			ARG 3 height
-			ARG 4 maxLevel
-			ARG 5 sprites

mappings/net/minecraft/client/texture/TextureStitcher.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher
 	FIELD field_18030 COMPARATOR Ljava/util/Comparator;
-	FIELD field_5237 holders Ljava/util/Set;
+	FIELD field_5237 holders Ljava/util/List;
 	FIELD field_5238 maxHeight I
 	FIELD field_5239 slots Ljava/util/List;
 	FIELD field_5240 maxWidth I
@@ -11,15 +11,13 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher
 		ARG 1 maxWidth
 		ARG 2 maxHeight
 		ARG 3 mipLevel
-	METHOD method_18336 (Lnet/minecraft/class_1055$class_4726;Lnet/minecraft/class_1055$class_1057;)V
-		ARG 2 slot
 	METHOD method_18337 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_2960;
 		ARG 0 holder
 	METHOD method_18338 (Lnet/minecraft/class_1055$class_1056;)Ljava/lang/Integer;
 		ARG 0 holder
 	METHOD method_18339 (Lnet/minecraft/class_1055$class_1056;)Ljava/lang/Integer;
 		ARG 0 holder
-	METHOD method_21686 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_1058$class_4727;
+	METHOD method_21686 (Lnet/minecraft/class_1055$class_1056;)Lnet/minecraft/class_1055$class_7769;
 		ARG 0 holder
 	METHOD method_4549 getStitchedSprites (Lnet/minecraft/class_1055$class_4726;)V
 		ARG 1 consumer
@@ -30,18 +28,21 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher
 		ARG 1 mipLevel
 	METHOD method_4552 growAndFit (Lnet/minecraft/class_1055$class_1056;)Z
 		ARG 1 holder
-	METHOD method_4553 add (Lnet/minecraft/class_1058$class_4727;)V
+	METHOD method_4553 add (Lnet/minecraft/class_1055$class_7769;)V
 		ARG 1 info
 	METHOD method_4554 getWidth ()I
 	METHOD method_4555 getHeight ()I
 	METHOD method_4557 stitch ()V
 	CLASS class_1056 Holder
-		FIELD field_5247 height I
+		FIELD comp_1046 sprite Lnet/minecraft/class_1055$class_7769;
-		FIELD field_5248 width I
+		FIELD comp_1047 width I
-		FIELD field_5249 sprite Lnet/minecraft/class_1058$class_4727;
+		FIELD comp_1048 height I
-		METHOD <init> (Lnet/minecraft/class_1058$class_4727;I)V
+		METHOD <init> (Lnet/minecraft/class_1055$class_7769;I)V
 			ARG 1 sprite
 			ARG 2 mipLevel
+		METHOD comp_1046 sprite ()Lnet/minecraft/class_1055$class_7769;
+		METHOD comp_1047 width ()I
+		METHOD comp_1048 height ()I
 	CLASS class_1057 Slot
 		FIELD field_5250 height I
 		FIELD field_5251 width I
@@ -54,17 +55,13 @@ CLASS net/minecraft/class_1055 net/minecraft/client/texture/TextureStitcher
 			ARG 2 y
 			ARG 3 width
 			ARG 4 height
-		METHOD method_4565 getTexture ()Lnet/minecraft/class_1055$class_1056;
 		METHOD method_4566 fit (Lnet/minecraft/class_1055$class_1056;)Z
 			ARG 1 holder
 		METHOD method_4567 getY ()I
-		METHOD method_4568 addAllFilledSlots (Ljava/util/function/Consumer;)V
+		METHOD method_4568 addAllFilledSlots (Lnet/minecraft/class_1055$class_4726;)V
-			ARG 1 slotConsumer
 		METHOD method_4569 getX ()I
 	CLASS class_4726 SpriteConsumer
-		METHOD load (Lnet/minecraft/class_1058$class_4727;IIII)V
+		METHOD load (Lnet/minecraft/class_1055$class_7769;II)V
 			ARG 1 info
 			ARG 2 width
 			ARG 3 height
-			ARG 4 x
-			ARG 5 y

mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1054 net/minecraft/client/texture/TextureStitcherCannotFitException
 	FIELD field_20311 sprites Ljava/util/Collection;
-	METHOD <init> (Lnet/minecraft/class_1058$class_4727;Ljava/util/Collection;)V
+	METHOD <init> (Lnet/minecraft/class_1055$class_7769;Ljava/util/Collection;)V
 		ARG 1 sprite
 		ARG 2 sprites
 	METHOD method_21687 getSprites ()Ljava/util/Collection;

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

@@ -8,5 +8,4 @@ CLASS net/minecraft/class_6417 net/minecraft/client/util/MacWindowUtil
 		ARG 0 handle
 	METHOD method_37464 toggleFullscreen (Lca/weblite/objc/NSObject;)V
 		ARG 0 handle
-	METHOD method_41718 setApplicationIconImage (Ljava/io/InputStream;)V
+	METHOD method_41718 setApplicationIconImage (Lnet/minecraft/class_7367;)V
-		ARG 0 stream

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

@@ -2,12 +2,8 @@ CLASS net/minecraft/class_1091 net/minecraft/client/util/ModelIdentifier
 	FIELD field_32990 SEPARATOR C
 	FIELD field_5406 variant Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-		ARG 1 namespace
-		ARG 2 path
 		ARG 3 variant
 	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;)V
 		ARG 1 id
 		ARG 2 variant
 	METHOD method_4740 getVariant ()Ljava/lang/String;
-	METHOD method_4741 split (Ljava/lang/String;)[Ljava/lang/String;
-		ARG 0 id

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

@@ -1,39 +0,0 @@
-CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile
-	FIELD field_5226 height I
-	FIELD field_5227 width I
-	METHOD <init> (Ljava/util/function/Supplier;Ljava/io/InputStream;)V
-		ARG 1 filenameSupplier
-		ARG 2 in
-	METHOD method_4542 createReader (Ljava/io/InputStream;)Lnet/minecraft/class_1050$class_1051;
-		ARG 0 is
-	CLASS class_1051 Reader
-		FIELD field_5228 errored Z
-		METHOD method_4543 read (JJI)I
-			ARG 1 user
-			ARG 3 data
-			ARG 5 size
-		METHOD method_4544 read (JI)I
-			ARG 1 data
-			ARG 3 size
-		METHOD method_4545 skip (I)V
-			ARG 1 n
-		METHOD method_4546 eof (J)I
-			ARG 1 user
-		METHOD method_4547 skip (JI)V
-			ARG 1 user
-			ARG 3 n
-	CLASS class_1052 ChannelReader
-		FIELD field_32035 BUFFER_SIZE I
-		FIELD field_5229 channel Ljava/nio/channels/ReadableByteChannel;
-		FIELD field_5230 readPosition I
-		FIELD field_5231 bufferPosition I
-		FIELD field_5232 bufferSize I
-		FIELD field_5233 buffer J
-		METHOD <init> (Ljava/nio/channels/ReadableByteChannel;)V
-			ARG 1 channel
-		METHOD method_4548 readToBuffer (I)V
-			ARG 1 size
-	CLASS class_1053 SeekableChannelReader
-		FIELD field_5234 channel Ljava/nio/channels/SeekableByteChannel;
-		METHOD <init> (Ljava/nio/channels/SeekableByteChannel;)V
-			ARG 1 channel

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

@@ -20,9 +20,6 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys
 		COMMENT Gets the key pair from the file cache, or if it is unavailable or expired,
 		COMMENT the Mojang server.
 		ARG 1 currentKey
-	METHOD method_43603 getPublicKey ()Ljava/util/Optional;
-		COMMENT {@return the public key, or {@link java.util.Optional#empty} if there is no
-		COMMENT public key associated with the profile}
 	METHOD method_43605 fetchKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7427;
 		COMMENT {@return the key pair fetched from Mojang's server}
 		COMMENT
@@ -40,21 +37,5 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys
 		COMMENT
 		COMMENT @throws NetworkEncryptionException when the response is malformed
 		ARG 0 keyPairResponse
-	METHOD method_44287 getSigner ()Lnet/minecraft/class_7501;
-		COMMENT {@return the signer, or {@code null} if there is no key pair associated with the profile}
-	METHOD method_45104 refresh ()Ljava/util/concurrent/CompletableFuture;
-	METHOD method_45105 (Lnet/minecraft/class_7434$class_7653;)Lnet/minecraft/class_7428;
-		ARG 0 key
-	METHOD method_45106 (Ljava/util/Optional;)Ljava/util/Optional;
-		ARG 0 key
-	METHOD method_45107 (Lnet/minecraft/class_7434$class_7653;)Lnet/minecraft/class_7428$class_7443;
-		ARG 0 key
-	METHOD method_45108 (Ljava/util/Optional;)Ljava/util/Optional;
-		ARG 0 maybeKey
 	METHOD method_45109 (Lnet/minecraft/class_7427;)Z
 		ARG 0 key
-	METHOD method_45111 (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage;
-		ARG 1 key
-	CLASS class_7653 SignableKey
-		METHOD <init> (Lnet/minecraft/class_7427;)V
-			ARG 1 keyPair

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

@@ -80,9 +80,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window
 		ARG 4 height
 	METHOD method_4489 getFramebufferWidth ()I
 	METHOD method_4490 getHandle ()J
-	METHOD method_4491 setIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V
+	METHOD method_4491 setIcon (Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)V
-		ARG 1 icon16
-		ARG 2 icon32
 	METHOD method_4492 acceptError (Ljava/util/function/BiConsumer;)V
 		ARG 0 consumer
 	METHOD method_4494 onWindowFocusChanged (JZ)V
@@ -106,8 +104,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window
 		ARG 1 videoMode
 	METHOD method_4506 getFramebufferHeight ()I
 	METHOD method_4507 getHeight ()I
-	METHOD method_4510 readImage (Ljava/io/InputStream;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/nio/ByteBuffer;
+	METHOD method_4510 readImage (Lnet/minecraft/class_7367;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/nio/ByteBuffer;
-		ARG 1 in
 		ARG 2 x
 		ARG 3 y
 		ARG 4 channels

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

@@ -109,13 +109,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	METHOD method_2945 removeEntity (ILnet/minecraft/class_1297$class_5529;)V
 		ARG 1 entityId
 		ARG 2 removalReason
-	METHOD method_2947 playSound (Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZ)V
-		ARG 1 pos
-		ARG 2 sound
-		ARG 3 category
-		ARG 4 volume
-		ARG 5 pitch
-		ARG 6 useDistance
 	METHOD method_2948 addParticle (Lnet/minecraft/class_2338;Lnet/minecraft/class_2394;Lnet/minecraft/class_265;D)V
 		ARG 1 pos
 		ARG 2 parameters

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

@@ -1,15 +1,10 @@
 CLASS net/minecraft/class_7193 net/minecraft/client/world/GeneratorOptionsHolder
 	FIELD comp_616 generatorOptions Lnet/minecraft/class_5285;
-	FIELD comp_618 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890;
 	FIELD comp_619 dataPackContents Lnet/minecraft/class_5350;
 	METHOD comp_616 generatorOptions ()Lnet/minecraft/class_5285;
-	METHOD comp_618 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890;
 	METHOD comp_619 dataPackContents ()Lnet/minecraft/class_5350;
-	METHOD method_41864 with (Lnet/minecraft/class_5285;)Lnet/minecraft/class_7193;
+	METHOD method_41864 with (Lnet/minecraft/class_5285;Lnet/minecraft/class_7723;)Lnet/minecraft/class_7193;
 		ARG 1 generatorOptions
-	METHOD method_41865 apply (Lnet/minecraft/class_7193$class_7194;)Lnet/minecraft/class_7193;
-		ARG 1 modifier
 	METHOD method_41866 apply (Lnet/minecraft/class_7193$class_7195;)Lnet/minecraft/class_7193;
-		ARG 1 modifier
 	CLASS class_7194 Modifier
 	CLASS class_7195 RegistryAwareModifier

mappings/net/minecraft/command/CommandRegistryAccess.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
 	COMMENT provides an instance with proper configurations.
 	FIELD field_37820 dynamicRegistryManager Lnet/minecraft/class_5455;
 	FIELD field_37821 entryListCreationPolicy Lnet/minecraft/class_7157$class_7158;
-	METHOD <init> (Lnet/minecraft/class_5455;)V
+	METHOD <init> (Lnet/minecraft/class_5455;Lnet/minecraft/class_7699;)V
 		ARG 1 dynamicRegistryManager
 	METHOD method_41698 setEntryListCreationPolicy (Lnet/minecraft/class_7157$class_7158;)V
 		COMMENT Sets the policy on how to handle unrecognized tags.

mappings/net/minecraft/command/CommandRegistryWrapper.mapping

@@ -23,7 +23,7 @@ CLASS net/minecraft/class_7225 net/minecraft/command/CommandRegistryWrapper
 		COMMENT {@return a stream of registry keys defined in the wrapped registry}
 		COMMENT
 		COMMENT @see Registry#getKeys
-	METHOD method_42018 of (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7225;
+	METHOD method_42018 of (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7225$class_7226;
 		COMMENT {@return a new wrapper for the {@code registry} without any special behaviors}
 		ARG 0 registry
 	METHOD method_42019 getEntry (Lnet/minecraft/class_5321;)Ljava/util/Optional;

mappings/net/minecraft/command/EntitySelectorOptions.mapping

@@ -152,10 +152,13 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions
 		METHOD handle (Lnet/minecraft/class_2303;)V
 			ARG 1 reader
 	CLASS class_2308 SelectorOption
-		FIELD field_10894 description Lnet/minecraft/class_2561;
+		FIELD comp_1063 handler Lnet/minecraft/class_2306$class_2307;
-		FIELD field_10895 handler Lnet/minecraft/class_2306$class_2307;
+		FIELD comp_1064 condition Ljava/util/function/Predicate;
-		FIELD field_10896 condition Ljava/util/function/Predicate;
+		FIELD comp_1065 description Lnet/minecraft/class_2561;
 		METHOD <init> (Lnet/minecraft/class_2306$class_2307;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V
 			ARG 1 handler
 			ARG 2 condition
 			ARG 3 description
+		METHOD comp_1063 handler ()Lnet/minecraft/class_2306$class_2307;
+		METHOD comp_1064 condition ()Ljava/util/function/Predicate;
+		METHOD comp_1065 description ()Lnet/minecraft/class_2561;

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

@@ -35,12 +35,7 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse
 		ARG 0 registryWrapper
 		ARG 1 reader
 		ARG 2 allowSnbt
-	METHOD method_41956 block (Lnet/minecraft/class_2378;Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2259$class_7211;
+	METHOD method_41957 block (Lnet/minecraft/class_7225;Ljava/lang/String;Z)Lnet/minecraft/class_2259$class_7211;
-		ARG 0 registry
-		ARG 1 reader
-		ARG 2 allowSnbt
-	METHOD method_41957 block (Lnet/minecraft/class_2378;Ljava/lang/String;Z)Lnet/minecraft/class_2259$class_7211;
-		ARG 0 registry
 		ARG 1 string
 		ARG 2 allowSnbt
 	METHOD method_41958 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
@@ -51,12 +46,7 @@ CLASS net/minecraft/class_2259 net/minecraft/command/argument/BlockArgumentParse
 		ARG 0 registryWrapper
 		ARG 1 reader
 		ARG 2 allowSnbt
-	METHOD method_41961 blockOrTag (Lnet/minecraft/class_2378;Lcom/mojang/brigadier/StringReader;Z)Lcom/mojang/datafixers/util/Either;
+	METHOD method_41962 blockOrTag (Lnet/minecraft/class_7225;Ljava/lang/String;Z)Lcom/mojang/datafixers/util/Either;
-		ARG 0 registry
-		ARG 1 reader
-		ARG 2 allowSnbt
-	METHOD method_41962 blockOrTag (Lnet/minecraft/class_2378;Ljava/lang/String;Z)Lcom/mojang/datafixers/util/Either;
-		ARG 0 registry
 		ARG 1 string
 		ARG 2 allowSnbt
 	METHOD method_41963 suggestBlockId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

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

@@ -5,13 +5,7 @@ CLASS net/minecraft/class_7644 net/minecraft/command/argument/DecoratableArgumen
 	METHOD method_45043 of (Lcom/mojang/brigadier/ParseResults;)Lnet/minecraft/class_7644;
 		COMMENT {@return a new instance of this list from {@code parseResults}}
 		ARG 0 parseResults
-	METHOD method_45044 collectDecoratableArguments (Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/List;
+	METHOD method_45044 collectDecoratableArguments (Ljava/lang/String;Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/List;
-		ARG 0 contextBuilder
-	METHOD method_45045 contains (Lcom/mojang/brigadier/tree/CommandNode;)Z
-		COMMENT {@return whether {@code node} is in this list of parsed decorated arguments}
-		ARG 1 node
 	CLASS class_7645 ParsedArgument
 		COMMENT A parsed decoratable argument, also used as the entry of {@link DecoratableArgumentList}.
-		FIELD comp_977 argumentType Lnet/minecraft/class_7517;
-		METHOD comp_977 argumentType ()Lnet/minecraft/class_7517;
 		METHOD method_45046 getNodeName ()Ljava/lang/String;

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

@@ -1,8 +0,0 @@
-CLASS net/minecraft/class_7517 net/minecraft/command/argument/DecoratableArgumentType
-	METHOD method_44258 decorate (Lnet/minecraft/class_2168;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 source
-		ARG 2 format
-	METHOD method_44261 getFormatClass ()Ljava/lang/Class;
-	METHOD method_44282 decorate (Lnet/minecraft/class_2168;Lcom/mojang/brigadier/context/ParsedArgument;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 source
-		ARG 2 parsedValue

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

@@ -1,14 +0,0 @@
-CLASS net/minecraft/class_2194 net/minecraft/command/argument/EnchantmentArgumentType
-	FIELD field_9871 EXAMPLES Ljava/util/Collection;
-	FIELD field_9872 UNKNOWN_ENCHANTMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 context
-		ARG 2 builder
-	METHOD method_9333 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
-	METHOD method_9334 getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1887;
-		ARG 0 context
-		ARG 1 name
-	METHOD method_9336 enchantment ()Lnet/minecraft/class_2194;
-	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
-		ARG 1 reader

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

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_2188 net/minecraft/command/argument/EntitySummonArgumentType
-	FIELD field_9865 EXAMPLES Ljava/util/Collection;
-	FIELD field_9866 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	METHOD method_9322 getEntitySummon (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2960;
-		ARG 0 context
-		ARG 1 name
-	METHOD method_9323 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
-	METHOD method_9324 entitySummon ()Lnet/minecraft/class_2188;
-	METHOD method_9326 validate (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
-		ARG 0 id
-	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
-		ARG 1 reader

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

@@ -1,14 +1,5 @@
 CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentType
-	FIELD field_39422 LOGGER Lorg/slf4j/Logger;
 	FIELD field_9876 EXAMPLES Ljava/util/Collection;
-	METHOD method_43770 getSignedMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2196$class_7515;
-		ARG 0 context
-		ARG 1 name
-	METHOD method_44259 (Lnet/minecraft/class_2168;Ljava/lang/Throwable;)Ljava/lang/Object;
-		ARG 1 throwable
-	METHOD method_44260 handleResolvingFailure (Lnet/minecraft/class_2168;Ljava/util/concurrent/CompletableFuture;)V
-		ARG 0 source
-		ARG 1 future
 	METHOD method_9339 getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 context
 		ARG 1 name
@@ -23,8 +14,6 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp
 			ARG 2 selectors
 		METHOD method_35691 getContents ()Ljava/lang/String;
 		METHOD method_35692 getSelectors ()[Lnet/minecraft/class_2196$class_2198;
-		METHOD method_44267 decorate (Lnet/minecraft/class_2168;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 source
 		METHOD method_44268 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561;
 			ARG 1 source
 		METHOD method_9341 format (Lnet/minecraft/class_2168;Z)Lnet/minecraft/class_2561;
@@ -46,20 +35,3 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp
 		METHOD method_9344 getEnd ()I
 		METHOD method_9345 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561;
 			ARG 1 source
-	CLASS class_7515 SignedMessage
-		METHOD method_44262 decorate (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V
-			ARG 1 source
-			ARG 2 callback
-		METHOD method_44806 sendHeader (Lnet/minecraft/class_2168;)V
-			COMMENT Sends the message's header to all players.
-			COMMENT
-			COMMENT <p>This should be called if the message could not be sent due to an exception.
-			COMMENT See {@link net.minecraft.server.command.MessageCommand} for an example.
-			ARG 1 source
-		METHOD method_44807 (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V
-			ARG 1 message
-		METHOD method_44808 filterText (Lnet/minecraft/class_2168;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 source
-			ARG 2 text
-		METHOD method_45070 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Ljava/lang/Void;)V
-			ARG 3 void_

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

@@ -4,8 +4,8 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
 		ARG 2 builder
-	METHOD method_9417 particleEffect ()Lnet/minecraft/class_2223;
+	METHOD method_9417 particleEffect (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2223;
-	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394;
+	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225;)Lnet/minecraft/class_2394;
 		ARG 0 reader
 	METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id

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

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumentType
 	FIELD field_37269 EXAMPLES Ljava/util/Collection;
-	FIELD field_37270 UNKNOWN_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_37271 INVALID_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_37272 registryRef Lnet/minecraft/class_5321;
 	FIELD field_39191 INVALID_STRUCTURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
@@ -10,9 +9,6 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
 		ARG 2 builder
-	METHOD method_41219 getAttribute (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1320;
-		ARG 0 context
-		ARG 1 name
 	METHOD method_41220 getKey (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_5321;
 		ARG 0 context
 		ARG 1 name
@@ -21,28 +17,26 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen
 	METHOD method_41221 getRegistry (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378;
 		ARG 0 context
 		ARG 1 registryRef
-	METHOD method_41223 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD method_41224 registryKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7079;
 		ARG 0 registryRef
-	METHOD method_41225 getConfiguredFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
+	METHOD method_41225 getConfiguredFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883;
 		ARG 0 context
 		ARG 1 name
 	METHOD method_41226 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_43776 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_43777 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_6880;
+	METHOD method_43777 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_6880$class_6883;
 		ARG 0 context
 		ARG 1 name
 		ARG 2 registryRef
 		ARG 3 invalidException
 	METHOD method_43778 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_43779 getStructureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
+	METHOD method_43779 getStructureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883;
 		ARG 0 context
 		ARG 1 name
-	METHOD method_43780 getStructurePoolEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
+	METHOD method_43780 getStructurePoolEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883;
 		ARG 0 context
 		ARG 1 name
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_7451 net/minecraft/command/argument/SignedArgumentType
-	METHOD method_43752 toSignedString (Ljava/lang/Object;)Ljava/lang/String;
-		ARG 1 value

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

@@ -1,14 +0,0 @@
-CLASS net/minecraft/class_2201 net/minecraft/command/argument/StatusEffectArgumentType
-	FIELD field_9895 EXAMPLES Ljava/util/Collection;
-	FIELD field_9896 INVALID_EFFECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 context
-		ARG 2 builder
-	METHOD method_9347 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1291;
-		ARG 0 context
-		ARG 1 name
-	METHOD method_9349 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
-	METHOD method_9350 statusEffect ()Lnet/minecraft/class_2201;
-	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
-		ARG 1 reader

mappings/net/minecraft/data/DataGenerator.mapping

@@ -1,40 +1,12 @@
 CLASS net/minecraft/class_2403 net/minecraft/data/DataGenerator
-	FIELD field_11272 inputs Ljava/util/Collection;
 	FIELD field_11273 providers Ljava/util/List;
-	FIELD field_11274 output Ljava/nio/file/Path;
 	FIELD field_11275 LOGGER Lorg/slf4j/Logger;
 	FIELD field_38909 runningProviders Ljava/util/List;
 	FIELD field_38910 gameVersion Lnet/minecraft/class_6489;
 	FIELD field_38911 ignoreCache Z
-	METHOD <init> (Ljava/nio/file/Path;Ljava/util/Collection;Lnet/minecraft/class_6489;Z)V
+	METHOD <init> (Ljava/nio/file/Path;Lnet/minecraft/class_6489;Z)V
 		ARG 1 output
-		ARG 2 inputs
-		ARG 3 gameVersion
-		ARG 4 ignoreCache
-	METHOD method_10312 getInputs ()Ljava/util/Collection;
-	METHOD method_10313 getOutput ()Ljava/nio/file/Path;
 	METHOD method_10314 addProvider (ZLnet/minecraft/class_2405;)V
 		ARG 1 shouldRun
 		ARG 2 provider
 	METHOD method_10315 run ()V
-	METHOD method_44105 resolveRootDirectoryPath (Lnet/minecraft/class_2403$class_7490;)Ljava/nio/file/Path;
-		ARG 1 outputType
-	METHOD method_44106 createPathResolver (Lnet/minecraft/class_2403$class_7490;Ljava/lang/String;)Lnet/minecraft/class_2403$class_7489;
-		ARG 1 outputType
-		ARG 2 directoryName
-	CLASS class_7489 PathResolver
-		FIELD field_39365 rootPath Ljava/nio/file/Path;
-		FIELD field_39366 directoryName Ljava/lang/String;
-		METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2403$class_7490;Ljava/lang/String;)V
-			ARG 1 dataGenerator
-			ARG 2 outputType
-			ARG 3 directoryName
-		METHOD method_44107 resolveJson (Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
-			ARG 1 id
-		METHOD method_44108 resolve (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path;
-			ARG 1 id
-			ARG 2 fileExtension
-	CLASS class_7490 OutputType
-		FIELD field_39370 path Ljava/lang/String;
-		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
-			ARG 3 path

mappings/net/minecraft/data/SnbtProvider.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider
-	FIELD field_11453 root Lnet/minecraft/class_2403;
 	FIELD field_11454 LOGGER Lorg/slf4j/Logger;
 	FIELD field_20309 write Ljava/util/List;
 	FIELD field_24615 DEBUG_OUTPUT_DIRECTORY Ljava/nio/file/Path;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;Ljava/lang/Iterable;)V
 		ARG 1 generator
 	METHOD method_10497 write (Lnet/minecraft/class_7403;Lnet/minecraft/class_2463$class_4511;Ljava/nio/file/Path;)V
 		ARG 1 cache

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

@@ -192,7 +192,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	METHOD method_25623 registerParentedItemModel (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)V
 		ARG 1 block
 		ARG 2 parentModelId
-	METHOD method_25626 createFenceGateBlockState (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_25626 createFenceGateBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_4917;
 		ARG 0 fenceGateBlock
 		ARG 1 openModelId
 		ARG 2 closedModelId

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

@@ -1,8 +1,8 @@
 CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider
 	FIELD field_22845 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39375 blockstatesPathResolver Lnet/minecraft/class_2403$class_7489;
+	FIELD field_39375 blockstatesPathResolver Lnet/minecraft/class_7784$class_7489;
-	FIELD field_39376 modelsPathResolver Lnet/minecraft/class_2403$class_7489;
+	FIELD field_39376 modelsPathResolver Lnet/minecraft/class_7784$class_7489;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 generator
 	METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/util/Map;Ljava/util/function/Function;)V
 		ARG 1 cache

mappings/net/minecraft/data/dev/NbtProvider.mapping

@@ -1,8 +1,5 @@
 CLASS net/minecraft/class_2461 net/minecraft/data/dev/NbtProvider
-	FIELD field_11449 root Lnet/minecraft/class_2403;
 	FIELD field_11450 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
-		ARG 1 root
 	METHOD method_10493 convertNbtToSnbt (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/nio/file/Path;
 		ARG 0 writer
 		ARG 1 inputPath

mappings/net/minecraft/data/family/BlockFamily.mapping

@@ -12,7 +12,7 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily
 		ARG 1 variant
 	METHOD method_33474 getVariants ()Ljava/util/Map;
 	METHOD method_33477 shouldGenerateModels ()Z
-	METHOD method_33478 shouldGenerateRecipes ()Z
+	METHOD method_33478 shouldGenerateRecipes (Lnet/minecraft/class_7699;)Z
 	METHOD method_33479 getGroup ()Ljava/util/Optional;
 	METHOD method_33480 getUnlockCriterionName ()Ljava/util/Optional;
 	CLASS class_5795 Builder

mappings/net/minecraft/data/report/BlockListProvider.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider
-	FIELD field_11307 generator Lnet/minecraft/class_2403;
+	METHOD <init> (Lnet/minecraft/class_7784;)V
-	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 generator

mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider
-	FIELD field_11321 generator Lnet/minecraft/class_2403;
+	METHOD <init> (Lnet/minecraft/class_7784;)V
-	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 generator

mappings/net/minecraft/data/report/RegistryDumpProvider.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider
-	FIELD field_11323 generator Lnet/minecraft/class_2403;
+	METHOD <init> (Lnet/minecraft/class_7784;)V
-	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 generator
 	METHOD method_17174 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 1 entry

mappings/net/minecraft/data/report/WorldgenProvider.mapping

@@ -1,9 +1,6 @@
 CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider
 	FIELD field_26377 LOGGER Lorg/slf4j/Logger;
-	FIELD field_26379 generator Lnet/minecraft/class_2403;
+	METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;)V
-	METHOD <init> (Lnet/minecraft/class_2403;)V
-		ARG 1 generator
-	METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V
 		ARG 1 writer
 		ARG 2 registryManager
 		ARG 3 ops
@@ -14,7 +11,7 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider
 		ARG 2 json
 		ARG 3 encoder
 		ARG 4 value
-	METHOD method_39682 (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V
+	METHOD method_39682 (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;)V
 		ARG 4 info
 	METHOD method_40362 (Ljava/nio/file/Path;Ljava/lang/String;)V
 		ARG 1 error

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

@@ -2,8 +2,8 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider
 	FIELD field_11479 LOGGER Lorg/slf4j/Logger;
 	FIELD field_11481 tagBuilders Ljava/util/Map;
 	FIELD field_11482 registry Lnet/minecraft/class_2378;
-	FIELD field_39380 pathResolver Lnet/minecraft/class_2403$class_7489;
+	FIELD field_39380 pathResolver Lnet/minecraft/class_7784$class_7489;
-	METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V
+	METHOD <init> (Lnet/minecraft/class_7784;Lnet/minecraft/class_2378;)V
 		ARG 1 root
 		ARG 2 registry
 	METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124;

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

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider
 	FIELD field_11289 tabGenerators Ljava/util/List;
 	FIELD field_11290 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39372 pathResolver Lnet/minecraft/class_2403$class_7489;
+	FIELD field_39372 pathResolver Lnet/minecraft/class_7784$class_7489;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
-		ARG 1 root
 	METHOD method_10333 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V
 		ARG 3 advancement

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

@@ -4,8 +4,6 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement
 	FIELD field_35092 OVERWORLD_MAX_Y I
 	FIELD field_35093 OVERWORLD_MIN_Y I
 	FIELD field_35094 OVERWORLD_BEDROCK_LAYER_HEIGHT I
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter
 	METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
 		ARG 1 builder
 	METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162;

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7458 net/minecraft/data/server/BannerPatternTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_4845 net/minecraft/data/server/BarterLootTableGenerator
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider
 	FIELD field_38012 LOGGER Lorg/slf4j/Logger;
 	FIELD field_39373 path Ljava/nio/file/Path;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator
 	METHOD method_42028 (Lnet/minecraft/class_2378;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;)V
 		ARG 4 preset

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_6957 net/minecraft/data/server/BiomeTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator
 	METHOD method_42040 (Lnet/minecraft/class_2474$class_5124;Lnet/minecraft/class_5321;)V
 		ARG 1 biome

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

@@ -1,309 +1,5 @@
 CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator
-	FIELD field_11336 WITH_SILK_TOUCH Lnet/minecraft/class_5341$class_210;
-	FIELD field_11337 WITHOUT_SILK_TOUCH Lnet/minecraft/class_5341$class_210;
 	FIELD field_11338 JUNGLE_SAPLING_DROP_CHANCE [F
-	FIELD field_11339 SAPLING_DROP_CHANCE [F
 	FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set;
-	FIELD field_11341 WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/class_5341$class_210;
-	FIELD field_11342 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_5341$class_210;
-	FIELD field_11343 WITH_SHEARS Lnet/minecraft/class_5341$class_210;
-	FIELD field_16493 lootTables Ljava/util/Map;
-	FIELD field_38468 LEAVES_STICK_DROP_CHANCE [F
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter
-	METHOD method_10371 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 dropWithShears
-	METHOD method_10372 dropsWithShears (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_10373 dropsWithSilkTouch (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_10375 dropsWithProperty (Lnet/minecraft/class_2248;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-		ARG 1 property
-		ARG 2 value
-	METHOD method_10377 oreDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53;
-		ARG 0 dropWithSilkTouch
-		ARG 1 drop
-	METHOD method_10378 oakLeavesDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53;
-		ARG 0 leaves
-		ARG 1 drop
-		ARG 2 chance
-	METHOD method_10380 dropsWithShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-		ARG 1 child
-	METHOD method_10381 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-		ARG 1 conditionBuilder
-		ARG 2 child
-	METHOD method_10382 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 dropWithSilkTouch
-		ARG 1 drop
-	METHOD method_10383 slabDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_10384 drops (Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-		ARG 1 count
-	METHOD method_10385 mushroomBlockDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 dropWithSilkTouch
-		ARG 1 drop
-	METHOD method_10386 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;Lnet/minecraft/class_5658;)Lnet/minecraft/class_52$class_53;
-		ARG 0 dropWithSilkTouch
-		ARG 1 drop
-		ARG 2 count
-	METHOD method_10387 cropStemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53;
-		ARG 0 stem
-		ARG 1 drop
-	METHOD method_10388 dropsWithSilkTouchOrShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-		ARG 1 child
-	METHOD method_10389 pottedPlantDrops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 plant
-	METHOD method_10390 leavesDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53;
-		ARG 0 leaves
-		ARG 1 drop
-		ARG 2 chance
-	METHOD method_10391 cropDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53;
-		ARG 0 crop
-		ARG 1 product
-		ARG 2 seeds
-		ARG 3 condition
-	METHOD method_10392 addSurvivesExplosionCondition (Lnet/minecraft/class_1935;Lnet/minecraft/class_192;)Lnet/minecraft/class_192;
-		ARG 0 drop
-		ARG 1 builder
-	METHOD method_10393 applyExplosionDecay (Lnet/minecraft/class_1935;Lnet/minecraft/class_116;)Lnet/minecraft/class_116;
-		ARG 0 drop
-		ARG 1 builder
-	METHOD method_10394 drops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_10395 dropsNothing ()Lnet/minecraft/class_52$class_53;
-	METHOD method_10396 nameableContainerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_10397 dropsWithSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-		ARG 1 child
-	METHOD method_16232 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16233 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16235 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16237 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16238 addDropWithSilkTouch (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
-		ARG 1 block
-		ARG 2 drop
-	METHOD method_16241 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16242 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16243 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16245 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16246 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16249 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16250 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16251 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16252 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16254 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16255 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16256 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)V
-		ARG 1 block
-		ARG 2 drop
-	METHOD method_16258 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_52$class_53;)V
-		ARG 1 block
-		ARG 2 lootTable
-	METHOD method_16262 addDropWithSilkTouch (Lnet/minecraft/class_2248;)V
-		ARG 1 block
-	METHOD method_16263 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16264 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16266 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16268 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16269 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16270 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16273 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16275 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16277 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16280 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16282 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16283 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16284 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16285 addPottedPlantDrop (Lnet/minecraft/class_2248;)V
-		ARG 1 block
-	METHOD method_16286 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16290 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16292 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16293 addDrop (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V
-		ARG 1 block
-		ARG 2 lootTableFunction
-	METHOD method_16295 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16296 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16300 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16302 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16303 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16306 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16307 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16310 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16311 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16312 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16314 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16316 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16317 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16324 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16325 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16326 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16327 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16328 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_16329 addDrop (Lnet/minecraft/class_2248;)V
-		ARG 1 block
-	METHOD method_16876 shulkerBoxDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_16877 bannerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_22142 beeNestDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_22143 beehiveDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_23229 attachedCropStemDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_52$class_53;
-		ARG 0 stem
-		ARG 1 drop
-	METHOD method_23230 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_23231 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_24817 doorDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_26000 addVinePlantDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
-		ARG 1 block
-		ARG 2 drop
-	METHOD method_26277 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_27164 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_27165 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_29399 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_29400 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_30157 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_30158 tallGrassDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 tallGrass
-		ARG 1 grass
-	METHOD method_30159 seagrassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 seagrass
-	METHOD method_32224 candleDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 candle
-	METHOD method_32225 candleCakeDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 candle
-	METHOD method_32226 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_33707 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_33708 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_33709 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 drop
-	METHOD method_34047 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34048 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34049 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34050 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34051 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34052 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34053 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34054 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34055 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34056 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34057 lapisOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 ore
-	METHOD method_34058 redstoneOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 ore
-	METHOD method_34594 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34595 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34596 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34597 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 flowerPot
-	METHOD method_34598 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
 	METHOD method_34599 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
 		ARG 0 block
-	METHOD method_34600 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34601 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_34602 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_36226 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_36229 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_36230 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_36231 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_36545 copperOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 ore
-	METHOD method_37108 multifaceGrowthDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53;
-		ARG 0 multifaceGrowthBlock
-		ARG 1 conditionBuilder
-	METHOD method_42752 mangroveLeavesDrop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 leaves
-	METHOD method_43810 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block
-	METHOD method_43813 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
-		ARG 0 block

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_2466 net/minecraft/data/server/BlockTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
-		ARG 1 root

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7393 net/minecraft/data/server/CatVariantTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_2432 net/minecraft/data/server/ChestLootTableGenerator
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_2419 net/minecraft/data/server/EndTabAdvancementGenerator
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -1,17 +1 @@
 CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerator
-	FIELD field_11344 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049;
-	FIELD field_16543 lootTables Ljava/util/Map;
-	FIELD field_19339 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set;
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter
-	METHOD method_10401 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
-		ARG 0 item
-	METHOD method_16368 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V
-		ARG 1 entityType
-		ARG 2 lootTable
-	METHOD method_16369 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
-		ARG 1 entityId
-		ARG 2 lootTable
-	METHOD method_43226 killedByFrog ()Lnet/minecraft/class_5341$class_210;
-	METHOD method_43227 killedByFrog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_5341$class_210;
-		ARG 1 variant

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_2467 net/minecraft/data/server/EntityTypeTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 root

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

@@ -2,5 +2,3 @@ CLASS net/minecraft/class_2437 net/minecraft/data/server/FishingLootTableGenerat
 	FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210;
 	FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210;
 	FIELD field_35165 NEEDS_SPARSE_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210;
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7229 net/minecraft/data/server/FlatLevelGeneratorPresetTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_2469 net/minecraft/data/server/FluidTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 root

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

@@ -1,4 +1,4 @@
 CLASS net/minecraft/class_5746 net/minecraft/data/server/GameEventTagProvider
 	FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 root

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_3714 net/minecraft/data/server/GiftLootTableGenerator
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -5,8 +5,6 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancement
 	FIELD field_11298 FOOD_ITEMS [Lnet/minecraft/class_1792;
 	FIELD field_33964 AXE_ITEMS [Lnet/minecraft/class_1792;
 	FIELD field_38467 EGG_LAYING_ANIMALS [Lnet/minecraft/class_1299;
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter
 	METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
 		ARG 1 builder
 	METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7459 net/minecraft/data/server/InstrumentTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,8 +1 @@
 CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagProvider
-	FIELD field_23783 blockTags Ljava/util/function/Function;
-	METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2466;)V
-		ARG 1 root
-		ARG 2 blockTagsProvider
-	METHOD method_10505 copy (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V
-		ARG 1 blockTag
-		ARG 2 itemTag

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

@@ -1,21 +1,17 @@
 CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider
 	FIELD field_11354 lootTypeGenerators Ljava/util/List;
 	FIELD field_11355 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39374 pathResolver Lnet/minecraft/class_2403$class_7489;
+	FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
-		ARG 1 root
 	METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 name
 		ARG 1 message
 	METHOD method_10408 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V
 		ARG 2 id
 		ARG 3 table
-	METHOD method_10410 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 1 generator
 	METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V
 		ARG 1 id
 		ARG 2 table
-	METHOD method_10412 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
+	METHOD method_10412 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
 		ARG 2 id
 		ARG 3 builder
 	METHOD method_22825 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341;

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

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_2416 net/minecraft/data/server/NetherTabAdvancementGenerator
 	FIELD field_24614 NETHER_BIOMES Ljava/util/List;
 	FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258;
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7416 net/minecraft/data/server/PaintingVariantTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7491 net/minecraft/data/server/PointOfInterestTypeTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,20 +1,9 @@
 CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 	FIELD field_11374 LOGGER Lorg/slf4j/Logger;
 	FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map;
-	FIELD field_33420 COAL_ORES Lcom/google/common/collect/ImmutableList;
+	FIELD field_39378 recipesPathResolver Lnet/minecraft/class_7784$class_7489;
-	FIELD field_33421 IRON_ORES Lcom/google/common/collect/ImmutableList;
+	FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_7784$class_7489;
-	FIELD field_33422 COPPER_ORES Lcom/google/common/collect/ImmutableList;
-	FIELD field_33423 GOLD_ORES Lcom/google/common/collect/ImmutableList;
-	FIELD field_33424 DIAMOND_ORES Lcom/google/common/collect/ImmutableList;
-	FIELD field_33425 LAPIS_ORES Lcom/google/common/collect/ImmutableList;
-	FIELD field_33426 REDSTONE_ORES Lcom/google/common/collect/ImmutableList;
-	FIELD field_33427 EMERALD_ORES Lcom/google/common/collect/ImmutableList;
-	FIELD field_39378 recipesPathResolver Lnet/minecraft/class_2403$class_7489;
-	FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_2403$class_7489;
-	METHOD <init> (Lnet/minecraft/class_2403;)V
-		ARG 1 root
 	METHOD method_10419 generate (Ljava/util/function/Consumer;)V
-		ARG 0 exporter
 	METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2066$class_2068;
 		ARG 0 tag
 	METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_2444;)V
@@ -33,10 +22,9 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 		ARG 0 cache
 		ARG 1 json
 		ARG 2 path
-	METHOD method_17585 generateCookingRecipes (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;I)V
+	METHOD method_17585 generateCookingRecipes (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_1865;I)V
 		ARG 0 exporter
 		ARG 1 cooker
-		ARG 2 serializer
 		ARG 3 cookingTime
 	METHOD method_24475 offerPlanksRecipe2 (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V
 		ARG 0 exporter
@@ -98,55 +86,36 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 		ARG 0 exporter
 		ARG 1 output
 		ARG 2 input
-	METHOD method_29728 offerNetheriteUpgradeRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)V
+	METHOD method_29728 offerNetheriteUpgradeRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V
 		ARG 0 exporter
 		ARG 1 input
-		ARG 2 output
 	METHOD method_32233 offerCandleDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
 		ARG 1 output
 		ARG 2 input
-	METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
+	METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
-		ARG 0 output
+	METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447;
-		ARG 1 input
+	METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
-	METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447;
-		ARG 0 output
-		ARG 1 input
-	METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
-		ARG 0 output
-		ARG 1 input
 	METHOD method_32807 hasItem (Lnet/minecraft/class_1935;)Ljava/lang/String;
 		ARG 0 item
 	METHOD method_32808 createStairsRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
 		ARG 0 output
 		ARG 1 input
-	METHOD method_32809 offerWallRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
+	METHOD method_32809 offerWallRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
-		ARG 1 output
+	METHOD method_32810 offerPolishedStoneRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
-		ARG 2 input
-	METHOD method_32810 offerPolishedStoneRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
-		ARG 1 output
+	METHOD method_32811 offerCutCopperRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
-		ARG 2 input
-	METHOD method_32811 offerCutCopperRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
-		ARG 1 output
+	METHOD method_32812 offerChiseledBlockRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
-		ARG 2 input
-	METHOD method_32812 offerChiseledBlockRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
-		ARG 1 output
-		ARG 2 input
 	METHOD method_32813 offerPressurePlateRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
 		ARG 1 output
 		ARG 2 input
-	METHOD method_32814 offerSlabRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
+	METHOD method_32814 offerSlabRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
-		ARG 1 output
+	METHOD method_33531 getWallRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
-		ARG 2 input
-	METHOD method_33531 getWallRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
-		ARG 0 output
-		ARG 1 input
 	METHOD method_33532 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797;
 		ARG 0 output
 		ARG 1 input
@@ -167,14 +136,10 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 		ARG 1 family
 	METHOD method_33536 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V
 		ARG 2 group
-	METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
+	METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
-		ARG 0 output
-		ARG 1 input
 	METHOD method_33538 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797;
 		ARG 0 output
 		ARG 1 input
-	METHOD method_33539 (Ljava/util/function/Consumer;Lnet/minecraft/class_5794;)V
-		ARG 1 family
 	METHOD method_33541 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797;
 		ARG 0 output
 		ARG 1 input
@@ -226,16 +191,12 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 	METHOD method_33714 convertBetween (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Ljava/lang/String;
 		ARG 0 to
 		ARG 1 from
-	METHOD method_33715 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;I)V
+	METHOD method_33715 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;I)V
 		ARG 0 exporter
-		ARG 1 output
-		ARG 2 input
-		ARG 3 count
 	METHOD method_33716 getItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String;
 		ARG 0 item
-	METHOD method_33717 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
+	METHOD method_33717 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
-		ARG 1 output
 		ARG 2 input
 	METHOD method_34662 offerCrackingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		COMMENT Offers a smelting recipe to the exporter that is used to convert the main block of a block family to its cracked variant.
@@ -250,39 +211,21 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 	METHOD method_35914 conditionsFromItem (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068;
 		ARG 0 count
 		ARG 1 item
-	METHOD method_36232 offerMultipleOptions (Ljava/util/function/Consumer;Lnet/minecraft/class_3957;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;Ljava/lang/String;)V
+	METHOD method_36232 offerMultipleOptions (Ljava/util/function/Consumer;Lnet/minecraft/class_1865;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;Ljava/lang/String;)V
 		ARG 0 exporter
-		ARG 1 serializer
 		ARG 2 inputs
-		ARG 3 output
+	METHOD method_36233 offerSmelting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;)V
-		ARG 4 experience
-		ARG 5 cookingTime
-		ARG 6 group
-		ARG 7 baseIdString
-	METHOD method_36233 offerSmelting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;)V
 		ARG 0 exporter
 		ARG 1 inputs
-		ARG 2 output
+	METHOD method_36234 offerBlasting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILjava/lang/String;)V
-		ARG 3 experience
-		ARG 4 cookingTime
-		ARG 5 group
-	METHOD method_36234 offerBlasting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;)V
 		ARG 0 exporter
 		ARG 1 inputs
-		ARG 2 output
+	METHOD method_36325 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)V
-		ARG 3 experience
-		ARG 4 cookingTime
-		ARG 5 group
-	METHOD method_36325 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		COMMENT Offers two recipes to convert between a normal and compacted form of an item.
 		COMMENT
 		COMMENT <p>The shaped recipe converts 9 items in a square to a compacted form of the item.
 		COMMENT <p>The shapeless recipe converts the compacted form to 9 of the normal form.
 		ARG 0 exporter
-		ARG 1 input
-			COMMENT input item used to craft compacted item, e.g. copper ingot
-		ARG 2 compacted
-			COMMENT compacted output item, e.g. block of copper
 	METHOD method_36444 offerSingleOutputShapelessRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;)V
 		ARG 0 exporter
 		ARG 1 output
@@ -294,34 +237,20 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 		ARG 2 input
 		ARG 3 group
 		ARG 4 outputCount
-	METHOD method_36446 offerReversibleCompactingRecipesWithCompactingRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
+	METHOD method_36446 offerReversibleCompactingRecipesWithCompactingRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 exporter
-		ARG 1 input
 		ARG 2 compacted
-		ARG 3 compactingRecipeName
+	METHOD method_36447 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-		ARG 4 compactingRecipeGroup
-	METHOD method_36447 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 exporter
-		ARG 1 input
+	METHOD method_36448 offerCookingRecipe (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_1865;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V
-		ARG 2 compacted
-		ARG 3 compactingRecipeName
-		ARG 4 compactingRecipeGroup
-		ARG 5 reverseRecipeName
-		ARG 6 reverseRecipeGroup
-	METHOD method_36448 offerCookingRecipe (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V
 		ARG 0 exporter
 		ARG 1 cooker
-		ARG 2 serializer
 		ARG 3 cookingTime
 		ARG 4 input
 		ARG 5 output
 		ARG 6 experience
-	METHOD method_36449 offerReversibleCompactingRecipesWithReverseRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
+	METHOD method_36449 offerReversibleCompactingRecipesWithReverseRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 exporter
-		ARG 1 input
-		ARG 2 compacted
-		ARG 3 reverseRecipeName
-		ARG 4 reverseRecipeGroup
 	METHOD method_36450 getRecipeName (Lnet/minecraft/class_1935;)Ljava/lang/String;
 		ARG 0 item
 	METHOD method_36451 getSmeltingItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String;
@@ -331,9 +260,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 	METHOD method_36546 (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797;
 		ARG 0 output
 		ARG 1 input
-	METHOD method_36547 createCutCopperRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447;
+	METHOD method_36547 createCutCopperRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447;
-		ARG 0 output
-		ARG 1 input
 	METHOD method_42754 offerChestBoatRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 0 exporter
 		ARG 1 output

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

@@ -1,3 +1 @@
 CLASS net/minecraft/class_2417 net/minecraft/data/server/StoryTabAdvancementGenerator
-	METHOD accept (Ljava/lang/Object;)V
-		ARG 1 exporter

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7071 net/minecraft/data/server/StructureTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

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

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7230 net/minecraft/data/server/WorldPresetTagProvider
-	METHOD <init> (Lnet/minecraft/class_2403;)V
+	METHOD <init> (Lnet/minecraft/class_7784;)V
 		ARG 1 dataGenerator

mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping

@@ -1,9 +1,6 @@
 CLASS net/minecraft/class_2456 net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder
-	FIELD field_11429 serializer Lnet/minecraft/class_1866;
+	FIELD field_11429 serializer Lnet/minecraft/class_1865;
-	METHOD <init> (Lnet/minecraft/class_1866;)V
-		ARG 1 serializer
 	METHOD method_10475 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V
 		ARG 1 exporter
 		ARG 2 recipeId
-	METHOD method_10476 create (Lnet/minecraft/class_1866;)Lnet/minecraft/class_2456;
+	METHOD method_10476 create (Lnet/minecraft/class_1865;)Lnet/minecraft/class_2456;
-		ARG 0 serializer

mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping

@@ -5,41 +5,14 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso
 	FIELD field_11417 output Lnet/minecraft/class_1792;
 	FIELD field_11418 input Lnet/minecraft/class_1856;
 	FIELD field_11419 group Ljava/lang/String;
-	FIELD field_17599 serializer Lnet/minecraft/class_3957;
+	FIELD field_17599 serializer Lnet/minecraft/class_1865;
-	METHOD <init> (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_3957;)V
-		ARG 1 output
-		ARG 2 input
-		ARG 3 experience
-		ARG 4 cookingTime
-		ARG 5 serializer
 	METHOD method_10471 validate (Lnet/minecraft/class_2960;)V
 		ARG 1 recipeId
-	METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
+	METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-		ARG 0 ingredient
+	METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FILnet/minecraft/class_1865;)Lnet/minecraft/class_2454;
-		ARG 1 result
+	METHOD method_17802 createSmelting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-		ARG 2 experience
+	METHOD method_35916 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-		ARG 3 cookingTime
+	METHOD method_35918 createSmoking (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-	METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FILnet/minecraft/class_3957;)Lnet/minecraft/class_2454;
-		ARG 0 ingredient
-		ARG 1 result
-		ARG 2 experience
-		ARG 3 cookingTime
-		ARG 4 serializer
-	METHOD method_17802 createSmelting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-		ARG 0 ingredient
-		ARG 1 result
-		ARG 2 experience
-		ARG 3 cookingTime
-	METHOD method_35916 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-		ARG 0 result
-		ARG 1 ingredient
-		ARG 2 experience
-		ARG 3 cookingTime
-	METHOD method_35918 createSmoking (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
-		ARG 0 result
-		ARG 1 ingredient
-		ARG 2 experience
-		ARG 3 cookingTime
 	CLASS class_2455 CookingRecipeJsonProvider
 		FIELD field_11421 experience F
 		FIELD field_11422 cookingTime I
@@ -50,13 +23,6 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso
 		FIELD field_11427 advancementId Lnet/minecraft/class_2960;
 		FIELD field_11428 result Lnet/minecraft/class_1792;
 		FIELD field_17600 serializer Lnet/minecraft/class_1865;
-		METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;)V
+		METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;)V
 			ARG 1 recipeId
 			ARG 2 group
-			ARG 3 input
-			ARG 4 result
-			ARG 5 experience
-			ARG 6 cookingTime
-			ARG 7 advancementBuilder
-			ARG 8 advancementId
-			ARG 9 serializer

mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping

@@ -5,9 +5,6 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson
 	FIELD field_11379 advancementBuilder Lnet/minecraft/class_161$class_162;
 	FIELD field_11380 output Lnet/minecraft/class_1792;
 	FIELD field_11381 group Ljava/lang/String;
-	METHOD <init> (Lnet/minecraft/class_1935;I)V
-		ARG 1 output
-		ARG 2 outputCount
 	METHOD method_10428 input (Ljava/lang/Character;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447;
 		ARG 1 c
 		ARG 2 ingredient
@@ -19,11 +16,8 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson
 	METHOD method_10434 input (Ljava/lang/Character;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447;
 		ARG 1 c
 		ARG 2 itemProvider
-	METHOD method_10436 create (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2447;
+	METHOD method_10436 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2447;
-		ARG 0 output
+	METHOD method_10437 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447;
-		ARG 1 outputCount
-	METHOD method_10437 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447;
-		ARG 0 output
 	METHOD method_10439 pattern (Ljava/lang/String;)Lnet/minecraft/class_2447;
 		ARG 1 patternStr
 	CLASS class_2448 ShapedRecipeJsonProvider
@@ -35,12 +29,8 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson
 		FIELD field_11388 inputs Ljava/util/Map;
 		FIELD field_11389 advancementBuilder Lnet/minecraft/class_161$class_162;
 		FIELD field_11390 advancementId Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V
+		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V
 			ARG 1 recipeId
 			ARG 2 output
 			ARG 3 resultCount
 			ARG 4 group
-			ARG 5 pattern
-			ARG 6 inputs
-			ARG 7 advancementBuilder
-			ARG 8 advancementId

mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping

@@ -4,18 +4,12 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ
 	FIELD field_11395 outputCount I
 	FIELD field_11396 output Lnet/minecraft/class_1792;
 	FIELD field_11398 group Ljava/lang/String;
-	METHOD <init> (Lnet/minecraft/class_1935;I)V
-		ARG 1 output
-		ARG 2 outputCount
 	METHOD method_10445 validate (Lnet/minecraft/class_2960;)V
 		ARG 1 recipeId
 	METHOD method_10446 input (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2450;
 		ARG 1 tag
-	METHOD method_10447 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2450;
+	METHOD method_10447 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2450;
-		ARG 0 output
+	METHOD method_10448 create (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450;
-	METHOD method_10448 create (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450;
-		ARG 0 output
-		ARG 1 outputCount
 	METHOD method_10449 input (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450;
 		ARG 1 itemProvider
 		ARG 2 size
@@ -34,11 +28,8 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ
 		FIELD field_11403 output Lnet/minecraft/class_1792;
 		FIELD field_11404 inputs Ljava/util/List;
 		FIELD field_11405 advancementId Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Ljava/util/List;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V
+		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Lnet/minecraft/class_7710;Ljava/util/List;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V
 			ARG 1 recipeId
 			ARG 2 output
 			ARG 3 outputCount
 			ARG 4 group
-			ARG 5 inputs
-			ARG 6 advancementBuilder
-			ARG 7 advancementId

mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping

@@ -5,18 +5,10 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe
 	FIELD field_17693 advancementBuilder Lnet/minecraft/class_161$class_162;
 	FIELD field_17694 group Ljava/lang/String;
 	FIELD field_17695 serializer Lnet/minecraft/class_1865;
-	METHOD <init> (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)V
+	METHOD method_17968 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981;
-		ARG 1 serializer
-		ARG 2 input
-		ARG 3 output
-		ARG 4 outputCount
-	METHOD method_17968 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981;
 		ARG 0 input
-		ARG 1 output
+	METHOD method_17969 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981;
-	METHOD method_17969 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981;
 		ARG 0 input
-		ARG 1 output
-		ARG 2 outputCount
 	METHOD method_17973 validate (Lnet/minecraft/class_2960;)V
 		ARG 1 recipeId
 	CLASS class_3982 SingleItemRecipeJsonProvider

mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping

@@ -4,15 +4,12 @@ CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJs
 	FIELD field_25493 result Lnet/minecraft/class_1792;
 	FIELD field_25494 advancementBuilder Lnet/minecraft/class_161$class_162;
 	FIELD field_25495 serializer Lnet/minecraft/class_1865;
-	METHOD <init> (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;)V
+	METHOD <init> (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V
-		ARG 1 serializer
 		ARG 2 base
 		ARG 3 addition
-		ARG 4 result
+	METHOD method_29729 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)Lnet/minecraft/class_5377;
-	METHOD method_29729 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;)Lnet/minecraft/class_5377;
 		ARG 0 base
 		ARG 1 addition
-		ARG 2 result
 	METHOD method_29730 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_5377;
 		ARG 1 criterionName
 		ARG 2 conditions

mappings/net/minecraft/entity/Entity.mapping

@@ -897,7 +897,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
-	METHOD method_43688 getMessageSourceProfile ()Lnet/minecraft/class_7436;
 	METHOD method_5621 getMountedHeightOffset ()D
 	METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
 		COMMENT Called when this entity's collision box intersects {@code state}.

mappings/net/minecraft/entity/EntityType.mapping

@@ -15,7 +15,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 	FIELD field_6094 spawnGroup Lnet/minecraft/class_1311;
 	FIELD field_6101 factory Lnet/minecraft/class_1299$class_4049;
 	FIELD field_6106 translationKey Ljava/lang/String;
-	METHOD <init> (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;II)V
+	METHOD <init> (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_4048;IILnet/minecraft/class_7699;)V
 		ARG 1 factory
 		ARG 2 spawnGroup
 		ARG 3 saveable
@@ -144,7 +144,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		FIELD field_6150 summonable Z
 		FIELD field_6151 saveable Z
 		METHOD <init> (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;)V
-			ARG 1 factory
 			ARG 2 spawnGroup
 		METHOD method_17687 setDimensions (FF)Lnet/minecraft/class_1299$class_1300;
 			ARG 1 width

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

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_7096 net/minecraft/entity/ai/brain/task/BiasedLongJump
 	FIELD field_37428 biasChance F
 	FIELD field_37429 unfavoredTargets Ljava/util/List;
 	FIELD field_37430 useBias Z
-	METHOD <init> (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Lnet/minecraft/class_6862;FLjava/util/function/Predicate;)V
+	METHOD <init> (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Lnet/minecraft/class_6862;FLjava/util/function/BiPredicate;)V
 		ARG 1 cooldownRange
 		ARG 2 verticalRange
 		ARG 3 horizontalRange
@@ -11,7 +11,3 @@ CLASS net/minecraft/class_7096 net/minecraft/entity/ai/brain/task/BiasedLongJump
 		ARG 5 entityToSound
 		ARG 6 favoredBlocks
 		ARG 7 biasChance
-		ARG 8 jumpToPredicate
-	METHOD method_41338 isFluidStateAndBelowEmpty (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 2 pos

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

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_7296 net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask
 	FIELD field_38389 lookTargetFunction Ljava/util/function/Function;
 	FIELD field_38390 speed F
-	METHOD <init> (Ljava/util/function/Function;F)V
+	METHOD <init> (Ljava/util/function/Function;FI)V
 		ARG 1 lookTargetFunction
 		ARG 2 speed
 	METHOD method_42649 hasItemAndTarget (Lnet/minecraft/class_1309;)Z

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

@@ -14,20 +14,19 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask
 	FIELD field_30146 targetTime J
 	FIELD field_33460 entityToSound Ljava/util/function/Function;
 	FIELD field_37431 RAM_RANGES Ljava/util/List;
-	FIELD field_37432 jumpToPredicate Ljava/util/function/Predicate;
+	FIELD field_37432 jumpToPredicate Ljava/util/function/BiPredicate;
 	METHOD <init> (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;)V
 		ARG 1 cooldownRange
 		ARG 2 verticalRange
 		ARG 3 horizontalRange
 		ARG 4 maxRange
 		ARG 5 entityToSound
-	METHOD <init> (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Ljava/util/function/Predicate;)V
+	METHOD <init> (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;Ljava/util/function/BiPredicate;)V
 		ARG 1 cooldownRange
 		ARG 2 verticalRange
 		ARG 3 horizontalRange
 		ARG 4 maxRange
 		ARG 5 entityToSound
-		ARG 6 jumpToPredicate
 	METHOD method_35078 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
 		ARG 1 entity
 		ARG 2 pos
@@ -35,18 +34,11 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask
 		ARG 1 entity
 		ARG 2 pos
 		ARG 3 range
-	METHOD method_35080 canReach (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z
+	METHOD method_35080 canReach (Lnet/minecraft/class_1308;Lnet/minecraft/class_4048;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z
-		ARG 1 entity
-		ARG 2 startPos
-		ARG 3 endPos
 	METHOD method_41336 getTarget (Lnet/minecraft/class_3218;)Ljava/util/Optional;
 		ARG 1 world
 	METHOD method_41337 canJumpTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 2 entity
 		ARG 3 pos
-	METHOD method_41339 (Lnet/minecraft/class_2680;)Z
-		ARG 0 state
 	METHOD method_41342 findTarget (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)V
 		ARG 1 world
 		ARG 2 entity

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

@@ -8,8 +8,6 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain
 	METHOD method_41369 coolDownLongJump (Lnet/minecraft/class_7102;Lnet/minecraft/class_5819;)V
 		ARG 0 frog
 		ARG 1 random
-	METHOD method_41370 (Lnet/minecraft/class_2680;)Z
-		ARG 0 state
 	METHOD method_41371 (Lnet/minecraft/class_1309;)Ljava/lang/Float;
 		ARG 0 frog
 	METHOD method_41372 addCoreActivities (Lnet/minecraft/class_4095;)V

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -2,8 +2,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	FIELD field_18134 POSE_DIMENSIONS Ljava/util/Map;
 	FIELD field_18135 STANDING_DIMENSIONS Lnet/minecraft/class_4048;
 	FIELD field_19428 shoulderEntityAddedTime J
-	FIELD field_38198 sculkShriekerWarningManager Lnet/minecraft/class_7262;
-	FIELD field_39118 publicKey Lnet/minecraft/class_7428;
 	FIELD field_39445 lastDeathPos Ljava/util/Optional;
 	FIELD field_7483 strideDistance F
 	FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796;
@@ -39,12 +37,11 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	FIELD field_7523 reducedDebugInfo Z
 	FIELD field_7524 prevCapeX D
 	FIELD field_7525 selectedItem Lnet/minecraft/class_1799;
-	METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V
+	METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;FLcom/mojang/authlib/GameProfile;)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 yaw
 		ARG 4 gameProfile
-		ARG 5 publicKey
 	METHOD method_16354 openJigsawScreen (Lnet/minecraft/class_3751;)V
 		ARG 1 jigsaw
 	METHOD method_16475 spawnParticles (Lnet/minecraft/class_2394;)V
@@ -111,13 +108,13 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 			COMMENT the item stack in the clicked slot
 		ARG 3 clickType
 			COMMENT the click type (mouse button used)
+	METHOD method_33793 shouldFilterText ()Z
 	METHOD method_40126 useRiptide (I)V
 		ARG 1 riptideTicks
-	METHOD method_42272 getSculkShriekerWarningManager ()Lnet/minecraft/class_7262;
+	METHOD method_42272 getSculkShriekerWarningManager ()Ljava/util/Optional;
 	METHOD method_43120 setLastDeathPos (Ljava/util/Optional;)V
 		ARG 1 lastDeathPos
 	METHOD method_43122 getLastDeathPos ()Ljava/util/Optional;
-	METHOD method_43696 getPublicKey ()Lnet/minecraft/class_7428;
 	METHOD method_45015 shouldCloseHandledScreenOnRespawn ()Z
 	METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I
 		ARG 1 recipes

mappings/net/minecraft/item/BlockItem.mapping

@@ -45,7 +45,6 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem
 		ARG 5 state
 	METHOD method_7711 getBlock ()Lnet/minecraft/class_2248;
 	METHOD method_7712 place (Lnet/minecraft/class_1750;)Lnet/minecraft/class_1269;
-		ARG 1 context
 	METHOD method_7713 appendBlocks (Ljava/util/Map;Lnet/minecraft/class_1792;)V
 		ARG 1 map
 		ARG 2 item

mappings/net/minecraft/item/Item.mapping

@@ -32,7 +32,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 	FIELD field_36401 registryEntry Lnet/minecraft/class_6880$class_6883;
 	FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID;
 	FIELD field_8003 BLOCK_ITEMS Ljava/util/Map;
-	FIELD field_8004 group Lnet/minecraft/class_1761;
 	FIELD field_8006 ATTACK_DAMAGE_MODIFIER_ID Ljava/util/UUID;
 	FIELD field_8008 recipeRemainder Lnet/minecraft/class_1792;
 	FIELD field_8009 rarity Lnet/minecraft/class_1814;
@@ -214,15 +213,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		ARG 3 entity
 		ARG 4 hand
 	METHOD method_7848 getName ()Lnet/minecraft/class_2561;
-	METHOD method_7850 appendStacks (Lnet/minecraft/class_1761;Lnet/minecraft/class_2371;)V
-		COMMENT Appends the stacks of this item shown in the item group to the list.
-		COMMENT
-		COMMENT <p>This can be overridden to append item stacks with custom NBT data to the
-		COMMENT creative inventory.
-		COMMENT
-		COMMENT @see #isIn(ItemGroup)
-		ARG 1 group
-		ARG 2 stacks
 	METHOD method_7851 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Ljava/util/List;Lnet/minecraft/class_1836;)V
 		COMMENT Called by the client to append tooltips to an item. Subclasses can override
 		COMMENT this and add custom tooltips to {@code tooltip} list.
@@ -265,7 +255,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		COMMENT Checks if this item has a remainder item that is left behind when used as a crafting ingredient.
 	METHOD method_7858 getRecipeRemainder ()Lnet/minecraft/class_1792;
 		COMMENT Gets the remainder item that should be left behind when this item is used as a crafting ingredient.
-	METHOD method_7859 getGroup ()Lnet/minecraft/class_1761;
 	METHOD method_7860 postProcessNbt (Lnet/minecraft/class_2487;)V
 		COMMENT Processes the NBT applied to an item stack of this item.
 		COMMENT
@@ -339,11 +328,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		ARG 0 id
 	METHOD method_7876 getTranslationKey ()Ljava/lang/String;
 		COMMENT Gets the translation key of this item.
-	METHOD method_7877 isIn (Lnet/minecraft/class_1761;)Z
-		COMMENT Checks whether this item should appear in a specified item group.
-		COMMENT
-		COMMENT @return true if the item is in the specified item group or the item group is {@link net.minecraft.item.ItemGroup#SEARCH}.
-		ARG 1 group
 	METHOD method_7878 canRepair (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		COMMENT {@return whether {@code stack} can be repaired using {@code ingredient}}
 		COMMENT
@@ -423,7 +407,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		FIELD field_18673 foodComponent Lnet/minecraft/class_4174;
 		FIELD field_21980 fireproof Z
 		FIELD field_8016 rarity Lnet/minecraft/class_1814;
-		FIELD field_8017 group Lnet/minecraft/class_1761;
 		FIELD field_8018 recipeRemainder Lnet/minecraft/class_1792;
 		FIELD field_8019 maxDamage I
 		FIELD field_8020 maxCount I
@@ -448,12 +431,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 			COMMENT @return this instance
 			ARG 1 maxCount
 				COMMENT maximum stack count of any ItemStack with an item using this Settings instance
-		METHOD method_7892 group (Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792$class_1793;
-			COMMENT Sets the ItemGroup of any item using this Settings instance. ItemGroups represent tabs in the creative inventory.
-			COMMENT
-			COMMENT @return this instance
-			ARG 1 group
-				COMMENT {@link ItemGroup itemGroup} to use
 		METHOD method_7894 rarity (Lnet/minecraft/class_1814;)Lnet/minecraft/class_1792$class_1793;
 			COMMENT Sets the {@link Rarity} of any item configured with this Settings instance, which changes the color of its name.
 			COMMENT

mappings/net/minecraft/item/ItemGroup.mapping

@@ -5,50 +5,22 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup
 	COMMENT @see Item#appendStacks
 	COMMENT @see Item#isIn(ItemGroup)
 	FIELD field_26391 displayName Lnet/minecraft/class_2561;
-	FIELD field_7914 REDSTONE Lnet/minecraft/class_1761;
-	FIELD field_7915 SEARCH Lnet/minecraft/class_1761;
-	FIELD field_7916 COMBAT Lnet/minecraft/class_1761;
 	FIELD field_7917 renderName Z
-	FIELD field_7918 INVENTORY Lnet/minecraft/class_1761;
 	FIELD field_7919 texture Ljava/lang/String;
 	FIELD field_7920 scrollbar Z
-	FIELD field_7921 GROUPS [Lnet/minecraft/class_1761;
-	FIELD field_7922 FOOD Lnet/minecraft/class_1761;
-	FIELD field_7923 TRANSPORTATION Lnet/minecraft/class_1761;
-	FIELD field_7924 BREWING Lnet/minecraft/class_1761;
-	FIELD field_7925 HOTBAR Lnet/minecraft/class_1761;
-	FIELD field_7926 name Ljava/lang/String;
-	FIELD field_7927 enchantments [Lnet/minecraft/class_1886;
-	FIELD field_7928 DECORATIONS Lnet/minecraft/class_1761;
-	FIELD field_7929 MATERIALS Lnet/minecraft/class_1761;
-	FIELD field_7930 TOOLS Lnet/minecraft/class_1761;
-	FIELD field_7931 BUILDING_BLOCKS Lnet/minecraft/class_1761;
-	FIELD field_7932 MISC Lnet/minecraft/class_1761;
 	FIELD field_7933 index I
 	FIELD field_7934 icon Lnet/minecraft/class_1799;
-	FIELD field_7935 id Ljava/lang/String;
+	METHOD <init> (ILnet/minecraft/class_2561;)V
-	METHOD <init> (ILjava/lang/String;)V
 		ARG 1 index
-		ARG 2 id
 	METHOD method_7737 getDisplayName ()Lnet/minecraft/class_2561;
-	METHOD method_7738 appendStacks (Lnet/minecraft/class_2371;)V
-		ARG 1 stacks
-	METHOD method_7739 setName (Ljava/lang/String;)Lnet/minecraft/class_1761;
-		ARG 1 name
-	METHOD method_7740 containsEnchantments (Lnet/minecraft/class_1886;)Z
-		ARG 1 target
 	METHOD method_7741 getIndex ()I
 	METHOD method_7742 getTexture ()Ljava/lang/String;
 	METHOD method_7743 getColumn ()I
-	METHOD method_7744 getEnchantments ()[Lnet/minecraft/class_1886;
-	METHOD method_7745 setEnchantments ([Lnet/minecraft/class_1886;)Lnet/minecraft/class_1761;
-		ARG 1 targets
 	METHOD method_7747 getIcon ()Lnet/minecraft/class_1799;
 	METHOD method_7748 hideName ()Lnet/minecraft/class_1761;
 		COMMENT Specifies that when this item group is selected, the name of the item group should not be rendered.
 	METHOD method_7749 setNoScrollbar ()Lnet/minecraft/class_1761;
 	METHOD method_7750 createIcon ()Lnet/minecraft/class_1799;
-	METHOD method_7751 getName ()Ljava/lang/String;
 	METHOD method_7752 isSpecial ()Z
 	METHOD method_7753 setTexture (Ljava/lang/String;)Lnet/minecraft/class_1761;
 		ARG 1 texture

mappings/net/minecraft/item/Items.mapping

@@ -776,20 +776,8 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
 	FIELD field_8889 YELLOW_GLAZED_TERRACOTTA Lnet/minecraft/class_1792;
 	FIELD field_8890 MOSSY_STONE_BRICK_STAIRS Lnet/minecraft/class_1792;
 	FIELD field_8893 BLUE_BED Lnet/minecraft/class_1792;
-	METHOD method_35220 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792;
+	METHOD method_35220 register (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792;
 		ARG 0 block
-		ARG 1 group
-		ARG 2 blocks
-	METHOD method_36679 register (Lnet/minecraft/class_2248;Ljava/util/Optional;)Lnet/minecraft/class_1792;
-		ARG 0 block
-		ARG 1 group
-	METHOD method_36680 createEmptyOptional (Ljava/lang/Object;)Ljava/util/Optional;
-		ARG 0 of
-	METHOD method_36682 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792;
-		ARG 1 group
-	METHOD method_7988 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792;
-		ARG 0 block
-		ARG 1 group
 	METHOD method_7989 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792;
 		ARG 0 block
 	METHOD method_7990 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792;

mappings/net/minecraft/item/WallStandingBlockItem.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1827 net/minecraft/item/WallStandingBlockItem
 	FIELD field_8918 wallBlock Lnet/minecraft/class_2248;
-	METHOD <init> (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V
+	METHOD <init> (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_2350;)V
 		ARG 1 standingBlock
 		ARG 2 wallBlock
 		ARG 3 settings

mappings/net/minecraft/loot/LootTable.mapping

@@ -28,10 +28,7 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable
 		ARG 2 context
 	METHOD method_330 validate (Lnet/minecraft/class_58;)V
 		ARG 1 reporter
-	METHOD method_331 (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V
+	METHOD method_332 processStacks (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
-		ARG 1 stack
-	METHOD method_332 processStacks (Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
-		ARG 0 lootConsumer
 	METHOD method_333 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/class_5819;)V
 		ARG 1 drops
 		ARG 2 freeSlots

mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio
 		ARG 3 entries
 	METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V
 		ARG 2 entry
-	METHOD method_600 (Lnet/minecraft/class_2371;Lnet/minecraft/class_47;Lnet/minecraft/class_82;)V
+	METHOD method_600 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_82;)V
 		ARG 2 choice
 	METHOD method_601 builder (Lnet/minecraft/class_2591;)Lnet/minecraft/class_134$class_135;
 		ARG 0 type

mappings/net/minecraft/nbt/NbtHelper.mapping

@@ -10,14 +10,13 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
 	FIELD field_33226 RIGHT_CURLY_BRACKET C
 	FIELD field_33227 COMMA Ljava/lang/String;
 	FIELD field_33228 COLON C
-	METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680;
+	METHOD method_10681 toBlockState (Lnet/minecraft/class_7225;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680;
 		COMMENT {@return the block state from the {@code nbt}}
 		COMMENT
 		COMMENT <p>This returns the default state for {@link net.minecraft.block.Blocks#AIR}
 		COMMENT if the block name is not present.
 		COMMENT
 		COMMENT @see #fromBlockState(BlockState)
-		ARG 0 nbt
 	METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688;
 		ARG 0 state
 		ARG 1 property

mappings/net/minecraft/nbt/NbtOps.mapping

@@ -83,49 +83,22 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
 		ARG 3 value
 	METHOD method_10638 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair;
 		ARG 2 key
-	METHOD method_10649 (Lnet/minecraft/class_2520;)Ljava/lang/Long;
-		ARG 0 nbt
-	METHOD method_10658 (Lnet/minecraft/class_2520;)Ljava/lang/Integer;
-		ARG 0 nbt
-	METHOD method_10659 (Lnet/minecraft/class_2520;)Ljava/lang/Byte;
-		ARG 0 nbt
 	METHOD method_10666 (Ljava/lang/String;Ljava/lang/String;)Z
 		ARG 1 k
 	METHOD method_10667 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
 		ARG 0 nbt
 	METHOD method_10670 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
 		ARG 2 k
-	METHOD method_29144 createList (BB)Lnet/minecraft/class_2483;
-		ARG 0 knownType
-		ARG 1 valueType
-	METHOD method_29145 isTypeEqual (BBB)Z
-		ARG 0 knownType
-		ARG 1 valueType
-		ARG 2 expectedType
 	METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
 		ARG 0 entry
 	METHOD method_29148 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2487;Ljava/lang/String;)V
 		ARG 3 key
-	METHOD method_29149 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V
-		ARG 1 nbt
-	METHOD method_29150 addAll (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;Ljava/util/List;)V
-		ARG 0 destination
-		ARG 1 source
-		ARG 2 additionalValues
-	METHOD method_29151 addAll (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V
-		ARG 0 destination
-		ARG 1 source
-		ARG 2 additionalValue
 	METHOD method_29152 (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
 		ARG 1 entry
 	METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V
 		ARG 2 entryConsumer
-	METHOD method_29158 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V
-		ARG 1 nbt
 	METHOD method_29159 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
 		ARG 0 key
-	METHOD method_29160 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V
-		ARG 1 nbt
 	METHOD method_29161 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
 		ARG 2 key
 	METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;

mappings/net/minecraft/network/PacketByteBuf.mapping

@@ -892,8 +892,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT
 		COMMENT @see #readProperty()
 		ARG 1 property
-	METHOD method_43618 (Lcom/mojang/authlib/properties/PropertyMap;Lnet/minecraft/class_2540;)V
-		ARG 2 buf
 	METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V
 		COMMENT Writes an {@code Either} to this buf. An either is represented by
 		COMMENT a boolean indicating if the left side or the right side of the either,

mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping

@@ -201,15 +201,9 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
 		ARG 1 packet
 	METHOD method_43596 onGameMessage (Lnet/minecraft/class_7439;)V
 		ARG 1 packet
-	METHOD method_44074 onChatPreview (Lnet/minecraft/class_7494;)V
-		ARG 1 packet
 	METHOD method_44075 onServerMetadata (Lnet/minecraft/class_7495;)V
 		ARG 1 packet
-	METHOD method_44286 onChatPreviewStateChange (Lnet/minecraft/class_7519;)V
-		ARG 1 packet
 	METHOD method_44763 onChatSuggestions (Lnet/minecraft/class_7597;)V
 		ARG 1 packet
 	METHOD method_44814 onHideMessage (Lnet/minecraft/class_7617;)V
 		ARG 1 packet
-	METHOD method_44815 onMessageHeader (Lnet/minecraft/class_7618;)V
-		ARG 1 packet

mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping

@@ -92,7 +92,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
 		ARG 1 packet
 	METHOD method_43667 onCommandExecution (Lnet/minecraft/class_7472;)V
 		ARG 1 packet
-	METHOD method_43931 onRequestChatPreview (Lnet/minecraft/class_7496;)V
-		ARG 1 packet
 	METHOD method_44898 onMessageAcknowledgment (Lnet/minecraft/class_7640;)V
 		ARG 1 packet

mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping

@@ -6,37 +6,4 @@ CLASS net/minecraft/class_7638 net/minecraft/network/message/AcknowledgmentValid
 	COMMENT waiting for message acknowledgments (more than {@value
 	COMMENT net.minecraft.server.network.ServerPlayNetworkHandler#MAX_PENDING_ACKNOWLEDGMENTS}),
 	COMMENT or if the acknowledgment is incorrect, the client will be disconnected.
-	FIELD field_39888 UNKNOWN I
+	METHOD method_44989 addPending (Lnet/minecraft/class_7469;)V
-	FIELD field_39889 prevValidated Lnet/minecraft/class_7635;
-	FIELD field_39890 pending Lit/unimi/dsi/fastutil/objects/ObjectList;
-	METHOD method_44987 getPendingCount ()I
-	METHOD method_44988 order (Ljava/util/List;[ILnet/minecraft/class_7635$class_7609;)I
-		COMMENT Orders {@code lastSeen}. {@code result} should be an array with the same size
-		COMMENT as {@code lastSeen}, and it will hold the order of each entry, where a larger
-		COMMENT integer corresponds to more recent message. If the integer is {@value #UNKNOWN},
-		COMMENT then the message is unknown (neither previously acknowledged nor is newly sent),
-		COMMENT which causes validation failure.
-		COMMENT
-		COMMENT @return the order of the last received message; if any messages have higher order
-		COMMENT than this, it is a validation failure.
-		ARG 1 lastSeen
-		ARG 2 result
-		ARG 3 lastReceived
-	METHOD method_44989 addPending (Lnet/minecraft/class_7635$class_7609;)V
-		ARG 1 entry
-	METHOD method_44990 validate (Lnet/minecraft/class_7635$class_7636;)Ljava/util/Set;
-		COMMENT Validates {@code acknowledgment}.
-		COMMENT
-		COMMENT @return reasons for acknowledgment validation failure, or an empty set if
-		COMMENT validation is successful
-		ARG 1 acknowledgment
-	METHOD method_44991 hasDuplicateProfiles (Lnet/minecraft/class_7635;)Z
-		COMMENT {@return whether {@code messages} have multiple entries with the same profile ID}
-		COMMENT
-		COMMENT <p>If {@code true}, validation fails.
-		ARG 1 messages
-	CLASS class_7639 FailureReason
-		FIELD field_39895 description Ljava/lang/String;
-		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
-			ARG 3 description
-		METHOD method_44992 getDescription ()Ljava/lang/String;

mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping

@@ -7,9 +7,6 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa
 	FIELD field_39807 EMPTY Lnet/minecraft/class_7450;
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_43747 resultToString (Lnet/minecraft/class_7451;Lcom/mojang/brigadier/context/ParsedArgument;)Ljava/lang/String;
-		ARG 0 type
-		ARG 1 argument
 	METHOD method_43748 get (Ljava/lang/String;)Lnet/minecraft/class_7469;
 		COMMENT {@return the signature data for {@code argumentName}, or {@code null} if the
 		COMMENT argument name is not present in this signatures}
@@ -21,19 +18,9 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa
 		COMMENT {@code signer}}
 		ARG 0 arguments
 		ARG 1 signer
-	METHOD method_44798 (Lnet/minecraft/class_7450$class_7600;Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_7450$class_7599;
-		ARG 1 entry
 	METHOD method_44799 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7450$class_7599;)V
 		ARG 0 buf2
 		ARG 1 entry
-	METHOD method_44910 hasSignedArgument (Lnet/minecraft/class_7644;)Z
-		COMMENT {@return whether the parsed arguments include {@link SignedArgumentType}}
-		ARG 0 arguments
-	METHOD method_45019 (Lnet/minecraft/class_7644$class_7645;)Z
-		ARG 0 argument
-	METHOD method_45020 toNameValuePairs (Lnet/minecraft/class_7644;)Ljava/util/List;
-		COMMENT {@return {@code arguments} converted to a list of signed name/value pairs}
-		ARG 0 arguments
 	CLASS class_7599 Entry
 		COMMENT An entry of the signatures map, consisting of the argument's name and signature data.
 		METHOD <init> (Lnet/minecraft/class_2540;)V
@@ -42,6 +29,5 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa
 			ARG 1 buf
 	CLASS class_7600 ArgumentSigner
 		COMMENT A functional interface that signs an argument of a command.
-		METHOD sign (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7469;
+		METHOD sign (Ljava/lang/String;)Lnet/minecraft/class_7469;
 			ARG 1 argumentName
-			ARG 2 value

mappings/net/minecraft/network/message/CachedDecoratorResult.mapping

@@ -1,27 +0,0 @@
-CLASS net/minecraft/class_7642 net/minecraft/network/message/CachedDecoratorResult
-	COMMENT The cached result of {@link MessageDecorator}'s decorated message.
-	COMMENT
-	COMMENT <p>The result is cached per player, and is consumed when the message is actually
-	COMMENT sent. Caching allows the decorator's result to be not pure (e.g. uses externally
-	COMMENT controlled variables), as decorators that produce different results on the second
-	COMMENT execution at submission time do not affect the verification.
-	FIELD field_39909 cachedResult Lnet/minecraft/class_7642$class_7643;
-	METHOD method_45035 tryConsume (Ljava/lang/String;)Lnet/minecraft/class_2561;
-		COMMENT Consumes the cached result if possible.
-		COMMENT
-		COMMENT <p>The result can only be consumed if it exists and the cached query equals
-		COMMENT {@code query}. After consuming, the cached result is set to {@code null}.
-		COMMENT
-		COMMENT @return the cached result, or {@code null} if it cannot be consumed
-		ARG 1 query
-	METHOD method_45036 setCachedResult (Ljava/lang/String;Lnet/minecraft/class_2561;)V
-		COMMENT Sets the cached result to {@code preview} for {@code query}.
-		COMMENT
-		COMMENT @see CachedDecoratorResult.Cache
-		ARG 1 query
-		ARG 2 preview
-	CLASS class_7643 Cache
-		COMMENT The cached result.
-		METHOD method_45037 queryEquals (Ljava/lang/String;)Z
-			COMMENT {@return whether the cached query equals {@code query}}
-			ARG 1 query

mappings/net/minecraft/network/message/DecoratedContents.mapping

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_7634 net/minecraft/network/message/DecoratedContents
-	COMMENT A pair of the decorated message content and its undecorated ("plain") message content.
-	COMMENT Note that the two contents can be equal if no decoration is applied.
-	METHOD <init> (Ljava/lang/String;)V
-		ARG 1 content
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2561;)V
-		ARG 2 decorated
-	METHOD method_44973 isDecorated ()Z
-	METHOD method_44977 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7634;
-		ARG 0 buf
-	METHOD method_44978 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7634;)V
-		ARG 0 buf
-		ARG 1 contents

mappings/net/minecraft/network/message/FilterMask.mapping

@@ -19,7 +19,5 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask
 	METHOD method_45091 writeMask (Lnet/minecraft/class_2540;Lnet/minecraft/class_7649;)V
 		ARG 0 buf
 		ARG 1 mask
-	METHOD method_45092 filter (Lnet/minecraft/class_7634;)Lnet/minecraft/class_2561;
-		ARG 1 contents
 	METHOD method_45093 isFullyFiltered ()Z
 	CLASS class_7650 FilterStatus

mappings/net/minecraft/network/message/LastSeenMessageList.mapping

@@ -2,22 +2,6 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList
 	COMMENT A list of messages a client has seen.
 	FIELD field_39883 EMPTY Lnet/minecraft/class_7635;
 	FIELD field_39884 MAX_ENTRIES I
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_44980 write (Ljava/io/DataOutput;)V
-		ARG 1 output
-	METHOD method_44981 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_44982 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7635$class_7609;)V
-		ARG 0 buf2
-		ARG 1 entries
-	CLASS class_7609 Entry
-		COMMENT A pair of a player's UUID and the signature of the last message they saw,
-		COMMENT used as an entry of {@link LastSeenMessageList}.
-		METHOD <init> (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
-		METHOD method_44873 write (Lnet/minecraft/class_2540;)V
-			ARG 1 buf
 	CLASS class_7636 Acknowledgment
 		COMMENT A record of messages acknowledged by a client.
 		COMMENT
@@ -27,6 +11,3 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList
 			ARG 1 buf
 		METHOD method_44983 write (Lnet/minecraft/class_2540;)V
 			ARG 1 buf
-		METHOD method_44984 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7635$class_7609;)V
-			ARG 0 buf2
-			ARG 1 lastReceived

mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping

@@ -13,11 +13,5 @@ CLASS net/minecraft/class_7637 net/minecraft/network/message/LastSeenMessagesCol
 	COMMENT
 	COMMENT @see AcknowledgmentValidator
 	COMMENT @see LastSeenMessageList
-	FIELD field_39885 entries [Lnet/minecraft/class_7635$class_7609;
-	FIELD field_39886 size I
-	FIELD field_39887 lastSeenMessages Lnet/minecraft/class_7635;
 	METHOD <init> (I)V
 		ARG 1 size
-	METHOD method_44985 getLastSeenMessages ()Lnet/minecraft/class_7635;
-	METHOD method_44986 add (Lnet/minecraft/class_7635$class_7609;)V
-		ARG 1 entry

mappings/net/minecraft/network/message/MessageBody.mapping

@@ -5,18 +5,5 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody
 	COMMENT the digest only.
 	FIELD comp_930 timestamp Ljava/time/Instant;
 	FIELD comp_932 lastSeenMessages Lnet/minecraft/class_7635;
-	FIELD field_39817 LAST_SEEN_SEPARATOR B
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD comp_930 timestamp ()Ljava/time/Instant;
 	METHOD comp_932 lastSeenMessages ()Lnet/minecraft/class_7635;
-	METHOD method_44867 digest ()Lcom/google/common/hash/HashCode;
-		COMMENT {@return the digest of this body}
-		COMMENT
-		COMMENT @implNote This is a SHA-256 hash of the salt, the timestamp represented as the seconds
-		COMMENT since the Unix epoch, the content, and the list of each player's last seen message.
-	METHOD method_44869 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_45047 withContent (Lnet/minecraft/class_7634;)Lnet/minecraft/class_7608;
-		COMMENT {@return a new message body with its content replaced with {@code content}}
-		ARG 1 content

mappings/net/minecraft/network/message/MessageChain.mapping

@@ -10,33 +10,8 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain
 	COMMENT "packing", and the server creating a signed message with its preceding message's
 	COMMENT signature is called "unpacking". Unpacked messages can then be verified to check the
 	COMMENT chain's legitimacy.
-	FIELD field_39818 precedingSignature Lnet/minecraft/class_7469;
+	METHOD method_44874 getUnpacker (Lnet/minecraft/class_7428;)Lnet/minecraft/class_7610$class_7611;
-	METHOD method_44874 getUnpacker ()Lnet/minecraft/class_7610$class_7611;
+	METHOD method_44880 getPacker (Lnet/minecraft/class_7501;)Lnet/minecraft/class_7610$class_7612;
-	METHOD method_44875 pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7610$class_7613;
-		ARG 1 signer
-		ARG 2 metadata
-		ARG 3 contents
-		ARG 4 lastSeenMessages
-	METHOD method_44876 sign (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7469;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7469;
-		ARG 0 signer
-		ARG 1 metadata
-		ARG 2 precedingSignature
-		ARG 3 contents
-		ARG 4 lastSeenMessages
-	METHOD method_44877 createMessage (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7469;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471;
-		ARG 0 signature
-		ARG 1 precedingSignature
-		ARG 2 metadata
-		ARG 3 contents
-		ARG 4 lastSeenMessage
-	METHOD method_44878 unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471;
-		ARG 1 signature
-		ARG 2 metadata
-		ARG 3 contents
-		ARG 4 lastSeenMessages
-	METHOD method_44879 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V
-		ARG 2 updatable
-	METHOD method_44880 getPacker ()Lnet/minecraft/class_7610$class_7612;
 	CLASS class_7611 Unpacker
 		COMMENT Unpacker creates a signed message on the server with the server's preceding message
 		COMMENT signature when they receive a message. Unpacked messages can then be verified to check
@@ -46,24 +21,7 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain
 		COMMENT the resulting signed message.
 		COMMENT
 		COMMENT @see MessageChain#getUnpacker
-		FIELD field_39951 UNSIGNED Lnet/minecraft/class_7610$class_7611;
-		METHOD method_45101 (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471;
-			ARG 0 signature
-			ARG 1 metadata
-			ARG 2 content
-			ARG 3 lastSeenMessages
-		METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471;
-			ARG 1 signature
-			ARG 2 metadata
-			ARG 3 content
-			ARG 4 lastSeenMessages
 	CLASS class_7612 Packer
 		COMMENT Packers sign a message on the client with its preceding message's signature.
 		COMMENT
 		COMMENT @see MessageChain#getPacker
-		METHOD pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7610$class_7613;
-			ARG 1 signer
-			ARG 2 metadata
-			ARG 3 contents
-			ARG 4 lastSeenMessages
-	CLASS class_7613 Signature

mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping

@@ -2,9 +2,5 @@ CLASS net/minecraft/class_7619 net/minecraft/network/message/MessageChainTaskQue
 	COMMENT Queues a future that handles received messages on the server thread.
 	FIELD field_39829 current Ljava/util/concurrent/CompletableFuture;
 	FIELD field_39830 executor Ljava/util/concurrent/Executor;
-	METHOD <init> (Ljava/util/concurrent/Executor;)V
-		ARG 1 executor
-	METHOD method_44903 (Lnet/minecraft/class_7620$class_7621;Ljava/lang/Object;)Ljava/util/concurrent/CompletionStage;
-		ARG 1 void_
 	METHOD method_44904 (Ljava/lang/Throwable;)Ljava/lang/Object;
 		ARG 0 throwable

mappings/net/minecraft/network/message/MessageDecorator.mapping

@@ -17,18 +17,8 @@ CLASS net/minecraft/class_7492 net/minecraft/network/message/MessageDecorator
 	COMMENT run during message submission to decorate filtered parts of the message.
 	FIELD field_39384 NOOP Lnet/minecraft/class_7492;
 		COMMENT An empty message decorator that returns the original message.
-	METHOD attachIfNotDecorated (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471;
-		ARG 0 message
-		ARG 1 attached
 	METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture;
-		COMMENT {@return the decorated {@code message}}
 		ARG 1 sender
-			COMMENT the player who sent the message, or {@code null} if {@code message} was not
-			COMMENT sent by a player
-		ARG 2 message
-	METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_7471;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 sender
-		ARG 2 message
 	METHOD method_44303 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 sender
 		ARG 1 message

mappings/net/minecraft/network/message/MessageHeader.mapping

@@ -1,16 +0,0 @@
-CLASS net/minecraft/class_7614 net/minecraft/network/message/MessageHeader
-	COMMENT The header of a message, which contains the preceding message's signature and the
-	COMMENT sender's UUID. Unlike {@link MessageBody}, clients receive this even if the message
-	COMMENT is censored.
-	FIELD comp_936 precedingSignature Lnet/minecraft/class_7469;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD comp_936 precedingSignature ()Lnet/minecraft/class_7469;
-	METHOD method_44882 update (Lnet/minecraft/class_7498$class_7499;[B)V
-		ARG 1 updater
-		ARG 2 bodyDigest
-	METHOD method_44883 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_44884 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469;)V
-		ARG 0 buf2
-		ARG 1 precedingSignature

mappings/net/minecraft/network/message/MessageMetadata.mapping

@@ -1,17 +0,0 @@
-CLASS net/minecraft/class_7470 net/minecraft/network/message/MessageMetadata
-	COMMENT A metadata for messages.
-	FIELD comp_801 sender Ljava/util/UUID;
-	FIELD comp_802 timestamp Ljava/time/Instant;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD comp_801 sender ()Ljava/util/UUID;
-	METHOD comp_802 timestamp ()Ljava/time/Instant;
-	METHOD method_43866 of (Ljava/util/UUID;)Lnet/minecraft/class_7470;
-		COMMENT {@return a new metadata with the given sender, current timestamp, and random salt}
-		ARG 0 sender
-	METHOD method_44849 of ()Lnet/minecraft/class_7470;
-		COMMENT {@return a new metadata without sender}
-	METHOD method_44850 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_44851 lacksSender ()Z
-		COMMENT {@return {@code true} if the metadata does not have a sender's UUID}

mappings/net/minecraft/network/message/MessageSignatureData.mapping

@@ -1,32 +1,14 @@
 CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureData
 	COMMENT A message signature data that can be verified when given the header.
 	FIELD comp_925 data [B
-	FIELD field_39811 EMPTY Lnet/minecraft/class_7469;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD comp_925 data ()[B
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_44842 isEmpty ()Z
+	METHOD method_44843 verify (Lnet/minecraft/class_7500;Lnet/minecraft/class_7498;)Z
-	METHOD method_44843 verify (Lnet/minecraft/class_7500;Lnet/minecraft/class_7614;Lnet/minecraft/class_7608;)Z
 		COMMENT {@return whether the signature data is verified}
 		ARG 1 verifier
 			COMMENT the verifier that is created with the sender's public key
-		ARG 2 header
+	METHOD method_44845 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469;)V
-		ARG 3 body
-	METHOD method_44844 verify (Lnet/minecraft/class_7500;Lnet/minecraft/class_7614;[B)Z
-		COMMENT {@return whether the signature data is verified}
-		ARG 1 verifier
-			COMMENT the verifier that is created with the sender's public key
-		ARG 2 header
-		ARG 3 bodyDigest
-			COMMENT the {@linkplain MessageBody#digest digest of the message body}
-	METHOD method_44845 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_44846 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V
-		ARG 2 updatable
-	METHOD method_44848 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V
-		ARG 2 updatable
 	METHOD method_44994 toByteBuffer ()Ljava/nio/ByteBuffer;
 		COMMENT {@return the byte buffer containing the signature data, or {@code null} if this
 		COMMENT signature data is empty}

mappings/net/minecraft/network/message/MessageSourceProfile.mapping

@@ -1,11 +0,0 @@
-CLASS net/minecraft/class_7436 net/minecraft/network/message/MessageSourceProfile
-	COMMENT A pair of the profile ID and public key of the message's source.
-	COMMENT
-	COMMENT <p>An instance can be obtained via {@link net.minecraft.entity.Entity#getMessageSourceProfile}.
-	FIELD comp_918 playerPublicKey Lnet/minecraft/class_7428;
-	FIELD field_39810 NONE Lnet/minecraft/class_7436;
-	METHOD comp_918 playerPublicKey ()Lnet/minecraft/class_7428;
-	METHOD method_44831 lacksProfileId ()Z
-		COMMENT {@return {@code true} if this source profile does not have the profile ID set}
-		COMMENT
-		COMMENT <p>Commands executed from server console or command block use such source profile.

mappings/net/minecraft/network/message/MessageVerifier.mapping

@@ -3,51 +3,10 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier
 	COMMENT
 	COMMENT <p>Methods in this interface must be called in the order of the message's reception,
 	COMMENT as it affects the verification result.
-	METHOD method_44885 create (Lnet/minecraft/class_7428;Z)Lnet/minecraft/class_7615;
+	METHOD method_45048 getStatus (Lnet/minecraft/class_7471;)Z
-		ARG 0 publicKey
-		ARG 1 secureChatEnforced
-	METHOD method_44886 verify (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7615$class_7646;
-		COMMENT {@return the status of verifying the message}
-		ARG 1 message
-	METHOD method_44887 verify (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Lnet/minecraft/class_7615$class_7646;
-		COMMENT {@return the status of verifying the header}
-		COMMENT
-		COMMENT <p>Clients can receive only the message header instead of the whole message. This
-		COMMENT allows the verification of such messages.
-		ARG 1 header
-		ARG 2 signature
-		ARG 3 bodyDigest
 	CLASS class_7616 Impl
 		FIELD field_39821 lastMessageVerified Z
 		FIELD field_39822 signatureVerifier Lnet/minecraft/class_7500;
-		FIELD field_39823 precedingSignature Lnet/minecraft/class_7469;
 		METHOD <init> (Lnet/minecraft/class_7500;)V
 			ARG 1 signatureVerifier
-		METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;Z)Z
+		METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7471;)Z
-			ARG 1 header
-			ARG 2 signature
-			ARG 3 fullMessage
-		METHOD method_44997 verifyInternal (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[BZ)Z
-			ARG 1 header
-			ARG 2 signature
-			ARG 3 bodyDigest
-			ARG 4 fullMessage
-		METHOD method_45048 getStatus (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[BZ)Lnet/minecraft/class_7615$class_7646;
-			ARG 1 header
-			ARG 2 signature
-			ARG 3 bodyDigest
-			ARG 4 fullMessage
-	CLASS class_7646 Status
-		COMMENT The verification status of a message.
-		FIELD field_39910 Lnet/minecraft/class_7615$class_7646;
-			COMMENT The message is verified.
-		FIELD field_39911 Lnet/minecraft/class_7615$class_7646;
-			COMMENT The message cannot be verified.
-		FIELD field_39912 Lnet/minecraft/class_7615$class_7646;
-			COMMENT The message cannot be verified due to the last message not being verified.
-	CLASS class_7651 Unsigned
-		FIELD field_39952 secureChatEnforced Z
-		METHOD <init> (Z)V
-			ARG 1 secureChatEnforced
-		METHOD method_45102 getStatus (Lnet/minecraft/class_7469;)Lnet/minecraft/class_7615$class_7646;
-			ARG 1 signature

mappings/net/minecraft/network/message/SentMessage.mapping

@@ -1,33 +1,23 @@
 CLASS net/minecraft/class_7604 net/minecraft/network/message/SentMessage
 	COMMENT A class wrapping {@link SignedMessage} on the server to allow custom behavior for
 	COMMENT sending messages.
-	METHOD method_44856 afterPacketsSent (Lnet/minecraft/class_3324;)V
+	METHOD comp_1081 getContent ()Lnet/minecraft/class_2561;
-		COMMENT Called after sending the message to applicable clients.
-		COMMENT
-		COMMENT @apiNote This is used to send the message header to clients that didn't receive
-		COMMENT the message due to text filtering.
-		COMMENT
-		COMMENT @see PlayerManager#sendMessageHeader
-		ARG 1 playerManager
 	METHOD method_44857 of (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7604;
 		COMMENT {@return the wrapped {@code message}}
 		ARG 0 message
-	METHOD method_45039 getContent ()Lnet/minecraft/class_2561;
 	METHOD method_45095 send (Lnet/minecraft/class_3222;ZLnet/minecraft/class_2556$class_7602;)V
 		ARG 1 sender
 		ARG 2 filterMaskEnabled
 		ARG 3 params
 	CLASS class_7606 Profileless
 		COMMENT The wrapper used for messages without associated source profile.
-		FIELD field_39814 message Lnet/minecraft/class_7471;
+		FIELD comp_1081 getContent Lnet/minecraft/class_2561;
-		METHOD <init> (Lnet/minecraft/class_7471;)V
-			ARG 1 message
 	CLASS class_7607 Chat
 		COMMENT The wrapper used for normal chat messages.
 		COMMENT
 		COMMENT <p>Text filtering can cause some players to not receive this kind of message.
 		COMMENT Message header is sent separately to those players.
-		FIELD field_39815 message Lnet/minecraft/class_7471;
+		FIELD comp_1082 message Lnet/minecraft/class_7471;
-		FIELD field_39816 recipients Ljava/util/Set;
 		METHOD <init> (Lnet/minecraft/class_7471;)V
 			ARG 1 message
+		METHOD comp_1082 message ()Lnet/minecraft/class_7471;

mappings/net/minecraft/network/message/SignedMessage.mapping

@@ -6,19 +6,6 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage
 	COMMENT <p>Note that the signature itself might not be valid.
 	FIELD field_39786 SERVERBOUND_TIME_TO_LIVE Ljava/time/Duration;
 	FIELD field_39787 CLIENTBOUND_TIME_TO_LIVE Ljava/time/Duration;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_43867 verify (Lnet/minecraft/class_7428;)Z
-		COMMENT {@return whether the message can be verified using the public key}
-		ARG 1 key
-	METHOD method_44125 getContent ()Lnet/minecraft/class_2561;
-		COMMENT {@return the content of the message}
-		COMMENT
-		COMMENT <p>This returns the unsigned content if present, and fallbacks to the signed content.
-	METHOD method_44310 verify (Lnet/minecraft/class_7436;)Z
-		COMMENT {@return whether the message can be verified using the public key <strong>or if the
-		COMMENT player does not have the key</strong>}
-		ARG 1 profile
 	METHOD method_44607 withoutUnsigned ()Lnet/minecraft/class_7471;
 		COMMENT {@return the signed chat message with {@link #unsignedContent} removed if it exists}
 		COMMENT
@@ -29,15 +16,11 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage
 		ARG 1 currentTime
 	METHOD method_44858 verify (Lnet/minecraft/class_7500;)Z
 		ARG 1 verifier
-	METHOD method_44859 write (Lnet/minecraft/class_2540;)V
+	METHOD method_44862 getSignedContent ()Ljava/lang/String;
-		ARG 1 buf
-	METHOD method_44862 getSignedContent ()Lnet/minecraft/class_7634;
 	METHOD method_44863 withUnsignedContent (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471;
 		ARG 1 unsignedContent
 	METHOD method_44864 getTimestamp ()Ljava/time/Instant;
 	METHOD method_44865 getSalt ()J
-	METHOD method_44866 createMetadata ()Lnet/minecraft/class_7470;
-	METHOD method_44995 toLastSeenMessageEntry ()Lnet/minecraft/class_7635$class_7609;
 	METHOD method_45040 canVerifyFrom (Ljava/util/UUID;)Z
 		COMMENT {@return whether the message can be verified as from {@code sender}}
 		COMMENT
@@ -45,16 +28,13 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage
 		COMMENT Rather, this returns whether it's possible to verify that {@code sender} sent this
 		COMMENT message.
 		ARG 1 sender
-	METHOD method_45041 ofUnsigned (Lnet/minecraft/class_7634;)Lnet/minecraft/class_7471;
+	METHOD method_45041 ofUnsigned (Ljava/lang/String;)Lnet/minecraft/class_7471;
 		COMMENT {@return a new signed message with empty signature}
-		ARG 0 content
 	METHOD method_45097 withFilterMask (Lnet/minecraft/class_7649;)Lnet/minecraft/class_7471;
 		COMMENT {@return the signed chat message with {@code filterMask} added}
 		ARG 1 filterMask
-	METHOD method_45098 ofUnsigned (Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;)Lnet/minecraft/class_7471;
+	METHOD method_45098 ofUnsigned (Ljava/util/UUID;Ljava/lang/String;)Lnet/minecraft/class_7471;
 		COMMENT {@return a new signed message with given metadata and empty signature}
-		ARG 0 metadata
-		ARG 1 content
 	METHOD method_45099 withFilterMaskEnabled (Z)Lnet/minecraft/class_7471;
 		COMMENT {@return this signed chat message if {@code enabled} is {@code true},
 		COMMENT otherwise a new signed chat message without filtered parts}

mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping

@@ -1,6 +1,3 @@
 CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_43638 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V
-		ARG 1 buf2
-		ARG 2 publicKey

mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping

@@ -21,13 +21,12 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2
 		ARG 1 buf
 	METHOD method_12654 decryptSecretKey (Ljava/security/PrivateKey;)Ljavax/crypto/SecretKey;
 		ARG 1 privateKey
-	METHOD method_43640 (Lnet/minecraft/class_7428;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean;
+	METHOD method_43640 (Lnet/minecraft/class_7500;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean;
 		ARG 2 signature
 	METHOD method_43642 ([B)Ljava/lang/Boolean;
 		ARG 0 encrypted
-	METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7428;)Z
+	METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7500;)Z
 		ARG 1 nonce
-		ARG 2 publicKeyInfo
 	METHOD method_43644 verifyEncryptedNonce ([BLjava/security/PrivateKey;)Z
 		ARG 1 nonce
 		ARG 2 privateKey

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

@@ -24,16 +24,12 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage
 	FIELD comp_945 chatMessage Ljava/lang/String;
 	FIELD comp_946 timestamp Ljava/time/Instant;
 	FIELD comp_970 acknowledgment Lnet/minecraft/class_7635$class_7636;
-	METHOD <init> (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;ZLnet/minecraft/class_7635$class_7636;)V
+	METHOD <init> (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;Lnet/minecraft/class_7635$class_7636;)V
 		ARG 2 timestamp
 		ARG 3 salt
 		ARG 5 signature
-		ARG 6 signedPreview
-		ARG 7 acknowledgment
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD comp_945 chatMessage ()Ljava/lang/String;
 	METHOD comp_946 timestamp ()Ljava/time/Instant;
 	METHOD comp_970 acknowledgment ()Lnet/minecraft/class_7635$class_7636;
-	METHOD method_44892 getMetadata (Lnet/minecraft/class_3222;)Lnet/minecraft/class_7470;
-		ARG 1 sender

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

@@ -23,13 +23,10 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec
 	COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution
 	FIELD comp_809 timestamp Ljava/time/Instant;
 	FIELD comp_969 acknowledgment Lnet/minecraft/class_7635$class_7636;
-	METHOD <init> (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;ZLnet/minecraft/class_7635$class_7636;)V
+	METHOD <init> (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;Lnet/minecraft/class_7635$class_7636;)V
-		ARG 1 command
 		ARG 2 timestamp
 		ARG 3 salt
 		ARG 5 argumentSignatures
-		ARG 6 signedPreview
-		ARG 7 acknowledgment
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD comp_809 timestamp ()Ljava/time/Instant;

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

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_7640 net/minecraft/network/packet/c2s/play/MessageAcknowledgmentC2SPacket
-	FIELD comp_968 acknowledgment Lnet/minecraft/class_7635$class_7636;
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD comp_968 acknowledgment ()Lnet/minecraft/class_7635$class_7636;

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

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_7496 net/minecraft/network/packet/c2s/play/RequestChatPreviewC2SPacket
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf

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

@@ -22,5 +22,3 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7603;
-	METHOD method_44891 getParameters (Lnet/minecraft/class_5455;)Ljava/util/Optional;
-		ARG 1 dynamicRegistryManager

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

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_7494 net/minecraft/network/packet/s2c/play/ChatPreviewS2CPacket
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf

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

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_7519 net/minecraft/network/packet/s2c/play/ChatPreviewStateChangeS2CPacket
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf

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

@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_7618 net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_7471;)V
-		ARG 1 message

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

@@ -1,42 +1,19 @@
 CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS2CPacket
-	FIELD field_12368 action Lnet/minecraft/class_2703$class_5893;
 	FIELD field_12369 entries Ljava/util/List;
+	METHOD <init> (Ljava/util/EnumSet;Ljava/util/Collection;)V
+		ARG 2 players
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_2703$class_5893;Ljava/util/Collection;)V
+	METHOD <init> (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V
 		ARG 1 action
-		ARG 2 players
+	METHOD method_43886 entryFromPlayer (Ljava/util/Collection;)Lnet/minecraft/class_2703;
-	METHOD <init> (Lnet/minecraft/class_2703$class_5893;[Lnet/minecraft/class_3222;)V
-		ARG 1 action
-		ARG 2 players
-	METHOD method_11722 getEntries ()Ljava/util/List;
-	METHOD method_11723 getAction ()Lnet/minecraft/class_2703$class_5893;
-	METHOD method_43886 entryFromPlayer (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2703$class_2705;
-		ARG 0 player
 	CLASS class_2705 Entry
-		FIELD field_12377 displayName Lnet/minecraft/class_2561;
+		FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile;
-		FIELD field_12378 latency I
+		FIELD comp_1109 latency I
-		FIELD field_12379 gameMode Lnet/minecraft/class_1934;
+		FIELD comp_1110 gameMode Lnet/minecraft/class_1934;
-		FIELD field_12380 profile Lcom/mojang/authlib/GameProfile;
+		FIELD comp_1111 displayName Lnet/minecraft/class_2561;
-		FIELD field_39243 publicKeyData Lnet/minecraft/class_7428$class_7443;
+		METHOD comp_1107 profile ()Lcom/mojang/authlib/GameProfile;
-		METHOD <init> (Lcom/mojang/authlib/GameProfile;ILnet/minecraft/class_1934;Lnet/minecraft/class_2561;Lnet/minecraft/class_7428$class_7443;)V
+		METHOD comp_1109 latency ()I
-			ARG 1 profile
+		METHOD comp_1110 gameMode ()Lnet/minecraft/class_1934;
-			ARG 2 latency
+		METHOD comp_1111 displayName ()Lnet/minecraft/class_2561;
-			ARG 3 gameMode
-			ARG 4 displayName
-			ARG 5 publicKeyData
-		METHOD method_11724 getDisplayName ()Lnet/minecraft/class_2561;
-		METHOD method_11725 getGameMode ()Lnet/minecraft/class_1934;
-		METHOD method_11726 getProfile ()Lcom/mojang/authlib/GameProfile;
-		METHOD method_11727 getLatency ()I
-		METHOD method_43889 getPublicKeyData ()Lnet/minecraft/class_7428$class_7443;
 	CLASS class_5893 Action
-		METHOD method_34150 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2703$class_2705;
-			ARG 1 buf
-		METHOD method_34151 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V
-			ARG 1 buf
-			ARG 2 entry
-		CLASS 1
-			METHOD method_43887 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V
-				ARG 0 buf2
-				ARG 1 publicKeyData

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

@@ -1,16 +1,13 @@
 CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket
 	FIELD field_39387 description Ljava/util/Optional;
 	FIELD field_39388 favicon Ljava/util/Optional;
-	FIELD field_39389 previewsChat Z
 	FIELD field_39920 secureChatEnforced Z
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_2561;Ljava/lang/String;ZZ)V
+	METHOD <init> (Lnet/minecraft/class_2561;Ljava/lang/String;Z)V
 		ARG 1 description
 		ARG 2 favicon
 		ARG 3 previewsChat
-		ARG 4 secureChatEnforced
 	METHOD method_44132 getDescription ()Ljava/util/Optional;
 	METHOD method_44133 getFavicon ()Ljava/util/Optional;
-	METHOD method_44134 shouldPreviewChat ()Z
 	METHOD method_45058 isSecureChatEnforced ()Z

mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping

@@ -6,13 +6,8 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe
 	FIELD field_9060 id Lnet/minecraft/class_2960;
 	FIELD field_9061 input Lnet/minecraft/class_1856;
 	FIELD field_9062 group Ljava/lang/String;
-	METHOD <init> (Lnet/minecraft/class_3956;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
+	METHOD <init> (Lnet/minecraft/class_3956;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
 		ARG 1 type
-		ARG 2 id
 		ARG 3 group
-		ARG 4 input
-		ARG 5 output
-		ARG 6 experience
-		ARG 7 cookTime
 	METHOD method_8167 getCookTime ()I
 	METHOD method_8171 getExperience ()F

mappings/net/minecraft/recipe/BlastingRecipe.mapping

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_3859 net/minecraft/recipe/BlastingRecipe
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
 		ARG 1 id
 		ARG 2 group
-		ARG 3 input
-		ARG 4 output
-		ARG 5 experience
-		ARG 6 cookTime

mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_3920 net/minecraft/recipe/CampfireCookingRecipe
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
 		ARG 1 id
 		ARG 2 group
-		ARG 3 input
-		ARG 4 output
-		ARG 5 experience
-		ARG 6 cookTime

mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping

@@ -5,10 +5,6 @@ CLASS net/minecraft/class_3957 net/minecraft/recipe/CookingRecipeSerializer
 		ARG 1 recipeFactory
 		ARG 2 cookingTime
 	CLASS class_3958 RecipeFactory
-		METHOD create (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874;
+		METHOD create (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874;
 			ARG 1 id
 			ARG 2 group
-			ARG 3 input
-			ARG 4 output
-			ARG 5 experience
-			ARG 6 cookTime

mappings/net/minecraft/recipe/MapExtendingRecipe.mapping

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_1861 net/minecraft/recipe/MapExtendingRecipe
-	METHOD <init> (Lnet/minecraft/class_2960;)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_7710;)V
 		ARG 1 id

mappings/net/minecraft/recipe/RecipeSerializer.mapping

@@ -10,25 +10,25 @@ CLASS net/minecraft/class_1865 net/minecraft/recipe/RecipeSerializer
 	COMMENT client, the client will disconnect upon receiving the recipe; if a
 	COMMENT recipe JSON intended for an absent recipe serializer is read, it is
 	COMMENT skipped.
-	FIELD field_17084 BLASTING Lnet/minecraft/class_3957;
+	FIELD field_17084 BLASTING Lnet/minecraft/class_1865;
-	FIELD field_17085 SMOKING Lnet/minecraft/class_3957;
+	FIELD field_17085 SMOKING Lnet/minecraft/class_1865;
-	FIELD field_17347 CAMPFIRE_COOKING Lnet/minecraft/class_3957;
+	FIELD field_17347 CAMPFIRE_COOKING Lnet/minecraft/class_1865;
-	FIELD field_19421 REPAIR_ITEM Lnet/minecraft/class_1866;
+	FIELD field_19421 REPAIR_ITEM Lnet/minecraft/class_1865;
-	FIELD field_9028 ARMOR_DYE Lnet/minecraft/class_1866;
+	FIELD field_9028 ARMOR_DYE Lnet/minecraft/class_1865;
-	FIELD field_9029 BOOK_CLONING Lnet/minecraft/class_1866;
+	FIELD field_9029 BOOK_CLONING Lnet/minecraft/class_1865;
-	FIELD field_9030 SUSPICIOUS_STEW Lnet/minecraft/class_1866;
+	FIELD field_9030 SUSPICIOUS_STEW Lnet/minecraft/class_1865;
 	FIELD field_9031 SHAPELESS Lnet/minecraft/class_1865;
-	FIELD field_9034 FIREWORK_STAR_FADE Lnet/minecraft/class_1866;
+	FIELD field_9034 FIREWORK_STAR_FADE Lnet/minecraft/class_1865;
 	FIELD field_9035 SHAPED Lnet/minecraft/class_1865;
-	FIELD field_9036 FIREWORK_STAR Lnet/minecraft/class_1866;
+	FIELD field_9036 FIREWORK_STAR Lnet/minecraft/class_1865;
-	FIELD field_9037 TIPPED_ARROW Lnet/minecraft/class_1866;
+	FIELD field_9037 TIPPED_ARROW Lnet/minecraft/class_1865;
-	FIELD field_9038 BANNER_DUPLICATE Lnet/minecraft/class_1866;
+	FIELD field_9038 BANNER_DUPLICATE Lnet/minecraft/class_1865;
-	FIELD field_9039 MAP_EXTENDING Lnet/minecraft/class_1866;
+	FIELD field_9039 MAP_EXTENDING Lnet/minecraft/class_1865;
-	FIELD field_9040 SHIELD_DECORATION Lnet/minecraft/class_1866;
+	FIELD field_9040 SHIELD_DECORATION Lnet/minecraft/class_1865;
-	FIELD field_9041 SHULKER_BOX Lnet/minecraft/class_1866;
+	FIELD field_9041 SHULKER_BOX Lnet/minecraft/class_1865;
-	FIELD field_9042 SMELTING Lnet/minecraft/class_3957;
+	FIELD field_9042 SMELTING Lnet/minecraft/class_1865;
-	FIELD field_9043 FIREWORK_ROCKET Lnet/minecraft/class_1866;
+	FIELD field_9043 FIREWORK_ROCKET Lnet/minecraft/class_1865;
-	FIELD field_9044 MAP_CLONING Lnet/minecraft/class_1866;
+	FIELD field_9044 MAP_CLONING Lnet/minecraft/class_1865;
 	METHOD method_17724 register (Ljava/lang/String;Lnet/minecraft/class_1865;)Lnet/minecraft/class_1865;
 		ARG 0 id
 		ARG 1 serializer

mappings/net/minecraft/recipe/ShapedRecipe.mapping

@@ -5,13 +5,9 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe
 	FIELD field_9054 height I
 	FIELD field_9055 width I
 	FIELD field_9056 group Ljava/lang/String;
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7710;IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V
 		ARG 1 id
 		ARG 2 group
-		ARG 3 width
-		ARG 4 height
-		ARG 5 input
-		ARG 6 output
 	METHOD method_31585 (Lnet/minecraft/class_1856;)Z
 		ARG 0 ingredient
 	METHOD method_31586 (Lnet/minecraft/class_1856;)Z

mappings/net/minecraft/recipe/ShapelessRecipe.mapping

@@ -3,11 +3,9 @@ CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe
 	FIELD field_9048 id Lnet/minecraft/class_2960;
 	FIELD field_9049 group Ljava/lang/String;
 	FIELD field_9050 output Lnet/minecraft/class_1799;
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1799;Lnet/minecraft/class_2371;)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7710;Lnet/minecraft/class_1799;Lnet/minecraft/class_2371;)V
 		ARG 1 id
 		ARG 2 group
-		ARG 3 output
-		ARG 4 input
 	CLASS class_1868 Serializer
 		METHOD method_8144 getIngredients (Lcom/google/gson/JsonArray;)Lnet/minecraft/class_2371;
 			ARG 0 json

mappings/net/minecraft/recipe/SmeltingRecipe.mapping

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_3861 net/minecraft/recipe/SmeltingRecipe
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
 		ARG 1 id
 		ARG 2 group
-		ARG 3 input
-		ARG 4 output
-		ARG 5 experience
-		ARG 6 cookTime

mappings/net/minecraft/recipe/SmokingRecipe.mapping

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_3862 net/minecraft/recipe/SmokingRecipe
-	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
 		ARG 1 id
 		ARG 2 group
-		ARG 3 input
-		ARG 4 output
-		ARG 5 experience
-		ARG 6 cookTime

mappings/net/minecraft/recipe/SpecialCraftingRecipe.mapping

@@ -1,4 +1,4 @@
 CLASS net/minecraft/class_1852 net/minecraft/recipe/SpecialCraftingRecipe
 	FIELD field_9009 id Lnet/minecraft/class_2960;
-	METHOD <init> (Lnet/minecraft/class_2960;)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_7710;)V
 		ARG 1 id

mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping

@@ -6,6 +6,4 @@ CLASS net/minecraft/class_1866 net/minecraft/recipe/SpecialRecipeSerializer
 	COMMENT <p>The name "special" comes from the fact that in vanilla, recipes using this
 	COMMENT serializer have IDs starting with {@code crafting_special_}. All of their logic and ingredients
 	COMMENT are also defined in code, which distinguishes them from "non-special" recipes.
-	FIELD field_9046 factory Ljava/util/function/Function;
+	FIELD field_9046 factory Lnet/minecraft/class_1866$class_7711;
-	METHOD <init> (Ljava/util/function/Function;)V
-		ARG 1 factory

mappings/net/minecraft/resource/AbstractFileResourcePack.mapping

@@ -1,20 +1,5 @@
 CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack
-	FIELD field_14181 base Ljava/io/File;
 	FIELD field_14182 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Ljava/io/File;)V
-		ARG 1 base
-	METHOD method_14391 openFile (Ljava/lang/String;)Ljava/io/InputStream;
-		ARG 1 name
 	METHOD method_14392 parseMetadata (Lnet/minecraft/class_3270;Ljava/io/InputStream;)Ljava/lang/Object;
 		ARG 0 metaReader
 		ARG 1 inputStream
-	METHOD method_14393 containsFile (Ljava/lang/String;)Z
-		ARG 1 name
-	METHOD method_14394 warnNonLowerCaseNamespace (Ljava/lang/String;)V
-		ARG 1 namespace
-	METHOD method_14395 getFilename (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String;
-		ARG 0 type
-		ARG 1 id
-	METHOD method_14396 relativize (Ljava/io/File;Ljava/io/File;)Ljava/lang/String;
-		ARG 0 base
-		ARG 1 target

mappings/net/minecraft/resource/DefaultResourcePack.mapping

@@ -1,36 +1,7 @@
 CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 	FIELD field_14193 namespaces Ljava/util/Set;
-	FIELD field_14194 resourceClass Ljava/lang/Class;
 	FIELD field_14195 LOGGER Lorg/slf4j/Logger;
-	FIELD field_14196 resourcePath Ljava/nio/file/Path;
+	FIELD field_26938 metadata Lnet/minecraft/class_7662;
-	FIELD field_17917 TYPE_TO_FILE_SYSTEM Ljava/util/Map;
+	METHOD method_14418 collectIdentifiers (Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;)V
-	FIELD field_26938 metadata Lnet/minecraft/class_3272;
-	METHOD <init> (Lnet/minecraft/class_3272;[Ljava/lang/String;)V
-		ARG 1 metadata
-		ARG 2 namespaces
-	METHOD method_14416 findInputStream (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/io/InputStream;
-		ARG 1 type
-		ARG 2 id
-	METHOD method_14417 getInputStream (Ljava/lang/String;)Ljava/io/InputStream;
-		ARG 1 path
-	METHOD method_14418 collectIdentifiers (Ljava/util/Collection;Ljava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V
-		ARG 0 results
-		ARG 1 namespace
 		ARG 2 root
-		ARG 3 prefix
-		ARG 4 allowedPathPredicate
-	METHOD method_20728 isValidUrl (Ljava/lang/String;Ljava/net/URL;)Z
-		ARG 0 fileName
-		ARG 1 url
-	METHOD method_20729 getPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String;
-		ARG 0 type
-		ARG 1 id
-	METHOD method_23857 (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/function/Consumer;)V
-		ARG 2 path
-	METHOD method_23858 (Ljava/nio/file/Path;)Z
-		ARG 0 path
-	METHOD method_37454 getPath (Ljava/net/URI;)Ljava/nio/file/Path;
-		ARG 0 uri
-	METHOD method_43031 (Lnet/minecraft/class_2960;)Ljava/util/Optional;
-		ARG 1 id
 	METHOD method_43032 getFactory ()Lnet/minecraft/class_5912;

mappings/net/minecraft/resource/DirectoryResourcePack.mapping

@@ -1,15 +1,3 @@
 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;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/function/Predicate;)V
+	METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z
-		ARG 1 file
-		ARG 2 namespace
-		ARG 3 foundIds
-		ARG 4 rootDirectory
-		ARG 5 allowedPathPredicate
-	METHOD method_14401 getFile (Ljava/lang/String;)Ljava/io/File;
-		ARG 1 name
-	METHOD method_14402 isValidPath (Ljava/io/File;Ljava/lang/String;)Z
-		ARG 0 file
-		ARG 1 filename

mappings/net/minecraft/resource/FileResourcePackProvider.mapping

@@ -1,11 +1,3 @@
 CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider
-	FIELD field_14217 POSSIBLE_PACK Ljava/io/FileFilter;
+	FIELD field_14218 packsFolder Ljava/nio/file/Path;
-	FIELD field_14218 packsFolder Ljava/io/File;
 	FIELD field_25345 source Lnet/minecraft/class_5352;
-	METHOD <init> (Ljava/io/File;Lnet/minecraft/class_5352;)V
-		ARG 1 packsFolder
-		ARG 2 source
-	METHOD method_14431 (Ljava/io/File;)Z
-		ARG 0 file
-	METHOD method_14432 createResourcePack (Ljava/io/File;)Ljava/util/function/Supplier;
-		ARG 1 file

mappings/net/minecraft/resource/InputSupplier.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7367 net/minecraft/resource/InputSupplier

mappings/net/minecraft/resource/JsonDataLoader.mapping

@@ -2,12 +2,8 @@ CLASS net/minecraft/class_4309 net/minecraft/resource/JsonDataLoader
 	COMMENT An abstract implementation of resource reloader that reads JSON files
 	COMMENT into Gson representations in the prepare stage.
 	FIELD field_19377 LOGGER Lorg/slf4j/Logger;
-	FIELD field_19378 FILE_SUFFIX_LENGTH I
 	FIELD field_19379 gson Lcom/google/gson/Gson;
 	FIELD field_19380 dataType Ljava/lang/String;
-	FIELD field_29783 FILE_SUFFIX Ljava/lang/String;
 	METHOD <init> (Lcom/google/gson/Gson;Ljava/lang/String;)V
 		ARG 1 gson
 		ARG 2 dataType
-	METHOD method_20730 (Lnet/minecraft/class_2960;)Z
-		ARG 0 id

mappings/net/minecraft/resource/NamespaceResourceManager.mapping

@@ -14,11 +14,6 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 		ARG 2 namespace
 	METHOD method_14473 getMetadataPath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
 		ARG 0 id
-	METHOD method_14476 createOpener (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)Lnet/minecraft/class_3298$class_7367;
-		ARG 1 id
-		ARG 2 pack
-	METHOD method_18221 isPathAbsolute (Lnet/minecraft/class_2960;)Z
-		ARG 1 id
 	METHOD method_24233 addPack (Lnet/minecraft/class_3262;)V
 		ARG 1 pack
 	METHOD method_41256 addPack (Lnet/minecraft/class_3262;Ljava/util/function/Predicate;)V
@@ -41,17 +36,12 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 	METHOD method_41261 addPack (Ljava/lang/String;Ljava/util/function/Predicate;)V
 		ARG 1 name
 		ARG 2 filter
-	METHOD method_41262 (Ljava/util/TreeMap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3294$class_7081;)V
+	METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_7367;
-		ARG 1 id
-		ARG 2 entryList
-	METHOD method_41264 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3294$class_7081;
-		ARG 1 id
-	METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_3298$class_7367;
 		ARG 1 id
 		ARG 2 index
 	CLASS class_3295 DebugInputStream
 		FIELD field_14287 closed Z
-		FIELD field_14288 leakMessage Ljava/lang/String;
+		FIELD field_14288 leakMessage Ljava/util/function/Supplier;
 		METHOD <init> (Ljava/io/InputStream;Lnet/minecraft/class_2960;Ljava/lang/String;)V
 			ARG 1 parent
 			ARG 2 id
@@ -59,7 +49,6 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 	CLASS class_7081 EntryList
 		FIELD comp_527 metadataId Lnet/minecraft/class_2960;
 		METHOD comp_527 metadataId ()Lnet/minecraft/class_2960;
-		METHOD method_41266 toReferenceList ()Ljava/util/List;
 	CLASS class_7082 FilterablePack
 		FIELD comp_530 underlying Lnet/minecraft/class_3262;
 		METHOD comp_530 underlying ()Lnet/minecraft/class_3262;
@@ -67,14 +56,3 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 			ARG 1 ids
 		METHOD method_41269 isFiltered (Lnet/minecraft/class_2960;)Z
 			ARG 1 id
-	CLASS class_7083 Entry
-		FIELD field_37284 id Lnet/minecraft/class_2960;
-		FIELD field_37285 metadataId Lnet/minecraft/class_2960;
-		FIELD field_37286 pack Lnet/minecraft/class_3262;
-		FIELD field_37287 checksMetadata Z
-		METHOD <init> (Lnet/minecraft/class_3294;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)V
-			ARG 2 id
-			ARG 3 metadataId
-			ARG 4 pack
-		METHOD method_41270 ignoreMetadata ()V
-		METHOD method_41272 toReference ()Lnet/minecraft/class_3298;

mappings/net/minecraft/resource/Resource.mapping

@@ -5,15 +5,12 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource
 	COMMENT
 	COMMENT @see ResourceFactory#getResource(Identifier)
 	COMMENT @see ResourceManager#getAllResources(Identifier)
-	FIELD field_38684 resourcePackName Ljava/lang/String;
+	FIELD field_38685 inputSupplier Lnet/minecraft/class_7367;
-	FIELD field_38685 inputSupplier Lnet/minecraft/class_3298$class_7367;
+	FIELD field_38686 metadataSupplier Lnet/minecraft/class_7367;
-	FIELD field_38686 metadataSupplier Lnet/minecraft/class_3298$class_7367;
 	FIELD field_38687 metadata Lnet/minecraft/class_7368;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_3298$class_7367;)V
+	METHOD <init> (Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;)V
-		ARG 1 resourcePackName
 		ARG 2 inputSupplier
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_3298$class_7367;Lnet/minecraft/class_3298$class_7367;)V
+	METHOD <init> (Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)V
-		ARG 1 resourcePackName
 		ARG 2 inputSupplier
 		ARG 3 metadataSupplier
 	METHOD method_14480 getResourcePackName ()Ljava/lang/String;
@@ -28,4 +25,3 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource
 		COMMENT
 		COMMENT <p>This input stream is closed when this resource is closed.
 	METHOD method_43039 getReader ()Ljava/io/BufferedReader;
-	CLASS class_7367 InputSupplier

mappings/net/minecraft/resource/ResourceNotFoundException.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_3266 net/minecraft/resource/ResourceNotFoundException
-	METHOD <init> (Ljava/io/File;Ljava/lang/String;)V
-		ARG 1 packSource
-		ARG 2 resource

mappings/net/minecraft/resource/ResourcePack.mapping

@@ -7,21 +7,16 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack
 	COMMENT on demand.
 	FIELD field_29780 METADATA_PATH_SUFFIX Ljava/lang/String;
 	FIELD field_29781 PACK_METADATA_NAME Ljava/lang/String;
-	METHOD method_14405 open (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/io/InputStream;
+	METHOD method_14405 open (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Lnet/minecraft/class_7367;
 		ARG 1 type
 		ARG 2 id
 	METHOD method_14406 getNamespaces (Lnet/minecraft/class_3264;)Ljava/util/Set;
 		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;Ljava/util/function/Predicate;)Ljava/util/Collection;
+	METHOD method_14408 findResources (Lnet/minecraft/class_3264;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;)V
 		ARG 1 type
 		ARG 2 namespace
 		ARG 3 prefix
-		ARG 4 allowedPathPredicate
 	METHOD method_14409 getName ()Ljava/lang/String;
-	METHOD method_14410 openRoot (Ljava/lang/String;)Ljava/io/InputStream;
+	METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367;
-		ARG 1 fileName
-	METHOD method_14411 contains (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Z
-		ARG 1 type
-		ARG 2 id

mappings/net/minecraft/resource/ResourcePackCompatibility.mapping

@@ -9,6 +9,3 @@ CLASS net/minecraft/class_3281 net/minecraft/resource/ResourcePackCompatibility
 	METHOD method_14437 isCompatible ()Z
 	METHOD method_14438 getConfirmMessage ()Lnet/minecraft/class_2561;
 	METHOD method_14439 getNotification ()Lnet/minecraft/class_2561;
-	METHOD method_31439 from (Lnet/minecraft/class_3272;Lnet/minecraft/class_3264;)Lnet/minecraft/class_3281;
-		ARG 0 metadata
-		ARG 1 type

mappings/net/minecraft/resource/ResourcePackManager.mapping

@@ -5,13 +5,6 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager
 	FIELD field_14225 enabled Ljava/util/List;
 	FIELD field_14226 profiles Ljava/util/Map;
 	FIELD field_14227 providers Ljava/util/Set;
-	FIELD field_14228 profileFactory Lnet/minecraft/class_3288$class_5351;
-	METHOD <init> (Lnet/minecraft/class_3264;[Lnet/minecraft/class_3285;)V
-		ARG 1 type
-		ARG 2 providers
-	METHOD <init> (Lnet/minecraft/class_3288$class_5351;[Lnet/minecraft/class_3285;)V
-		ARG 1 profileFactory
-		ARG 2 providers
 	METHOD method_14441 getProfiles ()Ljava/util/Collection;
 	METHOD method_14444 getEnabledProfiles ()Ljava/util/Collection;
 	METHOD method_14445 scanPacks ()V
@@ -31,11 +24,3 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager
 	METHOD method_29212 providePackProfiles ()Ljava/util/Map;
 	METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V
 		ARG 1 profile
-	METHOD method_31440 (Lnet/minecraft/class_3264;Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
-		ARG 1 name
-		ARG 2 displayName
-		ARG 3 alwaysEnabled
-		ARG 4 packFactory
-		ARG 5 metadata
-		ARG 6 direction
-		ARG 7 source

mappings/net/minecraft/resource/ResourcePackProfile.mapping

@@ -11,35 +11,16 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 	FIELD field_14270 pinned Z
 	FIELD field_14271 alwaysEnabled Z
 	FIELD field_14272 name Ljava/lang/String;
-	FIELD field_14273 packFactory Ljava/util/function/Supplier;
+	FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680;
 	FIELD field_14274 displayName Lnet/minecraft/class_2561;
 	FIELD field_14275 description Lnet/minecraft/class_2561;
 	FIELD field_14277 position Lnet/minecraft/class_3288$class_3289;
 	FIELD field_14278 compatibility Lnet/minecraft/class_3281;
 	FIELD field_14279 LOGGER Lorg/slf4j/Logger;
 	FIELD field_25346 source Lnet/minecraft/class_5352;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)V
-		ARG 1 name
-		ARG 2 displayName
-		ARG 3 alwaysEnabled
-		ARG 4 packFactory
-		ARG 5 metadata
-		ARG 6 type
-		ARG 7 direction
-		ARG 8 source
-	METHOD <init> (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V
-		ARG 1 name
-		ARG 2 alwaysEnabled
-		ARG 3 packFactory
-		ARG 4 displayName
-		ARG 5 description
-		ARG 6 compatibility
-		ARG 7 direction
-		ARG 8 pinned
-		ARG 9 source
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_14456 of (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3288$class_5351;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
+	METHOD method_14456 of (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
 		COMMENT Creates a resource pack profile from the given parameters.
 		COMMENT
 		COMMENT <p>Compared to calling the factory directly, this utility method obtains the
@@ -48,12 +29,6 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 		COMMENT {@code null}.
 		COMMENT
 		COMMENT @return the created profile, or {@code null} if missing metadata
-		ARG 0 name
-		ARG 1 alwaysEnabled
-		ARG 2 packFactory
-		ARG 3 profileFactory
-		ARG 4 insertionPosition
-		ARG 5 packSource
 	METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561;
 	METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262;
 	METHOD method_14459 getDescription ()Lnet/minecraft/class_2561;
@@ -74,19 +49,3 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
 			ARG 2 item
 			ARG 3 profileGetter
 			ARG 4 listInverted
-	CLASS class_5351 Factory
-		COMMENT A factory for resource pack profiles, somewhat resembling the constructor
-		COMMENT of {@link ResourcePackProfile} but allowing more customization.
-		METHOD create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
-			COMMENT Creates a proper resource pack profile from the given parameters.
-			COMMENT
-			COMMENT @apiNote Instead of calling this method, users usually call {@link
-			COMMENT ResourcePackProfile#of}, which fills some of the parameters for a call to this
-			COMMENT method.
-			ARG 1 name
-			ARG 2 displayName
-			ARG 3 alwaysEnabled
-			ARG 4 packFactory
-			ARG 5 metadata
-			ARG 6 initialPosition
-			ARG 7 source

mappings/net/minecraft/resource/ResourcePackProvider.mapping

@@ -1,12 +1,10 @@
 CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackProvider
 	COMMENT A resource pack provider provides {@link ResourcePackProfile}s, usually to
 	COMMENT {@link ResourcePackManager}s.
-	METHOD method_14453 register (Ljava/util/function/Consumer;Lnet/minecraft/class_3288$class_5351;)V
+	METHOD method_14453 register (Ljava/util/function/Consumer;)V
 		COMMENT Register resource pack profiles created with the {@code factory} to the
 		COMMENT {@code profileAdder}.
 		COMMENT
 		COMMENT @see ResourcePackProfile#of
 		ARG 1 profileAdder
 			COMMENT the profile adder that accepts created resource pack profiles
-		ARG 2 factory
-			COMMENT the factory that creates the resource pack profiles

mappings/net/minecraft/resource/ResourcePackSource.mapping

@@ -1,11 +1,4 @@
 CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource
 	FIELD field_25347 PACK_SOURCE_NONE Lnet/minecraft/class_5352;
-	METHOD decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
+	METHOD method_45282 decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
 		ARG 1 packName
-	METHOD method_29485 onlyName ()Lnet/minecraft/class_5352;
-	METHOD method_29486 nameAndSource (Ljava/lang/String;)Lnet/minecraft/class_5352;
-		ARG 0 source
-	METHOD method_29487 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 0 name
-	METHOD method_29488 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 1 name

mappings/net/minecraft/resource/VanillaDataPackProvider.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider
-	FIELD field_14269 pack Lnet/minecraft/class_3268;
+	FIELD field_26939 DEFAULT_PACK_METADATA Lnet/minecraft/class_7662;
-	FIELD field_26939 DEFAULT_PACK_METADATA Lnet/minecraft/class_3272;
+	FIELD field_29782 NAME Lnet/minecraft/class_2561;
-	FIELD field_29782 NAME Ljava/lang/String;

mappings/net/minecraft/resource/ZipResourcePack.mapping

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack
 	FIELD field_14183 TYPE_NAMESPACE_SPLITTER Lcom/google/common/base/Splitter;
 	FIELD field_14184 file Ljava/util/zip/ZipFile;
+	METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367;
 	METHOD method_14399 getZipFile ()Ljava/util/zip/ZipFile;

mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_3272 net/minecraft/resource/metadata/PackResourceMetadata
 	FIELD field_14201 packFormat I
-	FIELD field_14202 READER Lnet/minecraft/class_3274;
+	FIELD field_14202 READER Lnet/minecraft/class_7677;
 	FIELD field_14203 description Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_2561;I)V
 		ARG 1 description

mappings/net/minecraft/resource/metadata/ResourceFilter.mapping

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_7084 net/minecraft/resource/metadata/ResourceFilter
-	FIELD field_37289 READER Lnet/minecraft/class_3270;
-	FIELD field_37290 LOGGER Lorg/slf4j/Logger;
 	FIELD field_37291 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_37292 blocks Ljava/util/List;
 		COMMENT The list of block rules, named {@code block} in the JSON format.

mappings/net/minecraft/server/DataPackContents.mapping

@@ -15,25 +15,19 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 	FIELD field_28017 lootFunctionManager Lnet/minecraft/class_5640;
 	FIELD field_36491 LOGGER Lorg/slf4j/Logger;
 	FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157;
-	METHOD <init> (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;I)V
+	METHOD <init> (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V
 		ARG 1 dynamicRegistryManager
-		ARG 2 commandEnvironment
-		ARG 3 functionPermissionLevel
 	METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349;
 		COMMENT {@return the function loader}
 		COMMENT
 		COMMENT <p>Function loader loads the {@linkplain net.minecraft.server.function.CommandFunction
 		COMMENT functions} in data packs.
-	METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		COMMENT Reloads the data packs contents.
 		COMMENT
 		COMMENT @see MinecraftServer#reloadResources
 		ARG 0 manager
 		ARG 1 dynamicRegistryManager
-		ARG 2 commandEnvironment
-		ARG 3 functionPermissionLevel
-		ARG 4 prepareExecutor
-		ARG 5 applyExecutor
 	METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567;
 	METHOD method_29469 getLootManager ()Lnet/minecraft/class_60;
 		COMMENT @see MinecraftServer#getLootManager

mappings/net/minecraft/server/Main.mapping

@@ -2,16 +2,12 @@ CLASS net/minecraft/server/Main
 	FIELD field_24625 LOGGER Lorg/slf4j/Logger;
 	METHOD main ([Ljava/lang/String;)V
 		ARG 0 args
-	METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_5285;)V
+	METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;)V
 		ARG 0 session
 		ARG 1 dataFixer
 		ARG 2 eraseCache
 		ARG 3 continueCheck
-		ARG 4 generatorOptions
 	METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176;
 		ARG 12 thread
 	METHOD method_43612 (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_32$class_5143;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 6 applyExecutor
-	METHOD method_43613 (Lnet/minecraft/class_32$class_5143;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-		ARG 5 resourceManager
-		ARG 6 dataPackSettings

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -30,7 +30,7 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_24370 structureTemplateManager Lnet/minecraft/class_3485;
 	FIELD field_24371 saveHandler Lnet/minecraft/class_29;
 	FIELD field_24372 saveProperties Lnet/minecraft/class_5219;
-	FIELD field_25132 registryManager Lnet/minecraft/class_5455$class_6890;
+	FIELD field_25132 registryManager Lnet/minecraft/class_7780;
 	FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897;
 	FIELD field_33205 MILLISECONDS_PER_TICK J
 	FIELD field_33210 START_TICKET_CHUNK_RADIUS I
@@ -153,7 +153,7 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 2 resourceManagerHolder
 	METHOD method_29735 createDataPackSettings (Lnet/minecraft/class_3283;)Lnet/minecraft/class_5359;
 		ARG 0 dataPackManager
-	METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;Z)Lnet/minecraft/class_5359;
+	METHOD method_29736 loadDataPacks (Lnet/minecraft/class_3283;Lnet/minecraft/class_5359;ZLnet/minecraft/class_7699;)Lnet/minecraft/class_7712;
 		ARG 0 resourcePackManager
 		ARG 1 dataPackSettings
 		ARG 2 safeMode
@@ -414,7 +414,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_43824 getHostProfile ()Lcom/mojang/authlib/GameProfile;
 	METHOD method_43825 setHostProfile (Lcom/mojang/authlib/GameProfile;)V
 		ARG 1 hostProfile
-	METHOD method_43928 shouldPreviewChat ()Z
 	METHOD method_43929 getMessageDecorator ()Lnet/minecraft/class_7492;
 		COMMENT {@return the message decorator used by the server}
 		COMMENT

mappings/net/minecraft/server/PlayerManager.mapping

@@ -20,11 +20,11 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 	FIELD field_14361 whitelist Lnet/minecraft/class_3337;
 	FIELD field_14362 statisticsMap Ljava/util/Map;
 	FIELD field_14364 BANNED_IPS_FILE Ljava/io/File;
-	FIELD field_24626 registryManager Lnet/minecraft/class_5455$class_6890;
+	FIELD field_24626 registryManager Lnet/minecraft/class_7780;
 	FIELD field_29790 LATENCY_UPDATE_INTERVAL I
 	FIELD field_34895 simulationDistance I
 	FIELD field_39921 FILTERED_FULL_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;I)V
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_7780;Lnet/minecraft/class_29;I)V
 		ARG 1 server
 		ARG 2 registryManager
 		ARG 3 saveHandler
@@ -127,9 +127,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		ARG 1 profile
 	METHOD method_14611 remove (Lnet/minecraft/class_3222;)V
 		ARG 1 player
-	METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)Lnet/minecraft/class_3222;
+	METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7822;)Lnet/minecraft/class_3222;
 		ARG 1 profile
-		ARG 2 publicKey
 	METHOD method_14614 isWhitelistEnabled ()Z
 	METHOD method_14617 saveAllPlayerData ()V
 	METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
@@ -200,7 +199,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		ARG 1 message
 		ARG 2 source
 		ARG 3 params
-	METHOD method_44791 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Predicate;Lnet/minecraft/class_3222;Lnet/minecraft/class_7436;Lnet/minecraft/class_2556$class_7602;)V
+	METHOD method_44791 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Predicate;Lnet/minecraft/class_3222;Lnet/minecraft/class_2556$class_7602;)V
 		COMMENT Broadcasts a chat message to all players and the server console.
 		COMMENT
 		COMMENT <p>Chat messages have signatures. It is possible to use a bogus signature - such as
@@ -217,20 +216,9 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		ARG 2 shouldSendFiltered
 			COMMENT predicate that determines whether to send the filtered message for the given player
 		ARG 3 sender
-		ARG 4 sourceProfile
+	METHOD method_44793 verify (Lnet/minecraft/class_7471;)Z
-		ARG 5 params
-	METHOD method_44792 sendMessageHeader (Lnet/minecraft/class_7471;Ljava/util/Set;)V
-		COMMENT Sends {@code message}'s headers (only) to all players except {@code except}.
-		COMMENT
-		COMMENT <p>This is used to keep the integrity of the "message chain" when a message is censored
-		COMMENT or when the message is originally sent without metadata due to it being originated from
-		COMMENT entities.
-		ARG 1 message
-		ARG 2 except
-	METHOD method_44793 verify (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;)Z
 		COMMENT {@return whether {@code message} is not expired and is verified}
 		COMMENT
 		COMMENT @implNote This only affects the server log. Unverified messages are still broadcast
 		COMMENT to other clients.
 		ARG 1 message
-		ARG 2 profile

mappings/net/minecraft/server/SaveLoader.mapping

@@ -1,12 +1,7 @@
 CLASS net/minecraft/class_6904 net/minecraft/server/SaveLoader
 	FIELD comp_357 dataPackContents Lnet/minecraft/class_5350;
-	FIELD comp_358 dynamicRegistryManager Lnet/minecraft/class_5455$class_6890;
+	FIELD comp_358 dynamicRegistryManager Lnet/minecraft/class_7780;
 	FIELD comp_359 saveProperties Lnet/minecraft/class_5219;
 	METHOD comp_357 dataPackContents ()Lnet/minecraft/class_5350;
-	METHOD comp_358 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890;
+	METHOD comp_358 dynamicRegistryManager ()Lnet/minecraft/class_7780;
 	METHOD comp_359 saveProperties ()Lnet/minecraft/class_5219;
-	METHOD method_40431 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 serverConfig
-		ARG 1 savePropertiesSupplier
-		ARG 2 prepareExecutor
-		ARG 3 applyExecutor

mappings/net/minecraft/server/SaveLoading.mapping

@@ -2,8 +2,6 @@ CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading
 	METHOD method_42096 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V
 		ARG 1 dataPackContents
 		ARG 2 throwable
-	METHOD method_42097 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7237$class_7239;Lnet/minecraft/class_6860;Ljava/lang/Object;Lnet/minecraft/class_5350;)Ljava/lang/Object;
-		ARG 4 dataPackContents
 	METHOD method_42098 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Lnet/minecraft/class_7237$class_7239;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 serverConfig
 		ARG 1 loadContextSupplier
@@ -18,17 +16,14 @@ CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading
 		METHOD comp_362 functionPermissionLevel ()I
 		METHOD comp_634 dataPacks ()Lnet/minecraft/class_7237$class_7238;
 	CLASS class_6907 LoadContextSupplier
-		METHOD get (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-			ARG 1 resourceManager
-			ARG 2 dataPackSettings
 	CLASS class_7238 DataPacks
 		FIELD comp_635 manager Lnet/minecraft/class_3283;
-		FIELD comp_636 settings Lnet/minecraft/class_5359;
+		FIELD comp_636 settings Lnet/minecraft/class_7712;
 		METHOD comp_635 manager ()Lnet/minecraft/class_3283;
-		METHOD comp_636 settings ()Lnet/minecraft/class_5359;
+		METHOD comp_636 settings ()Lnet/minecraft/class_7712;
 		METHOD method_42099 load ()Lcom/mojang/datafixers/util/Pair;
 	CLASS class_7239 SaveApplierFactory
-		METHOD create (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Ljava/lang/Object;)Ljava/lang/Object;
+		METHOD create (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 resourceManager
 			ARG 2 dataPackContents
 			ARG 3 dynamicRegistryManager

mappings/net/minecraft/server/ServerMetadata.mapping

@@ -6,7 +6,6 @@ CLASS net/minecraft/class_2926 net/minecraft/server/ServerMetadata
 	FIELD field_13286 version Lnet/minecraft/class_2926$class_2930;
 	FIELD field_33375 FAVICON_WIDTH I
 	FIELD field_33376 FAVICON_HEIGHT I
-	FIELD field_39391 previewsChat Z
 	FIELD field_39914 secureChatEnforced Z
 	METHOD method_12677 setFavicon (Ljava/lang/String;)V
 		ARG 1 favicon
@@ -20,9 +19,6 @@ CLASS net/minecraft/class_2926 net/minecraft/server/ServerMetadata
 	METHOD method_12683 getVersion ()Lnet/minecraft/class_2926$class_2930;
 	METHOD method_12684 setDescription (Lnet/minecraft/class_2561;)V
 		ARG 1 description
-	METHOD method_44138 setPreviewsChat (Z)V
-		ARG 1 previewsChat
-	METHOD method_44139 shouldPreviewChat ()Z
 	METHOD method_45050 setSecureChatEnforced (Z)V
 		ARG 1 secureChatEnforced
 	METHOD method_45051 isSecureChatEnforced ()Z

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

@@ -5,35 +5,30 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand
 	FIELD field_24379 MODIFIER_ALREADY_PRESENT_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;
 	METHOD method_27733 getLivingEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309;
 		ARG 0 entity
-	METHOD method_27734 getAttributeInstance (Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324;
+	METHOD method_27734 getAttributeInstance (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324;
 		ARG 0 entity
-		ARG 1 attribute
+	METHOD method_27735 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
-	METHOD method_27735 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
 	METHOD method_27736 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	METHOD method_27738 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_27739 executeValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I
+	METHOD method_27739 executeValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;D)I
 		ARG 0 source
 		ARG 1 target
-		ARG 2 attribute
 		ARG 3 multiplier
-	METHOD method_27740 executeModifierRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;)I
+	METHOD method_27740 executeModifierRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Ljava/util/UUID;)I
 		ARG 0 source
 		ARG 1 target
-		ARG 2 attribute
 		ARG 3 uuid
-	METHOD method_27741 executeModifierValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;D)I
+	METHOD method_27741 executeModifierValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Ljava/util/UUID;D)I
 		ARG 0 source
 		ARG 1 target
-		ARG 2 attribute
 		ARG 3 uuid
 		ARG 4 multiplier
-	METHOD method_27742 executeModifierAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)I
+	METHOD method_27742 executeModifierAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)I
 		ARG 0 source
 		ARG 1 target
-		ARG 2 attribute
 		ARG 3 uuid
 		ARG 4 name
 		ARG 5 value
@@ -47,15 +42,13 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand
 		ARG 0 entityName
 		ARG 1 attributeName
 		ARG 2 uuid
-	METHOD method_27746 getLivingEntityWithAttribute (Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1309;
+	METHOD method_27746 getLivingEntityWithAttribute (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1309;
 		ARG 0 entity
-		ARG 1 attribute
 	METHOD method_27747 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_27748 executeBaseValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I
+	METHOD method_27748 executeBaseValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;D)I
 		ARG 0 source
 		ARG 1 target
-		ARG 2 attribute
 		ARG 3 multiplier
 	METHOD method_27749 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 entityName
@@ -63,10 +56,9 @@ CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand
 		ARG 2 uuid
 	METHOD method_27750 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_27751 executeBaseValueSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I
+	METHOD method_27751 executeBaseValueSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_6880;D)I
 		ARG 0 source
 		ARG 1 target
-		ARG 2 attribute
 		ARG 3 value
 	METHOD method_27752 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context

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

@@ -73,8 +73,6 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand
 		ARG 1 container
 	METHOD method_13141 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_29477 (Ljava/util/Collection;Lnet/minecraft/class_3288;)Z
-		ARG 1 profile
 	METHOD method_29776 (Ljava/util/Collection;Ljava/lang/String;)Z
 		ARG 1 name
 	CLASS class_3028 PackAdder

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

@@ -6,24 +6,22 @@ CLASS net/minecraft/class_3043 net/minecraft/server/command/EffectCommand
 		ARG 0 context
 	METHOD method_13226 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13227 executeGive (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_1291;Ljava/lang/Integer;IZ)I
+	METHOD method_13227 executeGive (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_6880;Ljava/lang/Integer;IZ)I
 		ARG 0 source
 		ARG 1 targets
-		ARG 2 effect
 		ARG 3 seconds
 		ARG 4 amplifier
 		ARG 5 showParticles
 	METHOD method_13228 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13229 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13229 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13230 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;)I
 		ARG 0 source
 		ARG 1 targets
-	METHOD method_13231 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_1291;)I
+	METHOD method_13231 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 targets
-		ARG 2 effect
 	METHOD method_13232 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	METHOD method_13233 (Lcom/mojang/brigadier/context/CommandContext;)I

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

@@ -6,14 +6,13 @@ CLASS net/minecraft/class_3048 net/minecraft/server/command/EnchantCommand
 	FIELD field_13633 FAILED_INCOMPATIBLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD method_13240 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13241 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_1887;I)I
+	METHOD method_13241 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_6880;I)I
 		ARG 0 source
 		ARG 1 targets
-		ARG 2 enchantment
 		ARG 3 level
 	METHOD method_13242 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 entityName
-	METHOD method_13243 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13243 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13244 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 itemName

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

@@ -2,9 +2,7 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
 	FIELD field_39245 STRUCTURE_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_39246 STRUCTURE_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_39247 BIOME_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_39248 BIOME_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_39249 POI_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_39250 POI_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_39251 LOCATE_STRUCTURE_RADIUS I
 	FIELD field_39252 LOCATE_BIOME_RADIUS I
 	FIELD field_39253 LOCATE_BIOME_HORIZONTAL_BLOCK_CHECK_INTERVAL I
@@ -15,7 +13,7 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
 		ARG 1 y1
 		ARG 2 x2
 		ARG 3 y2
-	METHOD method_13443 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13443 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13448 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
@@ -31,8 +29,6 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
 		ARG 1 key
 	METHOD method_41002 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_41003 (Lnet/minecraft/class_5321;)Ljava/lang/String;
-		ARG 0 key
 	METHOD method_41004 (Lnet/minecraft/class_5321;)Ljava/lang/String;
 		ARG 0 key
 	METHOD method_43905 executeLocateStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
@@ -45,17 +41,11 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
 		ARG 0 entry
 	METHOD method_43909 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/Optional;
 		ARG 1 key
-	METHOD method_43910 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+	METHOD method_43912 executeLocateBiome (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;)I
-		ARG 0 id
-	METHOD method_43912 executeLocateBiome (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
 		ARG 0 source
-		ARG 1 predicate
 	METHOD method_43913 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_43915 executeLocatePoi (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
+	METHOD method_43915 executeLocatePoi (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;)I
 		ARG 0 source
-		ARG 1 predicate
-	METHOD method_43916 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD method_43917 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id

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

@@ -3,5 +3,3 @@ CLASS net/minecraft/class_3045 net/minecraft/server/command/MeCommand
 		ARG 0 dispatcher
 	METHOD method_13238 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_43645 (Lnet/minecraft/class_3324;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V
-		ARG 2 message

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

@@ -1,11 +1,6 @@
 CLASS net/minecraft/class_3082 net/minecraft/server/command/MessageCommand
 	METHOD method_13461 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
-	METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2196$class_7515;)I
+	METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_7471;)V
-		ARG 0 source
-		ARG 1 targets
-		ARG 2 signedMessage
 	METHOD method_13463 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_44144 (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;)V
-		ARG 3 message

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

@@ -6,7 +6,7 @@ CLASS net/minecraft/class_3089 net/minecraft/server/command/ParticleCommand
 		ARG 0 context
 	METHOD method_13485 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13486 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13486 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13487 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context

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

@@ -11,14 +11,11 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand
 		ARG 0 context
 	METHOD method_39988 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_39989 executePlaceFeature (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I
+	METHOD method_39989 executePlaceFeature (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2338;)I
 		ARG 0 source
-		ARG 1 feature
 		ARG 2 pos
 	METHOD method_39990 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_41202 (Lnet/minecraft/class_5321;)Ljava/lang/String;
-		ARG 0 key
 	METHOD method_43646 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)Z
 		ARG 1 pos
 	METHOD method_43647 throwOnUnloadedPos (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Lnet/minecraft/class_1923;)V
@@ -35,13 +32,10 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand
 		ARG 2 id
 		ARG 3 maxDepth
 		ARG 4 pos
-	METHOD method_43652 (Lnet/minecraft/class_5321;)Ljava/lang/String;
-		ARG 0 key
 	METHOD method_43653 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_43654 executePlaceStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I
+	METHOD method_43654 executePlaceStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2338;)I
 		ARG 0 source
-		ARG 1 structure
 		ARG 2 pos
 	METHOD method_43655 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context

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

@@ -5,5 +5,3 @@ CLASS net/minecraft/class_3110 net/minecraft/server/command/SayCommand
 		ARG 0 context
 	METHOD method_13564 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_43657 (Lnet/minecraft/class_3324;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V
-		ARG 2 message

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

@@ -50,7 +50,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 3 registry
 	METHOD method_43735 withSignedArguments (Lnet/minecraft/class_7448;)Lnet/minecraft/class_2168;
 		ARG 1 signedArguments
-	METHOD method_43736 getMessageSourceProfile ()Lnet/minecraft/class_7436;
 	METHOD method_43737 isExecutedByPlayer ()Z
 	METHOD method_43738 getSignedArguments ()Lnet/minecraft/class_7448;
 	METHOD method_44023 getPlayer ()Lnet/minecraft/class_3222;

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

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_3138 net/minecraft/server/command/SummonCommand
 	FIELD field_26629 FAILED_UUID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	METHOD method_13689 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_13690 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD method_13690 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V
 		ARG 0 dispatcher
 	METHOD method_13691 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
@@ -12,9 +12,8 @@ CLASS net/minecraft/class_3138 net/minecraft/server/command/SummonCommand
 		ARG 0 context
 	METHOD method_13693 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_13694 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;Z)I
+	METHOD method_13694 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;Z)I
 		ARG 0 source
-		ARG 1 entity
 		ARG 2 pos
 		ARG 3 nbt
 		ARG 4 initialize

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

@@ -1,14 +1,8 @@
 CLASS net/minecraft/class_3945 net/minecraft/server/command/TeamMsgCommand
 	FIELD field_17440 NO_TEAM_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_24380 STYLE Lnet/minecraft/class_2583;
-	METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2196$class_7515;)I
+	METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Ljava/util/List;Lnet/minecraft/class_7471;)V
-		ARG 0 source
-		ARG 1 signedMessage
 	METHOD method_17600 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
 	METHOD method_17601 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_44147 (Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Lnet/minecraft/class_3222;)Z
-		ARG 2 player
-	METHOD method_44148 (Ljava/util/List;Lnet/minecraft/class_1297;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V
-		ARG 5 message

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_3174 net/minecraft/server/dedicated/DedicatedPlayerManager
 	FIELD field_13804 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Lnet/minecraft/class_3176;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;)V
+	METHOD <init> (Lnet/minecraft/class_3176;Lnet/minecraft/class_7780;Lnet/minecraft/class_29;)V
 		ARG 1 server
 		ARG 2 tracker
 		ARG 3 saveHandler

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

@@ -45,20 +45,16 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 	FIELD field_26899 textFilteringConfig Ljava/lang/String;
 	FIELD field_34883 simulationDistance I
 	FIELD field_35564 hideOnlinePlayers Z
-	FIELD field_37039 worldGenProperties Lnet/minecraft/class_3806$class_7044;
 	FIELD field_37275 maxChainedNeighborUpdates I
 	FIELD field_39018 enforceSecureProfile Z
 	FIELD field_39093 serverResourcePackProperties Ljava/util/Optional;
 	FIELD field_39094 SHA1_PATTERN Ljava/util/regex/Pattern;
-	FIELD field_39259 previewsChat Z
 	METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806;
 		ARG 0 path
 	METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer;
 		ARG 0 maxWorldSize
 	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 dynamicRegistryManager
 	METHOD method_41005 (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 type
 	METHOD method_41186 (Ljava/lang/String;)Lcom/google/gson/JsonObject;
@@ -73,9 +69,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 		ARG 0 prompt
 	CLASS class_7044 WorldGenProperties
 		FIELD field_37277 LEVEL_TYPE_TO_PRESET_KEY Ljava/util/Map;
-		METHOD method_41242 createGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
+		METHOD method_41242 createGeneratorOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723;
 			ARG 1 dynamicRegistryManager
-		METHOD method_41243 (Lnet/minecraft/class_5321;)Ljava/lang/String;
-			ARG 0 key
 		METHOD method_41244 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
 			ARG 0 levelTypeId

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

@@ -14,14 +14,11 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader
 	COMMENT
 	COMMENT @see CommandFunctionManager
 	FIELD field_25326 LOGGER Lorg/slf4j/Logger;
-	FIELD field_25327 PATH_PREFIX_LENGTH I
-	FIELD field_25328 EXTENSION_LENGTH I
 	FIELD field_25329 functions Ljava/util/Map;
 	FIELD field_25330 tagLoader Lnet/minecraft/class_3503;
 	FIELD field_25331 level I
 	FIELD field_25332 commandDispatcher Lcom/mojang/brigadier/CommandDispatcher;
 	FIELD field_25801 tags Ljava/util/Map;
-	FIELD field_33385 EXTENSION Ljava/lang/String;
 	METHOD <init> (ILcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 1 level
 		ARG 2 commandDispatcher
@@ -35,8 +32,6 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader
 		ARG 2 functionFuture
 	METHOD method_29453 (Lcom/mojang/datafixers/util/Pair;)V
 		ARG 1 intermediate
-	METHOD method_29454 (Lnet/minecraft/class_2960;)Z
-		ARG 0 id
 	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/integrated/IntegratedPlayerManager.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1130 net/minecraft/server/integrated/IntegratedPlayerManager
 	FIELD field_5514 userData Lnet/minecraft/class_2487;
-	METHOD <init> (Lnet/minecraft/class_1132;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;)V
+	METHOD <init> (Lnet/minecraft/class_1132;Lnet/minecraft/class_7780;Lnet/minecraft/class_29;)V
 		ARG 1 server
 		ARG 2 registryManager
 		ARG 3 saveHandler

mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping

@@ -5,18 +5,10 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_32;)V
 		ARG 1 client
 		ARG 2 storage
-	METHOD method_41885 (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_5455;Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-		ARG 3 resourceManager
-		ARG 4 dataPackSettings
-	METHOD method_41886 createDataPackManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283;
-		ARG 0 session
-	METHOD method_41887 (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
 	METHOD method_41888 close (Lnet/minecraft/class_32$class_5143;Ljava/lang/String;)V
 		ARG 0 session
 		ARG 1 levelName
-	METHOD method_41889 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5219;)V
+	METHOD method_41889 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5350;Lnet/minecraft/class_7780;Lnet/minecraft/class_5219;)V
 		ARG 1 session
 		ARG 2 dataPackContents
 		ARG 3 dynamicRegistryManager
@@ -25,7 +17,6 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
 		ARG 1 session
 		ARG 2 safeMode
 	METHOD method_41891 createSaveLoader (Lnet/minecraft/class_32$class_5143;ZLnet/minecraft/class_3283;)Lnet/minecraft/class_6904;
-		ARG 1 session
 		ARG 2 safeMode
 		ARG 3 dataPackManager
 	METHOD method_41892 tryLoad (Lnet/minecraft/class_310;Lnet/minecraft/class_525;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;)V
@@ -38,11 +29,9 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
 	METHOD method_41894 start (Lnet/minecraft/class_437;Ljava/lang/String;)V
 		ARG 1 parent
 		ARG 2 levelName
-	METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)V
+	METHOD method_41895 createAndStart (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Ljava/util/function/Function;)V
 		ARG 1 levelName
-		ARG 2 levelInfo
 		ARG 3 dynamicRegistryManager
-		ARG 4 generatorOptions
 	METHOD method_41896 (Ljava/lang/String;Ljava/lang/Runnable;ZZ)V
 		ARG 3 backup
 		ARG 4 eraseCache
@@ -56,9 +45,6 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL
 		ARG 2 levelName
 		ARG 3 safeMode
 		ARG 4 canShowBackupPrompt
-	METHOD method_41900 createSaveLoader (Lnet/minecraft/class_7237$class_7238;Lnet/minecraft/class_7237$class_6907;)Lnet/minecraft/class_6904;
-		ARG 1 dataPacks
-		ARG 2 savePropertiesSupplier
 	METHOD method_41901 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143;
 		ARG 1 levelName
 	METHOD method_43324 showPackLoadFailureScreen ()Ljava/util/concurrent/CompletableFuture;

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

@@ -29,9 +29,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa
 	FIELD field_14166 LOGGER Lorg/slf4j/Logger;
 	FIELD field_14167 nonce [B
 	FIELD field_29779 TIMEOUT_TICKS I
-	FIELD field_39743 publicKeyData Lnet/minecraft/class_7428$class_7443;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V
-		ARG 1 server
 		ARG 2 connection
 	METHOD method_14375 toOfflineProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile;
 		ARG 1 profile
@@ -51,9 +49,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa
 		ARG 0 c
 	METHOD method_40085 isValidName (Ljava/lang/String;)Z
 		ARG 0 name
-	METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_7428$class_7443;Ljava/util/UUID;Lnet/minecraft/class_7500;Z)Lnet/minecraft/class_7428;
+	METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_7822$class_7823;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7500;Z)Lnet/minecraft/class_7822;
-		ARG 0 publicKeyData
-		ARG 1 playerUuid
 		ARG 2 servicesSignatureVerifier
 		ARG 3 shouldThrowOnMissingKey
 	CLASS 1

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

@@ -35,17 +35,13 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D
 	FIELD field_37281 DEFAULT_SEQUENCE I
 	FIELD field_37282 sequence I
-	FIELD field_39261 previewTaskRunner Lnet/minecraft/class_7493;
 	FIELD field_39394 lastMessageTimestamp Ljava/util/concurrent/atomic/AtomicReference;
 	FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611;
 	FIELD field_39825 acknowledgmentValidator Lnet/minecraft/class_7638;
 	FIELD field_39826 messageChainTaskQueue Lnet/minecraft/class_7619;
-	FIELD field_39827 MAX_PENDING_ACKNOWLEDGMENTS I
-	FIELD field_39899 cachedDecoratorResult Lnet/minecraft/class_7642;
 	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
 		ARG 1 x
 		ARG 3 y
@@ -152,30 +148,14 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		COMMENT @see net.minecraft.SharedConstants#isValidChar(char)
 		ARG 0 message
 	METHOD method_43669 checkForSpam ()V
-	METHOD method_44154 (ILnet/minecraft/class_2561;)V
-		ARG 2 decorated
 	METHOD method_44155 handleDecoratedMessage (Lnet/minecraft/class_7471;)V
 		ARG 1 message
-	METHOD method_44156 decorateCommand (Lnet/minecraft/class_2168;Lnet/minecraft/class_7644;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 source
-		ARG 2 arguments
-	METHOD method_44158 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
-		ARG 1 decorated
-	METHOD method_44159 decorate (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 query
 	METHOD method_44160 isInProperOrder (Ljava/time/Instant;)Z
 		COMMENT {@return whether the message sent at {@code timestamp} is received in proper order}
 		COMMENT
 		COMMENT <p>If {@code false}, the message will be discarded.
 		ARG 1 timestamp
-	METHOD method_44161 decorateChat (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_44337 canAcceptMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional;
-		ARG 1 query
-	METHOD method_44162 decorateCommand (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 query
-	METHOD method_44318 sendChatPreviewPacket (ILnet/minecraft/class_2561;)V
-		ARG 1 queryId
-		ARG 2 preview
-	METHOD method_44337 canAcceptMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Z
 		COMMENT {@return whether {@code message}, sent at {@code timestamp}, should be accepted}
 		COMMENT
 		COMMENT <p>This returns {@code false} if the message arrives in {@linkplain
@@ -187,56 +167,22 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		ARG 1 message
 		ARG 2 timestamp
 		ARG 3 acknowledgment
-	METHOD method_44790 getMessageUnpacker ()Lnet/minecraft/class_7610$class_7611;
-	METHOD method_44895 handleAcknowledgmentFailure (Ljava/util/Set;)V
-		ARG 1 reasons
 	METHOD method_44897 addPendingAcknowledgment (Lnet/minecraft/class_7471;)V
 		ARG 1 message
-	METHOD method_44902 shouldPreviewChat ()Z
-		COMMENT {@return whether to handle chat preview requests}
-		COMMENT
-		COMMENT <p>Dedicated servers can configure chat preview in {@code server.properties} file.
-		COMMENT Chat preview is always enabled for integrated servers.
-		COMMENT
-		COMMENT @see MinecraftServer#shouldPreviewChat
 	METHOD method_45002 (Lnet/minecraft/class_7448;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168;
 		ARG 1 source
 	METHOD method_45003 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults;
 		COMMENT {@return the result of parsing {@code command}}
 		ARG 1 command
 			COMMENT the command to parse (without the leading slash)
-	METHOD method_45004 (Ljava/lang/String;Lnet/minecraft/class_2561;)V
+	METHOD method_45006 collectArgumentMessages (Lnet/minecraft/class_7472;Lnet/minecraft/class_7644;Lnet/minecraft/class_7635;)Ljava/util/Map;
-		ARG 2 decorated
-	METHOD method_45006 collectArgumentMessages (Lnet/minecraft/class_7472;Lnet/minecraft/class_7644;)Ljava/util/Map;
 		COMMENT {@return a map of argument name and value as signed messages}
 		ARG 1 packet
 		ARG 2 arguments
-	METHOD method_45008 (Ljava/lang/String;Lnet/minecraft/class_2561;)V
+	METHOD method_45010 handleCommandExecution (Lnet/minecraft/class_7472;Lnet/minecraft/class_7635;)V
-		ARG 2 decorated
-	METHOD method_45009 canAcceptMessage (Lnet/minecraft/class_7471;)Z
-		COMMENT {@return whether {@code message} can be accepted}
-		COMMENT
-		COMMENT <p>This verifies the message's signature and disconnects the client if it cannot
-		COMMENT be verified. Additionally, this logs a warning (without disconnection or
-		COMMENT rejection of messages) for expired messages.
-		COMMENT
-		COMMENT @see #canAcceptMessage(String, Instant, LastSeenMessageList.Acknowledgment)
-		ARG 1 message
-	METHOD method_45010 handleCommandExecution (Lnet/minecraft/class_7472;)V
 		ARG 1 packet
-	METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;)Lnet/minecraft/class_7471;
+	METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471;
 		ARG 1 packet
-	METHOD method_45013 getDecoratedContents (Lnet/minecraft/class_2797;)Lnet/minecraft/class_7634;
-		COMMENT {@return the decorated contents for {@code packet}}
-		COMMENT
-		COMMENT @implNote This returns the {@linkplain CachedDecoratorResult#tryConsume consumed
-		COMMENT cached result} if it exists, and otherwise returns a new {@link DecoratedContents}
-		COMMENT without message decorators applied. This method does not execute message decorators;
-		COMMENT they are executed in {@link #onRequestChatPreview} (for previewed messages) or {@link
-		COMMENT #onChatMessage} (for unpreviewed messages).
-		ARG 1 packet
-	METHOD method_45064 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)V
-		ARG 3 void_
 	CLASS 1
 		METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V
 			ARG 1 hand

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

@@ -48,11 +48,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	FIELD field_35007 fallStartPos Lnet/minecraft/class_243;
 	FIELD field_35008 vehicleInLavaRidingPos Lnet/minecraft/class_243;
 	FIELD field_35566 allowServerListing Z
-	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7428;)V
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7822;)V
 		ARG 1 server
-		ARG 2 world
 		ARG 3 profile
-		ARG 4 publicKey
 	METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V
 		ARG 1 oldPlayer
 		ARG 2 alive
@@ -202,7 +200,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 nbt
 	METHOD method_32749 writeGameModeNbt (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
-	METHOD method_33793 shouldFilterText ()Z
 	METHOD method_33795 shouldFilterMessagesSentTo (Lnet/minecraft/class_3222;)Z
 		ARG 1 player
 	METHOD method_34225 onSpawn ()V
@@ -236,15 +233,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	METHOD method_44706 acceptsChatMessage ()Z
 	METHOD method_44707 acceptsMessage (Z)Z
 		ARG 1 overlay
-	METHOD method_44786 sendMessageHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V
-		COMMENT Sends a message's header and other data required for verification to this player.
-		COMMENT
-		COMMENT <p>This is used to keep the integrity of the "message chain" when a message is censored
-		COMMENT or when the message is originally sent without metadata due to it being originated from
-		COMMENT entities.
-		ARG 1 header
-		ARG 2 headerSignature
-		ARG 3 bodyDigest
 	METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z
 		ARG 1 gameMode
 	CLASS 1

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

@@ -29,7 +29,6 @@ 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
-	FIELD field_39095 queuedEvents Ljava/util/List;
 	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
@@ -346,12 +345,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 		ARG 3 radius
 		ARG 4 horizontalBlockCheckInterval
 		ARG 5 verticalBlockCheckInterval
-	METHOD method_43663 processEvents (Ljava/util/List;)V
-		ARG 1 events
-	METHOD method_43664 (Ljava/util/List;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V
-		ARG 5 listener
-		ARG 6 listenerPos
-	METHOD method_43665 processEventQueue ()V
 	METHOD method_8448 updateSleepingPlayers ()V
 	METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338;
 		COMMENT Tries to find the closest structure of a given type near a given block.

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

@@ -216,7 +216,6 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties
 	FIELD field_31391 DISTANCE_0_7_MAX I
 	FIELD field_31392 CHARGES_MIN I
 	FIELD field_31393 CHARGES_MAX I
-	FIELD field_31394 ROTATION_MAX I
 	FIELD field_31395 AGE_1_MAX I
 	FIELD field_31396 AGE_2_MAX I
 	FIELD field_31397 AGE_3_MAX I

mappings/net/minecraft/structure/OceanMonumentGenerator.mapping

@@ -136,7 +136,7 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator
 			ARG 7 height
 			ARG 8 depth
 			ARG 9 state
-		METHOD method_14772 spawnElderGuardian (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;III)Z
+		METHOD method_14772 spawnElderGuardian (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;III)V
 			ARG 1 world
 			ARG 2 box
 			ARG 3 x

mappings/net/minecraft/structure/StructureTemplate.mapping

@@ -75,9 +75,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 		ARG 1 mirror
 		ARG 2 rotation
 		ARG 3 pivot
-	METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V
+	METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_7225;Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V
-		ARG 1 paletteNbt
-		ARG 2 blocksNbt
 	METHOD method_15179 spawnEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Z)V
 		ARG 1 world
 		ARG 2 pos
@@ -92,8 +90,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 		ARG 3 placementData2
 		ARG 4 pos2
 	METHOD method_15181 getAuthor ()Ljava/lang/String;
-	METHOD method_15183 readNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_15183 readNbt (Lnet/minecraft/class_7225;Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_15184 createNbtDoubleList ([D)Lnet/minecraft/class_2499;
 		ARG 1 doubles
 	METHOD method_16185 (Lnet/minecraft/class_3499$class_3501;)I

mappings/net/minecraft/structure/StructureTemplateManager.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager
 	FIELD field_31686 SNBT_FILE_EXTENSION Ljava/lang/String;
 	FIELD field_39416 GAME_TEST_STRUCTURES_DIRECTORY Ljava/lang/String;
 	FIELD field_39417 providers Ljava/util/List;
-	METHOD <init> (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V
+	METHOD <init> (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225;)V
 		ARG 1 resourceManager
 		ARG 2 session
 		ARG 3 dataFixer
@@ -82,9 +82,5 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager
 		ARG 1 id
 	METHOD method_44246 loadTemplateFromGameTestFile (Lnet/minecraft/class_2960;)Ljava/util/Optional;
 		ARG 1 id
-	METHOD method_44247 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
-		ARG 0 id
-	METHOD method_44248 (Lnet/minecraft/class_2960;)Z
-		ARG 0 id
 	CLASS class_7513 TemplateFileOpener
 	CLASS class_7514 Provider

mappings/net/minecraft/tag/TagGroupLoader.mapping

@@ -1,14 +1,10 @@
 CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader
-	FIELD field_15603 JSON_EXTENSION_LENGTH I
 	FIELD field_15605 dataType Ljava/lang/String;
 	FIELD field_15607 LOGGER Lorg/slf4j/Logger;
 	FIELD field_15609 registryGetter Ljava/util/function/Function;
-	FIELD field_29827 JSON_EXTENSION Ljava/lang/String;
 	METHOD <init> (Ljava/util/function/Function;Ljava/lang/String;)V
 		ARG 1 registryGetter
 		ARG 2 dataType
-	METHOD method_15194 (Lnet/minecraft/class_2960;)Z
-		ARG 0 id
 	METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map;
 		ARG 1 tags
 	METHOD method_32835 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Ljava/util/List;)V
@@ -43,7 +39,6 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader
 	METHOD method_32847 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Z
 		ARG 2 id
 	METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map;
-		ARG 1 manager
 	METHOD method_33175 (Lnet/minecraft/class_2960;Ljava/util/Collection;)V
 		ARG 1 missingReferences
 	METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map;

mappings/net/minecraft/tag/TagPacketSerializer.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer
 		ARG 2 pair
 	METHOD method_40104 (Lnet/minecraft/class_5455$class_6892;)Lcom/mojang/datafixers/util/Pair;
 		ARG 0 registry
-	METHOD method_40105 serializeTags (Lnet/minecraft/class_5455;)Ljava/util/Map;
+	METHOD method_40105 serializeTags (Lnet/minecraft/class_7780;)Ljava/util/Map;
 		ARG 0 dynamicRegistryManager
 	METHOD method_40106 loadTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lnet/minecraft/class_6864$class_5748;Lnet/minecraft/class_6864$class_6865;)V
 		ARG 0 registryKey

mappings/net/minecraft/test/TestContext.mapping

@@ -113,8 +113,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 		ARG 0 state
 	METHOD method_35974 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Z
 		ARG 2 block1
-	METHOD method_35976 (Lnet/minecraft/class_2769;Ljava/lang/Comparable;Lnet/minecraft/class_2680;)Z
-		ARG 2 state
 	METHOD method_35977 expectSameStates (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V
 		ARG 1 checkedBlockBox
 		ARG 2 correctStatePos
@@ -269,7 +267,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
 	METHOD method_36032 dontExpectEntityAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;)V
 		ARG 1 type
 		ARG 2 pos
-	METHOD method_36034 useBlock (Lnet/minecraft/class_2338;)V
+	METHOD method_36034 useBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
 		ARG 1 pos
 	METHOD method_36035 runAtEveryTick (Ljava/lang/Runnable;)V
 		ARG 1 task

mappings/net/minecraft/test/TestServer.mapping

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer
 	FIELD field_33158 batches Ljava/util/List;
 	FIELD field_33159 pos Lnet/minecraft/class_2338;
 	FIELD field_33160 GAME_RULES Lnet/minecraft/class_1928;
-	FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_1940;
+	FIELD field_33161 TEST_LEVEL Lnet/minecraft/class_5285;
 	FIELD field_33162 testSet Lnet/minecraft/class_4524;
 	FIELD field_39441 NONE_API_SERVICES Lnet/minecraft/class_7497;
 	METHOD <init> (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Collection;Lnet/minecraft/class_2338;)V
@@ -23,14 +23,9 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer
 	METHOD method_36097 (Lnet/minecraft/class_4517;)V
 		ARG 0 test
 	METHOD method_36098 isTesting ()Z
-	METHOD method_40377 (Lnet/minecraft/class_3300;Lnet/minecraft/class_5359;)Lcom/mojang/datafixers/util/Pair;
-		ARG 0 resourceManager
-		ARG 1 dataPackSettings
 	METHOD method_40378 create (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Ljava/util/Collection;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6306;
 		ARG 0 thread
 		ARG 1 session
 		ARG 2 resourcePackManager
 		ARG 3 batches
 		ARG 4 pos
-	METHOD method_43615 (Lnet/minecraft/class_7237$class_6906;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 applyExecutor

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

@@ -1 +0,0 @@
-CLASS net/minecraft/class_6204 net/minecraft/unused/packageinfo/PackageInfo6204

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7676 net/minecraft/unused/packageinfo/PackageInfo7676

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7694 net/minecraft/unused/packageinfo/PackageInfo7694

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7702 net/minecraft/unused/packageinfo/PackageInfo7702

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7727 net/minecraft/unused/packageinfo/PackageInfo7727

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7728 net/minecraft/unused/packageinfo/PackageInfo7728

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7787 net/minecraft/unused/packageinfo/PackageInfo7787

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7795 net/minecraft/unused/packageinfo/PackageInfo7795

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7797 net/minecraft/unused/packageinfo/PackageInfo7797

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7804 net/minecraft/unused/packageinfo/PackageInfo7804

mappings/net/minecraft/util/PendingTaskRunner.mapping

@@ -1,22 +0,0 @@
-CLASS net/minecraft/class_7493 net/minecraft/util/PendingTaskRunner
-	COMMENT A runner for tasks that can hold only one pending task. It replaces the
-	COMMENT current pending task if a new one is queued, but does not halt already
-	COMMENT running tasks.
-	COMMENT
-	COMMENT <p>The runner needs to be updated by {@link #tick}, which checks if
-	COMMENT the running task is done and polls the pending task. {@link #queue}
-	COMMENT sets the pending task for running.
-	FIELD field_39442 pending Ljava/util/concurrent/atomic/AtomicReference;
-	FIELD field_39443 running Ljava/util/concurrent/CompletableFuture;
-	METHOD method_44122 tick ()V
-		COMMENT Waits for the running task to finish and polls the pending task if there
-		COMMENT is no running task.
-	METHOD method_44306 queue (Lnet/minecraft/class_7493$class_7518;)V
-		COMMENT Queues a task for running, and replaces any existing pending task.
-		COMMENT
-		COMMENT @apiNote This method can be called asynchronously, such as from the
-		COMMENT netty event loop.
-		ARG 1 task
-	METHOD method_44307 poll ()V
-	CLASS class_7518 FutureRunnable
-		COMMENT A supplier of a running task.

mappings/net/minecraft/util/Util.mapping

@@ -34,9 +34,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 	METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable;
 		ARG 0 runnable
 		ARG 1 messageSupplier
-	METHOD method_19483 completeExceptionally (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture;
-		COMMENT {@return a future that is already completed exceptionally with {@code throwable}}
-		ARG 0 throwable
 	METHOD method_20793 getLast (Ljava/util/List;)Ljava/lang/Object;
 		COMMENT {@return the last item of {@code list}}
 		COMMENT

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

@@ -1,67 +0,0 @@
-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_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Map;
-		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
-	METHOD method_42083 createParseable (Lnet/minecraft/class_5321;)Ljava/util/Optional;
-		ARG 1 key
-	CLASS 1
-		FIELD field_36186 JSON Ljava/lang/String;
-		METHOD method_31158 (Lnet/minecraft/class_2960;)Z
-			ARG 0 id
-		METHOD method_39745 (Ljava/lang/String;Lnet/minecraft/class_5321;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V
-			ARG 4 id
-			ARG 5 resourceRef
-		METHOD method_39746 createId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960;
-			ARG 0 rootKey
-		METHOD method_39747 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
-			ARG 0 id
-		METHOD method_42084 (Lnet/minecraft/class_3298;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
-			ARG 3 jsonOps
-			ARG 4 decoder
-		METHOD method_42085 (Lnet/minecraft/class_3298;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
-			ARG 3 jsonOps
-			ARG 4 decoder
-		METHOD method_42086 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;Ljava/io/Reader;)Lcom/mojang/serialization/DataResult;
-			ARG 1 jsonOps
-			ARG 2 decoder
-			ARG 3 reader
-		METHOD method_43249 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lnet/minecraft/class_5506$class_7236;
-			ARG 2 resource
-	CLASS class_5507 Impl
-		FIELD field_26741 values Ljava/util/Map;
-		FIELD field_36187 LOGGER Lorg/slf4j/Logger;
-		METHOD method_31159 add (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V
-			ARG 1 registryManager
-			ARG 2 key
-			ARG 3 encoder
-			ARG 4 rawId
-			ARG 5 entry
-			ARG 6 lifecycle
-		METHOD method_42087 (Lcom/mojang/serialization/DataResult;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
-			ARG 1 jsonOps
-			ARG 2 decoder
-		METHOD method_42088 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5506$class_7236;
-			ARG 0 entry
-		METHOD method_42089 (Lnet/minecraft/class_5321;Ljava/util/Map$Entry;)Z
-			ARG 1 entry
-		METHOD method_42090 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5321;
-			ARG 0 entry
-		CLASS class_6821 Element
-			METHOD method_42091 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
-				ARG 1 jsonOps
-				ARG 2 decoder
-			METHOD method_42092 (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822;
-				ARG 1 value
-	CLASS class_6822 Entry
-		METHOD method_39750 of (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822;
-			ARG 0 value
-		METHOD method_39751 of (Ljava/lang/Object;I)Lnet/minecraft/class_5506$class_6822;
-			ARG 0 value
-			ARG 1 id
-	CLASS class_7236 Parseable
-		METHOD parseElement (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
-			ARG 1 jsonOps
-			ARG 2 decoder

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

@@ -31,13 +31,9 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec
 		ARG 0 registryRef
 		ARG 1 elementCodec
 		ARG 2 allowInlineDefinitions
-	METHOD method_40391 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair;
-		ARG 1 entry
 	METHOD method_40392 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 		ARG 3 value
 	METHOD method_40393 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult;
 		ARG 2 key
 	METHOD method_40394 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair;
 		ARG 0 pair
-	METHOD method_44140 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair;
-		ARG 1 entry

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

@@ -1,49 +0,0 @@
-CLASS net/minecraft/class_6900 net/minecraft/util/dynamic/RegistryLoader
-	FIELD field_36485 entryLoader Lnet/minecraft/class_5506;
-	FIELD field_36486 valueHolders Ljava/util/Map;
-	METHOD <init> (Lnet/minecraft/class_5506;)V
-		ARG 1 entryLoader
-	METHOD method_40401 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5506$class_6822;)Lnet/minecraft/class_6880;
-		ARG 1 entry
-	METHOD method_40402 createAccess (Lnet/minecraft/class_5455$class_6893;)Lnet/minecraft/class_6900$class_6901;
-		ARG 1 dynamicRegistryManager
-	METHOD method_40403 (Lnet/minecraft/class_2385;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2385;
-		ARG 1 entry
-	METHOD method_40404 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
-		ARG 1 registry
-		ARG 2 registryRef
-		ARG 3 codec
-		ARG 4 ops
-	METHOD method_40405 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
-		ARG 1 registry
-		ARG 2 registryRef
-		ARG 3 codec
-		ARG 4 entryKey
-		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;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
-	METHOD method_42082 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Ljava/util/Optional;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
-		ARG 1 registry
-		ARG 2 registryRef
-		ARG 3 codec
-		ARG 4 entryKey
-		ARG 5 parseable
-		ARG 6 ops
-	CLASS class_6901 LoaderAccess
-		FIELD comp_354 dynamicRegistryManager Lnet/minecraft/class_5455$class_6893;
-		METHOD comp_354 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6893;
-		METHOD method_40409 load (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
-			ARG 1 registryRef
-			ARG 2 codec
-			ARG 3 ops
-		METHOD method_40410 load (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
-			ARG 1 registryRef
-			ARG 2 codec
-			ARG 3 entryKey
-			ARG 4 ops
-	CLASS class_6902 ValueHolder
-		FIELD field_36487 values Ljava/util/Map;

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

@@ -1,20 +1,8 @@
 CLASS net/minecraft/class_6903 net/minecraft/util/dynamic/RegistryOps
-	FIELD field_36488 loaderAccess Ljava/util/Optional;
 	FIELD field_36489 registryManager Lnet/minecraft/class_5455;
-	FIELD field_36490 entryOps Lcom/mojang/serialization/DynamicOps;
+	METHOD <init> (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;)V
-	METHOD <init> (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Optional;)V
 		ARG 1 delegate
 		ARG 2 dynamicRegistryManager
-		ARG 3 loaderAccess
-	METHOD method_40411 getLoaderAccess ()Ljava/util/Optional;
-	METHOD method_40412 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_3300;)Lnet/minecraft/class_6903;
-		ARG 0 ops
-		ARG 1 registryManager
-		ARG 2 resourceManager
-	METHOD method_40413 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_6893;Lnet/minecraft/class_5506;)Lnet/minecraft/class_6903;
-		ARG 0 ops
-		ARG 1 registryManager
-		ARG 2 entryLoader
 	METHOD method_40414 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;)Lnet/minecraft/class_6903;
 		ARG 0 delegate
 		ARG 1 registryManager
@@ -24,6 +12,5 @@ CLASS net/minecraft/class_6903 net/minecraft/util/dynamic/RegistryOps
 		ARG 1 key
 	METHOD method_40417 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
 		ARG 1 ops
-	METHOD method_40418 getEntryOps ()Lcom/mojang/serialization/DynamicOps;
 	METHOD method_40419 createRegistryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 registryRef

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

@@ -23,7 +23,6 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries
 	FIELD field_26375 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_2378;
 	FIELD field_35435 NOISE_PARAMETERS Lnet/minecraft/class_2378;
 	FIELD field_35761 PLACED_FEATURE Lnet/minecraft/class_2378;
-	FIELD field_36476 DYNAMIC_REGISTRY_MANAGER Lnet/minecraft/class_5455;
 	FIELD field_37231 STRUCTURE_SET Lnet/minecraft/class_2378;
 	FIELD field_37232 DENSITY_FUNCTION Lnet/minecraft/class_2378;
 	FIELD field_38009 DIMENSION_TYPE Lnet/minecraft/class_2378;

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

@@ -2,10 +2,9 @@ CLASS net/minecraft/class_2348 net/minecraft/util/registry/DefaultedRegistry
 	COMMENT An implementation of {@link Registry} with a default ID and value for unknown lookups.
 	FIELD field_11014 defaultId Lnet/minecraft/class_2960;
 	FIELD field_11015 defaultEntry Lnet/minecraft/class_6880;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Z)V
 		ARG 1 defaultId
 		ARG 2 key
 		ARG 3 lifecycle
-		ARG 4 valueToEntryFunction
 	METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960;
 		COMMENT {@return the ID of the default value}

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

@@ -18,117 +18,21 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage
 	COMMENT @see net.minecraft.server.MinecraftServer#getRegistryManager()
 	COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#getRegistryManager()
 	FIELD field_25918 LOGGER Lorg/slf4j/Logger;
-	FIELD field_25919 INFOS Ljava/util/Map;
-	FIELD field_26733 BUILTIN Ljava/util/function/Supplier;
-	FIELD field_36469 CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_30519 load (Lnet/minecraft/class_5455$class_6893;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900;)V
-		COMMENT Loads a dynamic registry manager from the resource manager's data files.
-		ARG 0 dynamicRegistryManager
-		ARG 1 ops
-		ARG 2 registryLoader
-	METHOD method_30520 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V
-		ARG 0 infosBuilder
-		ARG 1 registryRef
-		ARG 2 entryCodec
-	METHOD method_30526 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_6900$class_6901;Lnet/minecraft/class_5455$class_5456;)V
-		COMMENT Loads elements from the {@code ops} into the registry specified by {@code
-		COMMENT info} within the {@code manager}. Note that the resource manager instance
-		COMMENT is kept within the {@code ops}.
-		ARG 0 ops
-		ARG 1 loaderAccess
-		ARG 2 info
-	METHOD method_30527 getOptionalManaged (Lnet/minecraft/class_5321;)Ljava/util/Optional;
-		COMMENT Retrieves a registry optionally from this manager.
-		ARG 1 key
 	METHOD method_30530 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378;
 		COMMENT Retrieves a registry from this manager or {@link Registry#REGISTRIES},
 		COMMENT or throws an exception when the registry does not exist.
 		COMMENT
 		COMMENT @throws IllegalStateException if the registry does not exist
 		ARG 1 key
-	METHOD method_31060 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V
-		ARG 0 infosBuilder
-		ARG 1 registryRef
-		ARG 2 entryCodec
-		ARG 3 networkEntryCodec
-	METHOD method_31141 addEntriesToLoad (Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V
-		ARG 0 entryLoader
-		ARG 1 info
-	METHOD method_33309 getManaged (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378;
-		COMMENT Retrieves a registry from this manager,
-		COMMENT or throws an exception when the registry does not exist.
-		COMMENT
-		COMMENT @throws IllegalStateException if the registry does not exist
-		ARG 1 key
 	METHOD method_33310 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional;
 		ARG 1 key
-	METHOD method_34849 (Lcom/mojang/serialization/DataResult$PartialResult;)V
-		ARG 0 partialResult
-	METHOD method_39674 getInfos ()Ljava/lang/Iterable;
-	METHOD method_40299 createDynamicRegistryManager (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5455;
-		ARG 0 dynamic
-	METHOD method_40300 (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378;
-		ARG 1 registryRef
-	METHOD method_40301 createCodec (Lcom/mojang/serialization/codecs/UnboundedMapCodec;)Lcom/mojang/serialization/Codec;
-		ARG 0 originalCodec
 	METHOD method_40302 of (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6890;
 		ARG 0 registries
-	METHOD method_40303 (Lnet/minecraft/class_5455$class_5456;)Lcom/mojang/serialization/Codec;
-		ARG 0 info
-	METHOD method_40304 (Lnet/minecraft/class_5455$class_6892;)Z
-		ARG 0 entry
-	METHOD method_40305 (Lnet/minecraft/class_5455;)Ljava/util/Map;
-		ARG 0 dynamicRegistryManager
-	METHOD method_40306 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 1 codec
-	METHOD method_40307 createRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_2378;
-		ARG 0 registryRef
-		ARG 1 dynamic
-	METHOD method_40308 streamManagedRegistries ()Ljava/util/stream/Stream;
-	METHOD method_40309 (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/DataResult;
-		ARG 0 registry
-	METHOD method_40310 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_2378;
-		ARG 0 entry
 	METHOD method_40311 streamAllRegistries ()Ljava/util/stream/Stream;
-	METHOD method_40312 (Lnet/minecraft/class_5455$class_6892;)Lnet/minecraft/class_5321;
-		ARG 0 entry
-	METHOD method_40313 streamSyncedRegistries ()Ljava/util/stream/Stream;
-	METHOD method_40314 createAndLoad ()Lnet/minecraft/class_5455$class_6893;
-		COMMENT {@return a new dynamic registry manager instance with all built-in registries loaded}
-		COMMENT
-		COMMENT <p>The registries do not contain values from data packs.
-		COMMENT Call {@link net.minecraft.util.dynamic.RegistryOps#ofLoaded(DynamicOps, DynamicRegistryManager.Mutable, net.minecraft.resource.ResourceManager)}
-		COMMENT to load those values.
 	METHOD method_40316 toImmutable ()Lnet/minecraft/class_5455$class_6890;
-	METHOD method_40317 createSimpleRegistry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385;
-		ARG 0 registryRef
-	METHOD method_40318 streamStaticRegistries ()Ljava/util/stream/Stream;
-	METHOD method_40319 getNetworkEntryCodec (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult;
-		ARG 0 registryKey
-	METHOD method_40320 createCodec ()Lcom/mojang/serialization/Codec;
-	METHOD method_40321 streamSyncedManagedRegistries ()Ljava/util/stream/Stream;
-	METHOD method_40323 createMutableRegistries ()Ljava/util/Map;
-	METHOD method_40325 createMutableRegistryManager ()Lnet/minecraft/class_5455$class_6893;
-	METHOD method_40326 (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult;
-		ARG 0 registryRef
 	METHOD method_41200 (Lnet/minecraft/class_5455$class_6892;)Lcom/mojang/serialization/Lifecycle;
 		ARG 0 entry
 	METHOD method_41201 getRegistryLifecycle ()Lcom/mojang/serialization/Lifecycle;
-	CLASS class_5456 Info
-		COMMENT Represents the serialization behavior of the registries, including the
-		COMMENT id of the registry, the codec for its elements, and whether the registry
-		COMMENT should be sent to the client.
-		FIELD comp_293 registry Lnet/minecraft/class_5321;
-		FIELD comp_294 entryCodec Lcom/mojang/serialization/Codec;
-		FIELD comp_295 networkEntryCodec Lcom/mojang/serialization/Codec;
-		METHOD <init> (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V
-			ARG 1 registry
-			ARG 2 entryCodec
-			ARG 3 networkEntryCodec
-		METHOD comp_293 registry ()Lnet/minecraft/class_5321;
-		METHOD comp_294 entryCodec ()Lcom/mojang/serialization/Codec;
-		METHOD comp_295 networkEntryCodec ()Lcom/mojang/serialization/Codec;
-		METHOD method_30537 isSynced ()Z
 	CLASS class_6890 Immutable
 	CLASS class_6891 ImmutableImpl
 		FIELD field_36471 registries Ljava/util/Map;
@@ -136,27 +40,10 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage
 			ARG 1 registries
 		METHOD <init> (Ljava/util/stream/Stream;)V
 			ARG 1 stream
-		METHOD method_40328 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2378;
-			ARG 0 registry
 	CLASS class_6892 Entry
-		METHOD method_40329 of (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_5455$class_6892;
-			ARG 0 entry
 		METHOD method_40330 of (Ljava/util/Map$Entry;)Lnet/minecraft/class_5455$class_6892;
 			ARG 0 entry
 		METHOD method_40331 of (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5455$class_6892;
 			ARG 0 key
 			ARG 1 value
 		METHOD method_40332 freeze ()Lnet/minecraft/class_5455$class_6892;
-	CLASS class_6893 Mutable
-		METHOD method_40333 getOptionalMutable (Lnet/minecraft/class_5321;)Ljava/util/Optional;
-			ARG 1 key
-		METHOD method_40334 getMutable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385;
-			ARG 1 key
-	CLASS class_6894 MutableImpl
-		FIELD field_36472 mutableRegistries Ljava/util/Map;
-		METHOD <init> (Ljava/util/Map;)V
-			ARG 1 mutableRegistries
-		METHOD method_40336 (Lnet/minecraft/class_2385;)Lnet/minecraft/class_2385;
-			ARG 0 registry
-		METHOD method_40337 (Lnet/minecraft/class_2385;)Lnet/minecraft/class_2378;
-			ARG 0 registry

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

@@ -12,17 +12,5 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry
 		ARG 2 key
 		ARG 3 value
 		ARG 4 lifecycle
-	METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880;
-		COMMENT If the given key is already present in the registry, replaces the entry associated with the given
-		COMMENT key with the new entry. This method asserts that the raw ID is equal to the value already in
-		COMMENT the registry. The raw ID not being present may lead to buggy behavior.
-		COMMENT
-		COMMENT <p>If the given key is not already present in the registry, adds the entry to the registry. If
-		COMMENT {@code rawId} is present, then this method gives the entry this raw ID. Otherwise, uses the
-		COMMENT next available ID.
-		ARG 1 rawId
-		ARG 2 key
-		ARG 3 newEntry
-		ARG 4 lifecycle
 	METHOD method_35863 isEmpty ()Z
 		COMMENT {@return whether the registry is empty}

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

@@ -557,22 +557,13 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 	METHOD method_40278 clearTags ()V
 	METHOD method_40279 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
 		ARG 1 entry
-	METHOD method_40281 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378;
+	METHOD method_40282 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348;
-		ARG 0 key
-		ARG 1 lifecycle
-		ARG 2 valueToEntryFunction
-		ARG 3 defaultEntryGetter
-	METHOD method_40282 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348;
 		ARG 0 key
 		ARG 1 defaultId
 		ARG 2 lifecycle
-		ARG 3 valueToEntryFunction
+	METHOD method_40283 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348;
-		ARG 4 defaultEntryGetter
-	METHOD method_40283 create (Lnet/minecraft/class_5321;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2348;
 		ARG 0 key
 		ARG 1 defaultId
-		ARG 2 valueToEntryFunction
-		ARG 3 defaultEntryGetter
 	METHOD method_40284 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/Lifecycle;
 		ARG 1 entry
 	METHOD method_40285 (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult;
@@ -583,7 +574,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 		ARG 1 tag
 	METHOD method_40288 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult;
 		ARG 1 id
-	METHOD method_40290 entryOf (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880;
+	METHOD method_40290 entryOf (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
 		COMMENT {@return the reference registry entry for the value assigned {@code key}}
 		COMMENT
 		COMMENT @throws IllegalStateException if there is no value that is assigned {@code key}
@@ -606,7 +597,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 		ARG 0 registry
 	METHOD method_43225 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7388;
 		ARG 0 registry
-	METHOD method_44298 getOrCreateEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880;
+	METHOD method_44298 getOrCreateEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
 		ARG 1 key
 	CLASS 1
 		METHOD method_40296 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880;

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

@@ -1,20 +1,10 @@
 CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs
 	COMMENT A utility class for serialization of registries using codecs.
-	METHOD method_40338 (Lnet/minecraft/class_2378;)Ljava/util/Map;
-		ARG 0 registry
-	METHOD method_40339 (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5321;Ljava/lang/Object;)V
-		ARG 2 key
-		ARG 3 value
 	METHOD method_40340 entryList (Lnet/minecraft/class_5321;)Lcom/mojang/serialization/Codec;
 		ARG 0 registryRef
 	METHOD method_40341 entryList (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 registryRef
 		ARG 1 elementCodec
-	METHOD method_40342 createRegistryDecoder (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Decoder;Lcom/mojang/serialization/Lifecycle;)Lcom/mojang/serialization/Decoder;
-		ARG 0 registryRef
-		ARG 1 codec
-		ARG 2 entryMapDecoder
-		ARG 3 lifecycle
 	METHOD method_40343 entryList (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/Codec;
 		ARG 0 registryRef
 		ARG 1 elementCodec
@@ -27,8 +17,6 @@ CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs
 		ARG 2 elementCodec
 	METHOD method_40345 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/List;)Lnet/minecraft/class_2378;
 		ARG 2 entries
-	METHOD method_40346 (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_2385;
-		ARG 2 map
 	METHOD method_40347 managerEntry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 registryRef
 		ARG 1 elementCodec
@@ -41,31 +29,6 @@ CLASS net/minecraft/class_6895 net/minecraft/util/registry/RegistryCodecs
 			COMMENT instead of serializing as one entry if the length is {@code 0}
 	METHOD method_40350 (Lnet/minecraft/class_2378;)Ljava/util/List;
 		ARG 0 registry
-	METHOD method_40351 registryMap (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 0 registryRef
-		ARG 1 elementCodec
-	METHOD method_40352 dynamicRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
-		ARG 0 registryRef
-		ARG 1 lifecycle
-		ARG 2 elementCodec
-	CLASS 1
-		METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-			ARG 1 ops
-			ARG 2 input
-		METHOD method_40354 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair;
-			ARG 0 pair
-		METHOD method_40355 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_2378;)Lcom/mojang/datafixers/util/Pair;
-			ARG 1 registry
-		METHOD method_40356 (Lcom/mojang/serialization/DataResult;Lnet/minecraft/class_6903;Lnet/minecraft/class_6900$class_6901;)Lcom/mojang/serialization/DataResult;
-			ARG 3 loaderAccess
-		METHOD method_40357 load (Lcom/mojang/serialization/DataResult;Lnet/minecraft/class_6903;Lnet/minecraft/class_6900;)Lcom/mojang/serialization/DataResult;
-			ARG 1 result
-			ARG 2 ops
-			ARG 3 loader
-		METHOD method_40358 (Lnet/minecraft/class_2385;)Lnet/minecraft/class_2378;
-			ARG 0 registry
-		METHOD method_40359 (Lnet/minecraft/class_6900;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_6903;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult;
-			ARG 4 pair
 	CLASS class_5501 RegistryManagerEntry
 		FIELD comp_290 key Lnet/minecraft/class_5321;
 		FIELD comp_291 rawId I

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

@@ -13,19 +13,10 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry
 	FIELD field_36461 valueToEntry Ljava/util/Map;
 	FIELD field_36462 tagToEntryList Ljava/util/Map;
 	FIELD field_36463 frozen Z
-	FIELD field_36464 valueToEntryFunction Ljava/util/function/Function;
-	FIELD field_36465 unfrozenValueToEntry Ljava/util/Map;
 	FIELD field_36634 cachedEntries Ljava/util/List;
-	METHOD <init> (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V
+	METHOD <init> (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Z)V
 		ARG 1 key
 		ARG 2 lifecycle
-		ARG 3 valueToEntryFunction
-	METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Lnet/minecraft/class_6880;
-		ARG 1 rawId
-		ARG 2 key
-		ARG 3 value
-		ARG 4 lifecycle
-		ARG 5 checkDuplicateKeys
 	METHOD method_40253 getValue (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Object;
 		ARG 0 entry
 	METHOD method_40255 (Lnet/minecraft/class_6885$class_6888;)V
@@ -44,8 +35,6 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry
 	METHOD method_40263 (Ljava/util/Map;Lnet/minecraft/class_6862;Ljava/util/List;)V
 		ARG 2 tag
 		ARG 3 entries
-	METHOD method_40267 (Lnet/minecraft/class_6880$class_6883;)Z
-		ARG 0 entry
 	METHOD method_40271 (Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883;
 		ARG 1 valuex
 	METHOD method_40274 assertNotFrozen (Lnet/minecraft/class_5321;)V

mappings/net/minecraft/util/thread/FutureQueue.mapping

@@ -1,12 +1,7 @@
 CLASS net/minecraft/class_7620 net/minecraft/util/thread/FutureQueue
 	COMMENT A functional interface that can enqueue completable futures.
 	FIELD field_39831 LOGGER Lorg/slf4j/Logger;
-	FIELD field_39832 NOOP Lnet/minecraft/class_7620;
 	METHOD append (Lnet/minecraft/class_7620$class_7621;)V
 		ARG 1 future
-	METHOD method_44905 (Lnet/minecraft/class_7620$class_7621;)V
-		ARG 0 future
-	METHOD method_44906 (Ljava/lang/Throwable;)Ljava/lang/Object;
-		ARG 0 throwable
 	CLASS class_7621 FutureSupplier
 		COMMENT A functional interface supplying the queued future to {@link FutureQueue}.

mappings/net/minecraft/world/RegistryWorldView.mapping

@@ -3,4 +3,3 @@ CLASS net/minecraft/class_5423 net/minecraft/world/RegistryWorldView
 	COMMENT a registry manager.
 	COMMENT
 	COMMENT @see #getRegistryManager()
-	METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455;

mappings/net/minecraft/world/SaveProperties.mapping

@@ -38,6 +38,5 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties
 	METHOD method_29037 setDragonFight (Lnet/minecraft/class_2487;)V
 		ARG 1 dragonFight
 	METHOD method_29588 getLifecycle ()Lcom/mojang/serialization/Lifecycle;
-	METHOD method_29589 getDataPackSettings ()Lnet/minecraft/class_5359;
+	METHOD method_29589 getDataPackSettings ()Lnet/minecraft/class_7712;
-	METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_5359;)V
+	METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_7712;)V
-		ARG 1 dataPackSettings

mappings/net/minecraft/world/WorldEvents.mapping

@@ -52,14 +52,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
 		COMMENT A brewing stand brews.
 		COMMENT <br>Plays the brewing stand brewing sound event.
 		COMMENT <p>Called by {@link net.minecraft.block.entity.BrewingStandBlockEntity#craft(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.util.collection.DefaultedList) BrewingStandBlockEntity#craft}
-	FIELD field_31124 IRON_TRAPDOOR_CLOSES I
-		COMMENT An iron trapdoor closes.
-		COMMENT <br>Plays the iron trapdoor closing sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound}
-	FIELD field_31125 IRON_TRAPDOOR_OPENS I
-		COMMENT An iron trapdoor opens.
-		COMMENT <br>Plays the iron trapdoor opening sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound}
 	FIELD field_31126 END_PORTAL_OPENED I
 		COMMENT An end portal is opened.
 		COMMENT <br>Plays the end portal spawn sound event.
@@ -246,24 +238,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
 		COMMENT A firework rocket is shot.
 		COMMENT <br>Plays the firework shoot sound event.
 		COMMENT <p>Called by {@link net.minecraft.block.dispenser.DispenserBehavior DispenserBehavior}
-	FIELD field_31163 IRON_DOOR_OPENS I
-		COMMENT An iron door is opened.
-		COMMENT <br>Plays the iron door opening sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound}
-	FIELD field_31164 WOODEN_DOOR_OPENS I
-		COMMENT A wooden door is opened.
-		COMMENT <br>Plays the wooden door opening sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.DoorBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) DoorBlock#onUse},
-		COMMENT and {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound}
-	FIELD field_31165 WOODEN_TRAPDOOR_OPENS I
-		COMMENT A wooden trapdoor is opened.
-		COMMENT <br>Plays the wooden trapdoor opening sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound}
-	FIELD field_31166 FENCE_GATE_OPENS I
-		COMMENT A fence gate is opened.
-		COMMENT <br>Plays the fence gate opening sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.FenceGateBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) FenceGateBlock#onUse},
-		COMMENT and {@link net.minecraft.block.FenceGateBlock#neighborUpdate(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.Block, net.minecraft.util.math.BlockPos, boolean) FenceGateBlock#neighborUpdate}
 	FIELD field_31167 FIRE_EXTINGUISHED I
 		COMMENT Fire is extinguished.
 		COMMENT <br>Plays the appropriate fire extinguish sound event.
@@ -278,24 +252,6 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
 		COMMENT <br>A {@code 0} should be passed to stop music.
 		COMMENT <p>Called by {@link net.minecraft.item.MusicDiscItem#useOnBlock(net.minecraft.item.ItemUsageContext) MusicDiscItem#useOnBlock},
 		COMMENT and {@link net.minecraft.block.JukeboxBlock#removeRecord(net.minecraft.world.World, net.minecraft.util.math.BlockPos) JukeboxBlock#removeRecord}
-	FIELD field_31169 IRON_DOOR_CLOSES I
-		COMMENT An iron door is closed.
-		COMMENT <br>Plays the iron door closing sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound}
-	FIELD field_31170 WOODEN_DOOR_CLOSES I
-		COMMENT A wooden door is closed.
-		COMMENT <br>Plays the wooden door closing sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.DoorBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) DoorBlock#onUse},
-		COMMENT and {@link net.minecraft.block.DoorBlock#playOpenCloseSound(net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) DoorBlock#playOpenCloseSound}
-	FIELD field_31171 WOODEN_TRAPDOOR_CLOSES I
-		COMMENT A wooden trapdoor is closed.
-		COMMENT <br>Plays the wooden trapdoor closing sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.TrapdoorBlock#playToggleSound(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.World, net.minecraft.util.math.BlockPos, boolean) TrapdoorBlock#playToggleSound}
-	FIELD field_31172 FENCE_GATE_CLOSES I
-		COMMENT A fence gate is closed.
-		COMMENT <br>Plays the fence gate closing sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.FenceGateBlock#onUse(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.entity.player.PlayerEntity, net.minecraft.util.Hand, net.minecraft.util.hit.BlockHitResult) FenceGateBlock#onUse},
-		COMMENT and {@link net.minecraft.block.FenceGateBlock#neighborUpdate(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.Block, net.minecraft.util.math.BlockPos, boolean) FenceGateBlock#neighborUpdate}
 	FIELD field_31173 GHAST_WARNS I
 		COMMENT A ghast warns its victim.
 		COMMENT <br>Plays the ghast warn sound event.

mappings/net/minecraft/world/WorldView.mapping

@@ -54,6 +54,7 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView
 		ARG 1 pos
 	METHOD method_29556 getStatesInBoxIfLoaded (Lnet/minecraft/class_238;)Ljava/util/stream/Stream;
 		ARG 1 box
+	METHOD method_30349 getRegistryManager ()Lnet/minecraft/class_5455;
 	METHOD method_33597 isRegionLoaded (IIII)Z
 		ARG 1 minX
 		ARG 2 minZ

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

@@ -216,6 +216,3 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom
 		ARG 6 weirdness
 		ARG 7 offset
 		ARG 8 biome
-	METHOD method_43718 (DD)Z
-		ARG 0 erosion
-		ARG 2 depth

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

@@ -1,25 +1,14 @@
 CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions
+	FIELD comp_1012 dimensionTypeEntry Lnet/minecraft/class_6880;
+	FIELD comp_1013 chunkGenerator Lnet/minecraft/class_2794;
 	FIELD field_25411 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_25412 OVERWORLD Lnet/minecraft/class_5321;
 	FIELD field_25413 NETHER Lnet/minecraft/class_5321;
 	FIELD field_25414 END Lnet/minecraft/class_5321;
-	FIELD field_25415 BASE_DIMENSIONS Ljava/util/Set;
-	FIELD field_25416 dimensionTypeEntry Lnet/minecraft/class_6880;
-	FIELD field_25417 chunkGenerator Lnet/minecraft/class_2794;
 	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)V
 		ARG 1 dimensionTypeEntry
 		ARG 2 chunkGenerator
-	METHOD method_29566 getDimensionTypeEntry ()Lnet/minecraft/class_6880;
+	METHOD comp_1012 dimensionTypeEntry ()Lnet/minecraft/class_6880;
-	METHOD method_29567 hasDefaultSettings (Lnet/minecraft/class_2378;)Z
+	METHOD comp_1013 chunkGenerator ()Lnet/minecraft/class_2794;
-		ARG 0 registry
 	METHOD method_29568 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_29569 createRegistry (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2378;
-		ARG 0 registry
-	METHOD method_29571 getChunkGenerator ()Lnet/minecraft/class_2794;
-	METHOD method_41525 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)V
-		ARG 2 registryKey
-	METHOD method_41526 streamRegistry (Ljava/util/stream/Stream;)Ljava/util/stream/Stream;
-		ARG 0 stream
-	METHOD method_41527 (Lnet/minecraft/class_5321;)Z
-		ARG 0 registryKey

mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping

@@ -4,13 +4,12 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa
 		COMMENT An unmodifiable, empty (non-operative) dispatcher.
 	METHOD method_32942 isEmpty ()Z
 		COMMENT Returns whether this dispatcher has no listeners.
-	METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Ljava/util/function/BiConsumer;)Z
+	METHOD method_32943 dispatch (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5713$class_7721;)Z
 		COMMENT Dispatches an event to all the listeners in this dispatcher.
 		ARG 1 event
 			COMMENT the event
 		ARG 2 pos
 		ARG 3 emitter
-		ARG 4 onListenerAccept
 	METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V
 		COMMENT Adds a listener to this dispatcher.
 		ARG 1 listener

mappings/net/minecraft/world/event/listener/GameEventListener.mapping

@@ -2,12 +2,10 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe
 	COMMENT A game event listener listens to game events from {@link GameEventDispatcher}s.
 	METHOD method_32946 getPositionSource ()Lnet/minecraft/class_5716;
 		COMMENT Returns the position source of this listener.
-	METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712$class_7447;)Z
+	METHOD method_32947 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;)Z
 		COMMENT Listens to an incoming game event.
 		COMMENT
 		COMMENT @return {@code true} if the game event has been accepted by this listener
 		ARG 1 world
-		ARG 2 event
 	METHOD method_32948 getRange ()I
 		COMMENT Returns the range, in blocks, of the listener.
-	METHOD method_43723 shouldListenImmediately ()Z

mappings/net/minecraft/world/event/listener/Vibration.mapping

@@ -0,0 +1,35 @@
+CLASS net/minecraft/class_7269 net/minecraft/world/event/listener/Vibration
+	FIELD field_38245 CODEC Lcom/mojang/serialization/Codec;
+	METHOD <init> (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V
+		ARG 1 gameEvent
+		ARG 2 distance
+		ARG 3 pos
+		ARG 4 uuid
+		ARG 5 projectileOwnerUuid
+	METHOD <init> (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V
+		ARG 1 gameEvent
+		ARG 2 distance
+		ARG 3 pos
+		ARG 4 entity
+	METHOD method_42348 getEntity (Lnet/minecraft/class_3218;)Ljava/util/Optional;
+		ARG 1 world
+	METHOD method_42349 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_42684 getOwnerUuid (Lnet/minecraft/class_1297;)Ljava/util/UUID;
+		ARG 0 entity
+	METHOD method_42685 (Lnet/minecraft/class_5712;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_7269;
+		ARG 0 event
+		ARG 1 distance
+		ARG 2 pos
+		ARG 3 uuid
+		ARG 4 projectileOwnerUuid
+	METHOD method_42686 (Lnet/minecraft/class_7269;)Ljava/util/Optional;
+		ARG 0 vibration
+	METHOD method_42687 getOwner (Lnet/minecraft/class_3218;)Ljava/util/Optional;
+		ARG 1 world
+	METHOD method_42688 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1676;
+		ARG 0 entity
+	METHOD method_42689 (Lnet/minecraft/class_7269;)Ljava/util/Optional;
+		ARG 0 vibration
+	METHOD method_42691 (Lnet/minecraft/class_1297;)Z
+		ARG 0 entity

mappings/net/minecraft/world/event/listener/VibrationListener.mapping

@@ -2,15 +2,12 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListe
 	FIELD field_28187 positionSource Lnet/minecraft/class_5716;
 	FIELD field_28188 range I
 	FIELD field_28189 callback Lnet/minecraft/class_5718$class_5719;
-	FIELD field_28190 vibration Lnet/minecraft/class_5718$class_7269;
-	FIELD field_28191 distance F
 	FIELD field_28192 delay I
-	METHOD <init> (Lnet/minecraft/class_5716;ILnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_5718$class_7269;FI)V
+	METHOD <init> (Lnet/minecraft/class_5716;ILnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_7269;Lnet/minecraft/class_7722;I)V
 		ARG 1 positionSource
 		ARG 2 range
 		ARG 3 callback
 		ARG 4 vibration
-		ARG 5 distance
 		ARG 6 delay
 	METHOD method_32964 tick (Lnet/minecraft/class_1937;)V
 		ARG 1 world
@@ -20,26 +17,17 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListe
 		ARG 2 end
 	METHOD method_32967 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_42339 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
-		ARG 1 world
-		ARG 2 gameEvent
-		ARG 3 emitter
-		ARG 4 start
-		ARG 5 end
 	METHOD method_42340 createCodec (Lnet/minecraft/class_5718$class_5719;)Lcom/mojang/serialization/Codec;
 		ARG 0 callback
 	METHOD method_42341 (Lnet/minecraft/class_5718$class_5719;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 1 instance
-	METHOD method_42342 (Lnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_5716;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Float;Ljava/lang/Integer;)Lnet/minecraft/class_5718;
+	METHOD method_42342 (Lnet/minecraft/class_5718$class_5719;Lnet/minecraft/class_5716;Ljava/lang/Integer;Ljava/util/Optional;Lnet/minecraft/class_7722;Ljava/lang/Integer;)Lnet/minecraft/class_5718;
 		ARG 1 positionSource
 		ARG 2 range
 		ARG 3 vibration
-		ARG 4 distance
 		ARG 5 delay
 	METHOD method_42343 (Lnet/minecraft/class_5718;)Ljava/lang/Integer;
 		ARG 0 listener
-	METHOD method_42344 (Lnet/minecraft/class_5718;)Ljava/lang/Float;
-		ARG 0 listener
 	METHOD method_42345 (Lnet/minecraft/class_5718;)Ljava/util/Optional;
 		ARG 0 listener
 	METHOD method_42346 (Lnet/minecraft/class_5718;)Ljava/lang/Integer;
@@ -69,38 +57,3 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListe
 			ARG 2 emitter
 		METHOD method_42672 onListen ()V
 		METHOD method_43695 triggersAvoidCriterion ()Z
-	CLASS class_7269 Vibration
-		FIELD field_38245 CODEC Lcom/mojang/serialization/Codec;
-		METHOD <init> (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V
-			ARG 1 gameEvent
-			ARG 2 distance
-			ARG 3 pos
-			ARG 4 uuid
-			ARG 5 projectileOwnerUuid
-		METHOD <init> (Lnet/minecraft/class_5712;FLnet/minecraft/class_243;Lnet/minecraft/class_1297;)V
-			ARG 1 gameEvent
-			ARG 2 distance
-			ARG 3 pos
-			ARG 4 entity
-		METHOD method_42348 getEntity (Lnet/minecraft/class_3218;)Ljava/util/Optional;
-			ARG 1 world
-		METHOD method_42349 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-			ARG 0 instance
-		METHOD method_42684 getOwnerUuid (Lnet/minecraft/class_1297;)Ljava/util/UUID;
-			ARG 0 entity
-		METHOD method_42685 (Lnet/minecraft/class_5712;Ljava/lang/Float;Lnet/minecraft/class_243;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_5718$class_7269;
-			ARG 0 event
-			ARG 1 distance
-			ARG 2 pos
-			ARG 3 uuid
-			ARG 4 projectileOwnerUuid
-		METHOD method_42686 (Lnet/minecraft/class_5718$class_7269;)Ljava/util/Optional;
-			ARG 0 vibration
-		METHOD method_42687 getOwner (Lnet/minecraft/class_3218;)Ljava/util/Optional;
-			ARG 1 world
-		METHOD method_42688 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1676;
-			ARG 0 entity
-		METHOD method_42689 (Lnet/minecraft/class_5718$class_7269;)Ljava/util/Optional;
-			ARG 0 vibration
-		METHOD method_42691 (Lnet/minecraft/class_1297;)Z
-			ARG 0 entity

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

@@ -3,53 +3,22 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions
 	FIELD field_24527 generateStructures Z
 	FIELD field_24528 bonusChest Z
 	FIELD field_24532 legacyCustomOptions Ljava/util/Optional;
-	FIELD field_24826 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_24826 CODEC Lcom/mojang/serialization/MapCodec;
-	FIELD field_24827 options Lnet/minecraft/class_2378;
+	METHOD <init> (JZZ)V
-	METHOD <init> (JZZLnet/minecraft/class_2378;)V
 		ARG 1 seed
 		ARG 3 generateStructures
 		ARG 4 bonusChest
-		ARG 5 options
+	METHOD <init> (JZZLjava/util/Optional;)V
-	METHOD <init> (JZZLnet/minecraft/class_2378;Ljava/util/Optional;)V
 		ARG 1 seed
 		ARG 3 generateStructures
 		ARG 4 bonusChest
-		ARG 5 options
+	METHOD method_28024 withHardcore (Ljava/util/OptionalLong;)Lnet/minecraft/class_5285;
-		ARG 6 legacyCustomOptions
-	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
-	METHOD method_28032 getChunkGenerator ()Lnet/minecraft/class_2794;
-	METHOD method_28033 isDebugWorld ()Z
-	METHOD method_28034 isFlatWorld ()Z
 	METHOD method_28035 isLegacyCustomizedType ()Z
-	METHOD method_28036 withBonusChest ()Lnet/minecraft/class_5285;
+	METHOD method_28036 withBonusChest (Z)Lnet/minecraft/class_5285;
-	METHOD method_28037 toggleGenerateStructures ()Lnet/minecraft/class_5285;
-	METHOD method_28038 toggleBonusChest ()Lnet/minecraft/class_5285;
 	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;
-		ARG 0 dimensionTypeRegistry
-		ARG 1 options
-		ARG 2 overworldGenerator
-	METHOD method_28609 getDimensions ()Lnet/minecraft/class_2378;
-	METHOD method_28610 validate ()Lcom/mojang/serialization/DataResult;
-	METHOD method_28611 isStable ()Z
-	METHOD method_29575 getWorlds ()Lcom/google/common/collect/ImmutableSet;
-	METHOD method_29962 getRegistryWithReplacedOverworld (Lnet/minecraft/class_2378;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2378;
-		ARG 0 options
-		ARG 1 dimensionType
-		ARG 2 overworldGenerator
-	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_40024 parseSeed (Ljava/lang/String;)Ljava/util/OptionalLong;
 		ARG 0 seed
-	METHOD method_41563 create (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_2794;)Lnet/minecraft/class_5285;
-		ARG 0 dynamicRegistryManager
-		ARG 1 generatorOptions
-		ARG 2 chunkGenerator

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

@@ -5,17 +5,10 @@ CLASS net/minecraft/class_7145 net/minecraft/world/gen/WorldPreset
 	METHOD <init> (Ljava/util/Map;)V
 		ARG 1 dimensions
 	METHOD method_41584 getOverworld ()Ljava/util/Optional;
-	METHOD method_41585 createGeneratorOptions (JZZ)Lnet/minecraft/class_5285;
-		ARG 1 seed
-		ARG 3 generateStructures
-		ARG 4 bonusChest
-	METHOD method_41587 createGeneratorOptions (Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285;
-		ARG 1 generatorOptions
 	METHOD method_41588 (Lnet/minecraft/class_7145;)Ljava/util/Map;
 		ARG 0 preset
 	METHOD method_41589 (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;)V
 		ARG 2 registryKey
-	METHOD method_41590 getOverworldOrElseThrow ()Lnet/minecraft/class_5363;
 	METHOD method_41591 createDimensionOptionsRegistry ()Lnet/minecraft/class_2378;
 	METHOD method_44351 validate (Lnet/minecraft/class_7145;)Lcom/mojang/serialization/DataResult;
 		ARG 0 preset

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

@@ -5,22 +5,11 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets
 	FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5321;
 	FIELD field_35756 LARGE_BIOMES Lnet/minecraft/class_5321;
 	FIELD field_35757 AMPLIFIED Lnet/minecraft/class_5321;
-	METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455;JZZ)Lnet/minecraft/class_5285;
-		ARG 0 dynamicRegistryManager
-		ARG 1 seed
-		ARG 3 generateStructures
-		ARG 4 bonusChest
 	METHOD method_41593 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
-	METHOD method_41594 getWorldPreset (Lnet/minecraft/class_5285;)Ljava/util/Optional;
+	METHOD method_41594 getWorldPreset (Lnet/minecraft/class_2378;)Ljava/util/Optional;
-		ARG 0 generatorOptions
-	METHOD method_41595 createDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
-		ARG 0 dynamicRegistryManager
-	METHOD method_41596 createDefaultOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_5285;
-		ARG 0 dynamicRegistryManager
-		ARG 1 seed
 	METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
-	METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;
+	METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723;
 		ARG 0 dynamicRegistryManager
 	METHOD method_41599 getDefaultOverworldOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5363;
 		ARG 0 dynamicRegistryManager

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

@@ -19,8 +19,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	METHOD <init> (Lnet/minecraft/class_2378;Ljava/util/Optional;Lnet/minecraft/class_1966;Ljava/util/function/Function;)V
 		ARG 1 structureSetRegistry
 		ARG 2 structureOverrides
-		ARG 3 biomeSource
-		ARG 4 generationSettingsGetter
 	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
@@ -116,7 +114,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 4 noiseConfig
 	METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec;
 	METHOD method_28509 generateConcentricRingPositions (Lnet/minecraft/class_6880;Lnet/minecraft/class_7138;Lnet/minecraft/class_6871;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 structureSet
 		ARG 2 noiseConfig
 		ARG 3 concentricRingsStructurePlacement
 	METHOD method_33730 getMinimumY ()I
@@ -167,7 +164,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 1 text
 		ARG 2 noiseConfig
 		ARG 3 pos
-	METHOD method_41039 streamStructureSets ()Ljava/util/stream/Stream;
+	METHOD method_41039 streamStructureSets ()Ljava/util/List;
 	METHOD method_41040 (Lnet/minecraft/class_5138;Lnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z
 		ARG 2 start
 	METHOD method_41041 (Lnet/minecraft/class_5138;Lnet/minecraft/class_4076;Lnet/minecraft/class_2791;Lnet/minecraft/class_7138;JLnet/minecraft/class_1923;Lnet/minecraft/class_5455;Lnet/minecraft/class_3485;Lnet/minecraft/class_6880;)V

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

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
-	FIELD field_16576 defaultBlock Lnet/minecraft/class_2680;
 	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_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565;
+	FIELD field_34591 fluidLevelSampler Ljava/util/function/Supplier;
 	FIELD field_35361 noiseRegistry Lnet/minecraft/class_2378;
 	METHOD <init> (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)V
 		ARG 1 structureSetRegistry
@@ -42,10 +41,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
 		ARG 3 y
 		ARG 4 z
 		ARG 5 state
-	METHOD method_38325 (Lnet/minecraft/class_6350$class_6351;ILnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;III)Lnet/minecraft/class_6350$class_6351;
-		ARG 4 x
-		ARG 5 y
-		ARG 6 z
 	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 noiseConfig

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

@@ -2,18 +2,17 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo
 	FIELD field_24105 name Ljava/lang/String;
 	FIELD field_24106 difficulty Lnet/minecraft/class_1267;
 	FIELD field_24107 gameRules Lnet/minecraft/class_1928;
-	FIELD field_25403 dataPackSettings Lnet/minecraft/class_5359;
+	FIELD field_25403 dataPackSettings Lnet/minecraft/class_7712;
 	FIELD field_9257 gameMode Lnet/minecraft/class_1934;
 	FIELD field_9261 allowCommands Z
 	FIELD field_9262 hardcore Z
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_1934;ZLnet/minecraft/class_1267;ZLnet/minecraft/class_1928;Lnet/minecraft/class_5359;)V
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_1934;ZLnet/minecraft/class_1267;ZLnet/minecraft/class_1928;Lnet/minecraft/class_7712;)V
 		ARG 1 name
 		ARG 2 gameMode
 		ARG 3 hardcore
 		ARG 4 difficulty
 		ARG 5 allowCommands
 		ARG 6 gameRules
-		ARG 7 dataPackSettings
 	METHOD method_27339 getLevelName ()Ljava/lang/String;
 	METHOD method_27340 getDifficulty ()Lnet/minecraft/class_1267;
 	METHOD method_27341 getGameRules ()Lnet/minecraft/class_1928;
@@ -21,15 +20,13 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo
 		ARG 1 difficulty
 	METHOD method_28382 withGameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1940;
 		ARG 1 mode
-	METHOD method_28383 fromDynamic (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940;
+	METHOD method_28383 fromDynamic (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7712;)Lnet/minecraft/class_1940;
 		ARG 0 dynamic
-		ARG 1 dataPackSettings
 	METHOD method_28384 (Ljava/lang/Number;)Lnet/minecraft/class_1267;
 		ARG 0 difficulty
 	METHOD method_28385 withCopiedGameRules ()Lnet/minecraft/class_1940;
-	METHOD method_29557 withDataPackSettings (Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940;
+	METHOD method_29557 withDataPackSettings (Lnet/minecraft/class_7712;)Lnet/minecraft/class_1940;
-		ARG 1 dataPackSettings
+	METHOD method_29558 getDataPackSettings ()Lnet/minecraft/class_7712;
-	METHOD method_29558 getDataPackSettings ()Lnet/minecraft/class_5359;
 	METHOD method_8574 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_8582 areCommandsAllowed ()Z
 	METHOD method_8583 isHardcore ()Z

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

@@ -32,7 +32,7 @@ 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;
 	FIELD field_36349 PLAYER_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
+	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;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V
 		ARG 1 dataFixer
 		ARG 2 dataVersion
 		ARG 3 playerData
@@ -60,23 +60,18 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
 		ARG 27 customBossEvents
 		ARG 28 dragonFight
 		ARG 29 levelInfo
-		ARG 30 generatorOptions
+	METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V
-		ARG 31 lifecycle
-	METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)V
 		ARG 1 levelInfo
 		ARG 2 generatorOptions
-		ARG 3 lifecycle
 	METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V
 		ARG 1 registryManager
 		ARG 2 levelNbt
 		ARG 3 playerNbt
 	METHOD method_185 loadPlayerData ()V
-	METHOD method_29029 readProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31;
+	METHOD method_29029 readProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Lnet/minecraft/class_31$class_7729;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31;
 		ARG 0 dynamic
 		ARG 1 dataFixer
 		ARG 2 dataVersion
 		ARG 3 playerData
 		ARG 4 levelInfo
 		ARG 5 saveVersionInfo
-		ARG 6 generatorOptions
-		ARG 7 lifecycle

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

@@ -10,10 +10,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 		ARG 1 savesDirectory
 		ARG 2 backupsDirectory
 		ARG 3 dataFixer
-	METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;)Ljava/util/function/BiFunction;
+	METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7712;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Lifecycle;)Ljava/util/function/BiFunction;
 		ARG 0 ops
-		ARG 1 dataPackSettings
-		ARG 2 lifecycle
 	METHOD method_17931 getCurrentVersion ()I
 	METHOD method_19636 getSavesDirectory ()Ljava/nio/file/Path;
 	METHOD method_230 levelExists (Ljava/lang/String;)Z
@@ -29,7 +27,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 		ARG 0 path
 	METHOD method_27002 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143;
 		ARG 1 directoryName
-	METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/datafixers/util/Pair;
+	METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/serialization/DataResult;
 		ARG 0 levelData
 		ARG 1 dataFixer
 		ARG 2 version
@@ -39,12 +37,9 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 	METHOD method_29015 (Lnet/minecraft/class_32$class_7411;ZLjava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_34;
 		ARG 3 path
 		ARG 4 dataFixer
-	METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359;
+	METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_7712;
 		ARG 0 dynamic
-	METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31;
+	METHOD method_29583 readDataPackSettings (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_7712;
-		ARG 3 path
-		ARG 4 dataFixer
-	METHOD method_29583 readDataPackSettings (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359;
 		ARG 0 path
 		ARG 1 dataFixer
 	METHOD method_35504 getFormatName ()Ljava/lang/String;
@@ -73,10 +68,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 			ARG 1 name
 		METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path;
 			ARG 1 savePath
-		METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_5219;
+		METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7712;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Lifecycle;)Lcom/mojang/datafixers/util/Pair;
 			ARG 1 ops
-			ARG 2 dataPackSettings
-			ARG 3 lifecycle
 		METHOD method_27014 getIconFile ()Ljava/util/Optional;
 		METHOD method_27015 deleteSessionLock ()V
 		METHOD method_27016 createBackup ()J
@@ -92,7 +85,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
 			ARG 3 nbt
 		METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29;
 		METHOD method_29584 getLevelSummary ()Lnet/minecraft/class_34;
-		METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_5359;
+		METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_7712;
 		CLASS 1
 			METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult;
 				ARG 1 path

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

@@ -6,13 +6,12 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
 	FIELD field_24191 details Lnet/minecraft/class_2561;
 	FIELD field_25022 levelInfo Lnet/minecraft/class_1940;
 	FIELD field_25023 versionInfo Lnet/minecraft/class_5315;
-	METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZLjava/nio/file/Path;)V
+	METHOD <init> (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZZLjava/nio/file/Path;)V
 		ARG 1 levelInfo
 		ARG 2 versionInfo
 		ARG 3 name
 		ARG 4 requiresConversion
 		ARG 5 locked
-		ARG 6 iconPath
 	METHOD compareTo (Ljava/lang/Object;)I
 		ARG 1 other
 	METHOD method_247 getGameMode ()Lnet/minecraft/class_1934;

mappings/net/minecraft/world/poi/PointOfInterestTypes.mapping

@@ -7,8 +7,7 @@ CLASS net/minecraft/class_7477 net/minecraft/world/poi/PointOfInterestTypes
 		ARG 0 block
 	METHOD method_43989 getTypeForState (Lnet/minecraft/class_2680;)Ljava/util/Optional;
 		ARG 0 state
-	METHOD method_43990 registerStates (Lnet/minecraft/class_6880;)V
+	METHOD method_43990 registerStates (Lnet/minecraft/class_6880;Ljava/util/Set;)V
-		ARG 0 poiType
 	METHOD method_43991 (Lnet/minecraft/class_6880;Lnet/minecraft/class_2680;)V
 		ARG 1 state
 	METHOD method_43992 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4158;

mappings/net/minecraft/world/updater/WorldUpdater.mapping

@@ -3,7 +3,6 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	FIELD field_19225 eraseCache Z
 	FIELD field_24083 session Lnet/minecraft/class_32$class_5143;
 	FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer;
-	FIELD field_35454 generatorOptions Lnet/minecraft/class_5285;
 	FIELD field_5755 persistentStateManager Lnet/minecraft/class_26;
 	FIELD field_5756 LOGGER Lorg/slf4j/Logger;
 	FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory;
@@ -16,17 +15,16 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	FIELD field_5766 upgradedChunkCount I
 	FIELD field_5767 updateThread Ljava/lang/Thread;
 	FIELD field_5768 totalChunkCount I
-	METHOD <init> (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5285;Z)V
+	METHOD <init> (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;Z)V
 		ARG 1 session
 		ARG 2 dataFixer
-		ARG 3 generatorOptions
 		ARG 4 eraseCache
 	METHOD method_17829 (Ljava/io/File;Ljava/lang/String;)Z
 		ARG 0 directory
 		ARG 1 name
 	METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List;
 		ARG 1 world
-	METHOD method_28304 getWorlds ()Lcom/google/common/collect/ImmutableSet;
+	METHOD method_28304 getWorlds ()Ljava/util/Set;
 	METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F
 		ARG 1 world
 	METHOD method_5394 getStatus ()Lnet/minecraft/class_2561;