25w18a

build.gradle

@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "25w17a"
+def minecraft_version = "25w18a"
 
 filament {
 	minecraftVersion = minecraft_version

mappings/net/minecraft/block/ShapeContext.mapping

@@ -23,6 +23,5 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext
 		ARG 1 state
 	METHOD method_67714 (Lnet/minecraft/class_3610;)Z
 		ARG 0 state
-	METHOD method_67715 ofPlacement (Lnet/minecraft/class_1297;)Lnet/minecraft/class_3726;
+	METHOD method_67715 ofPlacement (Lnet/minecraft/class_1657;)Lnet/minecraft/class_3726;
-		ARG 0 placer
 	METHOD method_67716 isPlacement ()Z

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

@@ -43,12 +43,10 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity
 		ARG 3 z
 	METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880;
 		ARG 0 effect
-	METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_6880;
+	METHOD method_53252 readStatusEffect (Lnet/minecraft/class_11368;Ljava/lang/String;)Lnet/minecraft/class_6880;
-		ARG 0 nbt
 		ARG 1 key
-	METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_6880;)V
+	METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_11372;Ljava/lang/String;Lnet/minecraft/class_6880;)V
-		ARG 0 nbt
 		ARG 1 key
 		ARG 2 effect
-	METHOD method_55779 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_5321;)V
+	METHOD method_55779 (Lnet/minecraft/class_11372;Ljava/lang/String;Lnet/minecraft/class_5321;)V
 		ARG 2 entryKey

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

@@ -58,13 +58,12 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT {@return the world the block entity belongs to}
 		COMMENT
 		COMMENT <p>This can return {@code null} during world generation.
-	METHOD method_10999 writeIdentifyingData (Lnet/minecraft/class_2487;)V
+	METHOD method_10999 writeIdentifyingData (Lnet/minecraft/class_11372;)V
 		COMMENT Writes to {@code nbt} the block entity type ID under the {@code id} key,
 		COMMENT and the block's position under {@code x}, {@code y}, and {@code z} keys.
 		COMMENT
 		COMMENT @throws RuntimeException if the block entity type is not registered in
 		COMMENT the registry
-		ARG 1 nbt
 	METHOD method_11002 hasWorld ()Z
 	METHOD method_11003 populateCrashReport (Lnet/minecraft/class_129;)V
 		ARG 1 crashReportSection
@@ -85,7 +84,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		ARG 1 state
 		ARG 2 nbt
 		ARG 3 registries
-	METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_11007 writeNbt (Lnet/minecraft/class_11372;)V
 		COMMENT Writes data to {@code nbt}. Subclasses should override this if they
 		COMMENT store a persistent data.
 		COMMENT
@@ -94,14 +93,12 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT of the NBT. The data is written back to NBT when saving the block entity.
 		COMMENT
 		COMMENT @see #readNbt
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680;
 		COMMENT {@return the cached block state at the block entity's position}
 		COMMENT
 		COMMENT <p>This is faster than calling {@link World#getBlockState}.
 	METHOD method_11012 markRemoved ()V
-	METHOD method_11014 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_11014 readNbt (Lnet/minecraft/class_11368;)V
 		COMMENT Reads data from {@code nbt}. Subclasses should override this if they
 		COMMENT store a persistent data.
 		COMMENT
@@ -115,8 +112,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT exception.
 		COMMENT
 		COMMENT @see #writeNbt
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_11015 isRemoved ()Z
 	METHOD method_11016 getPos ()Lnet/minecraft/class_2338;
 		COMMENT {@return the block entity's position}
@@ -167,9 +162,8 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT serverWorld.getChunkManager().markForUpdate(this.getPos());}.
 		COMMENT
 		COMMENT @see #toInitialChunkDataNbt
-	METHOD method_38238 writeIdToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2591;)V
+	METHOD method_38238 writeIdToNbt (Lnet/minecraft/class_11372;Lnet/minecraft/class_2591;)V
 		COMMENT Writes the ID of {@code type} to {@code nbt} under the {@code id} key.
-		ARG 0 nbt
 		ARG 1 type
 	METHOD method_38239 posFromNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338;
 		COMMENT {@return the block position from {@code nbt}}
@@ -179,12 +173,11 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT net.minecraft.nbt.NbtHelper#fromBlockPos} that use uppercase keys.
 		ARG 0 chunkPos
 		ARG 1 nbt
-	METHOD method_38241 writeIdToNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_38241 writeIdToNbt (Lnet/minecraft/class_11372;)V
 		COMMENT Writes the block entity type ID to {@code nbt} under the {@code id} key.
 		COMMENT
 		COMMENT @throws RuntimeException if the block entity type is not registered in
 		COMMENT the registry
-		ARG 1 nbt
 	METHOD method_38242 createNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data with identifying data}
 		COMMENT
@@ -195,7 +188,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithId
 		ARG 1 registries
-	METHOD method_38243 createNbtWithId (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
+	METHOD method_38243 createNbtWithId (Lnet/minecraft/class_11372;)V
 		COMMENT {@return the block entity's NBT data with block entity type ID}
 		COMMENT
 		COMMENT <p>In addition to data written at {@link #writeNbt}, this also
@@ -203,7 +196,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithIdentifyingData
-		ARG 1 registries
 	METHOD method_38244 createNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data}
 		COMMENT
@@ -218,8 +210,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		ARG 1 builder
 	METHOD method_57568 readComponents (Lnet/minecraft/class_9473;)V
 		ARG 1 components
-	METHOD method_57569 removeFromCopiedStackNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_57569 removeFromCopiedStackNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
 	METHOD method_57590 createComponentMap ()Lnet/minecraft/class_9323;
 	METHOD method_58683 readComponents (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
@@ -228,20 +219,12 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 	METHOD method_58685 readComponents (Lnet/minecraft/class_9323;Lnet/minecraft/class_9326;)V
 		ARG 1 defaultComponents
 		ARG 2 components
-	METHOD method_58690 read (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_58690 read (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
+	METHOD method_58691 readComponentlessNbt (Lnet/minecraft/class_11368;)V
-		ARG 2 registries
-	METHOD method_58691 readComponentlessNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_58692 createComponentlessNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		ARG 1 registries
 	METHOD method_58693 getComponents ()Lnet/minecraft/class_9323;
-	METHOD method_59535 createComponentlessNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
+	METHOD method_59894 tryParseCustomName (Lnet/minecraft/class_11368;Ljava/lang/String;)Lnet/minecraft/class_2561;
-		ARG 1 registries
-	METHOD method_59894 tryParseCustomName (Lnet/minecraft/class_2520;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2561;
-		ARG 0 nbt
-		ARG 1 registries
 	METHOD method_61175 validateSupports (Lnet/minecraft/class_2680;)V
 		ARG 1 state
 	METHOD method_61176 supports (Lnet/minecraft/class_2680;)Z
@@ -250,7 +233,3 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 	METHOD method_66473 onBlockReplaced (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 oldState
-	METHOD method_66474 (Ljava/lang/String;)V
-		ARG 0 error
-	CLASS class_9472 Components
-		FIELD field_50176 CODEC Lcom/mojang/serialization/MapCodec;

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

@@ -37,9 +37,8 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity
 		ARG 1 world
 		ARG 2 brusher
 		ARG 3 brush
-	METHOD method_49222 readLootTableFromNbt (Lnet/minecraft/class_2487;)Z
+	METHOD method_49222 readLootTableFromNbt (Lnet/minecraft/class_11368;)Z
-	METHOD method_49223 writeLootTableToNbt (Lnet/minecraft/class_2487;)Z
+	METHOD method_49223 writeLootTableToNbt (Lnet/minecraft/class_11372;)Z
-		ARG 1 nbt
 	METHOD method_49224 getHitDirection ()Lnet/minecraft/class_2350;
 	METHOD method_49225 getItem ()Lnet/minecraft/class_1799;
 	METHOD method_49226 getDustedLevel ()I

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

@@ -34,10 +34,8 @@ CLASS net/minecraft/class_8887 net/minecraft/block/entity/CrafterBlockEntity
 		ARG 1 craftingTicksRemaining
 	METHOD method_54485 canToggleSlot (I)Z
 		ARG 1 slot
-	METHOD method_54486 putDisabledSlots (Lnet/minecraft/class_2487;)V
+	METHOD method_54486 putDisabledSlots (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
+	METHOD method_54487 putTriggered (Lnet/minecraft/class_11372;)V
-	METHOD method_54487 putTriggered (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_54488 isTriggered ()Z
 	METHOD method_54489 getComparatorOutput ()I
 	METHOD method_68285 ([I)V

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

@@ -26,5 +26,5 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity
 	METHOD method_60992 getComparatorOutput ()I
 	METHOD method_68286 (Ljava/lang/Long;Lnet/minecraft/class_6880;)V
 		ARG 2 song
-	METHOD method_68287 (Lnet/minecraft/class_7225$class_7874;Ljava/lang/Long;)V
+	METHOD method_68287 (Lnet/minecraft/class_11368;Ljava/lang/Long;)V
 		ARG 2 ticksSinceSongStarted

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

@@ -30,11 +30,9 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager
 	METHOD method_41482 spread (Lnet/minecraft/class_2338;I)V
 		ARG 1 pos
 		ARG 2 charge
-	METHOD method_41483 readNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_41483 readNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
 	METHOD method_41485 createWorldGen ()Lnet/minecraft/class_7128;
-	METHOD method_41486 writeNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_41486 writeNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
 	METHOD method_41487 getReplaceableTag ()Lnet/minecraft/class_6862;
 	METHOD method_41488 getExtraBlockChance ()I
 	METHOD method_41489 getMaxDistance ()I

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

@@ -27,9 +27,7 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-	METHOD method_11319 readInventoryNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_11319 readInventoryNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_11320 getColor ()Lnet/minecraft/class_1767;
 	METHOD method_20047 updateNeighborStates (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 0 world

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

@@ -44,8 +44,6 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti
 		ARG 4 pos
 	METHOD method_66749 (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Boolean;
 		ARG 0 entry
-	METHOD method_66750 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
-		ARG 1 dataNbt
 	METHOD method_66751 setErrorMessage (Lnet/minecraft/class_2561;)V
 		ARG 1 errorMessage
 	METHOD method_66752 getStructureTemplate (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional;

mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping

@@ -18,8 +18,7 @@ CLASS net/minecraft/class_1917 net/minecraft/block/spawner/MobSpawnerLogic
 	FIELD field_57761 DEFAULT_MAX_NEARBY_ENTITIES I
 	FIELD field_57762 DEFAULT_REQUIRED_PLAYER_RANGE I
 	FIELD field_57763 DEFAULT_SPAWN_RANGE I
-	METHOD method_8272 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+	METHOD method_8272 writeNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
 	METHOD method_8273 sendStatus (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V
 		ARG 1 world
 		ARG 2 pos
@@ -38,10 +37,9 @@ CLASS net/minecraft/class_1917 net/minecraft/block/spawner/MobSpawnerLogic
 		ARG 3 spawnEntry
 	METHOD method_8278 getRotation ()D
 	METHOD method_8279 getLastRotation ()D
-	METHOD method_8280 readNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V
+	METHOD method_8280 readNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_11368;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 nbt
 	METHOD method_8282 updateSpawns (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 	FIELD field_47369 SPAWN_DATA_KEY Ljava/lang/String;
-	FIELD field_47370 codec Lcom/mojang/serialization/MapCodec;
 	FIELD field_47371 players Ljava/util/Set;
 	FIELD field_47372 spawnedMobsAlive Ljava/util/Set;
 	FIELD field_47373 cooldownEnd J
@@ -13,14 +12,6 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 	FIELD field_47381 lastDisplayEntityRotation D
 	FIELD field_47382 NEXT_MOB_SPAWNS_AT_KEY Ljava/lang/String;
 	FIELD field_50192 itemsToDropWhenOminous Lnet/minecraft/class_6012;
-	METHOD <init> (Ljava/util/Set;Ljava/util/Set;JJILjava/util/Optional;Ljava/util/Optional;)V
-		ARG 1 players
-		ARG 2 spawnedMobsAlive
-		ARG 3 cooldownEnd
-		ARG 5 nextMobSpawnsAt
-		ARG 7 totalSpawnedMobs
-		ARG 8 spawnData
-		ARG 9 rewardLootTable
 	METHOD method_55182 reset ()V
 	METHOD method_55183 isCooldownOver (Lnet/minecraft/class_3218;)Z
 		ARG 1 world
@@ -34,8 +25,6 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 logic
-	METHOD method_55187 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 0 instance
 	METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952;
 		ARG 1 logic
 		ARG 2 random
@@ -46,8 +35,6 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 	METHOD method_55192 hasSpawnedAllMobs (Lnet/minecraft/class_8965;I)Z
 		ARG 1 config
 		ARG 2 additionalPlayers
-	METHOD method_55193 (Lnet/minecraft/class_8966;)Ljava/util/Optional;
-		ARG 0 data
 	METHOD method_55194 getSpawnDataNbt (Lnet/minecraft/class_8967;)Lnet/minecraft/class_2487;
 		ARG 1 state
 	METHOD method_55195 getAdditionalPlayers (Lnet/minecraft/class_2338;)I
@@ -59,21 +46,9 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData
 		ARG 2 random
 	METHOD method_55198 isCooldownAtRepeating (Lnet/minecraft/class_3218;FI)Z
 		ARG 1 world
-	METHOD method_55199 (Lnet/minecraft/class_8966;)Ljava/util/Optional;
-		ARG 0 data
 	METHOD method_55200 areMobsDead ()Z
-	METHOD method_55201 (Lnet/minecraft/class_8966;)Ljava/lang/Integer;
-		ARG 0 data
 	METHOD method_55202 getDisplayEntityRotation ()D
-	METHOD method_55203 (Lnet/minecraft/class_8966;)Ljava/lang/Long;
-		ARG 0 data
 	METHOD method_55204 getLastDisplayEntityRotation ()D
-	METHOD method_55205 (Lnet/minecraft/class_8966;)Ljava/lang/Long;
-		ARG 0 data
-	METHOD method_55207 (Lnet/minecraft/class_8966;)Ljava/util/Set;
-		ARG 0 data
-	METHOD method_55208 (Lnet/minecraft/class_8966;)Ljava/util/Set;
-		ARG 0 data
 	METHOD method_58713 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V
 		ARG 1 entity
 	METHOD method_58714 getItemsToDropWhenOminous (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6012;

mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping

@@ -7,29 +7,9 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	FIELD field_47365 entityDetector Lnet/minecraft/class_8962;
 	FIELD field_47366 forceActivate Z
 	FIELD field_48864 entitySelector Lnet/minecraft/class_8962$class_9198;
-	FIELD field_50177 NORMAL_CONFIG_NBT_KEY Ljava/lang/String;
-	FIELD field_50178 OMINOUS_CONFIG_NBT_KEY Ljava/lang/String;
 	FIELD field_50179 DEFAULT_COOLDOWN_LENGTH I
 	FIELD field_50180 DEFAULT_ENTITY_DETECTION_RANGE I
-	FIELD field_50181 normalConfig Lnet/minecraft/class_6880;
-	FIELD field_50182 ominousConfig Lnet/minecraft/class_6880;
-	FIELD field_50183 entityDetectionRange I
-	FIELD field_50184 cooldownLength I
 	FIELD field_50185 ominous Z
-	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_8966;IILnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
-		ARG 1 normalConfig
-		ARG 2 ominousConfig
-		ARG 3 data
-		ARG 4 cooldownLength
-		ARG 5 entityDetectionRange
-		ARG 6 trialSpawner
-		ARG 7 entityDetector
-		ARG 8 entitySelector
-	METHOD <init> (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
-		ARG 1 trialSpawner
-		ARG 2 entityDetector
-		ARG 3 entitySelector
-	METHOD method_55156 codec ()Lcom/mojang/serialization/MapCodec;
 	METHOD method_55158 trySpawnMob (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional;
 		ARG 1 world
 		ARG 2 pos
@@ -41,8 +21,6 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 uuid
-	METHOD method_55161 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
-		ARG 1 instance
 	METHOD method_55162 canActivate (Lnet/minecraft/class_3218;)Z
 		ARG 1 world
 	METHOD method_55163 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V
@@ -69,7 +47,6 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 		ARG 4 particle
 	METHOD method_55168 setEntityDetector (Lnet/minecraft/class_8962;)V
 		ARG 1 detector
-	METHOD method_55170 getConfig ()Lnet/minecraft/class_8965;
 	METHOD method_55171 tickServer (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)V
 		ARG 1 world
 		ARG 2 pos
@@ -101,12 +78,6 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	METHOD method_58705 isOminous ()Z
 	METHOD method_58706 getCooldownLength ()I
 	METHOD method_58707 getDetectionRadius ()I
-	METHOD method_63464 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_8966;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_8963;
-		ARG 1 normalConfig
-		ARG 2 ominousConfig
-		ARG 3 data
-		ARG 4 cooldownLength
-		ARG 5 entityDetectionRange
 	METHOD method_65372 setEntityType (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
 		ARG 1 entityType
 		ARG 2 world

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

@@ -12,7 +12,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 	FIELD field_24237 FORWARD_SHIFT F
 	FIELD field_24238 handler Lnet/minecraft/class_5225;
 	FIELD field_32166 Z_INDEX F
-	FIELD field_35427 ARABIC_SHAPING_LETTERS_SHAPE I
 	FIELD field_39925 validateAdvance Z
 	METHOD <init> (Ljava/util/function/Function;Z)V
 		ARG 1 fontStorageAccessor
@@ -82,8 +81,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 		ARG 8 layerType
 		ARG 9 backgroundColor
 		ARG 10 light
-	METHOD method_27515 tweakTransparency (I)I
-		ARG 0 argb
 	METHOD method_27516 (ILnet/minecraft/class_2583;)F
 		ARG 1 codePoint
 		ARG 2 style

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

@@ -551,15 +551,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 3 y1
 		ARG 4 x2
 		ARG 5 y2
-	METHOD method_71045 popLayers (I)V
-		ARG 1 count
-	METHOD method_71046 goUpLayer ()V
-	METHOD method_71047 goTopLayer ()V
 	METHOD method_71048 createNewRootLayer ()V
-	METHOD method_71049 goDownLayer ()V
-	METHOD method_71050 popLayer ()V
-	METHOD method_71051 pushCheckpoint ()V
-	METHOD method_71052 popCheckpoint ()V
 	METHOD method_71273 drawTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_8000;Lnet/minecraft/class_2960;Z)V
 		ARG 1 textRenderer
 		ARG 2 components

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

@@ -54,7 +54,6 @@ CLASS net/minecraft/class_7530 net/minecraft/client/gui/EditBox
 		ARG 1 cursorChangeListener
 	METHOD method_44414 setText (Ljava/lang/String;)V
 		COMMENT Sets the text of the edit box and moves the cursor to the end of the edit box.
-		ARG 1 text
 	METHOD method_44415 setChangeListener (Ljava/util/function/Consumer;)V
 		COMMENT Sets the change listener that is called every time the text changes.
 		ARG 1 changeListener

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

@@ -16,7 +16,6 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud
 	METHOD method_1797 shouldDarkenSky ()Z
 	METHOD method_1798 shouldPlayDragonMusic ()Z
 	METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V
-		ARG 1 context
 		ARG 2 x
 		ARG 3 y
 		ARG 4 bossBar

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

@@ -156,7 +156,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	METHOD method_34004 setTitle (Lnet/minecraft/class_2561;)V
 		ARG 1 title
 	METHOD method_37298 renderHealthBar (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;IIIIFIIIZ)V
-		ARG 1 context
 		ARG 2 player
 		ARG 3 x
 		ARG 4 y
@@ -190,7 +189,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	METHOD method_55441 (I)[Lnet/minecraft/class_329$class_9016;
 		ARG 0 size
 	METHOD method_55798 renderMiscOverlays (Lnet/minecraft/class_332;Lnet/minecraft/class_9779;)V
-		ARG 1 context
 		ARG 2 tickCounter
 	METHOD method_55799 renderSleepOverlay (Lnet/minecraft/class_332;Lnet/minecraft/class_9779;)V
 		ARG 1 context
@@ -211,7 +209,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 		ARG 1 context
 		ARG 2 tickCounter
 	METHOD method_55805 renderMainHud (Lnet/minecraft/class_332;Lnet/minecraft/class_9779;)V
-		ARG 1 context
 		ARG 2 tickCounter
 	METHOD method_58477 renderFood (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;II)V
 		ARG 1 context

mappings/net/minecraft/client/gui/hud/bar/LocatorBar.mapping

@@ -1,12 +1,8 @@
 CLASS net/minecraft/class_11226 net/minecraft/client/gui/hud/bar/LocatorBar
 	FIELD field_59849 BACKGROUND Lnet/minecraft/class_2960;
-	FIELD field_59851 ARROWS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_59860 client Lnet/minecraft/class_310;
-	FIELD field_59861 time F
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
-	METHOD method_70870 (Lnet/minecraft/class_1937;Lnet/minecraft/class_332;IILnet/minecraft/class_11200;)V
-		ARG 5 waypoint
 	METHOD method_70871 (Ljava/lang/String;)Ljava/lang/Integer;
 		ARG 0 name
 	METHOD method_70872 (Ljava/util/UUID;)Ljava/lang/Integer;

mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping

@@ -29,7 +29,6 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart
 		ARG 3 width
 		ARG 4 height
 	METHOD method_53474 drawBorderedText (Lnet/minecraft/class_332;Ljava/lang/String;II)V
-		ARG 1 context
 		ARG 2 string
 		ARG 3 x
 		ARG 4 y

mappings/net/minecraft/client/gui/render/state/GuiRenderState.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_11246 net/minecraft/client/gui/render/state/GuiRenderState
 	FIELD field_60043 rootLayers Ljava/util/List;
 	FIELD field_60044 currentLayer Lnet/minecraft/class_11246$class_11276;
-	FIELD field_60045 checkpointStack Ljava/util/List;
 	FIELD field_60046 itemModelKeys Ljava/util/Set;
 	FIELD field_60314 blurLayer I
 	METHOD method_70919 addSimpleElement (Lnet/minecraft/class_11244;)V
@@ -35,7 +34,6 @@ CLASS net/minecraft/class_11246 net/minecraft/client/gui/render/state/GuiRenderS
 		ARG 1 textElementStateConsumer
 	METHOD method_71069 (Ljava/util/function/Consumer;Lnet/minecraft/class_11246$class_11276;)V
 		ARG 2 layer
-	METHOD method_71070 goTopLayer ()V
 	METHOD method_71071 forEachSpecialElement (Ljava/util/function/Consumer;)V
 		ARG 1 specialElementStateConsumer
 	METHOD method_71072 (Ljava/util/function/Consumer;Lnet/minecraft/class_11246$class_11276;)V
@@ -44,9 +42,6 @@ CLASS net/minecraft/class_11246 net/minecraft/client/gui/render/state/GuiRenderS
 	METHOD method_71074 forEachLayer (Ljava/util/function/Consumer;Lnet/minecraft/class_11246$class_11325;)V
 		ARG 1 layerConsumer
 		ARG 2 filter
-	METHOD method_71075 pushCheckpoint ()V
-	METHOD method_71076 popCheckpoint ()V
-	METHOD method_71077 popLayer ()V
 	METHOD method_71078 getItemModelKeys ()Ljava/util/Set;
 	METHOD method_71299 applyBlur ()V
 	CLASS class_11275 SimpleElementStateConsumer

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

@@ -10,7 +10,6 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo
 	FIELD field_49490 TITLE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_49491 layout Lnet/minecraft/class_8132;
 	METHOD <init> (Lnet/minecraft/class_315;Ljava/lang/Runnable;)V
-		ARG 1 gameOptions
 		ARG 2 onClose
 	METHOD method_48259 yMargin ()I
 	METHOD method_48260 tickNarratorPrompt ()V

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

@@ -74,7 +74,6 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto
 		ARG 0 exception
 	METHOD method_44931 clearWindow ()V
 	METHOD method_44932 renderMessages (Lnet/minecraft/class_332;)V
-		ARG 1 context
 	METHOD method_44933 tryRenderWindow (Lnet/minecraft/class_332;II)Z
 		ARG 1 context
 		ARG 2 mouseX

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

@@ -53,7 +53,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		COMMENT <p>If the client is in a world, {@linkplain #renderInGameBackground
 		COMMENT renders the translucent background gradient}.
 		COMMENT Otherwise {@linkplain #renderBackgroundTexture renders the background texture}.
-		ARG 1 context
 		ARG 2 mouseX
 		ARG 3 mouseY
 		ARG 4 deltaTicks

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

@@ -4,9 +4,7 @@ CLASS net/minecraft/class_8519 net/minecraft/client/gui/screen/SplashTextRendere
 	FIELD field_44666 text Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;)V
 		ARG 1 text
-	METHOD method_51453 render (Lnet/minecraft/class_332;ILnet/minecraft/class_327;I)V
+	METHOD method_51453 render (Lnet/minecraft/class_332;ILnet/minecraft/class_327;F)V
 		ARG 1 context
 		ARG 2 screenWidth
 		ARG 3 textRenderer
-		ARG 4 alpha
-			COMMENT a color with the appropriate alpha component bits set

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

@@ -44,8 +44,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 	METHOD method_44692 getMultiplayerDisabledText ()Lnet/minecraft/class_2561;
 	METHOD method_55814 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
-	METHOD method_59752 setWidgetAlpha (F)V
-		ARG 1 alpha
 	METHOD method_64237 addDevelopmentWidgets (II)I
 		ARG 1 y
 		ARG 2 spacingY

mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping

@@ -28,7 +28,6 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc
 		ARG 1 advancement
 	METHOD method_2309 getTitle ()Lnet/minecraft/class_2561;
 	METHOD method_2310 render (Lnet/minecraft/class_332;II)V
-		ARG 1 context
 		ARG 2 x
 		ARG 3 y
 	METHOD method_2311 drawBackground (Lnet/minecraft/class_332;IIZ)V
@@ -41,7 +40,6 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc
 		ARG 1 offsetX
 		ARG 3 offsetY
 	METHOD method_2314 drawWidgetTooltip (Lnet/minecraft/class_332;IIII)V
-		ARG 1 context
 		ARG 2 mouseX
 		ARG 3 mouseY
 		ARG 4 x

mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping

@@ -32,7 +32,6 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc
 		ARG 3 y
 		ARG 4 border
 	METHOD method_2325 renderWidgets (Lnet/minecraft/class_332;II)V
-		ARG 1 context
 		ARG 2 x
 		ARG 3 y
 	METHOD method_2326 getY ()I

mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping

@@ -23,7 +23,6 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc
 		ARG 1 advancementHandler
 		ARG 2 parent
 	METHOD method_2334 drawWindow (Lnet/minecraft/class_332;II)V
-		ARG 1 context
 		ARG 2 x
 		ARG 3 y
 	METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_8781;)Lnet/minecraft/class_456;

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

@@ -1,164 +1,31 @@
 CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScreen
 	FIELD field_2826 player Lnet/minecraft/class_1657;
-	FIELD field_2827 lastClickIndex I
-	FIELD field_2828 signing Z
-	FIELD field_2830 lastClickTime J
-	FIELD field_2831 signButton Lnet/minecraft/class_4185;
 	FIELD field_2832 hand Lnet/minecraft/class_1268;
 	FIELD field_2835 stack Lnet/minecraft/class_1799;
-	FIELD field_2837 dirty Z
 	FIELD field_2839 previousPageButton Lnet/minecraft/class_474;
 	FIELD field_2840 currentPage I
-	FIELD field_2841 finalizeButton Lnet/minecraft/class_4185;
 	FIELD field_2843 nextPageButton Lnet/minecraft/class_474;
-	FIELD field_2844 tickCounter I
-	FIELD field_2847 title Ljava/lang/String;
-	FIELD field_2848 doneButton Lnet/minecraft/class_4185;
-	FIELD field_2849 cancelButton Lnet/minecraft/class_4185;
 	FIELD field_17116 pages Ljava/util/List;
-	FIELD field_24268 pageContent Lnet/minecraft/class_473$class_5233;
-	FIELD field_24269 currentPageSelectionManager Lnet/minecraft/class_3728;
-	FIELD field_24270 bookTitleSelectionManager Lnet/minecraft/class_3728;
-	FIELD field_25891 pageIndicatorText Lnet/minecraft/class_2561;
-	FIELD field_25892 signedByText Lnet/minecraft/class_2561;
-	FIELD field_25893 EDIT_TITLE_TEXT Lnet/minecraft/class_2561;
-	FIELD field_25894 FINALIZE_WARNING_TEXT Lnet/minecraft/class_2561;
-	FIELD field_25895 BLACK_CURSOR_TEXT Lnet/minecraft/class_5481;
-	FIELD field_25896 GRAY_CURSOR_TEXT Lnet/minecraft/class_5481;
 	FIELD field_32323 MAX_TEXT_WIDTH I
 	FIELD field_32324 MAX_TEXT_HEIGHT I
 	FIELD field_32326 WIDTH I
 	FIELD field_32327 HEIGHT I
 	METHOD <init> (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_9301;)V
-		ARG 1 player
 		ARG 2 stack
 		ARG 3 hand
 		ARG 4 writableBookContent
-	METHOD method_2407 finalizeBook (Z)V
+	METHOD method_2407 finalizeBook ()V
-		ARG 1 signBook
-	METHOD method_2413 updateButtons ()V
-	METHOD method_2414 moveToLineEnd ()V
-	METHOD method_2421 moveToLineStart ()V
-	METHOD method_2427 getCurrentPageContent ()Ljava/lang/String;
 	METHOD method_2436 appendNewPage ()V
 	METHOD method_2437 openPreviousPage ()V
-	METHOD method_2439 setPageContent (Ljava/lang/String;)V
-		ARG 1 newContent
 	METHOD method_2444 openNextPage ()V
-	METHOD method_2446 keyPressedSignMode (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-		ARG 3 modifiers
 	METHOD method_17046 countPages ()I
 	METHOD method_17047 removeEmptyPages ()V
 	METHOD method_19878 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_19879 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
-	METHOD method_19880 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
 	METHOD method_19881 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_19882 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
-	METHOD method_19883 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
-	METHOD method_27576 getPageContent ()Lnet/minecraft/class_473$class_5233;
-	METHOD method_27577 invalidatePageContent ()V
-	METHOD method_27578 createPageContent ()Lnet/minecraft/class_473$class_5233;
-	METHOD method_27580 moveVertically (I)V
-		ARG 1 lines
-	METHOD method_27581 drawCursor (Lnet/minecraft/class_332;Lnet/minecraft/class_473$class_5234;Z)V
-		ARG 1 context
-		ARG 2 position
-		ARG 3 atEnd
-	METHOD method_27582 screenPositionToAbsolutePosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234;
-		ARG 1 position
-	METHOD method_27583 getRectFromCorners (Lnet/minecraft/class_473$class_5234;Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_768;
-		ARG 1 start
-		ARG 2 end
-	METHOD method_27584 setClipboard (Ljava/lang/String;)V
-		ARG 1 clipboard
-	METHOD method_27585 getLineSelectionRectangle (Ljava/lang/String;Lnet/minecraft/class_5225;IIII)Lnet/minecraft/class_768;
-		ARG 1 string
-		ARG 2 handler
-		ARG 3 selectionStart
-		ARG 4 selectionEnd
-		ARG 5 lineY
-		ARG 6 lineStart
-	METHOD method_27586 createPageFromWrappedLines (Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lit/unimi/dsi/fastutil/ints/IntList;Ljava/util/List;Lnet/minecraft/class_2583;II)V
-		ARG 1 linesCount
-		ARG 2 content
-		ARG 3 anyOfLinesEndsWithNewLine
-		ARG 4 starts
-		ARG 5 lines
-		ARG 6 style
-		ARG 7 start
-		ARG 8 end
-	METHOD method_27588 drawSelection (Lnet/minecraft/class_332;[Lnet/minecraft/class_768;)V
-		ARG 1 context
-		ARG 2 selectionRectangles
-	METHOD method_27589 selectCurrentWord (I)V
-		ARG 1 cursor
-	METHOD method_27590 absolutePositionToScreenPosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234;
-		ARG 1 position
-	METHOD method_27591 getLineFromOffset ([II)I
-		ARG 0 lineStarts
-		ARG 1 position
-	METHOD method_27592 keyPressedEditMode (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-		ARG 3 modifiers
-	METHOD method_27593 (Ljava/lang/String;)Z
-		ARG 0 string
-	METHOD method_27594 (Ljava/lang/String;)V
-		ARG 1 title
-	METHOD method_27595 getClipboard ()Ljava/lang/String;
-	METHOD method_27596 (Ljava/lang/String;)Z
-		ARG 1 string
-	METHOD method_27597 moveUpLine ()V
-	METHOD method_27598 moveDownLine ()V
-	METHOD method_27872 changePage ()V
 	METHOD method_37433 writeNbtData ()V
-	CLASS class_475 Line
-		FIELD field_2853 y I
-		FIELD field_2854 x I
-		FIELD field_24278 style Lnet/minecraft/class_2583;
-		FIELD field_24279 content Ljava/lang/String;
-		FIELD field_24280 text Lnet/minecraft/class_2561;
-		METHOD <init> (Lnet/minecraft/class_2583;Ljava/lang/String;II)V
-			ARG 1 style
-			ARG 2 content
-			ARG 3 x
-			ARG 4 y
-	CLASS class_5233 PageContent
-		FIELD field_24271 EMPTY Lnet/minecraft/class_473$class_5233;
-		FIELD field_24272 pageContent Ljava/lang/String;
-		FIELD field_24273 position Lnet/minecraft/class_473$class_5234;
-		FIELD field_24274 atEnd Z
-		FIELD field_24275 lineStarts [I
-		FIELD field_24276 lines [Lnet/minecraft/class_473$class_475;
-		FIELD field_24277 selectionRectangles [Lnet/minecraft/class_768;
-		METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_473$class_5234;Z[I[Lnet/minecraft/class_473$class_475;[Lnet/minecraft/class_768;)V
-			ARG 1 pageContent
-			ARG 2 position
-			ARG 3 atEnd
-			ARG 4 lineStarts
-			ARG 5 lines
-			ARG 6 selectionRectangles
-		METHOD method_27600 getLineStart (I)I
-			ARG 1 position
-		METHOD method_27601 getVerticalOffset (II)I
-			ARG 1 position
-			ARG 2 lines
-		METHOD method_27602 getCursorPosition (Lnet/minecraft/class_327;Lnet/minecraft/class_473$class_5234;)I
-			ARG 1 renderer
-			ARG 2 position
-		METHOD method_27604 getLineEnd (I)I
-			ARG 1 position
-	CLASS class_5234 Position
-		FIELD field_24281 x I
-		FIELD field_24282 y I
-		METHOD <init> (II)V
-			ARG 1 x
-			ARG 2 y

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

@@ -44,5 +44,5 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen
 		METHOD method_17560 getPageCount ()I
 		METHOD method_17562 create (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3872$class_3931;
 			ARG 0 stack
-		METHOD method_17563 getPage (I)Lnet/minecraft/class_5348;
+		METHOD method_17563 getPage (I)Lnet/minecraft/class_2561;
 			ARG 1 index

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

@@ -17,7 +17,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	FIELD field_32340 TAB_HEIGHT I
 	FIELD field_32341 SCROLLBAR_WIDTH I
 	FIELD field_32342 SCROLLBAR_HEIGHT I
-	FIELD field_32343 WHITE I
 	FIELD field_41112 operatorTabEnabled Z
 	FIELD field_45456 TAB_TOP_SELECTED_TEXTURES [Lnet/minecraft/class_2960;
 	FIELD field_45457 TAB_BOTTOM_UNSELECTED_TEXTURES [Lnet/minecraft/class_2960;
@@ -47,7 +46,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 		ARG 1 mouseX
 		ARG 3 mouseY
 	METHOD method_2468 renderTabIcon (Lnet/minecraft/class_332;Lnet/minecraft/class_1761;)V
-		ARG 1 context
 		ARG 2 group
 	METHOD method_2470 isCreativeInventorySlot (Lnet/minecraft/class_1735;)Z
 		ARG 1 slot

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

@@ -54,7 +54,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 		ARG 6 top
 		ARG 7 button
 	METHOD method_2382 drawItem (Lnet/minecraft/class_332;Lnet/minecraft/class_1799;IILjava/lang/String;)V
-		ARG 1 context
 		ARG 2 stack
 		ARG 3 x
 		ARG 4 y
@@ -119,7 +118,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 	METHOD method_71084 renderLetGoTouchStack (Lnet/minecraft/class_332;)V
 		ARG 1 context
 	METHOD method_71085 renderMain (Lnet/minecraft/class_332;IIF)V
-		ARG 1 context
 		ARG 2 mouseX
 		ARG 3 mouseY
 		ARG 4 deltaTicks

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

@@ -7,7 +7,6 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/StatusEffec
 	METHOD <init> (Lnet/minecraft/class_465;)V
 		ARG 1 parent
 	METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_332;II)V
-		ARG 1 context
 		ARG 2 mouseX
 		ARG 3 mouseY
 	METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_332;IILjava/lang/Iterable;Z)V

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

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_9934 net/minecraft/client/gui/screen/recipebook/GhostR
 	METHOD <init> (Lnet/minecraft/class_9938;)V
 		ARG 1 currentIndexProvider
 	METHOD method_62029 clear ()V
-	METHOD method_62030 (Lnet/minecraft/class_332;ZLnet/minecraft/class_310;Lnet/minecraft/class_1735;Lnet/minecraft/class_9934$class_9935;)V
+	METHOD method_62030 (ZLnet/minecraft/class_332;Lnet/minecraft/class_310;Lnet/minecraft/class_1735;Lnet/minecraft/class_9934$class_9935;)V
 		ARG 4 slot
 		ARG 5 item
 	METHOD method_62032 drawTooltip (Lnet/minecraft/class_332;Lnet/minecraft/class_310;IILnet/minecraft/class_1735;)V

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

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeG
 	METHOD <init> (Lnet/minecraft/class_507$class_10329;)V
 		ARG 1 tab
 	METHOD method_2621 renderIcons (Lnet/minecraft/class_332;)V
-		ARG 1 context
 	METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_299;Z)V
 		ARG 1 recipeBook
 		ARG 2 filteringCraftable

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

@@ -14,13 +14,12 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget
 	FIELD field_39509 editBox Lnet/minecraft/class_7530;
 	FIELD field_45363 CURSOR_BLINK_INTERVAL I
 	FIELD field_45364 lastSwitchFocusTime J
-	METHOD <init> (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
+	METHOD <init> (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;IZIZZ)V
 		ARG 1 textRenderer
 		ARG 2 x
 		ARG 3 y
 		ARG 4 width
 		ARG 5 height
-		ARG 6 placeholder
 		ARG 7 message
 	METHOD method_44400 setText (Ljava/lang/String;)V
 		COMMENT Sets the text of the edit box and moves the cursor to the end of the edit box.

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

@@ -76,7 +76,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 2 entry
 	METHOD method_37019 getHoveredEntry ()Lnet/minecraft/class_350$class_351;
 	METHOD method_44397 renderEntry (Lnet/minecraft/class_332;IIFIIIII)V
-		ARG 1 context
 		ARG 2 mouseX
 		ARG 3 mouseY
 		ARG 4 delta

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

@@ -87,8 +87,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 1 chunk
 		ARG 2 x
 		ARG 3 z
-	METHOD method_38542 (Lnet/minecraft/class_2622;Lnet/minecraft/class_2586;)V
-		ARG 2 blockEntity
 	METHOD method_38543 readLightData (IILnet/minecraft/class_6606;Z)V
 		ARG 1 x
 		ARG 2 z

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

@@ -32,7 +32,6 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo
 		ARG 2 bytesPerSecond
 	METHOD method_21528 onCancel ()V
 	METHOD method_21532 drawProgressBar (Lnet/minecraft/class_332;)V
-		ARG 1 context
 	METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_332;)V
 		ARG 1 context
 	METHOD method_21536 upload ()V

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

@@ -1,17 +1,12 @@
 CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgumentType
 	FIELD field_50037 FAILED_TO_PARSE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_50038 EXAMPLES Ljava/util/Collection;
-	FIELD field_50039 INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_50040 registries Lnet/minecraft/class_7225$class_7874;
-	FIELD field_50041 canLookupRegistry Z
 	FIELD field_50042 entryCodec Lcom/mojang/serialization/Codec;
-	FIELD field_58145 SNBT_READER Lnet/minecraft/class_2522;
 	METHOD <init> (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V
 		ARG 1 registryAccess
 		ARG 2 registry
 		ARG 3 entryCodec
-	METHOD method_58480 (Lcom/mojang/brigadier/StringReader;Ljava/lang/String;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
-		ARG 1 argument
 	METHOD method_58481 getLootTable (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
 		ARG 0 context
 		ARG 1 argument
@@ -19,17 +14,11 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum
 		ARG 0 registryAccess
 	METHOD method_58483 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 argument
-	METHOD method_58484 parseAsNbt (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2522;Lcom/mojang/brigadier/StringReader;)Lcom/mojang/serialization/Dynamic;
-		ARG 0 ops
-		ARG 1 snbtReader
-		ARG 2 reader
 	METHOD method_58485 getLootFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
 		ARG 0 context
 		ARG 1 argument
 	METHOD method_58486 lootFunction (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9433$class_9434;
 		ARG 0 registryAccess
-	METHOD method_58487 hasFinishedReading (Lcom/mojang/brigadier/StringReader;)Z
-		ARG 0 stringReader
 	METHOD method_58488 getLootCondition (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
 		ARG 0 context
 		ARG 1 argument
@@ -38,9 +27,8 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum
 	METHOD method_58490 getArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
 		ARG 0 context
 		ARG 1 argument
-	METHOD method_68814 parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2522;)Lnet/minecraft/class_6880;
+	METHOD method_68814 parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9408;Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_6880;
 		ARG 1 reader
-		ARG 2 snbtReader
 	CLASS class_9434 LootFunctionArgumentType
 		METHOD <init> (Lnet/minecraft/class_7157;)V
 			ARG 1 registryAccess

mappings/net/minecraft/data/Main.mapping

@@ -16,8 +16,6 @@ CLASS net/minecraft/data/Main
 		ARG 2 output
 	METHOD method_65775 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2461;
 		ARG 1 output
-	METHOD method_65776 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2471;
-		ARG 2 output
 	METHOD method_65777 (Lnet/minecraft/class_7784;)Lnet/minecraft/class_7796;
 		ARG 0 output
 	METHOD method_65778 (Ljava/util/Collection;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2463;

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

@@ -9,9 +9,8 @@ CLASS net/minecraft/class_2438 net/minecraft/data/loottable/LootTableProvider
 		ARG 2 lootTableIds
 		ARG 3 lootTypeGenerators
 		ARG 4 registriesFuture
-	METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V
+	METHOD method_10407 (Ljava/lang/String;Lnet/minecraft/class_8942$class_11337;)V
 		ARG 0 name
-		ARG 1 message
 	METHOD method_10408 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture;
 		ARG 3 entry
 	METHOD method_10410 (Lnet/minecraft/class_7225$class_7874;Ljava/util/Map;Lnet/minecraft/class_2385;Lnet/minecraft/class_2438$class_7790;)V

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

@@ -1,25 +0,0 @@
-CLASS net/minecraft/class_7805 net/minecraft/data/tag/ItemTagProvider
-	FIELD field_40664 blockTags Ljava/util/concurrent/CompletableFuture;
-	FIELD field_43092 blockTagsToCopy Ljava/util/Map;
-	METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V
-		ARG 1 output
-		ARG 2 registriesFuture
-		ARG 3 blockTagLookupFuture
-	METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V
-		ARG 1 output
-		ARG 2 registriesFuture
-		ARG 3 parentTagLookupFuture
-		ARG 4 blockTagLookupFuture
-	METHOD method_46218 copy (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V
-		ARG 1 blockTag
-		ARG 2 itemTag
-	METHOD method_46831 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5321;
-		ARG 0 item
-	METHOD method_49649 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2474$class_8211;)Lnet/minecraft/class_7225$class_7874;
-		ARG 1 registries
-		ARG 2 blockTags
-	METHOD method_49650 (Lnet/minecraft/class_2474$class_8211;Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;)V
-		ARG 2 blockTag
-		ARG 3 itemTag
-	METHOD method_49652 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5321;
-		ARG 0 item

mappings/net/minecraft/data/tag/TagProvider.mapping

@@ -14,8 +14,6 @@ CLASS net/minecraft/class_2474 net/minecraft/data/tag/TagProvider
 		ARG 2 registryRef
 		ARG 3 registriesFuture
 		ARG 4 parentTagLookupFuture
-	METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124;
-		ARG 1 tag
 	METHOD method_10514 configure (Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 registries
 	METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495;
@@ -43,22 +41,6 @@ CLASS net/minecraft/class_2474 net/minecraft/data/tag/TagProvider
 		ARG 1 registries
 	METHOD method_49707 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874;
 		ARG 1 registriesFuture
-	CLASS class_5124 ProvidedTagBuilder
-		FIELD field_23960 builder Lnet/minecraft/class_3495;
-		METHOD <init> (Lnet/minecraft/class_3495;)V
-			ARG 1 builder
-		METHOD method_26792 addTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124;
-			ARG 1 identifiedTag
-		METHOD method_35922 addOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124;
-			ARG 1 id
-		METHOD method_35923 addOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124;
-			ARG 1 id
-		METHOD method_40565 add ([Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124;
-			ARG 1 keys
-		METHOD method_46835 add (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124;
-			ARG 1 key
-		METHOD method_55842 add (Ljava/util/List;)Lnet/minecraft/class_2474$class_5124;
-			ARG 1 keys
 	CLASS class_8210 RegistryInfo
 	CLASS class_8211 TagLookup
 		METHOD contains (Lnet/minecraft/class_6862;)Z

mappings/net/minecraft/data/tag/ValueLookupTagProvider.mapping

@@ -11,12 +11,3 @@ CLASS net/minecraft/class_7889 net/minecraft/data/tag/ValueLookupTagProvider
 		ARG 2 registryRef
 		ARG 3 registriesFuture
 		ARG 4 valueToKey
-	CLASS class_7890 ObjectBuilder
-		FIELD field_40955 valueToKey Ljava/util/function/Function;
-		METHOD <init> (Lnet/minecraft/class_3495;Ljava/util/function/Function;)V
-			ARG 1 builder
-			ARG 2 valueToKey
-		METHOD method_46829 add (Ljava/lang/Object;)Lnet/minecraft/class_7889$class_7890;
-			ARG 1 value
-		METHOD method_46830 add ([Ljava/lang/Object;)Lnet/minecraft/class_7889$class_7890;
-			ARG 1 values

mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping

@@ -10,5 +10,3 @@ CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffec
 		ARG 0 lootContextType
 	METHOD method_60008 (Lnet/minecraft/class_176;Lnet/minecraft/class_5341;)Lcom/mojang/serialization/DataResult;
 		ARG 1 condition
-	METHOD method_60010 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
-		ARG 0 errors

mappings/net/minecraft/entity/Entity.mapping

@@ -330,8 +330,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @apiNote This is used by water, {@link net.minecraft.block.LeveledCauldronBlock},
 		COMMENT and splash water bottles in vanilla.
-	METHOD method_5647 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+	METHOD method_5647 writeNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
 	METHOD method_5648 setInvisible (Z)V
 		COMMENT Sets whether the entity is invisible to everyone.
 		COMMENT
@@ -353,9 +352,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #kill
 		COMMENT @see #discard
 		ARG 1 reason
-	METHOD method_5651 readNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_5651 readNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
+	METHOD method_5652 writeCustomDataToNbt (Lnet/minecraft/class_11372;)V
-	METHOD method_5652 writeCustomDataToNbt (Lnet/minecraft/class_2487;)V
 		COMMENT Writes custom data to {@code nbt}. Subclasses have to implement this.
 		COMMENT
 		COMMENT <p>NBT is a storage format; therefore, a data from NBT is loaded to an entity instance's
@@ -363,7 +361,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT back to NBT when saving the entity.
 		COMMENT
 		COMMENT @see #readCustomDataFromNbt
-		ARG 1 nbt
 	METHOD method_5653 getSavedEntityId ()Ljava/lang/String;
 	METHOD method_5654 doesNotCollide (DDD)Z
 		COMMENT {@return whether the bounding box with the given offsets do not collide with
@@ -403,8 +400,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #isSneaking
 		COMMENT @see #isInSneakingPose
 		ARG 1 sneaking
-	METHOD method_5662 saveNbt (Lnet/minecraft/class_2487;)Z
+	METHOD method_5662 saveNbt (Lnet/minecraft/class_11372;)Z
-		ARG 1 nbt
 	METHOD method_5663 getRotationVecClient ()Lnet/minecraft/class_243;
 	METHOD method_5664 interactAt (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
 		COMMENT Called when the player interacts with the entity at the specific position.
@@ -761,7 +757,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @see #getAir
 		COMMENT @see #setAir
-	METHOD method_5749 readCustomDataFromNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_5749 readCustomDataFromNbt (Lnet/minecraft/class_11368;)V
 		COMMENT Reads custom data from {@code nbt}. Subclasses have to implement this.
 		COMMENT
 		COMMENT <p>NBT is a storage format; therefore, a data from NBT is loaded to an entity instance's
@@ -773,7 +769,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT fall back to a reasonable default value instead of throwing an exception.
 		COMMENT
 		COMMENT @see #writeCustomDataToNbt
-		ARG 1 nbt
 	METHOD method_5750 setVelocityClient (DDD)V
 		ARG 1 x
 		ARG 3 y
@@ -943,8 +938,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 type
 		ARG 2 movement
 	METHOD method_5785 scheduleVelocityUpdate ()V
-	METHOD method_5786 saveSelfNbt (Lnet/minecraft/class_2487;)Z
+	METHOD method_5786 saveSelfNbt (Lnet/minecraft/class_11372;)Z
-		ARG 1 nbt
 	METHOD method_5790 updateSwimming ()V
 	METHOD method_5791 getHeadYaw ()F
 		COMMENT {@return the head yaw of the entity}
@@ -1358,7 +1352,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @see #readNbt
 		COMMENT @see #teleportTo
-		ARG 1 original
 	METHOD method_5879 animateDamage (F)V
 		COMMENT Called on the client to animate the entity's damage (the wobble).
 		ARG 1 yaw

mappings/net/minecraft/entity/EntityType.mapping

@@ -57,8 +57,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 	METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960;
 		ARG 0 type
 	METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311;
-	METHOD method_5892 getEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;)Ljava/util/Optional;
+	METHOD method_5892 getEntityFromNbt (Lnet/minecraft/class_11368;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;)Ljava/util/Optional;
-		ARG 0 nbt
 		ARG 1 world
 		ARG 2 reason
 	METHOD method_5893 isSaveable ()Z
@@ -85,23 +84,20 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 5 alignPosition
 		ARG 6 invertY
 	METHOD method_16351 getLootTableKey ()Ljava/util/Optional;
-	METHOD method_17684 fromNbt (Lnet/minecraft/class_2487;)Ljava/util/Optional;
+	METHOD method_17684 fromNbt (Lnet/minecraft/class_11368;)Ljava/util/Optional;
-		ARG 0 nbt
 	METHOD method_17685 getWidth ()F
 	METHOD method_17686 getHeight ()F
-	METHOD method_17839 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V
+	METHOD method_17839 (Lnet/minecraft/class_11368;Lnet/minecraft/class_1297;)V
 		ARG 1 entity
-	METHOD method_17842 loadEntityWithPassengers (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Ljava/util/function/Function;)Lnet/minecraft/class_1297;
+	METHOD method_17842 loadEntityWithPassengers (Lnet/minecraft/class_11368;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Ljava/util/function/Function;)Lnet/minecraft/class_1297;
-		ARG 0 nbt
 		ARG 1 world
 		ARG 2 reason
 		ARG 3 entityProcessor
-	METHOD method_17843 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Ljava/util/function/Function;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
+	METHOD method_17843 (Lnet/minecraft/class_11368;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Ljava/util/function/Function;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 4 entity
 	METHOD method_17846 (Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Lnet/minecraft/class_1299;)Lnet/minecraft/class_1297;
 		ARG 2 type
-	METHOD method_17848 loadEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;)Ljava/util/Optional;
+	METHOD method_17848 loadEntityFromNbt (Lnet/minecraft/class_11368;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;)Ljava/util/Optional;
-		ARG 0 nbt
 		ARG 1 world
 		ARG 2 reason
 	METHOD method_18386 getDimensions ()Lnet/minecraft/class_4048;
@@ -123,8 +119,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		COMMENT
 		COMMENT <p>This can be overwritten via {@link EntityType.Builder#allowSpawningInside(Block[])}
 		ARG 1 state
-	METHOD method_31489 streamFromNbt (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;)Ljava/util/stream/Stream;
+	METHOD method_31489 streamFromNbt (Lnet/minecraft/class_11368$class_11370;Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;)Ljava/util/stream/Stream;
-		ARG 0 entityNbtList
 		ARG 1 world
 		ARG 2 reason
 	METHOD method_35050 getUntranslatedName ()Ljava/lang/String;
@@ -190,13 +185,10 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 	METHOD method_66663 componentsCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)Ljava/util/function/Consumer;
 		ARG 0 chained
 		ARG 1 stack
-	METHOD method_67636 (Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V
+	METHOD method_67636 (Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Lnet/minecraft/class_11368;Ljava/util/function/Consumer;)V
-		ARG 2 nbt
 		ARG 3 callback
 	METHOD method_67637 (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 1 entity
-	METHOD method_68263 (Lnet/minecraft/class_2520;)Ljava/util/stream/Stream;
-		ARG 0 nbt
 	CLASS class_1300 Builder
 		FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049;
 		FIELD field_6149 spawnGroup Lnet/minecraft/class_1311;

mappings/net/minecraft/entity/InventoryOwner.mapping

@@ -6,11 +6,5 @@ CLASS net/minecraft/class_6067 net/minecraft/entity/InventoryOwner
 		ARG 1 entity
 		ARG 2 inventoryOwner
 		ARG 3 item
-	METHOD method_46399 writeInventory (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_46399 writeInventory (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
+	METHOD method_46400 readInventory (Lnet/minecraft/class_11368;)V
-		ARG 2 registries
-	METHOD method_46400 readInventory (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 nbt
-		ARG 2 registries
-	METHOD method_68276 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2499;)V
-		ARG 2 inventory

mappings/net/minecraft/entity/LazyEntityReference.mapping

@@ -21,16 +21,13 @@ CLASS net/minecraft/class_10583 net/minecraft/entity/LazyEntityReference
 		ARG 2 clazz
 	METHOD method_66258 (Ljava/util/UUID;)Ljava/util/UUID;
 		ARG 0 uuid
-	METHOD method_66259 writeNbt (Lnet/minecraft/class_2487;Ljava/lang/String;)V
+	METHOD method_66259 writeNbt (Lnet/minecraft/class_11372;Ljava/lang/String;)V
-		ARG 1 nbt
 		ARG 2 key
-	METHOD method_66260 fromNbtOrPlayerName (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_1937;)Lnet/minecraft/class_10583;
+	METHOD method_66260 fromNbtOrPlayerName (Lnet/minecraft/class_11368;Ljava/lang/String;Lnet/minecraft/class_1937;)Lnet/minecraft/class_10583;
-		ARG 0 nbt
 		ARG 1 key
 		ARG 2 world
 	METHOD method_66261 createPacketCodec ()Lnet/minecraft/class_9139;
-	METHOD method_66262 fromNbt (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_10583;
+	METHOD method_66262 fromNbt (Lnet/minecraft/class_11368;Ljava/lang/String;)Lnet/minecraft/class_10583;
-		ARG 0 nbt
 		ARG 1 key
 	METHOD method_66263 getUuid ()Ljava/util/UUID;
 	METHOD method_68262 (Lnet/minecraft/class_1937;Ljava/lang/String;)Ljava/util/UUID;

mappings/net/minecraft/entity/Leashable.mapping

@@ -28,8 +28,7 @@ CLASS net/minecraft/class_9817 net/minecraft/entity/Leashable
 		ARG 2 dropItem
 	METHOD method_60960 setLeashData (Lnet/minecraft/class_9817$class_9818;)V
 		ARG 1 leashData
-	METHOD method_60962 writeLeashDataToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_9817$class_9818;)V
+	METHOD method_60962 writeLeashDataToNbt (Lnet/minecraft/class_11372;Lnet/minecraft/class_9817$class_9818;)V
-		ARG 1 nbt
 		ARG 2 leashData
 	METHOD method_60963 onShortLeashTick (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
@@ -41,8 +40,7 @@ CLASS net/minecraft/class_9817 net/minecraft/entity/Leashable
 		ARG 1 entity
 	METHOD method_60966 getLeashHolder (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 0 entity
-	METHOD method_60967 readLeashDataFromNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_60967 readLeashDataFromNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
 	METHOD method_60968 setUnresolvedLeashHolderId (I)V
 		ARG 1 unresolvedLeashHolderId
 	METHOD method_60970 snapLongLeash ()V

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -388,8 +388,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 entity
 	METHOD method_18392 setPositionInBed (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
-	METHOD method_18393 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2338;)V
-		ARG 1 pos
 	METHOD method_18395 canTarget (Lnet/minecraft/class_1309;)Z
 		ARG 1 target
 	METHOD method_18396 getArmorVisibility ()F
@@ -492,8 +490,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 state
 	METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_27071 shouldDropLoot ()Z
-	METHOD method_28305 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
-		ARG 1 brain
 	METHOD method_28306 createBrainProfile ()Lnet/minecraft/class_4095$class_5303;
 	METHOD method_29242 updateLimbs (Z)V
 		ARG 1 flutter
@@ -762,8 +758,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 pos
 	METHOD method_68264 (Ljava/lang/String;)V
 		ARG 1 team
-	METHOD method_68265 (Lnet/minecraft/class_2487;)V
-		ARG 1 brain
 	METHOD method_70670 travelFlying (Lnet/minecraft/class_243;F)V
 		ARG 1 movementInput
 		ARG 2 speed

mappings/net/minecraft/entity/Variants.mapping

@@ -5,15 +5,11 @@ CLASS net/minecraft/class_10704 net/minecraft/entity/Variants
 	METHOD method_67175 getOrDefaultOrThrow (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880;
 		ARG 0 registries
 		ARG 1 variantKey
-	METHOD method_67176 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V
+	METHOD method_67176 (Lnet/minecraft/class_11372;Lnet/minecraft/class_5321;)V
 		ARG 1 key
-	METHOD method_67177 writeVariantToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880;)V
+	METHOD method_67177 writeVariantToNbt (Lnet/minecraft/class_11372;Lnet/minecraft/class_6880;)V
-		ARG 0 nbt
 		ARG 1 variantEntry
-	METHOD method_67178 readVariantFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;)Ljava/util/Optional;
+	METHOD method_67178 readVariantFromNbt (Lnet/minecraft/class_11368;Lnet/minecraft/class_5321;)Ljava/util/Optional;
-		ARG 0 nbt
-		ARG 1 registries
-		ARG 2 registryRef
 	METHOD method_67179 getDefaultOrThrow (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880;
 		ARG 0 registries
 		ARG 1 registryRef

mappings/net/minecraft/entity/attribute/AttributeContainer.mapping

@@ -9,14 +9,11 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer
 		ARG 1 instance
 	METHOD method_26846 setFrom (Lnet/minecraft/class_5131;)V
 		ARG 1 other
-	METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V
-		ARG 1 nbt
 	METHOD method_26851 getAttributesToSend ()Ljava/util/Collection;
 	METHOD method_26852 getValue (Lnet/minecraft/class_6880;)D
 		ARG 1 attribute
 	METHOD method_26853 (Lnet/minecraft/class_1324;)V
 		ARG 1 attributeInstance
-	METHOD method_26855 toNbt ()Lnet/minecraft/class_2499;
 	METHOD method_26856 getBaseValue (Lnet/minecraft/class_6880;)D
 		ARG 1 attribute
 	METHOD method_26857 (Lnet/minecraft/class_1324;)Z
@@ -57,5 +54,3 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer
 		ARG 1 other
 	METHOD method_65115 resetToBaseValue (Lnet/minecraft/class_6880;)Z
 		ARG 1 attribute
-	METHOD method_68266 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1324;)V
-		ARG 1 instance

mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping

@@ -8,10 +8,6 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns
 	FIELD field_23705 dirty Z
 	FIELD field_23706 value D
 	FIELD field_23707 updateCallback Ljava/util/function/Consumer;
-	FIELD field_52007 ID_NBT_KEY Ljava/lang/String;
-	FIELD field_52008 BASE_NBT_KEY Ljava/lang/String;
-	FIELD field_52009 MODIFIERS_NBT_KEY Ljava/lang/String;
-	FIELD field_57596 ENTRY_CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (Lnet/minecraft/class_6880;Ljava/util/function/Consumer;)V
 		ARG 1 type
 		ARG 2 updateCallback
@@ -44,8 +40,6 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns
 	METHOD method_26832 (Lnet/minecraft/class_1322$class_1323;Ljava/util/Map;)V
 		ARG 1 operation
 		ARG 2 modifiers
-	METHOD method_26833 readNbt (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_26834 getModifiersByOperation (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Collection;
 		ARG 1 operation
 	METHOD method_26835 addTemporaryModifier (Lnet/minecraft/class_1322;)V
@@ -57,7 +51,6 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns
 	METHOD method_26837 addPersistentModifier (Lnet/minecraft/class_1322;)V
 		ARG 1 modifier
 	METHOD method_26838 onUpdate ()V
-	METHOD method_26839 toNbt ()Lnet/minecraft/class_2487;
 	METHOD method_26840 computeValue ()D
 		COMMENT Computes this attribute's value, taking modifiers into account.
 		COMMENT

mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping

@@ -1,11 +1,7 @@
 CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity
 	FIELD field_7102 RIDEABLE_MINECART_PREDICATE Ljava/util/function/Predicate;
-	FIELD field_7103 rightLegRotation Lnet/minecraft/class_2379;
-	FIELD field_7104 headRotation Lnet/minecraft/class_2379;
 	FIELD field_7105 TRACKER_RIGHT_ARM_ROTATION Lnet/minecraft/class_2940;
-	FIELD field_7106 bodyRotation Lnet/minecraft/class_2379;
 	FIELD field_7107 ARMOR_STAND_FLAGS Lnet/minecraft/class_2940;
-	FIELD field_7110 leftLegRotation Lnet/minecraft/class_2379;
 	FIELD field_7111 invisible Z
 	FIELD field_7112 lastHitTime J
 	FIELD field_7113 DEFAULT_HEAD_ROTATION Lnet/minecraft/class_2379;
@@ -14,13 +10,11 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity
 	FIELD field_7117 DEFAULT_RIGHT_LEG_ROTATION Lnet/minecraft/class_2379;
 	FIELD field_7118 disabledSlots I
 	FIELD field_7119 DEFAULT_BODY_ROTATION Lnet/minecraft/class_2379;
-	FIELD field_7120 rightArmRotation Lnet/minecraft/class_2379;
 	FIELD field_7121 DEFAULT_LEFT_LEG_ROTATION Lnet/minecraft/class_2379;
 	FIELD field_7122 TRACKER_BODY_ROTATION Lnet/minecraft/class_2940;
 	FIELD field_7123 TRACKER_HEAD_ROTATION Lnet/minecraft/class_2940;
 	FIELD field_7124 DEFAULT_LEFT_ARM_ROTATION Lnet/minecraft/class_2379;
 	FIELD field_7125 TRACKER_RIGHT_LEG_ROTATION Lnet/minecraft/class_2940;
-	FIELD field_7126 leftArmRotation Lnet/minecraft/class_2379;
 	FIELD field_7127 TRACKER_LEFT_LEG_ROTATION Lnet/minecraft/class_2940;
 	FIELD field_26745 MARKER_DIMENSIONS Lnet/minecraft/class_4048;
 	FIELD field_26746 SMALL_DIMENSIONS Lnet/minecraft/class_4048;
@@ -61,7 +55,6 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity
 		ARG 1 angle
 	METHOD method_6910 setLeftArmRotation (Lnet/minecraft/class_2379;)V
 		ARG 1 angle
-	METHOD method_6911 poseToNbt ()Lnet/minecraft/class_2487;
 	METHOD method_6912 isMarker ()Z
 	METHOD method_6913 setShowArms (Z)V
 		ARG 1 showArms
@@ -89,7 +82,6 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity
 		ARG 1 angle
 	METHOD method_6927 setBodyRotation (Lnet/minecraft/class_2379;)V
 		ARG 1 angle
-	METHOD method_6928 readPoseNbt (Lnet/minecraft/class_2487;)V
 	METHOD method_6929 shouldShowArms ()Z
 	METHOD method_6930 getLeftArmRotation ()Lnet/minecraft/class_2379;
 	METHOD method_18059 canClip ()Z

mappings/net/minecraft/entity/decoration/DisplayEntity.mapping

@@ -173,16 +173,14 @@ CLASS net/minecraft/class_8113 net/minecraft/entity/decoration/DisplayEntity
 		FIELD field_57578 DEFAULT_LINE_WIDTH I
 		METHOD method_48902 getAlignment (B)Lnet/minecraft/class_8113$class_8123$class_8124;
 			ARG 0 flags
-		METHOD method_48903 readFlag (BLnet/minecraft/class_2487;Ljava/lang/String;B)B
+		METHOD method_48903 readFlag (BLnet/minecraft/class_11368;Ljava/lang/String;B)B
 			ARG 0 flags
-			ARG 1 nbt
 			ARG 2 nbtKey
 			ARG 3 flag
 		METHOD method_48905 splitLines (Lnet/minecraft/class_8113$class_8123$class_8127;)Lnet/minecraft/class_8113$class_8123$class_8125;
 			ARG 1 splitter
-		METHOD method_48907 writeFlag (BLnet/minecraft/class_2487;Ljava/lang/String;B)V
+		METHOD method_48907 writeFlag (BLnet/minecraft/class_11372;Ljava/lang/String;B)V
 			ARG 0 flags
-			ARG 1 nbt
 			ARG 2 nbtKey
 			ARG 3 flag
 		METHOD method_48908 setLineWidth (I)V

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

@@ -17,9 +17,8 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable
 		ARG 2 angerPersistent
 			COMMENT if {@code true}, the anger time will not decrease for a player target
 	METHOD method_29511 hasAngerTime ()Z
-	METHOD method_29512 readAngerFromNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2487;)V
+	METHOD method_29512 readAngerFromNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_11368;)V
 		ARG 1 world
-		ARG 2 nbt
 	METHOD method_29513 setAngryAt (Ljava/util/UUID;)V
 		ARG 1 angryAt
 	METHOD method_29514 setAngerTime (I)V
@@ -30,8 +29,7 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable
 	METHOD method_29516 forgive (Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;)V
 		ARG 1 world
 		ARG 2 player
-	METHOD method_29517 writeAngerToNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_29517 writeAngerToNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
 	METHOD method_29921 universallyAnger ()V
 	METHOD method_29922 stopAnger ()V
 	METHOD method_29923 isUniversallyAngry (Lnet/minecraft/class_3218;)Z

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

@@ -39,14 +39,8 @@ CLASS net/minecraft/class_1571 net/minecraft/entity/mob/GhastEntity
 			ARG 3 addedVelocityMultiplier
 		METHOD method_7051 willCollide (Lnet/minecraft/class_243;)Z
 			ARG 1 movement
-		METHOD method_71149 canPassThrough (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;ZZ)Z
+		METHOD method_71149 canPassThrough (Lnet/minecraft/class_1922;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2338;ZZ)Z
 			ARG 1 world
-			ARG 2 pos
-			ARG 3 waterAllowed
-			ARG 4 lavaAllowed
-		METHOD method_71150 (Lnet/minecraft/class_238;ZZLnet/minecraft/class_2338;I)Z
-			ARG 4 pos
-			ARG 5 version
 	CLASS class_1574 ShootFireballGoal
 		FIELD field_7277 ghast Lnet/minecraft/class_1571;
 		FIELD field_7278 cooldown I

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

@@ -22,7 +22,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	FIELD field_6206 lookControl Lnet/minecraft/class_1333;
 	FIELD field_6207 moveControl Lnet/minecraft/class_1335;
 	FIELD field_18074 positionTarget Lnet/minecraft/class_2338;
-	FIELD field_18075 positionTargetRange F
+	FIELD field_18075 positionTargetRange I
 	FIELD field_30083 DEFAULT_CAN_PICKUP_LOOT_CHANCE F
 		COMMENT Used by Zombies to control the chance that they spawn with the ability to pick up loot.
 		COMMENT
@@ -178,7 +178,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_18410 hasPositionTarget ()Z
 	METHOD method_18411 isInPositionTargetRange ()Z
 	METHOD method_18412 getPositionTarget ()Lnet/minecraft/class_2338;
-	METHOD method_18413 getPositionTargetRange ()F
+	METHOD method_18413 getPositionTargetRange ()I
 	METHOD method_19540 setAttacking (Z)V
 		ARG 1 attacking
 	METHOD method_20240 getMaxLookYawChange ()I

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

@@ -57,7 +57,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
 		ARG 1 tickProgress
 	METHOD method_68128 (Lnet/minecraft/class_5321;)Ljava/util/Optional;
 		ARG 1 soundVariantKey
-	METHOD method_68130 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V
+	METHOD method_68130 (Lnet/minecraft/class_11372;Lnet/minecraft/class_5321;)V
 		ARG 1 soundVariant
 	METHOD method_68131 getSoundVariant ()Lnet/minecraft/class_6880;
 	METHOD method_68132 setSoundVariant (Lnet/minecraft/class_6880;)V

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

@@ -11,12 +11,10 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager
 		ARG 1 foodLevel
 	METHOD method_7581 setSaturationLevel (F)V
 		ARG 1 saturationLevel
-	METHOD method_7582 writeNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_7582 writeNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
 	METHOD method_7583 addExhaustion (F)V
 		ARG 1 exhaustion
-	METHOD method_7584 readNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_7584 readNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
 	METHOD method_7585 add (IF)V
 		ARG 1 food
 		ARG 2 saturationModifier

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

@@ -15,11 +15,7 @@ CLASS net/minecraft/class_1656 net/minecraft/entity/player/PlayerAbilities
 	FIELD field_57722 DEFAULT_WALK_SPEED F
 	METHOD method_7248 setFlySpeed (F)V
 		ARG 1 flySpeed
-	METHOD method_7249 readNbt (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_7250 setWalkSpeed (F)V
 		ARG 1 walkSpeed
-	METHOD method_7251 writeNbt (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_7252 getFlySpeed ()F
 	METHOD method_7253 getWalkSpeed ()F

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

@@ -114,7 +114,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	METHOD method_7294 canModifyBlocks ()Z
 	METHOD method_7295 updateWaterSubmersionState ()Z
 	METHOD method_7296 dropShoulderEntity (Lnet/minecraft/class_2487;)V
-		ARG 1 entityNbt
 	METHOD method_7297 getSleepTimer ()I
 	METHOD method_7298 addShoulderEntity (Lnet/minecraft/class_2487;)Z
 		ARG 1 entityNbt
@@ -263,8 +262,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 		ARG 2 category
 		ARG 3 volume
 		ARG 4 pitch
-	METHOD method_17853 (Lnet/minecraft/class_1297;)V
-		ARG 1 entity
 	METHOD method_21701 isBlockBreakingRestricted (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1934;)Z
 		ARG 1 world
 		ARG 2 pos
@@ -362,7 +359,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 		ARG 1 testBlock
 	METHOD method_66696 openTestInstanceBlockScreen (Lnet/minecraft/class_10638;)V
 		ARG 1 testInstanceBlock
-	METHOD method_67360 (Lnet/minecraft/class_2487;Lnet/minecraft/class_4208;)V
+	METHOD method_67360 (Lnet/minecraft/class_11372;Lnet/minecraft/class_4208;)V
 		ARG 1 pos
 	METHOD method_68876 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_68877 asString ()Ljava/lang/String;

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

@@ -45,8 +45,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 	METHOD method_7381 updateItems ()V
 	METHOD method_7382 contains (Lnet/minecraft/class_6862;)Z
 		ARG 1 tag
-	METHOD method_7384 writeNbt (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499;
+	METHOD method_7384 writeNbt (Lnet/minecraft/class_11372$class_11373;)V
-		ARG 1 nbtList
 	METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I
 		ARG 1 slot
 		ARG 2 stack
@@ -64,8 +63,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory
 		ARG 1 stack
 	METHOD method_7395 getSlotWithStack (Lnet/minecraft/class_1799;)I
 		ARG 1 stack
-	METHOD method_7397 readNbt (Lnet/minecraft/class_2499;)V
+	METHOD method_7397 readNbt (Lnet/minecraft/class_11368$class_11369;)V
-		ARG 1 nbtList
 	METHOD method_7398 offerOrDrop (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
 	METHOD method_29280 remove (Ljava/util/function/Predicate;ILnet/minecraft/class_1263;)I

mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping

@@ -17,9 +17,8 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti
 		ARG 1 pos
 	METHOD method_46401 (Lnet/minecraft/class_1309;)Z
 		ARG 0 entity
-	METHOD method_67148 spawnAreaEffectCloud (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V
+	METHOD method_67148 spawnAreaEffectCloud (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_239;)V
 		ARG 1 world
 		ARG 2 stack
-		ARG 3 entityHit
 	METHOD method_67149 explodeWaterPotion (Lnet/minecraft/class_3218;)V
 		ARG 1 world

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

@@ -32,7 +32,7 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity
 		ARG 1 celebrating
 	METHOD method_58646 isCaptain ()Z
 	METHOD method_58647 hasRaid ()Z
-	METHOD method_67376 (Lnet/minecraft/class_2487;I)V
+	METHOD method_67376 (Lnet/minecraft/class_11372;I)V
 		ARG 1 raidId
 	METHOD method_68278 (Lnet/minecraft/class_3218;Ljava/lang/Integer;)V
 		ARG 2 raidId

mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping

@@ -78,5 +78,3 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 		ARG 3 y
 		ARG 5 z
 	METHOD method_67672 getCustomBlockState ()Ljava/util/Optional;
-	METHOD method_67673 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2680;)V
-		ARG 2 state

mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping

@@ -17,18 +17,14 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory
 		ARG 3 vehicle
 	METHOD method_42284 open (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269;
 		ARG 1 player
-	METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_42286 removeInventoryStack (II)Lnet/minecraft/class_1799;
 		ARG 1 slot
 		ARG 2 amount
 	METHOD method_42287 setInventoryStack (ILnet/minecraft/class_1799;)V
 		ARG 1 slot
 		ARG 2 stack
-	METHOD method_42288 writeInventoryToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_42288 writeInventoryToNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_42289 removeInventoryStack (I)Lnet/minecraft/class_1799;
 		ARG 1 slot
 	METHOD method_42290 getInventoryStack (I)Lnet/minecraft/class_1799;

mappings/net/minecraft/inventory/ContainerLock.mapping

@@ -9,13 +9,9 @@ CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock
 		COMMENT An item stack is a valid key if the stack name matches the key string of this lock,
 		COMMENT or if the key string is empty.
 		ARG 1 stack
-	METHOD method_5473 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1273;
+	METHOD method_5473 fromNbt (Lnet/minecraft/class_11368;)Lnet/minecraft/class_1273;
 		COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the NBT compound.
 		COMMENT <p>
 		COMMENT If the {@code Lock} key is not present, returns an empty lock.
-		ARG 0 nbt
+	METHOD method_5474 writeNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 registries
-	METHOD method_5474 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Inserts the key string of this lock into the {@code Lock} key of the NBT compound.
-		ARG 1 nbt
-		ARG 2 registries

mappings/net/minecraft/inventory/Inventories.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories
 	COMMENT Contains utility methods used by {@link Inventory} implementations or for working
 	COMMENT with inventories.
 	FIELD field_49719 ITEMS_NBT_KEY Ljava/lang/String;
-	METHOD method_5426 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
+	METHOD method_5426 writeNbt (Lnet/minecraft/class_11372;Lnet/minecraft/class_2371;)V
 		COMMENT Writes the inventory to {@code nbt}. This method will always write to the NBT,
 		COMMENT even if {@code stacks} only contains empty stacks.
 		COMMENT
@@ -12,10 +12,8 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories
 		COMMENT @see #readNbt(NbtCompound, DefaultedList, RegistryWrapper.WrapperLookup)
 		COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)
 		COMMENT @return the passed {@code nbt}
-		ARG 0 nbt
 		ARG 1 stacks
-		ARG 2 registries
+	METHOD method_5427 writeNbt (Lnet/minecraft/class_11372;Lnet/minecraft/class_2371;Z)V
-	METHOD method_5427 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;ZLnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT Writes the inventory to {@code nbt}.
 		COMMENT
 		COMMENT <p>The inventory is serialized as a list of non-empty item stacks.
@@ -29,10 +27,8 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories
 		COMMENT
 		COMMENT @see #readNbt(NbtCompound, DefaultedList, RegistryWrapper.WrapperLookup)
 		COMMENT @return the passed {@code nbt}
-		ARG 0 nbt
 		ARG 1 stacks
 		ARG 2 setIfEmpty
-		ARG 3 registries
 	METHOD method_5428 removeStack (Ljava/util/List;I)Lnet/minecraft/class_1799;
 		COMMENT Sets the stack at {@code slot} to {@link ItemStack#EMPTY} and returns the old stack.
 		COMMENT
@@ -44,7 +40,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories
 		COMMENT @return the stack previously at {@code slot}
 		ARG 0 stacks
 		ARG 1 slot
-	METHOD method_5429 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_5429 readNbt (Lnet/minecraft/class_11368;Lnet/minecraft/class_2371;)V
 		COMMENT Reads {@code nbt} and sets the elements of {@code stacks} accordingly.
 		COMMENT
 		COMMENT <p>See {@link #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)}
@@ -52,9 +48,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories
 		COMMENT
 		COMMENT @see #writeNbt(NbtCompound, DefaultedList, RegistryWrapper.WrapperLookup)
 		COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)
-		ARG 0 nbt
 		ARG 1 stacks
-		ARG 2 registries
 	METHOD method_5430 splitStack (Ljava/util/List;II)Lnet/minecraft/class_1799;
 		COMMENT {@return the copy of the stack split from the stack at {@code slot}}
 		COMMENT

mappings/net/minecraft/inventory/LootableInventory.mapping

@@ -46,14 +46,13 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory
 		COMMENT table associated with the inventory, although it is not necessary.
 		COMMENT
 		COMMENT <p>This is usually stored under the {@value LOOT_TABLE_SEED_KEY} NBT key.
-	METHOD method_54871 readLootTable (Lnet/minecraft/class_2487;)Z
+	METHOD method_54871 readLootTable (Lnet/minecraft/class_11368;)Z
 		COMMENT Reads the loot table and seed from {@code nbt}, if the loot table
 		COMMENT exists in {@code nbt}. Implementations should skip reading the contents of
 		COMMENT the inventory if this returns {@code true}.
 		COMMENT
 		COMMENT @return whether the loot table was found
-		ARG 1 nbt
+	METHOD method_54872 writeLootTable (Lnet/minecraft/class_11372;)Z
-	METHOD method_54872 writeLootTable (Lnet/minecraft/class_2487;)Z
 		COMMENT Writes the loot table and seed to {@code nbt}, if {@linkplain #getLootTable
 		COMMENT the loot table} is not {@code null}. Implementations should skip writing the
 		COMMENT contents of the inventory if this returns {@code true}.
@@ -62,7 +61,6 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory
 		COMMENT difference in-game, as getting nonexistent {@code long} values return {@code 0L}.
 		COMMENT
 		COMMENT @return whether the loot table was non-{@code null}
-		ARG 1 nbt
 	METHOD method_54873 generateLoot (Lnet/minecraft/class_1657;)V
 		COMMENT Replaces the contents of this inventory with the generated loot, if it exists.
 		COMMENT Does nothing if there is no loot table associated with this inventory.

mappings/net/minecraft/inventory/SimpleInventory.mapping

@@ -39,20 +39,17 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory
 		COMMENT @return the leftover part of the stack, or {@code ItemStack#EMPTY} if the entire
 		COMMENT stack fit inside the inventory
 		ARG 1 stack
-	METHOD method_7659 readNbtList (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_7659 readNbtList (Lnet/minecraft/class_11368$class_11369;)V
 		COMMENT Reads the item stacks from {@code nbtList}.
 		COMMENT
 		COMMENT @see #toNbtList
-		ARG 1 list
+	METHOD method_7660 toNbtList (Lnet/minecraft/class_11372$class_11373;)V
-		ARG 2 registries
-	METHOD method_7660 toNbtList (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499;
 		COMMENT {@return an NBT list of non-empty {@linkplain ItemStack#encode(RegistryWrapper.WrapperLookup) item stacks}}
 		COMMENT
 		COMMENT <p>Unlike {@link Inventories#writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)},
 		COMMENT this does not serialize the slots.
 		COMMENT
 		COMMENT @see #readNbtList
-		ARG 1 registries
 	METHOD method_20631 removeItem (Lnet/minecraft/class_1792;I)Lnet/minecraft/class_1799;
 		COMMENT Searches this inventory for the specified item and removes the given amount from this inventory.
 		COMMENT
@@ -78,5 +75,3 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory
 		COMMENT {@return whether {@code stack} can be inserted into this inventory}
 		ARG 1 stack
 	METHOD method_54454 getHeldStacks ()Lnet/minecraft/class_2371;
-	METHOD method_68258 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2487;)Ljava/util/stream/Stream;
-		ARG 1 nbt

mappings/net/minecraft/item/BlockItem.mapping

@@ -40,10 +40,9 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem
 	METHOD method_19260 getPlaceSound (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3414;
 		ARG 1 state
 	METHOD method_20360 checkStatePlacement ()Z
-	METHOD method_57338 setBlockEntityData (Lnet/minecraft/class_1799;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V
+	METHOD method_57338 setBlockEntityData (Lnet/minecraft/class_1799;Lnet/minecraft/class_2591;Lnet/minecraft/class_11362;)V
 		ARG 0 stack
 		ARG 1 type
-		ARG 2 nbt
 	METHOD method_57339 copyComponentsToBlockEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/item/ItemStack.mapping

@@ -448,11 +448,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 2 builder
 	METHOD method_57357 canPlaceOn (Lnet/minecraft/class_2694;)Z
 		ARG 1 pos
-	METHOD method_57358 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520;
-		ARG 1 registries
-	METHOD method_57360 fromNbt (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2520;)Ljava/util/Optional;
-		ARG 0 registries
-		ARG 1 nbt
 	METHOD method_57361 listHashCode (Ljava/util/List;)I
 		ARG 0 stacks
 	METHOD method_57362 stacksEqual (Ljava/util/List;Ljava/util/List;)Z
@@ -516,11 +511,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 0 stack
 	METHOD method_57373 canBreak (Lnet/minecraft/class_2694;)Z
 		ARG 1 pos
-	METHOD method_57376 toNbt (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
-		ARG 1 registries
-		ARG 2 prefix
-	METHOD method_57377 (Ljava/lang/String;)V
-		ARG 0 error
 	METHOD method_57378 (Ljava/util/Optional;)Lnet/minecraft/class_1799;
 		ARG 0 optional
 	METHOD method_57379 set (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object;

mappings/net/minecraft/loot/LootTableReporter.mapping

@@ -15,18 +15,15 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter
 		ARG 1 errorReporter
 		ARG 2 contextType
 		ARG 3 dataLookup
-	METHOD method_360 report (Ljava/lang/String;)V
+	METHOD method_360 report (Lnet/minecraft/class_8942$class_11337;)V
-		ARG 1 message
+	METHOD method_364 makeChild (Lnet/minecraft/class_8942$class_11336;)Lnet/minecraft/class_58;
-	METHOD method_364 makeChild (Ljava/lang/String;)Lnet/minecraft/class_58;
-		ARG 1 name
 	METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V
 		ARG 1 contextAware
 	METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58;
 		ARG 1 contextType
 	METHOD method_51218 isInStack (Lnet/minecraft/class_5321;)Z
 		ARG 1 key
-	METHOD method_51219 makeChild (Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_58;
+	METHOD method_51219 makeChild (Lnet/minecraft/class_8942$class_11336;Lnet/minecraft/class_5321;)Lnet/minecraft/class_58;
-		ARG 1 name
 		ARG 2 key
 	METHOD method_51220 getDataLookup ()Lnet/minecraft/class_7871$class_7872;
 	METHOD method_60288 getErrorReporter ()Lnet/minecraft/class_8942;

mappings/net/minecraft/network/codec/PacketCodecs.mapping

@@ -166,10 +166,6 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		COMMENT <p>Internally, the data is serialized as an NBT element of up to {@code 200000L}
 		COMMENT bytes.
 		ARG 0 codec
-	METHOD method_56369 (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520;
-		ARG 1 value
-	METHOD method_56370 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2520;)Ljava/lang/Object;
-		ARG 1 nbt
 	METHOD method_56371 entryOf (Lnet/minecraft/class_2359;)Lnet/minecraft/class_9139;
 		COMMENT {@return a codec for an entry of {@code iterable}}
 		COMMENT
@@ -177,8 +173,6 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		ARG 0 iterable
 	METHOD method_56372 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2359;
 		ARG 0 registry
-	METHOD method_56373 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException;
-		ARG 1 error
 	METHOD method_56374 toCollection (Ljava/util/function/IntFunction;)Lnet/minecraft/class_9139$class_9140;
 		COMMENT Used to make a codec for a collection of values using {@link PacketCodec#collect}.
 		COMMENT
@@ -227,8 +221,6 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker)
 		COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement)
 		ARG 0 sizeTracker
-	METHOD method_56381 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException;
-		ARG 1 error
 	METHOD method_56382 optional (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139;
 		COMMENT {@return a codec wrapping another codec, the value of which is optional}
 		COMMENT
@@ -340,38 +332,5 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		METHOD method_68116 encode (Lio/netty/buffer/ByteBuf;[J)V
 			ARG 1 buf
 			ARG 2 values
-	CLASS 8
-		METHOD method_68121 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException;
-			ARG 1 error
-		METHOD method_68122 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException;
-			ARG 1 error
-	CLASS 15
 	CLASS 16
-		METHOD method_68096 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V
-			ARG 3 k
-			ARG 4 v
-	CLASS 17
-		METHOD method_68099 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;)V
-			ARG 2 r
-		METHOD method_68100 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;)V
-			ARG 2 l
-	CLASS 20
-		METHOD method_68105 getValues (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359;
-			ARG 1 buf
-	CLASS 21
-		FIELD field_58184 DIRECT_ENTRY_MARKER I
-		METHOD method_68867 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359;
-			ARG 1 buf
 	CLASS 22
-		FIELD field_58185 DIRECT_MARKER I
-		FIELD field_58186 entryPacketCodec Lnet/minecraft/class_9139;
-	CLASS 24
-		FIELD field_57064 NAME_MAX_LENGTH I
-		FIELD field_57065 VALUE_MAX_LENGTH I
-		FIELD field_57066 SIGNATURE_MAX_LENGTH I
-		FIELD field_57067 MAP_MAX_SIZE I
-		METHOD method_68111 (Lio/netty/buffer/ByteBuf;Ljava/lang/String;)V
-			ARG 0 buf2
-			ARG 1 signature
-		METHOD method_68112 (Lio/netty/buffer/ByteBuf;)Ljava/lang/String;
-			ARG 0 buf2

mappings/net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket.mapping

@@ -1,10 +1,4 @@
 CLASS net/minecraft/class_2909 net/minecraft/network/packet/s2c/login/LoginDisconnectS2CPacket
-	FIELD field_13243 reason Lnet/minecraft/class_2561;
+	FIELD comp_4195 reason Lnet/minecraft/class_2561;
 	FIELD field_48237 CODEC Lnet/minecraft/class_9139;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
+	METHOD comp_4195 reason ()Lnet/minecraft/class_2561;
-		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_2561;)V
-		ARG 1 reason
-	METHOD method_12638 getReason ()Lnet/minecraft/class_2561;
-	METHOD method_56015 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf

mappings/net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket.mapping

@@ -1,10 +1,6 @@
 CLASS net/minecraft/class_2924 net/minecraft/network/packet/s2c/query/QueryResponseS2CPacket
 	FIELD comp_1272 metadata Lnet/minecraft/class_2926;
 	FIELD field_48258 CODEC Lnet/minecraft/class_9139;
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD <init> (Lnet/minecraft/class_2926;)V
 		ARG 1 metadata
 	METHOD comp_1272 metadata ()Lnet/minecraft/class_2926;
-	METHOD method_56026 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf

mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping

@@ -1,50 +1,24 @@
 CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions
-	FIELD field_25735 CATEGORY_OPTION_NAMES Ljava/util/Map;
-	FIELD field_25736 categoryOptions Ljava/util/Map;
 	FIELD field_54548 PACKET_CODEC Lnet/minecraft/class_9139;
-	METHOD <init> (Ljava/util/Map;)V
-		ARG 1 categoryOptions
-	METHOD equals (Ljava/lang/Object;)Z
-		ARG 1 o
 	METHOD method_30178 copy ()Lnet/minecraft/class_5411;
 	METHOD method_30179 copyFrom (Lnet/minecraft/class_5411;)V
-		ARG 1 other
 	METHOD method_30180 isGuiOpen (Lnet/minecraft/class_5421;)Z
 		ARG 1 category
 	METHOD method_30181 setGuiOpen (Lnet/minecraft/class_5421;Z)V
 		ARG 1 category
 		ARG 2 open
-	METHOD method_30183 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_5411;
-		ARG 0 nbt
-	METHOD method_30184 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5421;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 2 category
-		ARG 3 pair
-	METHOD method_30185 (Lnet/minecraft/class_2487;Ljava/util/Map;Lnet/minecraft/class_5421;Lcom/mojang/datafixers/util/Pair;)V
-		ARG 2 category
-		ARG 3 pair
-	METHOD method_30186 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5411;
-		ARG 0 buf
 	METHOD method_30187 isFilteringCraftable (Lnet/minecraft/class_5421;)Z
 		ARG 1 category
 	METHOD method_30188 setFilteringCraftable (Lnet/minecraft/class_5421;Z)V
 		ARG 1 category
 		ARG 2 filtering
-	METHOD method_30189 writeNbt (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
-	METHOD method_30190 toPacket (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
 	METHOD method_64581 apply (Lnet/minecraft/class_5421;Ljava/util/function/UnaryOperator;)V
-		ARG 1 category
 		ARG 2 modifier
-	METHOD method_64582 (Ljava/util/function/UnaryOperator;Lnet/minecraft/class_5421;Lnet/minecraft/class_5411$class_5412;)Lnet/minecraft/class_5411$class_5412;
-		ARG 1 key
-		ARG 2 value
 	METHOD method_64583 (ZLnet/minecraft/class_5411$class_5412;)Lnet/minecraft/class_5411$class_5412;
 		ARG 1 option
 	METHOD method_64584 (ZLnet/minecraft/class_5411$class_5412;)Lnet/minecraft/class_5411$class_5412;
 		ARG 1 option
 	METHOD method_64585 getOption (Lnet/minecraft/class_5421;)Lnet/minecraft/class_5411$class_5412;
-		ARG 1 category
 	CLASS class_5412 CategoryOption
 		FIELD comp_3247 guiOpen Z
 		FIELD comp_3248 filteringCraftable Z

mappings/net/minecraft/registry/ReloadableRegistries.mapping

@@ -24,9 +24,8 @@ CLASS net/minecraft/class_9383 net/minecraft/registry/ReloadableRegistries
 		ARG 1 registries
 	METHOD method_61241 (Lnet/minecraft/class_58;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8490;)V
 		ARG 2 type
-	METHOD method_61242 (Ljava/lang/String;Ljava/lang/String;)V
+	METHOD method_61242 (Ljava/lang/String;Lnet/minecraft/class_8942$class_11337;)V
 		ARG 0 id
-		ARG 1 error
 	METHOD method_61243 validate (Lnet/minecraft/class_7225$class_7874;)V
 		ARG 0 registries
 	METHOD method_61244 concat (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874;

mappings/net/minecraft/server/PlayerManager.mapping

@@ -103,7 +103,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		ARG 2 permissionLevel
 	METHOD method_14597 disconnectAllPlayers ()V
 	METHOD method_14599 reloadWhitelist ()V
-	METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;)Ljava/util/Optional;
+	METHOD method_14600 loadPlayerData (Lnet/minecraft/class_3222;Lnet/minecraft/class_8942;)Ljava/util/Optional;
 		ARG 1 player
 	METHOD method_14601 updatePlayerLatency ()V
 	METHOD method_14602 getPlayer (Ljava/util/UUID;)Lnet/minecraft/class_3222;
@@ -225,8 +225,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		ARG 1 message
 	METHOD method_52449 disconnectDuplicateLogins (Lcom/mojang/authlib/GameProfile;)Z
 		ARG 1 profile
-	METHOD method_55634 (Lnet/minecraft/class_2487;)Ljava/util/Optional;
-		ARG 0 nbt
 	METHOD method_60597 sendStatusEffects (Lnet/minecraft/class_1309;Lnet/minecraft/class_3244;)V
 		ARG 1 entity
 		ARG 2 networkHandler

mappings/net/minecraft/server/ServerAdvancementLoader.mapping

@@ -15,5 +15,3 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader
 	METHOD method_54921 validate (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;)V
 		ARG 1 id
 		ARG 2 advancement
-	METHOD method_54922 (Lnet/minecraft/class_2960;Ljava/lang/String;)V
-		ARG 1 error

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

@@ -160,8 +160,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 0 entity
 	METHOD method_29779 forgiveMobAnger ()V
 	METHOD method_31273 getTextStream ()Lnet/minecraft/class_5513;
-	METHOD method_32745 gameModeFromNbt (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_1934;
+	METHOD method_32745 gameModeFromNbt (Lnet/minecraft/class_11368;Ljava/lang/String;)Lnet/minecraft/class_1934;
-		ARG 0 nbt
 		ARG 1 key
 	METHOD method_32746 getServerGameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1934;
 		COMMENT Returns the server game mode the player should be set to, namely the forced game mode.
@@ -171,10 +170,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		COMMENT
 		COMMENT @see MinecraftServer#getForcedGameMode
 		ARG 1 backupGameMode
-	METHOD method_32748 readGameModeNbt (Lnet/minecraft/class_2487;)V
+	METHOD method_32748 readGameModeNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
+	METHOD method_32749 writeGameModeNbt (Lnet/minecraft/class_11372;)V
-	METHOD method_32749 writeGameModeNbt (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_33795 shouldFilterMessagesSentTo (Lnet/minecraft/class_3222;)Z
 		ARG 1 player
 	METHOD method_34225 onSpawn ()V
@@ -270,23 +267,19 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 chunkPos
 	METHOD method_64124 addEnderPearl (Lnet/minecraft/class_1684;)V
 		ARG 1 enderPearl
-	METHOD method_64125 readRootVehicle (Lnet/minecraft/class_2487;)V
+	METHOD method_64125 readRootVehicle (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
 	METHOD method_64128 getEnderPearls ()Ljava/util/Set;
 	METHOD method_64130 removeEnderPearl (Lnet/minecraft/class_1684;)V
 		ARG 1 enderPearl
-	METHOD method_64131 readEnderPearls (Lnet/minecraft/class_2487;)V
+	METHOD method_64131 readEnderPearls (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
 	METHOD method_64132 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 1 entity
 	METHOD method_64133 handleThrownEnderPearl (Lnet/minecraft/class_1684;)J
 		ARG 1 enderPearl
 	METHOD method_64134 sendMapPacket (Lnet/minecraft/class_1799;)V
 		ARG 1 stack
-	METHOD method_64135 writeRootVehicle (Lnet/minecraft/class_2487;)V
+	METHOD method_64135 writeRootVehicle (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
+	METHOD method_64136 writeEnderPearls (Lnet/minecraft/class_11372;)V
-	METHOD method_64136 writeEnderPearls (Lnet/minecraft/class_2487;)V
-		ARG 1 nbt
 	METHOD method_64396 getCommandSource ()Lnet/minecraft/class_2168;
 	METHOD method_64398 sendMessage (Lnet/minecraft/class_2561;)V
 		ARG 1 message
@@ -297,12 +290,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	METHOD method_64580 (Lnet/minecraft/class_5321;)Z
 		ARG 1 recipeKey
 	METHOD method_67564 getRespawn ()Lnet/minecraft/class_3222$class_10766;
-	METHOD method_68173 (Lnet/minecraft/class_2499;)V
-		ARG 1 enderPearls
 	METHOD method_68174 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 1 enderPearl
-	METHOD method_68175 readEnderPearl (Lnet/minecraft/class_2487;)V
+	METHOD method_68175 readEnderPearl (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
 	METHOD method_70637 canReceiveWaypoints ()Z
 	CLASS 1
 		FIELD field_58076 componentHashCache Lcom/google/common/cache/LoadingCache;

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

@@ -7,16 +7,11 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook
 		COMMENT
 		COMMENT <p>This is saved under {@code toBeDisplayed} key in the player NBT data.
 	FIELD field_54552 collector Lnet/minecraft/class_3441$class_10271;
-	FIELD field_56611 RECIPES_CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (Lnet/minecraft/class_3441$class_10271;)V
 		ARG 1 collector
 	METHOD method_14900 lockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I
 		ARG 1 recipes
 		ARG 2 player
-	METHOD method_14901 readNbt (Lnet/minecraft/class_2487;Ljava/util/function/Predicate;)V
-		ARG 1 nbt
-		ARG 2 validPredicate
-	METHOD method_14902 toNbt ()Lnet/minecraft/class_2487;
 	METHOD method_14903 unlockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I
 		ARG 1 recipes
 		ARG 2 player

mappings/net/minecraft/structure/StructureTemplate.mapping

@@ -25,7 +25,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 		ARG 4 offsetZ
 	METHOD method_15163 (Lnet/minecraft/class_1297;)Z
 		ARG 0 entity
-	METHOD method_15164 addEntitiesFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V
+	METHOD method_15164 addEntitiesFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_8942;)V
 		ARG 1 world
 		ARG 2 firstCorner
 		ARG 3 secondCorner
@@ -79,8 +79,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 		ARG 1 blockLookup
 		ARG 2 palette
 		ARG 3 blocks
-	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
+	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;ZLnet/minecraft/class_8942;)V
-		ARG 1 world
 		ARG 2 pos
 		ARG 3 mirror
 		ARG 4 rotation
@@ -113,9 +112,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate
 		ARG 2 pivot
 		ARG 3 placementData
 		ARG 4 infos
-	METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional;
+	METHOD method_17916 getEntity (Lnet/minecraft/class_8942;Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional;
-		ARG 0 world
-		ARG 1 nbt
 	METHOD method_17917 (Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_1297;)V
 		ARG 5 entity
 	METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V

mappings/net/minecraft/text/Text.mapping

@@ -123,35 +123,3 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text
 	METHOD method_62790 score (Lnet/minecraft/class_10104;Ljava/lang/String;)Lnet/minecraft/class_5250;
 		ARG 0 selector
 		ARG 1 objective
-	CLASS class_2562 Serialization
-		FIELD field_11754 GSON Lcom/google/gson/Gson;
-		METHOD method_10867 toJsonString (Lnet/minecraft/class_2561;Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String;
-			ARG 0 text
-			ARG 1 registries
-		METHOD method_10871 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250;
-			ARG 0 json
-			ARG 1 registries
-		METHOD method_10872 fromJsonTree (Lcom/google/gson/JsonElement;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250;
-			ARG 0 json
-			ARG 1 registries
-		METHOD method_10873 fromLenientJson (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250;
-			ARG 0 json
-			ARG 1 registries
-		METHOD method_10874 toJson (Lnet/minecraft/class_2561;Lnet/minecraft/class_7225$class_7874;)Lcom/google/gson/JsonElement;
-			ARG 0 text
-			ARG 1 registries
-		METHOD method_10877 fromJson (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_5250;
-			ARG 0 json
-			ARG 1 registries
-	CLASS class_8822 Serializer
-		FIELD field_49665 registries Lnet/minecraft/class_7225$class_7874;
-		METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-			ARG 1 registries
-		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
-			ARG 1 json
-			ARG 2 type
-			ARG 3 context
-		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
-			ARG 1 text
-			ARG 2 type
-			ARG 3 context

mappings/net/minecraft/util/ErrorReporter.mapping

@@ -1,15 +1,5 @@
 CLASS net/minecraft/class_8942 net/minecraft/util/ErrorReporter
-	METHOD method_54946 makeChild (Ljava/lang/String;)Lnet/minecraft/class_8942;
+	METHOD method_54946 makeChild (Lnet/minecraft/class_8942$class_11336;)Lnet/minecraft/class_8942;
-		ARG 1 name
+	METHOD method_54947 report (Lnet/minecraft/class_8942$class_11337;)V
-	METHOD method_54947 report (Ljava/lang/String;)V
-		ARG 1 message
 	CLASS class_8943 Impl
-		FIELD field_47225 errors Lcom/google/common/collect/Multimap;
+		METHOD method_59906 getErrorsAsString ()Ljava/lang/String;
-		FIELD field_47226 pathSupplier Ljava/util/function/Supplier;
-		FIELD field_47227 path Ljava/lang/String;
-		METHOD <init> (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;)V
-			ARG 1 errors
-			ARG 2 pathSupplier
-		METHOD method_54948 getErrors ()Lcom/google/common/collect/Multimap;
-		METHOD method_54949 getPath ()Ljava/lang/String;
-		METHOD method_59906 getErrorsAsString ()Ljava/util/Optional;

mappings/net/minecraft/util/JsonHelper.mapping

@@ -32,11 +32,6 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
 	METHOD method_15261 getArray (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonArray;
 		ARG 0 object
 		ARG 1 element
-	METHOD method_15262 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
-		ARG 0 gson
-		ARG 1 content
-		ARG 2 typeToken
-		ARG 3 lenient
 	METHOD method_15263 asLong (Lcom/google/gson/JsonElement;Ljava/lang/String;)J
 		ARG 0 element
 		ARG 1 name
@@ -48,11 +43,6 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
 		ARG 1 element
 	METHOD method_15266 getType (Lcom/google/gson/JsonElement;)Ljava/lang/String;
 		ARG 0 element
-	METHOD method_15267 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object;
-		ARG 0 gson
-		ARG 1 reader
-		ARG 2 type
-		ARG 3 lenient
 	METHOD method_15268 asBoolean (Lcom/google/gson/JsonElement;Ljava/lang/String;)Z
 		ARG 0 element
 		ARG 1 name
@@ -71,14 +61,6 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
 		ARG 1 element
 		ARG 2 context
 		ARG 3 type
-	METHOD method_15273 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
-		ARG 0 gson
-		ARG 1 reader
-		ARG 2 typeToken
-		ARG 3 lenient
-	METHOD method_15274 deserialize (Ljava/io/Reader;Z)Lcom/google/gson/JsonObject;
-		ARG 0 reader
-		ARG 1 lenient
 	METHOD method_15275 isNumber (Lcom/google/gson/JsonElement;)Z
 		ARG 0 element
 	METHOD method_15276 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object;
@@ -92,11 +74,6 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
 	METHOD method_15278 hasPrimitive (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
 		ARG 0 object
 		ARG 1 element
-	METHOD method_15279 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object;
-		ARG 0 gson
-		ARG 1 content
-		ARG 2 type
-		ARG 3 lenient
 	METHOD method_15280 getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J
 		ARG 0 object
 		ARG 1 element
@@ -161,9 +138,6 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
 		ARG 0 gson
 		ARG 1 reader
 		ARG 2 typeToken
-	METHOD method_15298 deserialize (Ljava/lang/String;Z)Lcom/google/gson/JsonObject;
-		ARG 0 content
-		ARG 1 lenient
 	METHOD method_22449 getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;)J
 		ARG 0 object
 		ARG 1 name
@@ -245,21 +219,10 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper
 		ARG 0 content
 	METHOD method_43680 toSortedString (Lcom/google/gson/JsonElement;)Ljava/lang/String;
 		ARG 0 json
-	METHOD method_47992 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
+	METHOD method_47992 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object;
 		ARG 0 gson
 		ARG 1 reader
 		ARG 2 typeToken
-		ARG 3 lenient
-	METHOD method_47993 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object;
-		ARG 0 gson
-		ARG 1 reader
-		ARG 2 type
-		ARG 3 lenient
-	METHOD method_47994 deserializeNullable (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object;
-		ARG 0 gson
-		ARG 1 content
-		ARG 2 type
-		ARG 3 lenient
 	METHOD method_52226 getElement (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonElement;
 		ARG 0 object
 		ARG 1 name

mappings/net/minecraft/util/LowercaseEnumTypeAdapterFactory.mapping

@@ -1,12 +0,0 @@
-CLASS net/minecraft/class_3530 net/minecraft/util/LowercaseEnumTypeAdapterFactory
-	METHOD create (Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;
-		ARG 1 gson
-		ARG 2 typeToken
-	METHOD method_15334 getKey (Ljava/lang/Object;)Ljava/lang/String;
-		ARG 1 o
-	CLASS 1
-		METHOD read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
-			ARG 1 reader
-		METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
-			ARG 1 writer
-			ARG 2 o

mappings/net/minecraft/world/CollisionView.mapping

@@ -57,9 +57,6 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView
 	METHOD method_51716 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_265;)Lnet/minecraft/class_265;
 		ARG 0 pos
 		ARG 1 voxelShape
-	METHOD method_51717 (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_265;)Lnet/minecraft/class_265;
-		ARG 0 pos
-		ARG 1 voxelShape
 	METHOD method_51718 findSupportingBlockPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/Optional;
 		ARG 1 entity
 		ARG 2 box

mappings/net/minecraft/world/CommandBlockExecutor.mapping

@@ -31,9 +31,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor
 		ARG 2 returnValue
 	METHOD method_8295 markDirty ()V
 	METHOD method_8296 isTrackingOutput ()Z
-	METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
+	METHOD method_8297 writeNbt (Lnet/minecraft/class_11372;)V
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_8298 setSuccessCount (I)V
 		ARG 1 successCount
 	METHOD method_8299 getName ()Lnet/minecraft/class_2561;
@@ -42,8 +40,6 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor
 		ARG 1 world
 	METHOD method_8303 getSource ()Lnet/minecraft/class_2168;
 	METHOD method_8304 getSuccessCount ()I
-	METHOD method_8305 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
+	METHOD method_8305 readNbt (Lnet/minecraft/class_11368;)V
-		ARG 1 nbt
-		ARG 2 registries
 	METHOD method_52175 isEditable ()Z
 	METHOD method_57558 getCustomName ()Lnet/minecraft/class_2561;

mappings/net/minecraft/world/PlayerSaveHandler.mapping

@@ -14,7 +14,4 @@ CLASS net/minecraft/class_29 net/minecraft/world/PlayerSaveHandler
 	METHOD method_55787 backupCorruptedPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)V
 		ARG 1 player
 		ARG 2 extension
-	METHOD method_55788 (Lnet/minecraft/class_1657;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+	METHOD method_55789 loadPlayerData (Lnet/minecraft/class_1657;Lnet/minecraft/class_8942;)Ljava/util/Optional;
-		ARG 2 nbt
-	METHOD method_55789 loadPlayerData (Lnet/minecraft/class_1657;)Ljava/util/Optional;
-		ARG 1 player

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

@@ -58,9 +58,8 @@ CLASS net/minecraft/class_9310 net/minecraft/world/chunk/ChunkGenerating
 		ARG 1 step
 		ARG 2 chunks
 		ARG 3 chunk
-	METHOD method_60552 addEntities (Lnet/minecraft/class_3218;Ljava/util/List;)V
+	METHOD method_60552 addEntities (Lnet/minecraft/class_3218;Lnet/minecraft/class_11368$class_11370;)V
 		ARG 0 world
-		ARG 1 entities
 	METHOD method_60555 light (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
 		ARG 1 step

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

@@ -48,7 +48,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
 	METHOD method_12224 loadFromPacket (Lnet/minecraft/class_2540;Ljava/util/Map;Ljava/util/function/Consumer;)V
 		ARG 1 buf
 		ARG 2 heightmaps
-		ARG 3 blockEntityVisitorConsumer
 	METHOD method_12225 getLevelType ()Lnet/minecraft/class_3194;
 	METHOD method_12226 setLoadedToWorld (Z)V
 		ARG 1 loadedToWorld
@@ -60,10 +59,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
 		ARG 1 time
 	METHOD method_31713 updateAllBlockEntities ()V
 	METHOD method_31715 canTickBlockEntities ()Z
-	METHOD method_31716 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V
-		ARG 1 pos
-		ARG 2 blockEntityType
-		ARG 3 nbtx
 	METHOD method_31718 wrapTicker (Lnet/minecraft/class_2586;Lnet/minecraft/class_5558;)Lnet/minecraft/class_5562;
 		ARG 1 blockEntity
 		ARG 2 blockEntityTicker

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

@@ -33,8 +33,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/nio/file/Path;)Ljava/nio/file/Path;
 		ARG 0 worldRef
 		ARG 1 worldDirectory
-	METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult;
-		ARG 0 nbt
 	METHOD method_28522 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_28528 getSkyAngle (J)F

mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping

@@ -12,8 +12,6 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess
 		ARG 3 executor
 	METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566;
 		ARG 2 nbt
-	METHOD method_31734 (Lnet/minecraft/class_2499;Lnet/minecraft/class_1297;)V
-		ARG 1 entity
 	METHOD method_31735 emptyDataList (Lnet/minecraft/class_1923;)Lnet/minecraft/class_5566;
 		ARG 0 pos
 	METHOD method_61000 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Object;

mappings/net/minecraft/world/waypoint/TrackedWaypoint.mapping

@@ -37,7 +37,7 @@ CLASS net/minecraft/class_11200 net/minecraft/world/waypoint/TrackedWaypoint
 	METHOD method_71153 getRelativeYaw (Lnet/minecraft/class_1937;Lnet/minecraft/class_11200$class_11297;)D
 		ARG 1 world
 		ARG 2 yawProvider
-	METHOD method_71154 getPitch (Lnet/minecraft/class_1937;Lnet/minecraft/class_11200$class_11204;)I
+	METHOD method_71154 getPitch (Lnet/minecraft/class_1937;Lnet/minecraft/class_11200$class_11204;)Lnet/minecraft/class_11200$class_11379;
 		ARG 1 world
 		ARG 2 cameraProvider
 	CLASS class_11201 Azimuth