24w12a

build.gradle

@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w11a"
+def minecraft_version = "24w12a"
 
 filament {
 	minecraftVersion = minecraft_version

mappings/net/minecraft/advancement/Advancement.mapping

@@ -26,10 +26,9 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement
 		ARG 0 advancement
 	METHOD method_54911 (Lnet/minecraft/class_161;Lnet/minecraft/class_8782;)Lnet/minecraft/class_161;
 		ARG 1 validated
-	METHOD method_54912 validate (Lnet/minecraft/class_8942;Lnet/minecraft/class_8489;)V
+	METHOD method_54912 validate (Lnet/minecraft/class_8942;Lnet/minecraft/class_7871$class_7872;)V
 		ARG 1 errorReporter
-		ARG 2 conditionsLookup
+	METHOD method_54913 (Lnet/minecraft/class_8942;Lnet/minecraft/class_7871$class_7872;Ljava/lang/String;Lnet/minecraft/class_175;)V
-	METHOD method_54913 (Lnet/minecraft/class_8942;Lnet/minecraft/class_8489;Ljava/lang/String;Lnet/minecraft/class_175;)V
 		ARG 2 name
 		ARG 3 criterion
 	METHOD method_54914 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;

mappings/net/minecraft/advancement/AdvancementRewards.mapping

@@ -24,10 +24,8 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards
 		FIELD field_1169 experience I
 		FIELD field_1170 function Ljava/util/Optional;
 		FIELD field_1171 loot Lcom/google/common/collect/ImmutableList$Builder;
-		METHOD method_34899 loot (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171;
+		METHOD method_34899 loot (Lnet/minecraft/class_5321;)Lnet/minecraft/class_170$class_171;
-			ARG 0 loot
+		METHOD method_34900 addLoot (Lnet/minecraft/class_5321;)Lnet/minecraft/class_170$class_171;
-		METHOD method_34900 addLoot (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171;
-			ARG 1 loot
 		METHOD method_34901 function (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171;
 			ARG 0 function
 		METHOD method_34902 setFunction (Lnet/minecraft/class_2960;)Lnet/minecraft/class_170$class_171;

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

@@ -1,18 +1,14 @@
 CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion
-	METHOD method_27992 (Lnet/minecraft/class_2960;Lnet/minecraft/class_5282$class_5283;)Z
+	METHOD method_27992 (Lnet/minecraft/class_5321;Lnet/minecraft/class_5282$class_5283;)Z
 		ARG 1 conditions
-	METHOD method_27993 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2960;)V
+	METHOD method_27993 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;)V
 		ARG 1 player
-		ARG 2 id
 	CLASS class_5283 Conditions
 		FIELD comp_2029 player Ljava/util/Optional;
 		FIELD field_47307 CODEC Lcom/mojang/serialization/Codec;
-		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2960;)V
+		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_5321;)V
 			ARG 1 playerPredicate
-			ARG 2 lootTable
+		METHOD method_27995 create (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175;
-		METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175;
+		METHOD method_27996 test (Lnet/minecraft/class_5321;)Z
-			ARG 0 lootTable
-		METHOD method_27996 test (Lnet/minecraft/class_2960;)Z
-			ARG 1 lootTable
 		METHOD method_55060 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -225,7 +225,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		COMMENT @see Block#hasDynamicBounds
 	FIELD field_23155 settings Lnet/minecraft/class_4970$class_2251;
 		COMMENT The {@link AbstractBlock.Settings} to apply to this block.
-	FIELD field_23156 lootTableId Lnet/minecraft/class_2960;
+	FIELD field_23156 lootTableId Lnet/minecraft/class_5321;
 		COMMENT The {@link net.minecraft.util.Identifier} of the loot table that determines what this block drops.
 		COMMENT
 		COMMENT @see #getLootTableId
@@ -343,7 +343,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		COMMENT {@return the block as {@link Block}}
 		COMMENT
 		COMMENT <p>This is used for casting purposes.
-	METHOD method_26162 getLootTableId ()Lnet/minecraft/class_2960;
+	METHOD method_26162 getLootTableId ()Lnet/minecraft/class_5321;
 	METHOD method_26403 getDefaultMapColor ()Lnet/minecraft/class_3620;
 	METHOD method_32913 getMaxHorizontalModelOffset ()F
 	METHOD method_36555 getHardness ()F
@@ -888,7 +888,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_10663 luminance Ljava/util/function/ToIntFunction;
 		FIELD field_10664 collidable Z
 		FIELD field_10665 soundGroup Lnet/minecraft/class_2498;
-		FIELD field_10666 lootTableId Lnet/minecraft/class_2960;
+		FIELD field_10666 lootTableId Lnet/minecraft/class_5321;
 		FIELD field_10667 slipperiness F
 		FIELD field_10669 hardness F
 		FIELD field_10670 dynamicBounds Z

mappings/net/minecraft/block/CrafterBlock.mapping

@@ -10,8 +10,7 @@ CLASS net/minecraft/class_8886 net/minecraft/block/CrafterBlock
 	METHOD method_54475 getCraftingRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_8566;)Ljava/util/Optional;
 		ARG 0 world
 		ARG 1 inputInventory
-	METHOD method_54476 transferOrSpawnStack (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_8887;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)V
+	METHOD method_54476 transferOrSpawnStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8887;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_8786;)V
-		ARG 1 world
 		ARG 2 pos
 		ARG 3 blockEntity
 		ARG 4 stack

mappings/net/minecraft/block/HeavyCoreBlock.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_9366 net/minecraft/block/HeavyCoreBlock
 	FIELD field_49831 CODEC Lcom/mojang/serialization/MapCodec;
-	FIELD field_49832 ORIENTATION Lnet/minecraft/class_2754;
 	FIELD field_49833 OUTLINE_SHAPE Lnet/minecraft/class_265;

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

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity
 	FIELD field_42811 nextBrushTime J
 	FIELD field_42812 item Lnet/minecraft/class_1799;
 	FIELD field_42813 hitDirection Lnet/minecraft/class_2350;
-	FIELD field_42814 lootTable Lnet/minecraft/class_2960;
+	FIELD field_42814 lootTable Lnet/minecraft/class_5321;
 	FIELD field_42815 lootTableSeed J
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
@@ -18,8 +18,7 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity
 		ARG 1 worldTime
 		ARG 3 player
 		ARG 4 hitDirection
-	METHOD method_49216 setLootTable (Lnet/minecraft/class_2960;J)V
+	METHOD method_49216 setLootTable (Lnet/minecraft/class_5321;J)V
-		ARG 1 lootTable
 		ARG 2 seed
 	METHOD method_49217 generateItem (Lnet/minecraft/class_1657;)V
 		ARG 1 player

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

@@ -5,7 +5,7 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit
 	FIELD field_46661 lastWobbleTime J
 	FIELD field_46662 lastWobbleType Lnet/minecraft/class_8172$class_8837;
 	FIELD field_46663 stack Lnet/minecraft/class_1799;
-	FIELD field_47156 lootTableId Lnet/minecraft/class_2960;
+	FIELD field_47156 lootTableId Lnet/minecraft/class_5321;
 	FIELD field_47157 lootTableSeed J
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos

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

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity
 	FIELD field_12036 lootTableSeed J
-	FIELD field_12037 lootTableId Lnet/minecraft/class_2960;
+	FIELD field_12037 lootTableId Lnet/minecraft/class_5321;
-	METHOD method_11285 (Lnet/minecraft/class_2960;)V
-		ARG 1 id

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

@@ -98,10 +98,9 @@ CLASS net/minecraft/class_9199 net/minecraft/block/entity/VaultBlockEntity
 			ARG 4 serverData
 			ARG 5 sharedData
 			ARG 6 itemsToEject
-		METHOD method_56755 generateDisplayItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1799;
+		METHOD method_56755 generateDisplayItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)Lnet/minecraft/class_1799;
 			ARG 0 world
 			ARG 1 pos
-			ARG 2 lootTable
 		METHOD method_56756 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;)V
 			ARG 0 world
 			ARG 1 pos

mappings/net/minecraft/block/enums/TrialSpawnerState.mapping

@@ -16,8 +16,6 @@ CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState
 	METHOD method_55210 emitParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_55211 (Lnet/minecraft/class_8963;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V
-		ARG 3 lootTable
 	METHOD method_55212 (Lnet/minecraft/class_8966;Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;Lnet/minecraft/class_8963;Ljava/util/UUID;)V
 		ARG 4 uuid
 	METHOD method_55213 (Lnet/minecraft/class_8966;Lnet/minecraft/class_8963;Lnet/minecraft/class_6008$class_6010;)V

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

@@ -23,10 +23,9 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	METHOD method_55158 trySpawnMob (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional;
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_55159 ejectLootTable (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V
+	METHOD method_55159 ejectLootTable (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 lootTable
 	METHOD method_55160 shouldRemoveMobFromData (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/UUID;)Z
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/block/vault/VaultConfig.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig
 	FIELD field_48881 CONFIG_KEY Ljava/lang/String;
 	FIELD field_48882 DEFAULT Lnet/minecraft/class_9203;
 	FIELD field_48883 codec Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_2960;DDLnet/minecraft/class_1799;Ljava/util/Optional;)V
+	METHOD <init> (Lnet/minecraft/class_5321;DDLnet/minecraft/class_1799;Ljava/util/Optional;)V
-		ARG 1 lootTable
 		ARG 2 activationRange
 		ARG 4 deactivationRange
 		ARG 6 keyItem

mappings/net/minecraft/class_9421.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9421
+	CLASS class_9422
+		FIELD comp_2029 player Ljava/util/Optional;

mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping

@@ -7,8 +7,7 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR
 	FIELD field_24448 ITEM_SPECIFIC Ljava/util/Map;
 	METHOD method_27877 (Lnet/minecraft/class_1792;)Ljava/util/Map;
 		ARG 0 key
-	METHOD method_27878 get (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1800;
+	METHOD method_27878 get (Lnet/minecraft/class_1799;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1800;
-		ARG 0 item
 		ARG 1 id
 	METHOD method_27879 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;Lnet/minecraft/class_6395;)V
 		ARG 0 item

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

@@ -92,7 +92,3 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 		FIELD field_48384 TEXTURE Lnet/minecraft/class_2960;
 		FIELD field_48385 SIZE I
 		FIELD field_48386 TEXTURE_MARGIN I
-		METHOD <init> (Lnet/minecraft/class_4410;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V
-			ARG 2 message
-			ARG 3 image
-			ARG 4 onPress

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

@@ -1,11 +1,9 @@
 CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer
 	FIELD field_2043 textureManager Lnet/minecraft/class_1060;
-	FIELD field_2044 MAP_ICONS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2045 mapTextures Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-	FIELD field_21688 MAP_ICONS_RENDER_LAYER Lnet/minecraft/class_1921;
 	FIELD field_32173 DEFAULT_IMAGE_WIDTH I
 	FIELD field_32174 DEFAULT_IMAGE_HEIGHT I
-	METHOD <init> (Lnet/minecraft/class_1060;)V
+	METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_9443;)V
 		ARG 1 textureManager
 	METHOD method_1769 updateTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V
 		ARG 1 id

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

@@ -15,7 +15,6 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverri
 		ARG 1 condition
 	METHOD method_3495 apply (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087;
 		ARG 1 model
-		ARG 2 stack
 		ARG 3 world
 		ARG 4 entity
 		ARG 5 seed

mappings/net/minecraft/command/EntitySelectorOptions.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions
 	FIELD field_10893 NEGATIVE_LEVEL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	METHOD method_22822 (Lnet/minecraft/class_2303;)Z
 		ARG 0 reader
-	METHOD method_22823 (Lnet/minecraft/class_2960;ZLnet/minecraft/class_1297;)Z
+	METHOD method_22823 (Lnet/minecraft/class_5321;ZLnet/minecraft/class_1297;)Z
 		ARG 2 entity
 	METHOD method_22824 (Lnet/minecraft/class_2303;)V
 		ARG 0 reader

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

@@ -1,17 +1,7 @@
 CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgumentType
-	FIELD field_21506 UNKNOWN_PREDICATE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_28002 UNKNOWN_ITEM_MODIFIER_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_9945 UNKNOWN_ADVANCEMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_9946 EXAMPLES Ljava/util/Collection;
 	FIELD field_9947 UNKNOWN_RECIPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	METHOD method_23727 getPredicateArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_5341;
-		ARG 0 context
-		ARG 1 argumentName
-	METHOD method_32687 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
-	METHOD method_32688 getItemModifierArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_117;
-		ARG 0 context
-		ARG 1 argumentName
 	METHOD method_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_8779;
 		ARG 0 context
 		ARG 1 argumentName
@@ -26,7 +16,5 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgument
 		ARG 1 name
 	METHOD method_9444 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_9445 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader

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

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType
 	FIELD field_10812 EXAMPLES Ljava/util/Collection;
-	FIELD field_48959 reader Lnet/minecraft/class_9215;
 	METHOD <init> (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

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

@@ -1,89 +0,0 @@
-CLASS net/minecraft/class_9216 net/minecraft/command/argument/ItemPredicateReader
-	FIELD field_48963 INVALID_ID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_48964 INVALID_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_48965 HASH C
-	FIELD field_48966 CURLY_OPEN_BRACKET C
-	FIELD field_48967 DEFAULT_SUGGESTOR Ljava/util/function/Function;
-	FIELD field_48968 itemRegistry Lnet/minecraft/class_7225$class_7226;
-	FIELD field_48969 allowTags Z
-	FIELD field_49573 SQUARE_OPEN_BRACKET C
-	FIELD field_49574 SQUARE_CLOSED_BRACKET C
-	FIELD field_49575 COMMA C
-	FIELD field_49576 EQUAL_SIGN C
-	FIELD field_49577 UNKNOWN_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_49578 MALFORMED_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
-	FIELD field_49579 EXPECTED_ITEM_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
-	FIELD field_49580 nbtOps Lcom/mojang/serialization/DynamicOps;
-	FIELD field_49771 REPEATED_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	METHOD <init> (Lnet/minecraft/class_7225$class_7874;Z)V
-		ARG 1 registryLookup
-		ARG 2 allowTags
-	METHOD method_56865 read (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V
-		ARG 1 reader
-		ARG 2 callbacks
-	METHOD method_56866 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 builder
-	METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 tag
-	METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
-	METHOD method_57804 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 type
-	METHOD method_57805 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 type
-		ARG 1 error
-	METHOD method_58141 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 type
-	CLASS class_9217 Reader
-		FIELD field_48971 reader Lcom/mojang/brigadier/StringReader;
-		FIELD field_48972 callbacks Lnet/minecraft/class_9216$class_9219;
-		FIELD field_49581 readComponents Z
-		METHOD <init> (Lnet/minecraft/class_9216;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V
-			ARG 2 reader
-			ARG 3 callbacks
-		METHOD method_56869 suggest ()V
-		METHOD method_56872 readItem ()V
-		METHOD method_56874 suggestItems (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-		METHOD method_56875 readTag ()V
-		METHOD method_56876 suggestTags (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-		METHOD method_56878 suggestAll (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-		METHOD method_57806 (ILnet/minecraft/class_9331;Ljava/lang/String;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
-			ARG 3 error
-		METHOD method_57807 readComponentType (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_9331;
-			ARG 0 reader
-		METHOD method_57808 suggestBracket (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-		METHOD method_57809 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/Map$Entry;)V
-			ARG 1 entry
-		METHOD method_57810 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960;
-			ARG 0 entry
-		METHOD method_57811 readComponentValue (Lnet/minecraft/class_9331;)V
-			ARG 1 type
-		METHOD method_57812 suggestEndOfComponent (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-		METHOD method_57813 suggestEqual (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-		METHOD method_57814 readComponents ()V
-		METHOD method_57815 readNbt ()V
-		METHOD method_57816 suggestComponentType (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-	CLASS class_9218 SuggestionCallbacks
-		FIELD field_48973 suggestor Ljava/util/function/Function;
-		METHOD method_56879 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/StringReader;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 builder
-			ARG 2 reader
-	CLASS class_9219 Callbacks
-		METHOD method_56853 onItem (Lnet/minecraft/class_6880;)V
-			ARG 1 item
-		METHOD method_56854 setNbt (Lnet/minecraft/class_2487;)V
-			ARG 1 nbt
-		METHOD method_56862 onTag (Lnet/minecraft/class_6885;)V
-			ARG 1 tag
-		METHOD method_56880 setSuggestor (Ljava/util/function/Function;)V
-			ARG 1 suggestor
-		METHOD method_57802 onComponent (Lnet/minecraft/class_9331;Ljava/lang/Object;)V
-			ARG 1 type
-			ARG 2 value

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

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_9215 net/minecraft/command/argument/ItemPredicateStringReader
-	FIELD field_48960 predicateReader Lnet/minecraft/class_9216;
-	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 registryLookup
-	METHOD method_56859 read (Lcom/mojang/brigadier/StringReader;)Ljava/util/function/Predicate;
-		ARG 1 reader
-	METHOD method_56860 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 builder
-	CLASS 1
-		METHOD method_56861 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)Z
-			ARG 1 stack
-		METHOD method_56863 (Lnet/minecraft/class_6885;Lnet/minecraft/class_1799;)Z
-			ARG 1 stack

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

@@ -1,9 +1,48 @@
 CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
-	FIELD field_48955 predicateReader Lnet/minecraft/class_9216;
-	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 registryLookup
 	METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215;
 		ARG 1 reader
 	METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 builder
 	CLASS class_7215 ItemResult
+	CLASS class_9217 Reader
+		FIELD field_48971 reader Lcom/mojang/brigadier/StringReader;
+		FIELD field_48972 callbacks Lnet/minecraft/class_2291$class_9219;
+		METHOD <init> (Lnet/minecraft/class_2291;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2291$class_9219;)V
+			ARG 2 reader
+			ARG 3 callbacks
+		METHOD method_56869 suggest ()V
+		METHOD method_56872 readItem ()V
+		METHOD method_56874 suggestItems (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_57806 (ILnet/minecraft/class_9331;Ljava/lang/String;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
+			ARG 3 error
+		METHOD method_57807 readComponentType (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_9331;
+			ARG 0 reader
+		METHOD method_57808 suggestBracket (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_57809 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/Map$Entry;)V
+			ARG 1 entry
+		METHOD method_57810 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960;
+			ARG 0 entry
+		METHOD method_57811 readComponentValue (Lnet/minecraft/class_9331;)V
+			ARG 1 type
+		METHOD method_57812 suggestEndOfComponent (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_57813 suggestEqual (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_57814 readComponents ()V
+		METHOD method_57816 suggestComponentType (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+	CLASS class_9218 SuggestionCallbacks
+		FIELD field_48973 suggestor Ljava/util/function/Function;
+		METHOD method_56879 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/StringReader;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+			ARG 2 reader
+	CLASS class_9219 Callbacks
+		METHOD method_56853 onItem (Lnet/minecraft/class_6880;)V
+			ARG 1 item
+		METHOD method_56880 setSuggestor (Ljava/util/function/Function;)V
+			ARG 1 suggestor
+		METHOD method_57802 onComponent (Lnet/minecraft/class_9331;Ljava/lang/Object;)V
+			ARG 1 type
+			ARG 2 value

mappings/net/minecraft/component/type/BookContent.mapping

@@ -1,3 +1,4 @@
 CLASS net/minecraft/class_9364 net/minecraft/component/type/BookContent
+	METHOD comp_2422 comp_2418 ()Ljava/util/List;
 	METHOD method_58186 withPages (Ljava/util/List;)Ljava/lang/Object;
 		ARG 1 pages

mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent
+	FIELD comp_2422 comp_2418 Ljava/util/List;
 	FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I
 	FIELD field_49376 MAX_PAGE_COUNT I
 	FIELD field_49378 MAX_TITLE_LENGTH I

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

@@ -12,19 +12,16 @@ CLASS net/minecraft/class_7789 net/minecraft/data/server/loottable/EntityLootTab
 	METHOD method_10400 generate ()V
 	METHOD method_46027 shouldCheck (Lnet/minecraft/class_1299;)Z
 		ARG 0 entityType
-	METHOD method_46028 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
+	METHOD method_46028 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V
 		ARG 1 entityType
-		ARG 2 entityId
 		ARG 3 lootTable
 	METHOD method_46029 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V
 		ARG 1 entityType
 		ARG 2 lootTable
-	METHOD method_46030 killedByFrog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_5341$class_210;
+	METHOD method_46030 killedByFrog (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210;
-		ARG 1 variant
 	METHOD method_46031 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53;
 		ARG 0 item
-	METHOD method_46032 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
+	METHOD method_46032 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V
-		ARG 3 lootTableId
 		ARG 4 lootTableBuilder
 	METHOD method_46033 (Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 3 entityType

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

@@ -12,13 +12,7 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv
 	METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 name
 		ARG 1 message
-	METHOD method_10410 (Lnet/minecraft/class_7225$class_7874;Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V
+	METHOD method_10412 (Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V
-		ARG 3 generator
-	METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V
-		ARG 1 id
-		ARG 2 table
-	METHOD method_10412 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V
-		ARG 3 id
 		ARG 4 builder
 	METHOD method_56883 run (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 writer

mappings/net/minecraft/datafixer/schema/Schema3822.mapping

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_9352 net/minecraft/datafixer/schema/Schema3822
-	METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;
-		ARG 1 schema

mappings/net/minecraft/enchantment/AquaAffinityEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1912 net/minecraft/enchantment/AquaAffinityEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/BindingCurseEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1883 net/minecraft/enchantment/BindingCurseEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/ChannelingEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1905 net/minecraft/enchantment/ChannelingEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/DamageEnchantment.mapping

@@ -1,12 +1,4 @@
 CLASS net/minecraft/class_1882 net/minecraft/enchantment/DamageEnchantment
-	FIELD field_48366 basePower I
-	FIELD field_48367 powerPerLevel I
-	FIELD field_48368 minMaxPowerDifference I
 	FIELD field_48369 applicableEntities Ljava/util/Optional;
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;IIILjava/util/Optional;[Lnet/minecraft/class_1304;)V
+	METHOD <init> (Lnet/minecraft/class_1887$class_9427;Ljava/util/Optional;)V
 		ARG 1 weight
-		ARG 2 basePower
-		ARG 3 powerPerLevel
-		ARG 4 minMaxPowerDifference
-		ARG 5 applicableEntities
-		ARG 6 slotTypes

mappings/net/minecraft/enchantment/DepthStriderEnchantment.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_1913 net/minecraft/enchantment/DepthStriderEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
+	METHOD <init> (Lnet/minecraft/class_1887$class_9427;)V
 		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/EfficiencyEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1884 net/minecraft/enchantment/EfficiencyEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/Enchantment.mapping

@@ -1,13 +1,6 @@
 CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment
 	FIELD field_45769 registryEntry Lnet/minecraft/class_6880$class_6883;
-	FIELD field_48370 applicableItems Lnet/minecraft/class_6862;
 	FIELD field_9084 translationKey Ljava/lang/String;
-	FIELD field_9085 rarity Lnet/minecraft/class_1887$class_1888;
-	FIELD field_9086 slotTypes [Lnet/minecraft/class_1304;
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_6862;[Lnet/minecraft/class_1304;)V
-		ARG 1 rarity
-		ARG 2 applicableItems
-		ARG 3 slotTypes
 	METHOD method_20742 getMaxPower (I)I
 		ARG 1 level
 	METHOD method_25949 isAvailableForEnchantedBookOffer ()Z
@@ -37,7 +30,6 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment
 	METHOD method_8184 getTranslationKey ()Ljava/lang/String;
 	METHOD method_8185 getEquipment (Lnet/minecraft/class_1309;)Ljava/util/Map;
 		ARG 1 entity
-	METHOD method_8186 getRarity ()Lnet/minecraft/class_1887$class_1888;
 	METHOD method_8187 getMinLevel ()I
 	METHOD method_8188 canCombine (Lnet/minecraft/class_1887;)Z
 		COMMENT {@return whether this enchantment can exist on an item stack with the
@@ -58,13 +50,3 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment
 	METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1299;)F
 		ARG 1 level
 		ARG 2 entityType
-	CLASS class_1888 Rarity
-		COMMENT The rarity is an attribute of an enchantment.
-		COMMENT
-		COMMENT <p>It affects the chance of getting an enchantment from enchanting or
-		COMMENT loots as well as the combination cost in anvil.
-		FIELD field_9089 weight I
-		METHOD <init> (Ljava/lang/String;II)V
-			ARG 3 weight
-		METHOD method_8197 getWeight ()I
-			COMMENT {@return the weight of an enchantment in weighted pickers}

mappings/net/minecraft/enchantment/FireAspectEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1892 net/minecraft/enchantment/FireAspectEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/FlameEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1877 net/minecraft/enchantment/FlameEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/FrostWalkerEnchantment.mapping

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_1894 net/minecraft/enchantment/FrostWalkerEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes
 	METHOD method_8236 freezeWater (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V
 		ARG 0 entity
 		ARG 1 world

mappings/net/minecraft/enchantment/ImpalingEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1908 net/minecraft/enchantment/ImpalingEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/InfinityEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1880 net/minecraft/enchantment/InfinityEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/KnockbackEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1897 net/minecraft/enchantment/KnockbackEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slot

mappings/net/minecraft/enchantment/LoyaltyEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1907 net/minecraft/enchantment/LoyaltyEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/LureEnchantment.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_1895 net/minecraft/enchantment/LureEnchantment

mappings/net/minecraft/enchantment/MendingEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1899 net/minecraft/enchantment/MendingEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/MultishotEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1898 net/minecraft/enchantment/MultishotEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/PiercingEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1881 net/minecraft/enchantment/PiercingEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/PowerEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1878 net/minecraft/enchantment/PowerEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment
 	FIELD field_9133 protectionType Lnet/minecraft/class_1900$class_1901;
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1900$class_1901;[Lnet/minecraft/class_1304;)V
+	METHOD <init> (Lnet/minecraft/class_1887$class_9427;Lnet/minecraft/class_1900$class_1901;)V
 		ARG 1 weight
 		ARG 2 protectionType
-		ARG 3 slotTypes
 	METHOD method_8237 transformExplosionKnockback (Lnet/minecraft/class_1309;D)D
 		ARG 0 entity
 		ARG 1 velocity
@@ -11,10 +10,3 @@ CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment
 		ARG 0 entity
 		ARG 1 duration
 	CLASS class_1901 Type
-		FIELD field_9134 powerPerLevel I
-		FIELD field_9135 basePower I
-		METHOD <init> (Ljava/lang/String;III)V
-			ARG 3 basePower
-			ARG 4 powerPerLevel
-		METHOD method_8239 getPowerPerLevel ()I
-		METHOD method_8240 getBasePower ()I

mappings/net/minecraft/enchantment/PunchEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1879 net/minecraft/enchantment/PunchEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/QuickChargeEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1904 net/minecraft/enchantment/QuickChargeEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slot

mappings/net/minecraft/enchantment/RespirationEnchantment.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_1902 net/minecraft/enchantment/RespirationEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/RiptideEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1910 net/minecraft/enchantment/RiptideEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/SilkTouchEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1909 net/minecraft/enchantment/SilkTouchEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/SoulSpeedEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_4948 net/minecraft/enchantment/SoulSpeedEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/enchantment/SweepingEnchantment.mapping

@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_1903 net/minecraft/enchantment/SweepingEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes
-	METHOD method_8241 getMultiplier (I)F
-		ARG 0 level

mappings/net/minecraft/enchantment/SwiftSneakEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_7267 net/minecraft/enchantment/SwiftSneakEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 rarity
-		ARG 2 slots

mappings/net/minecraft/enchantment/ThornsEnchantment.mapping

@@ -1,8 +1,5 @@
 CLASS net/minecraft/class_1906 net/minecraft/enchantment/ThornsEnchantment
 	FIELD field_30950 ATTACK_CHANCE_PER_LEVEL F
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes
 	METHOD method_8242 getDamageAmount (ILnet/minecraft/class_5819;)I
 		ARG 0 level
 		ARG 1 random

mappings/net/minecraft/enchantment/UnbreakingEnchantment.mapping

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_1885 net/minecraft/enchantment/UnbreakingEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes
 	METHOD method_8176 shouldPreventDamage (Lnet/minecraft/class_1799;ILnet/minecraft/class_5819;)Z
 		ARG 0 item
 		ARG 1 level

mappings/net/minecraft/enchantment/VanishingCurseEnchantment.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_1911 net/minecraft/enchantment/VanishingCurseEnchantment
-	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
-		ARG 1 weight
-		ARG 2 slotTypes

mappings/net/minecraft/entity/EntityType.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
-	FIELD field_16526 lootTableId Lnet/minecraft/class_2960;
+	FIELD field_16526 lootTableId Lnet/minecraft/class_5321;
 	FIELD field_18070 dimensions Lnet/minecraft/class_4048;
 	FIELD field_18981 fireImmune Z
 	FIELD field_19423 spawnableFarFromPlayer Z
@@ -27,7 +27,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 9 maxTrackDistance
 		ARG 10 trackTickInterval
 		ARG 11 requiredFeatures
-	METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960;
+	METHOD method_16351 getLootTableId ()Lnet/minecraft/class_5321;
 	METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238;
 		ARG 1 feetX
 		ARG 3 feetY

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -16,7 +16,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_30073 GLOWING_FLAG I
 	FIELD field_30076 GRAVITY D
 	FIELD field_30077 DEATH_TICKS I
-	FIELD field_30079 FALL_FLYING_FLAG I
 	FIELD field_30082 noDrag Z
 	FIELD field_33908 MAX_ENTITY_VIEWING_DISTANCE D
 	FIELD field_36332 LOGGER Lorg/slf4j/Logger;
@@ -139,10 +138,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 stack
 	METHOD method_18808 getProjectileType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
 		ARG 1 stack
-	METHOD method_18865 applyFoodEffects (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V
+	METHOD method_18865 applyFoodEffects (Lnet/minecraft/class_4174;)V
-		ARG 1 stack
-		ARG 2 world
-		ARG 3 targetEntity
 	METHOD method_18866 eatFood (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
 		ARG 1 world
 		ARG 2 stack
@@ -397,7 +393,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type
-	METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960;
+	METHOD method_5989 getLootTable ()Lnet/minecraft/class_5321;
 	METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324;
 		ARG 1 attribute
 	METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V

mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping

@@ -1,9 +1,7 @@
 CLASS net/minecraft/class_5760 net/minecraft/entity/ai/brain/sensor/TemptationsSensor
 	FIELD field_28330 TEMPTER_PREDICATE Lnet/minecraft/class_4051;
-	FIELD field_28331 ingredient Lnet/minecraft/class_1856;
+	FIELD field_28331 ingredient Ljava/util/function/Predicate;
 	FIELD field_30262 MAX_DISTANCE I
-	METHOD <init> (Lnet/minecraft/class_1856;)V
-		ARG 1 ingredient
 	METHOD method_33214 (Lnet/minecraft/class_1314;Lnet/minecraft/class_3222;)Z
 		ARG 1 player
 	METHOD method_33215 test (Lnet/minecraft/class_1657;)Z

mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping

@@ -12,11 +12,10 @@ CLASS net/minecraft/class_1391 net/minecraft/entity/ai/goal/TemptGoal
 	FIELD field_6619 lastPlayerPitch D
 	FIELD field_6620 canBeScared Z
 	FIELD field_6621 lastPlayerZ D
-	FIELD field_6622 food Lnet/minecraft/class_1856;
+	FIELD field_6622 food Ljava/util/function/Predicate;
-	METHOD <init> (Lnet/minecraft/class_1314;DLnet/minecraft/class_1856;Z)V
+	METHOD <init> (Lnet/minecraft/class_1314;DLjava/util/function/Predicate;Z)V
 		ARG 1 entity
 		ARG 2 speed
-		ARG 4 food
 		ARG 5 canBeScared
 	METHOD method_16081 canBeScared ()Z
 	METHOD method_6312 isTemptedBy (Lnet/minecraft/class_1309;)Z

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

@@ -47,7 +47,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	FIELD field_6194 experiencePoints I
 	FIELD field_6195 handItems Lnet/minecraft/class_2371;
 	FIELD field_6196 pathfindingPenalties Ljava/util/Map;
-	FIELD field_6198 lootTable Lnet/minecraft/class_2960;
+	FIELD field_6198 lootTable Lnet/minecraft/class_5321;
 	FIELD field_6199 target Lnet/minecraft/class_1309;
 	FIELD field_6200 persistent Z
 	FIELD field_6201 goalSelector Lnet/minecraft/class_1355;
@@ -273,7 +273,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_5987 isAiDisabled ()Z
 	METHOD method_5988 getLookControl ()Lnet/minecraft/class_1333;
 	METHOD method_5990 playSpawnEffects ()V
-	METHOD method_5991 getLootTableId ()Lnet/minecraft/class_2960;
+	METHOD method_5991 getLootTableId ()Lnet/minecraft/class_5321;
 	METHOD method_5992 interactMob (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
 		ARG 1 player
 		ARG 2 hand

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

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity
 	FIELD field_18118 PARENT_HORSE_PREDICATE Lnet/minecraft/class_4051;
-	FIELD field_25374 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_30419 TAMED_FLAG I
 	FIELD field_30420 SADDLED_FLAG I
 	FIELD field_30421 BRED_FLAG I

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain
-	FIELD field_47796 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_47802 WALK_TOWARDS_CLOSEST_ADULT_RANGE Lnet/minecraft/class_6019;
 	FIELD field_47803 SENSOR_TYPES Lcom/google/common/collect/ImmutableList;
 	FIELD field_47804 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList;
@@ -15,7 +14,7 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain
 		ARG 0 context
 	METHOD method_55734 updateActivities (Lnet/minecraft/class_9069;)V
 		ARG 0 armadillo
-	METHOD method_55735 getBreedingIngredient ()Lnet/minecraft/class_1856;
+	METHOD method_55735 getBreedingIngredient ()Ljava/util/function/Predicate;
 	METHOD method_55736 (Lnet/minecraft/class_1309;)Ljava/lang/Float;
 		ARG 0 armadillo
 	METHOD method_55737 addCoreActivities (Lnet/minecraft/class_4095;)V

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

@@ -52,7 +52,7 @@ CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain
 	FIELD field_30396 IDLE_SPEED F
 	FIELD field_30397 TARGET_APPROACHING_SPEED F
 	FIELD field_30398 ADULT_FOLLOWING_SPEED F
-	METHOD method_33241 getTemptItems ()Lnet/minecraft/class_1856;
+	METHOD method_33241 getTemptItems ()Ljava/util/function/Predicate;
 	METHOD method_33242 getTargetApproachingSpeed (Lnet/minecraft/class_1309;)F
 		COMMENT {@return the axolotl's speed when approaching the attack target}
 		ARG 0 entity

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

@@ -14,7 +14,7 @@ CLASS net/minecraft/class_7691 net/minecraft/entity/passive/CamelBrain
 	METHOD method_45367 initialize (Lnet/minecraft/class_7689;Lnet/minecraft/class_5819;)V
 		ARG 0 camel
 		ARG 1 random
-	METHOD method_45368 getTemptItems ()Lnet/minecraft/class_1856;
+	METHOD method_45368 getTemptItems ()Ljava/util/function/Predicate;
 	METHOD method_45369 addCoreActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	METHOD method_45370 addIdleActivities (Lnet/minecraft/class_4095;)V

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity
-	FIELD field_40131 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_40136 SITTING_DIMENSIONS Lnet/minecraft/class_4048;
 	FIELD field_40137 dashCooldown I
 	FIELD field_40138 idleAnimationCooldown I

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

@@ -13,7 +13,6 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	FIELD field_30311 NORMAL_SPEED D
 	FIELD field_30312 SPRINTING_SPEED D
 	FIELD field_6808 fleeGoal Lnet/minecraft/class_1451$class_3698;
-	FIELD field_6809 TAMING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_6810 temptGoal Lnet/minecraft/class_1391;
 	FIELD field_6811 CAT_VARIANT Lnet/minecraft/class_2940;
 	METHOD method_16082 getSleepAnimation (F)F
@@ -41,8 +40,6 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	METHOD method_16096 getCollarColor ()Lnet/minecraft/class_1767;
 	METHOD method_22327 getAttackDamage ()F
 	METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133;
-	METHOD method_43088 (Lnet/minecraft/class_6880;)V
-		ARG 1 variant
 	METHOD method_58168 tryTame (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_6175 onTamedChanged ()V
@@ -68,8 +65,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	CLASS class_3700 TemptGoal
 		FIELD field_16298 player Lnet/minecraft/class_1657;
 		FIELD field_17948 cat Lnet/minecraft/class_1451;
-		METHOD <init> (Lnet/minecraft/class_1451;DLnet/minecraft/class_1856;Z)V
+		METHOD <init> (Lnet/minecraft/class_1451;DLjava/util/function/Predicate;Z)V
 			ARG 1 cat
 			ARG 2 speed
-			ARG 4 food
 			ARG 5 canBeScared

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

@@ -6,7 +6,6 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity
 	FIELD field_6739 eggLayTime I
 	FIELD field_6740 hasJockey Z
 	FIELD field_6741 flapProgress F
-	FIELD field_6742 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_6743 maxWingDeviation F
 	METHOD method_26882 createChickenAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_6472 hasJockey ()Z

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

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain
 	FIELD field_37469 FLEE_SPEED F
 	FIELD field_37474 longJumpCooldownRange Lnet/minecraft/class_6019;
 	FIELD field_37478 TEMPT_SPEED F
-	METHOD method_41366 getTemptItems ()Lnet/minecraft/class_1856;
+	METHOD method_41366 getTemptItems ()Ljava/util/function/Predicate;
 	METHOD method_41367 (Lnet/minecraft/class_1309;)Ljava/lang/Float;
 		ARG 0 frog
 	METHOD method_41368 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity
-	FIELD field_37448 SLIME_BALL Lnet/minecraft/class_1856;
 	FIELD field_37449 SENSORS Lcom/google/common/collect/ImmutableList;
 	FIELD field_37450 MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
 	FIELD field_37451 longJumpingAnimationState Lnet/minecraft/class_7094;
@@ -11,8 +10,7 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity
 	FIELD field_38720 VARIANT_KEY Ljava/lang/String;
 	METHOD method_41352 setFrogTarget (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
-	METHOD method_41353 setVariant (Lnet/minecraft/class_7106;)V
+	METHOD method_41353 setVariant (Lnet/minecraft/class_6880;)V
-		ARG 1 variant
 	METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_41358 isValidFrogFood (Lnet/minecraft/class_1309;)Z
 		ARG 0 entity

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

@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_7106 net/minecraft/entity/passive/FrogVariant
-	METHOD method_43091 register (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7106;
+	METHOD method_43091 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7106;
-		ARG 0 id
-		ARG 1 textureId

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

@@ -17,7 +17,7 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain
 	FIELD field_33500 RAM_TARGET_PREDICATE Lnet/minecraft/class_4051;
 	FIELD field_33501 RAM_SPEED F
 	FIELD field_33693 SCREAMING_RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019;
-	METHOD method_35181 getTemptItems ()Lnet/minecraft/class_1856;
+	METHOD method_35181 getTemptItems ()Ljava/util/function/Predicate;
 	METHOD method_35182 (Lnet/minecraft/class_1309;)Ljava/lang/Float;
 		ARG 0 goat
 	METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity
-	FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_30425 MAX_STRENGTH I
 	FIELD field_47808 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048;
 	FIELD field_6996 VARIANT Lnet/minecraft/class_2940;

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity
-	FIELD field_16299 TAMING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_16300 fleeGoal Lnet/minecraft/class_3701$class_3702;
 	FIELD field_16301 TRUSTING Lnet/minecraft/class_2940;
 	FIELD field_16302 temptGoal Lnet/minecraft/class_3701$class_3703;
@@ -30,8 +29,7 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity
 			ARG 6 fastSpeed
 	CLASS class_3703 OcelotTemptGoal
 		FIELD field_16304 ocelot Lnet/minecraft/class_3701;
-		METHOD <init> (Lnet/minecraft/class_3701;DLnet/minecraft/class_1856;Z)V
+		METHOD <init> (Lnet/minecraft/class_3701;DLjava/util/function/Predicate;Z)V
 			ARG 1 ocelot
 			ARG 2 speed
-			ARG 4 food
 			ARG 5 canBeScared

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

@@ -6,10 +6,8 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity
 	FIELD field_6822 MOB_SOUNDS Ljava/util/Map;
 	FIELD field_6823 songPlaying Z
 	FIELD field_6824 flapSpeed F
-	FIELD field_6825 TAMING_INGREDIENTS Ljava/util/Set;
 	FIELD field_6826 VARIANT Lnet/minecraft/class_2940;
 	FIELD field_6827 prevMaxWingDeviation F
-	FIELD field_6828 COOKIE Lnet/minecraft/class_1792;
 	FIELD field_6829 prevFlapProgress F
 	METHOD method_20667 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type

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

@@ -2,5 +2,4 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity
 	FIELD field_23230 saddledComponent Lnet/minecraft/class_4980;
 	FIELD field_6815 BOOST_TIME Lnet/minecraft/class_2940;
 	FIELD field_6816 SADDLED Lnet/minecraft/class_2940;
-	FIELD field_6817 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
 	METHOD method_26890 createPigAttributes ()Lnet/minecraft/class_5132$class_5133;

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

@@ -25,8 +25,6 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity
 	METHOD method_6607 wantsCarrots ()Z
 	METHOD method_6608 doScheduleJump ()V
 	METHOD method_6611 enableJump ()V
-	METHOD method_6614 isTempting (Lnet/minecraft/class_1799;)Z
-		ARG 0 stack
 	METHOD method_6615 getJumpSound ()Lnet/minecraft/class_3414;
 	METHOD method_6616 lookTowards (DD)V
 		ARG 1 x

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

@@ -16,7 +16,7 @@ CLASS net/minecraft/class_8155 net/minecraft/entity/passive/SnifferBrain
 		ARG 0 brain
 	METHOD method_49157 addIdleActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
-	METHOD method_51159 getTemptItems ()Lnet/minecraft/class_1856;
+	METHOD method_51159 getTemptItems ()Ljava/util/function/Predicate;
 	METHOD method_51160 (Lnet/minecraft/class_1309;)Ljava/lang/Float;
 		ARG 0 sniffer
 	METHOD method_51161 stopDiggingOrSniffing (Lnet/minecraft/class_8153;)Lnet/minecraft/class_8153;

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

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity
 	FIELD field_23240 saddledComponent Lnet/minecraft/class_4980;
 	FIELD field_23241 temptGoal Lnet/minecraft/class_1391;
-	FIELD field_23243 BREEDING_INGREDIENT Lnet/minecraft/class_1856;
-	FIELD field_23244 ATTRACTING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_23245 BOOST_TIME Lnet/minecraft/class_2940;
 	FIELD field_23246 COLD Lnet/minecraft/class_2940;
 	FIELD field_23247 SADDLED Lnet/minecraft/class_2940;

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity
-	FIELD field_28406 BREEDING_ITEM Lnet/minecraft/class_1856;
 	FIELD field_47774 BABY_SCALE F
 	FIELD field_47775 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048;
 	FIELD field_6918 sandDiggingCounter I

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

@@ -8,9 +8,7 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager
 	METHOD method_35218 setExhaustion (F)V
 		ARG 1 exhaustion
 	METHOD method_35219 getExhaustion ()F
-	METHOD method_7579 eat (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)V
+	METHOD method_7579 eat (Lnet/minecraft/class_1799;)V
-		ARG 1 item
-		ARG 2 stack
 	METHOD method_7580 setFoodLevel (I)V
 		ARG 1 foodLevel
 	METHOD method_7581 setSaturationLevel (F)V

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

@@ -8,7 +8,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	FIELD field_41765 damageTiltYaw F
 	FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306;
 	FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243;
-	FIELD field_49094 ignoreFallDamageAboveY Ljava/lang/Double;
 	FIELD field_7483 strideDistance F
 	FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796;
 	FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730;

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_7264 net/minecraft/entity/vehicle/ChestBoatEntity
 	FIELD field_38204 inventory Lnet/minecraft/class_2371;
-	FIELD field_38205 lootTableId Lnet/minecraft/class_2960;
+	FIELD field_38205 lootTableId Lnet/minecraft/class_5321;
 	FIELD field_38206 lootTableSeed J
 	FIELD field_38207 INVENTORY_SIZE I
 	METHOD method_42282 generateLoot (Lnet/minecraft/class_1657;)V

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntity
 	FIELD field_7732 lootSeed J
-	FIELD field_7734 lootTableId Lnet/minecraft/class_2960;
+	FIELD field_7734 lootTableId Lnet/minecraft/class_5321;
 	FIELD field_7735 inventory Lnet/minecraft/class_2371;
 	METHOD <init> (Lnet/minecraft/class_1299;DDDLnet/minecraft/class_1937;)V
 		ARG 1 type
@@ -11,6 +11,5 @@ CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntit
 	METHOD method_17357 getScreenHandler (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703;
 		ARG 1 syncId
 		ARG 2 playerInventory
-	METHOD method_7562 setLootTable (Lnet/minecraft/class_2960;J)V
+	METHOD method_7562 setLootTable (Lnet/minecraft/class_5321;J)V
-		ARG 1 id
 		ARG 2 lootSeed

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

@@ -5,9 +5,8 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory
 	METHOD method_42273 resetInventory ()V
 	METHOD method_42274 setLootTableSeed (J)V
 		ARG 1 lootTableSeed
-	METHOD method_42275 setLootTableId (Lnet/minecraft/class_2960;)V
+	METHOD method_42275 setLootTableId (Lnet/minecraft/class_5321;)V
-		ARG 1 lootTableId
+	METHOD method_42276 getLootTableId ()Lnet/minecraft/class_5321;
-	METHOD method_42276 getLootTableId ()Lnet/minecraft/class_2960;
 	METHOD method_42277 getLootTableSeed ()J
 	METHOD method_42278 getInventory ()Lnet/minecraft/class_2371;
 	METHOD method_42283 onBroken (Lnet/minecraft/class_1282;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)V
@@ -23,7 +22,6 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory
 		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
 		ARG 1 nbt
 	METHOD method_42289 removeInventoryStack (I)Lnet/minecraft/class_1799;

mappings/net/minecraft/inventory/Inventory.mapping

@@ -30,7 +30,6 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory
 	COMMENT
 	COMMENT @see net.minecraft.entity.vehicle.VehicleInventory
 	COMMENT @see net.minecraft.block.entity.LockableContainerBlockEntity
-	FIELD field_29952 MAX_COUNT_PER_STACK I
 	FIELD field_48319 DEFAULT_MAX_INTERACTION_RANGE F
 	METHOD method_18861 count (Lnet/minecraft/class_1792;)I
 		COMMENT {@return the number of times {@code item} occurs in this inventory

mappings/net/minecraft/inventory/LootableInventory.mapping

@@ -7,12 +7,10 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory
 	FIELD field_47155 LOOT_TABLE_SEED_KEY Ljava/lang/String;
 	METHOD method_10997 getWorld ()Lnet/minecraft/class_1937;
 	METHOD method_11016 getPos ()Lnet/minecraft/class_2338;
-	METHOD method_11285 setLootTableId (Lnet/minecraft/class_2960;)V
+	METHOD method_11285 setLootTableId (Lnet/minecraft/class_5321;)V
 		COMMENT Sets the loot table ID.
 		COMMENT
 		COMMENT <p>This is usually stored under the {@value LOOT_TABLE_KEY} NBT key.
-		ARG 1 lootTableId
-			COMMENT the loot table ID, or {@code null} to remove the loot table
 	METHOD method_54866 setLootTableSeed (J)V
 		COMMENT Sets the loot table's seed.
 		COMMENT
@@ -21,16 +19,15 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory
 		COMMENT
 		COMMENT <p>This is usually stored under the {@value LOOT_TABLE_SEED_KEY} NBT key.
 		ARG 1 lootTableSeed
-	METHOD method_54867 setLootTable (Lnet/minecraft/class_2960;J)V
+	METHOD method_54867 setLootTable (Lnet/minecraft/class_5321;J)V
 		COMMENT Sets the loot table ID and seed at once.
 		COMMENT This is useful for code-based structure generation.
 		COMMENT
 		COMMENT @see #setLootTableId(Identifier)
 		COMMENT @see #setLootTableSeed(long)
 		COMMENT @see #setLootTable(BlockView, Random, BlockPos, Identifier)
-		ARG 1 lootTableId
 		ARG 2 lootTableSeed
-	METHOD method_54868 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V
+	METHOD method_54868 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;)V
 		COMMENT Queries the block entity at {@code pos}, checks if it is a {@link LootableInventory},
 		COMMENT and sets the loot table ID and seed if applicable.
 		COMMENT This is useful for code-based structure generation.
@@ -41,8 +38,7 @@ CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory
 		ARG 0 world
 		ARG 1 random
 		ARG 2 pos
-		ARG 3 lootTableId
+	METHOD method_54869 getLootTableId ()Lnet/minecraft/class_5321;
-	METHOD method_54869 getLootTableId ()Lnet/minecraft/class_2960;
 		COMMENT {@return the loot table ID, or {@code null} if there is no associated loot table}
 		COMMENT
 		COMMENT <p>This is usually stored under the {@value LOOT_TABLE_KEY} NBT key.

mappings/net/minecraft/item/FoodComponent.mapping

@@ -1,33 +1,24 @@
 CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent
 	COMMENT Represents the components that make up the properties of a food item.
-	FIELD field_18614 hunger I
+	FIELD comp_2491 hunger I
-	FIELD field_18615 saturationModifier F
+	FIELD comp_2492 saturationModifier F
-	FIELD field_18616 meat Z
+	FIELD comp_2493 alwaysEdible Z
-	FIELD field_18617 alwaysEdible Z
+	FIELD comp_2495 statusEffects Ljava/util/List;
-	FIELD field_18618 snack Z
+	METHOD <init> (IFZFLjava/util/List;)V
-	FIELD field_18619 statusEffects Ljava/util/List;
-	METHOD <init> (IFZZZLjava/util/List;)V
 		ARG 1 hunger
 		ARG 2 saturationModifier
 		ARG 3 meat
-		ARG 4 alwaysEdible
+	METHOD comp_2491 hunger ()I
-		ARG 5 snack
-		ARG 6 statusEffects
-	METHOD method_19230 getHunger ()I
 		COMMENT Gets the amount of hunger a food item will fill.
 		COMMENT
 		COMMENT <p>One hunger is equivalent to half of a hunger bar icon.
-	METHOD method_19231 getSaturationModifier ()F
+	METHOD comp_2492 saturationModifier ()F
 		COMMENT Gets the saturation modifier of a food item.
 		COMMENT
 		COMMENT <p>This value is typically used to determine how long a player can sustain the current hunger value before the hunger is used.
-	METHOD method_19232 isMeat ()Z
+	METHOD comp_2493 alwaysEdible ()Z
-		COMMENT Checks if a food item can be fed to dogs.
-	METHOD method_19233 isAlwaysEdible ()Z
 		COMMENT Checks if a food item can be eaten when the current hunger bar is full.
-	METHOD method_19234 isSnack ()Z
+	METHOD comp_2495 statusEffects ()Ljava/util/List;
-		COMMENT Checks if a food item is snack-like and is eaten quickly.
-	METHOD method_19235 getStatusEffects ()Ljava/util/List;
 		COMMENT Gets a list of all status effect instances that may be applied when a food item is consumed.
 		COMMENT
 		COMMENT <p>The first value in the pair is the status effect instance to be applied.
@@ -35,12 +26,8 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent
 	CLASS class_4175 Builder
 		FIELD field_18620 hunger I
 		FIELD field_18621 saturationModifier F
-		FIELD field_18622 meat Z
 		FIELD field_18623 alwaysEdible Z
-		FIELD field_18624 snack Z
+		FIELD field_18625 statusEffects Lcom/google/common/collect/ImmutableList$Builder;
-		FIELD field_18625 statusEffects Ljava/util/List;
-		METHOD method_19236 meat ()Lnet/minecraft/class_4174$class_4175;
-			COMMENT Specifies that a food item can be fed to dogs.
 		METHOD method_19237 saturationModifier (F)Lnet/minecraft/class_4174$class_4175;
 			COMMENT Specifies the saturation modifier of a food item.
 			COMMENT

mappings/net/minecraft/item/Item.mapping

@@ -22,11 +22,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 	COMMENT @see BlockItem
 	COMMENT @see ItemStack
 	COMMENT @see net.minecraft.inventory.Inventory
-	FIELD field_18672 foodComponent Lnet/minecraft/class_4174;
-	FIELD field_21979 fireproof Z
 	FIELD field_27017 LOGGER Lorg/slf4j/Logger;
 	FIELD field_30887 DEFAULT_MAX_COUNT I
-	FIELD field_30888 DEFAULT_MAX_USE_TIME I
 	FIELD field_30889 ITEM_BAR_STEPS I
 	FIELD field_36401 registryEntry Lnet/minecraft/class_6880$class_6883;
 	FIELD field_40209 requiredFeatures Lnet/minecraft/class_7699;
@@ -35,9 +32,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 	FIELD field_8003 BLOCK_ITEMS Ljava/util/Map;
 	FIELD field_8006 ATTACK_DAMAGE_MODIFIER_ID Ljava/util/UUID;
 	FIELD field_8008 recipeRemainder Lnet/minecraft/class_1792;
-	FIELD field_8009 rarity Lnet/minecraft/class_1814;
-	FIELD field_8012 maxDamage I
-	FIELD field_8013 maxCount I
 	FIELD field_8014 translationKey Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/class_1792$class_1793;)V
 		ARG 1 settings
@@ -50,19 +44,10 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		COMMENT Such items must subclass {@link NetworkSyncedItem}.
 		COMMENT
 		COMMENT @see NetworkSyncedItem
-	METHOD method_19263 isFood ()Z
-		COMMENT Checks if this item is food and therefore is edible.
-	METHOD method_19264 getFoodComponent ()Lnet/minecraft/class_4174;
-		COMMENT {@return this item's {@link #foodComponent FoodComponent}, or {@code null} if none was set}
 	METHOD method_21830 getEatSound ()Lnet/minecraft/class_3414;
 		COMMENT {@return the sound for eating the item}
 	METHOD method_21831 getDrinkSound ()Lnet/minecraft/class_3414;
 		COMMENT {@return the sound for drinking the item}
-	METHOD method_24357 damage (Lnet/minecraft/class_1282;)Z
-		COMMENT {@return whether this item can be damaged by the given {@link DamageSource source}}
-		ARG 1 source
-	METHOD method_24358 isFireproof ()Z
-		COMMENT {@return whether this item is immune to fire and lava damage}
 	METHOD method_31565 onStackClicked (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_5536;Lnet/minecraft/class_1657;)Z
 		COMMENT Called when the item at the cursor is clicked at {@code slot}.
 		COMMENT
@@ -191,8 +176,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		ARG 2 world
 		ARG 3 user
 		ARG 4 remainingUseTicks
-	METHOD method_7841 getMaxDamage ()I
-		COMMENT {@return the maximum durability of this item} Can be configured through {@link Item.Settings#maxDamage(int) settings.maxDamage()}.
 	METHOD method_7843 onCraft (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;)V
 		COMMENT Called when the item is made by crafting, smelting, smithing, etc.
 		ARG 1 stack
@@ -202,8 +185,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		COMMENT
 		COMMENT <p>Tools and armor should override this to specify the attack damage or armor points.
 		ARG 1 slot
-	METHOD method_7846 isDamageable ()Z
-		COMMENT {@return whether this item can lose durability}
 	METHOD method_7847 useOnEntity (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
 		COMMENT Called on both the client and the server when a player uses the item on an entity.
 		COMMENT
@@ -249,15 +230,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		COMMENT
 		COMMENT <p>Items that expect certain components in the item stack should override
 		COMMENT this method to return the stack with the component data.
-	METHOD method_7856 isSuitableFor (Lnet/minecraft/class_2680;)Z
-		COMMENT Determines whether this item can be used as a suitable tool for mining the specified block.
-		COMMENT Depending on block implementation, when combined together, the correct item and block may achieve a better mining speed and yield
-		COMMENT drops that would not be obtained when mining otherwise.
-		COMMENT <p>
-		COMMENT Note that this is not the <b>only</b> way to achieve "effectiveness" when mining.
-		COMMENT Other items, such as shears on string, may use their own logic
-		COMMENT and calls to this method might not return a value consistent to this rule for those items.
-		ARG 1 state
 	METHOD method_7857 hasRecipeRemainder ()Z
 		COMMENT Checks if this item has a remainder item that is left behind when used as a crafting ingredient.
 	METHOD method_7858 getRecipeRemainder ()Lnet/minecraft/class_1792;
@@ -282,28 +254,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		ARG 1 stack
 		ARG 2 world
 		ARG 3 user
-	METHOD method_7862 getRarity (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1814;
-		COMMENT {@return this item's rarity, which changes the color of its name}
-		COMMENT
-		COMMENT <p>By default, if an item has an enchantment, its rarity is modified:
-		COMMENT <ul>
-		COMMENT \t<li>Common and Uncommon -> Rare
-		COMMENT \t<li>Rare -> Epic
-		COMMENT </ul>
-		ARG 1 stack
 	METHOD method_7864 getName (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2561;
 		ARG 1 stack
-	METHOD method_7865 getMiningSpeedMultiplier (Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)F
-		COMMENT {@return the multiplier applied to the mining speed of {@code stack} when mining
-		COMMENT {@code state}}
-		COMMENT
-		COMMENT <p>The default value is {@code 1.0f}. Returning larger integer will cause the block
-		COMMENT to be mined faster. Enchantments, status effects, and other effects that affect
-		COMMENT mining speed are instead handled in {@link PlayerEntity#getBlockBreakingSpeed}.
-		COMMENT
-		COMMENT @see MiningToolItem
-		ARG 1 stack
-		ARG 2 state
 	METHOD method_7866 getTranslationKey (Lnet/minecraft/class_1799;)Ljava/lang/String;
 		COMMENT Gets the translation key of this item using the provided item stack for context.
 		ARG 1 stack
@@ -407,15 +359,10 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 		COMMENT Item settings configure behaviors common to all items, such as the stack's max
 		COMMENT count. An instance of this must be passed to the constructor
 		COMMENT of {@link Item} (or most of its subclasses).
-		FIELD field_18673 foodComponent Lnet/minecraft/class_4174;
-		FIELD field_21980 fireproof Z
 		FIELD field_40210 requiredFeatures Lnet/minecraft/class_7699;
 		FIELD field_49264 COMPONENT_MAP_INTERNER Lcom/google/common/collect/Interner;
 		FIELD field_49265 components Lnet/minecraft/class_9323$class_9324;
-		FIELD field_8016 rarity Lnet/minecraft/class_1814;
 		FIELD field_8018 recipeRemainder Lnet/minecraft/class_1792;
-		FIELD field_8019 maxDamage I
-		FIELD field_8020 maxCount I
 		METHOD method_19265 food (Lnet/minecraft/class_4174;)Lnet/minecraft/class_1792$class_1793;
 			COMMENT When set, any item configured with this Settings instance will be edible based on the provided {@link FoodComponent}.
 			COMMENT
@@ -467,11 +414,3 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 			COMMENT
 			COMMENT @return this instance
 			ARG 1 recipeRemainder
-		METHOD method_7898 maxDamageIfAbsent (I)Lnet/minecraft/class_1792$class_1793;
-			COMMENT Calls {@link Item.Settings#maxDamage} If this Settings instance has not already set max damage (or if max damage is the default value, 0).
-			COMMENT
-			COMMENT <p>Note that max stack count is set to 1 when maxDamage is called.
-			COMMENT
-			COMMENT @return this instance
-			ARG 1 maxDamage
-				COMMENT maximum durability of an ItemStack using an item with this Item.Settings instance

mappings/net/minecraft/item/ItemStack.mapping

@@ -82,7 +82,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		ARG 1 item
 		ARG 2 count
 		ARG 3 changes
-	METHOD method_19267 isFood ()Z
 	METHOD method_21832 getDrinkSound ()Lnet/minecraft/class_3414;
 	METHOD method_21833 getEatSound ()Lnet/minecraft/class_3414;
 	METHOD method_27319 getHolder ()Lnet/minecraft/class_1297;
@@ -418,7 +417,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		COMMENT
 		COMMENT @return values consistent with calls to {@link Item#isSuitableFor}
 		COMMENT @see Item#isSuitableFor(BlockState)
-		ARG 1 state
 	METHOD method_7952 postMine (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
 		ARG 1 world
 		ARG 2 state

mappings/net/minecraft/item/MiningToolItem.mapping

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem
-	FIELD field_7940 miningSpeed F
-	FIELD field_7941 effectiveBlocks Lnet/minecraft/class_6862;
 	METHOD <init> (Lnet/minecraft/class_1832;Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V
 		ARG 1 material
 		ARG 2 effectiveBlocks

mappings/net/minecraft/item/ToolMaterial.mapping

@@ -7,11 +7,6 @@ CLASS net/minecraft/class_1832 net/minecraft/item/ToolMaterial
 		COMMENT <p>
 		COMMENT By default, {@link net.minecraft.item.ToolMaterial} will delegate {@link net.minecraft.item.Item#canRepair(ItemStack, ItemStack)}
 		COMMENT back to this method.
-	METHOD method_8024 getMiningLevel ()I
-		COMMENT {@return the mining level of a {@link net.minecraft.item.ToolItem} using this {@link ToolMaterial}}
-		COMMENT To prevent this tool from successfully harvesting any mining level gated blocks, return {@link net.fabricmc.yarn.constants.MiningLevels#HAND}.
-		COMMENT <p>
-		COMMENT For more information on mining levels, visit {@link net.fabricmc.yarn.constants.MiningLevels}.
 	METHOD method_8025 getDurability ()I
 		COMMENT {@return the total amount of durability a {@link net.minecraft.item.ToolItem} using this {@link ToolMaterial} has}
 		COMMENT <p>

mappings/net/minecraft/item/ToolMaterials.mapping

@@ -1,13 +1,11 @@
 CLASS net/minecraft/class_1834 net/minecraft/item/ToolMaterials
 	COMMENT Provides the default {@link ToolMaterial}s used by vanilla tools.
 	FIELD field_8924 itemDurability I
-	FIELD field_8925 miningLevel I
+	FIELD field_8928 repairIngredient Ljava/util/function/Supplier;
-	FIELD field_8928 repairIngredient Lnet/minecraft/class_3528;
 	FIELD field_8931 attackDamage F
 	FIELD field_8932 miningSpeed F
 	FIELD field_8933 enchantability I
-	METHOD <init> (Ljava/lang/String;IIIFFILjava/util/function/Supplier;)V
+	METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_6862;IFFILjava/util/function/Supplier;)V
-		ARG 3 miningLevel
 		ARG 4 itemDurability
 		ARG 5 miningSpeed
 		ARG 6 attackDamage

mappings/net/minecraft/item/map/MapBannerMarker.mapping

@@ -12,7 +12,7 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
 	METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_71 getKey ()Ljava/lang/String;
-	METHOD method_72 getIconType ()Lnet/minecraft/class_20$class_21;
+	METHOD method_72 getIconType ()Lnet/minecraft/class_6880;
 	METHOD method_73 fromWorldBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_17;
 		ARG 0 blockView
 		ARG 1 blockPos

mappings/net/minecraft/item/map/MapIcon.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
 	FIELD comp_1844 z B
 	FIELD comp_1845 rotation B
 	FIELD field_48920 CODEC Lnet/minecraft/class_9139;
-	METHOD <init> (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V
+	METHOD <init> (Lnet/minecraft/class_6880;BBBLjava/util/Optional;)V
-		ARG 1 type
 		ARG 2 x
 		ARG 3 z
 		ARG 4 rotation
@@ -11,35 +10,4 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon
 	METHOD comp_1845 rotation ()B
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD method_92 getTypeId ()B
 	METHOD method_94 isAlwaysRendered ()Z
-	CLASS class_21 Type
-		FIELD field_111 alwaysRender Z
-		FIELD field_33990 useIconCountLimit Z
-		FIELD field_45788 CODEC Lcom/mojang/serialization/Codec;
-		FIELD field_45789 name Ljava/lang/String;
-		FIELD field_46184 structure Z
-		FIELD field_48921 INDEX_TO_TYPE Ljava/util/function/IntFunction;
-		FIELD field_48922 PACKET_CODEC Lnet/minecraft/class_9139;
-		FIELD field_48923 index I
-		FIELD field_81 id B
-		FIELD field_82 tintColor I
-		METHOD <init> (Ljava/lang/String;IILjava/lang/String;ZIZZ)V
-			ARG 3 index
-			ARG 4 name
-			ARG 5 alwaysRender
-			ARG 6 tintColor
-			ARG 7 useIconCountLimit
-			ARG 8 structure
-		METHOD <init> (Ljava/lang/String;IILjava/lang/String;ZZ)V
-			ARG 3 index
-			ARG 4 name
-			ARG 5 alwaysRender
-			ARG 6 useIconCountLimit
-		METHOD method_37342 shouldUseIconCountLimit ()Z
-		METHOD method_53841 isStructure ()Z
-		METHOD method_56813 getIndex ()I
-		METHOD method_95 isAlwaysRendered ()Z
-		METHOD method_96 getTintColor ()I
-		METHOD method_97 hasTintColor ()Z
-		METHOD method_98 getId ()B

mappings/net/minecraft/item/map/MapState.mapping

@@ -49,8 +49,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 	METHOD method_104 removeFrame (Lnet/minecraft/class_2338;I)V
 		ARG 1 pos
 		ARG 2 id
-	METHOD method_107 addIcon (Lnet/minecraft/class_20$class_21;Lnet/minecraft/class_1936;Ljava/lang/String;DDDLnet/minecraft/class_2561;)V
+	METHOD method_107 addIcon (Lnet/minecraft/class_6880;Lnet/minecraft/class_1936;Ljava/lang/String;DDDLnet/minecraft/class_2561;)V
-		ARG 1 type
 		ARG 2 world
 		ARG 3 key
 		ARG 4 x
@@ -64,11 +63,10 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
 		ARG 1 world
 		ARG 2 x
 		ARG 3 z
-	METHOD method_110 addDecorationsNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_20$class_21;)V
+	METHOD method_110 addDecorationsNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_6880;)V
 		ARG 0 stack
 		ARG 1 pos
 		ARG 2 id
-		ARG 3 type
 	METHOD method_32361 copy ()Lnet/minecraft/class_22;
 	METHOD method_32362 of (BZLnet/minecraft/class_5321;)Lnet/minecraft/class_22;
 		COMMENT Creates a new map state instance for the client.

mappings/net/minecraft/item/map/Type.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_21 net/minecraft/item/map/Type

mappings/net/minecraft/item/trim/ArmorTrim.mapping

@@ -25,7 +25,7 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim
 		ARG 1 armorMaterial
 	METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
 		ARG 1 armorMaterial
-	METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String;
+	METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Ljava/lang/String;
 		ARG 1 armorMaterial
 	METHOD method_57406 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
@@ -35,9 +35,9 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim
 		ARG 1 materialName
 	METHOD method_57410 (Lnet/minecraft/class_8053;)Ljava/lang/Boolean;
 		ARG 0 trim
-	METHOD method_57411 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+	METHOD method_57411 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
 		ARG 2 materialEntry
 	METHOD method_57412 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 materialName
-	METHOD method_57413 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
+	METHOD method_57413 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960;
 		ARG 2 materialEntry

mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping

@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_8055 net/minecraft/item/trim/ArmorTrimMaterials
 	METHOD method_48439 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z
 		ARG 1 recipe
-	METHOD method_48440 get (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;)Ljava/util/Optional;
+	METHOD method_48440 get (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional;
-		ARG 0 registryManager
 		ARG 1 stack
 	METHOD method_48441 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id

mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping

@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_8057 net/minecraft/item/trim/ArmorTrimPatterns
 	METHOD method_48447 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z
 		ARG 1 pattern
-	METHOD method_48448 get (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;)Ljava/util/Optional;
+	METHOD method_48448 get (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional;
-		ARG 0 registryManager
 		ARG 1 stack
 	METHOD method_48449 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id

mappings/net/minecraft/loot/LootDataKey.mapping

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_8488 net/minecraft/loot/LootDataKey
-	FIELD comp_1475 id Lnet/minecraft/class_2960;
-	METHOD comp_1475 id ()Lnet/minecraft/class_2960;

mappings/net/minecraft/loot/LootDataLookup.mapping

@@ -1,13 +0,0 @@
-CLASS net/minecraft/class_8489 net/minecraft/loot/LootDataLookup
-	METHOD getElement (Lnet/minecraft/class_8488;)Ljava/lang/Object;
-		ARG 1 key
-	METHOD getElement (Lnet/minecraft/class_8490;Lnet/minecraft/class_2960;)Ljava/lang/Object;
-		ARG 1 type
-		ARG 2 id
-	METHOD getElementOptional (Lnet/minecraft/class_8488;)Ljava/util/Optional;
-		ARG 1 key
-	METHOD getElementOptional (Lnet/minecraft/class_8490;Lnet/minecraft/class_2960;)Ljava/util/Optional;
-		ARG 1 type
-		ARG 2 id
-	METHOD getLootTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52;
-		ARG 1 id

mappings/net/minecraft/loot/LootDataType.mapping

@@ -1,36 +1,30 @@
 CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType
+	FIELD comp_2520 codec Lcom/mojang/serialization/Codec;
+	FIELD comp_2521 id Ljava/lang/String;
+	FIELD comp_2522 validator Lnet/minecraft/class_8490$class_8491;
 	FIELD field_44499 LOGGER Lorg/slf4j/Logger;
-	FIELD field_44502 id Ljava/lang/String;
+	METHOD comp_2520 codec ()Lcom/mojang/serialization/Codec;
-	FIELD field_44503 validator Lnet/minecraft/class_8490$class_8491;
+	METHOD comp_2521 id ()Ljava/lang/String;
-	FIELD field_45794 codec Lcom/mojang/serialization/Codec;
+	METHOD comp_2522 validator ()Lnet/minecraft/class_8490$class_8491;
-	METHOD <init> (Lcom/mojang/serialization/Codec;Ljava/lang/String;Lnet/minecraft/class_8490$class_8491;)V
-		ARG 1 codec
-		ARG 2 id
-		ARG 3 validator
 	METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional;
 		ARG 1 id
 		ARG 2 ops
 		ARG 3 json
-	METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V
+	METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Lnet/minecraft/class_46;)V
 		ARG 0 reporter
-		ARG 1 key
 		ARG 2 value
-	METHOD method_51208 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V
+	METHOD method_51208 (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Lnet/minecraft/class_52;)V
 		ARG 0 reporter
-		ARG 1 key
 		ARG 2 value
-	METHOD method_51209 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V
+	METHOD method_51209 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Ljava/lang/Object;)V
 		ARG 1 reporter
-		ARG 2 key
 		ARG 3 value
-	METHOD method_51214 getId ()Ljava/lang/String;
 	METHOD method_51215 stream ()Ljava/util/stream/Stream;
 	METHOD method_51216 validator ()Lnet/minecraft/class_8490$class_8491;
 	METHOD method_51217 tableValidator ()Lnet/minecraft/class_8490$class_8491;
 	METHOD method_53267 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)V
 		ARG 2 result
 	CLASS class_8491 Validator
-		METHOD run (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V
+		METHOD run (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Ljava/lang/Object;)V
 			ARG 1 reporter
-			ARG 2 key
 			ARG 3 value

mappings/net/minecraft/loot/LootManager.mapping

@@ -1,43 +0,0 @@
-CLASS net/minecraft/class_60 net/minecraft/loot/LootManager
-	FIELD field_44491 EMPTY_LOOT_TABLE Lnet/minecraft/class_8488;
-	FIELD field_44492 keyToValue Ljava/util/Map;
-	FIELD field_44493 typeToIds Lcom/google/common/collect/Multimap;
-	FIELD field_45793 GSON Lcom/google/gson/Gson;
-	FIELD field_48927 registryLookup Lnet/minecraft/class_7225$class_7874;
-	FIELD field_975 LOGGER Lorg/slf4j/Logger;
-	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 registryLookup
-	METHOD method_20712 validate (Ljava/util/Map;)V
-		ARG 1 lootData
-	METHOD method_51190 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture;
-		ARG 4 type
-	METHOD method_51191 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_8490;Ljava/util/Map;)V
-		ARG 2 type
-		ARG 3 idToValue
-	METHOD method_51192 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_8490;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_2960;Ljava/lang/Object;)V
-		ARG 3 id
-		ARG 4 value
-	METHOD method_51193 getIds (Lnet/minecraft/class_8490;)Ljava/util/Collection;
-		ARG 1 type
-	METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 type
-		ARG 1 registryLookup
-		ARG 2 resourceManager
-		ARG 3 executor
-	METHOD method_51195 (Lnet/minecraft/class_8490;Lnet/minecraft/class_6903;Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V
-		ARG 3 id
-		ARG 4 json
-	METHOD method_51196 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V
-		ARG 0 reporter
-		ARG 1 key
-		ARG 2 value
-	METHOD method_51197 (Ljava/lang/String;Ljava/lang/String;)V
-		ARG 0 name
-		ARG 1 message
-	METHOD method_51198 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/lang/Object;)V
-		ARG 2 value
-	METHOD method_51199 (Ljava/util/Map;Ljava/lang/Void;)V
-		ARG 2 v
-	METHOD method_51202 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V
-		ARG 1 key
-		ARG 2 value

mappings/net/minecraft/loot/LootTableReporter.mapping

@@ -1,16 +1,14 @@
 CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter
 	FIELD field_20756 contextType Lnet/minecraft/class_176;
-	FIELD field_44504 dataLookup Lnet/minecraft/class_8489;
+	FIELD field_44504 dataLookup Lnet/minecraft/class_7871$class_7872;
 	FIELD field_44505 referenceStack Ljava/util/Set;
 	FIELD field_47427 errorReporter Lnet/minecraft/class_8942;
-	METHOD <init> (Lnet/minecraft/class_8942;Lnet/minecraft/class_176;Lnet/minecraft/class_8489;)V
+	METHOD <init> (Lnet/minecraft/class_8942;Lnet/minecraft/class_176;Lnet/minecraft/class_7871$class_7872;)V
 		ARG 1 errorReporter
 		ARG 2 contextType
-		ARG 3 dataLookup
+	METHOD <init> (Lnet/minecraft/class_8942;Lnet/minecraft/class_176;Lnet/minecraft/class_7871$class_7872;Ljava/util/Set;)V
-	METHOD <init> (Lnet/minecraft/class_8942;Lnet/minecraft/class_176;Lnet/minecraft/class_8489;Ljava/util/Set;)V
 		ARG 1 errorReporter
 		ARG 2 contextType
-		ARG 3 dataLookup
 		ARG 4 referenceStack
 	METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V
 		ARG 1 contextAware
@@ -20,9 +18,7 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter
 		ARG 1 message
 	METHOD method_364 makeChild (Ljava/lang/String;)Lnet/minecraft/class_58;
 		ARG 1 name
-	METHOD method_51218 isInStack (Lnet/minecraft/class_8488;)Z
+	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 (Ljava/lang/String;Lnet/minecraft/class_8488;)Lnet/minecraft/class_58;
 		ARG 1 name
-		ARG 2 currentKey
+	METHOD method_51220 getDataLookup ()Lnet/minecraft/class_7871$class_7872;
-	METHOD method_51220 getDataLookup ()Lnet/minecraft/class_8489;

mappings/net/minecraft/loot/LootTables.mapping

@@ -1,42 +1,41 @@
 CLASS net/minecraft/class_39 net/minecraft/loot/LootTables
-	FIELD field_16748 VILLAGE_PLAINS_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16748 VILLAGE_PLAINS_CHEST Lnet/minecraft/class_5321;
-	FIELD field_16749 VILLAGE_TAIGA_HOUSE_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16749 VILLAGE_TAIGA_HOUSE_CHEST Lnet/minecraft/class_5321;
-	FIELD field_16750 VILLAGE_TANNERY_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16750 VILLAGE_TANNERY_CHEST Lnet/minecraft/class_5321;
-	FIELD field_16751 VILLAGE_CARTOGRAPHER_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16751 VILLAGE_CARTOGRAPHER_CHEST Lnet/minecraft/class_5321;
-	FIELD field_16752 VILLAGE_DESERT_HOUSE_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16752 VILLAGE_DESERT_HOUSE_CHEST Lnet/minecraft/class_5321;
-	FIELD field_16753 VILLAGE_SAVANNA_HOUSE_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16753 VILLAGE_SAVANNA_HOUSE_CHEST Lnet/minecraft/class_5321;
-	FIELD field_16754 VILLAGE_SNOWY_HOUSE_CHEST Lnet/minecraft/class_2960;
+	FIELD field_16754 VILLAGE_SNOWY_HOUSE_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17009 VILLAGE_ARMORER_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17009 VILLAGE_ARMORER_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17010 VILLAGE_MASON_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17010 VILLAGE_MASON_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17011 VILLAGE_SHEPARD_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17011 VILLAGE_SHEPARD_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17012 VILLAGE_BUTCHER_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17012 VILLAGE_BUTCHER_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17107 VILLAGE_TOOLSMITH_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17107 VILLAGE_TOOLSMITH_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17108 VILLAGE_FLETCHER_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17108 VILLAGE_FLETCHER_CHEST Lnet/minecraft/class_5321;
-	FIELD field_17109 VILLAGE_TEMPLE_CHEST Lnet/minecraft/class_2960;
+	FIELD field_17109 VILLAGE_TEMPLE_CHEST Lnet/minecraft/class_5321;
-	FIELD field_18007 VILLAGE_FISHER_CHEST Lnet/minecraft/class_2960;
+	FIELD field_18007 VILLAGE_FISHER_CHEST Lnet/minecraft/class_5321;
-	FIELD field_224 MAGENTA_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_224 MAGENTA_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_285 PURPLE_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_285 PURPLE_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_365 CYAN_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_365 CYAN_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_385 YELLOW_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_385 YELLOW_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_394 BLUE_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_394 BLUE_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_434 VILLAGE_WEAPONSMITH_CHEST Lnet/minecraft/class_2960;
+	FIELD field_434 VILLAGE_WEAPONSMITH_CHEST Lnet/minecraft/class_5321;
-	FIELD field_461 LIGHT_BLUE_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_461 LIGHT_BLUE_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_489 BROWN_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_489 BROWN_SHEEP_ENTITY Lnet/minecraft/class_5321;
 	FIELD field_600 LOOT_TABLES_READ_ONLY Ljava/util/Set;
-	FIELD field_607 GREEN_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_607 GREEN_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_629 PINK_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_629 PINK_SHEEP_ENTITY Lnet/minecraft/class_5321;
 	FIELD field_667 LOOT_TABLES Ljava/util/Set;
-	FIELD field_702 LIME_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_702 LIME_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_716 RED_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_716 RED_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_778 BLACK_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_778 BLACK_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_806 LIGHT_GRAY_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_806 LIGHT_GRAY_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_814 ORANGE_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_814 ORANGE_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_844 EMPTY Lnet/minecraft/class_2960;
+	FIELD field_844 EMPTY Lnet/minecraft/class_5321;
-	FIELD field_850 SPAWN_BONUS_CHEST Lnet/minecraft/class_2960;
+	FIELD field_850 SPAWN_BONUS_CHEST Lnet/minecraft/class_5321;
-	FIELD field_869 WHITE_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_869 WHITE_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	FIELD field_878 GRAY_SHEEP_ENTITY Lnet/minecraft/class_2960;
+	FIELD field_878 GRAY_SHEEP_ENTITY Lnet/minecraft/class_5321;
-	METHOD method_269 register (Ljava/lang/String;)Lnet/minecraft/class_2960;
+	METHOD method_269 register (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
 	METHOD method_270 getAll ()Ljava/util/Set;
-	METHOD method_271 registerLootTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
+	METHOD method_271 registerLootTable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5321;
-		ARG 0 id

mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping

@@ -1,14 +1,9 @@
 CLASS net/minecraft/class_4568 net/minecraft/loot/condition/ReferenceLootCondition
-	FIELD comp_1869 id Lnet/minecraft/class_2960;
+	FIELD comp_1869 id Lnet/minecraft/class_5321;
 	FIELD field_20763 LOGGER Lorg/slf4j/Logger;
 	FIELD field_45861 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Lnet/minecraft/class_2960;)V
+	METHOD comp_1869 id ()Lnet/minecraft/class_5321;
-		ARG 1 id
+	METHOD method_35555 builder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210;
-	METHOD comp_1869 id ()Lnet/minecraft/class_2960;
-	METHOD method_35555 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341$class_210;
-		ARG 0 id
-	METHOD method_51230 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_5341;)V
-		ARG 3 predicate
 	METHOD method_53411 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD test (Ljava/lang/Object;)Z

mappings/net/minecraft/loot/context/LootContext.mapping

@@ -1,12 +1,11 @@
 CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
-	FIELD field_44490 dataLookup Lnet/minecraft/class_8489;
+	FIELD field_44490 dataLookup Lnet/minecraft/class_7871$class_7872;
 	FIELD field_44881 parameters Lnet/minecraft/class_8567;
 	FIELD field_923 random Lnet/minecraft/class_5819;
 	FIELD field_927 activeEntries Ljava/util/Set;
-	METHOD <init> (Lnet/minecraft/class_8567;Lnet/minecraft/class_5819;Lnet/minecraft/class_8489;)V
+	METHOD <init> (Lnet/minecraft/class_8567;Lnet/minecraft/class_5819;Lnet/minecraft/class_7871$class_7872;)V
 		ARG 1 parameters
 		ARG 2 random
-		ARG 3 dataLookup
 	METHOD method_294 getRandom ()Lnet/minecraft/class_5819;
 	METHOD method_295 markInactive (Lnet/minecraft/class_47$class_8487;)V
 		ARG 1 entry
@@ -23,7 +22,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 	METHOD method_302 getLuck ()F
 	METHOD method_35508 requireParameter (Lnet/minecraft/class_169;)Ljava/lang/Object;
 		ARG 1 parameter
-	METHOD method_51183 getDataLookup ()Lnet/minecraft/class_8489;
+	METHOD method_51183 getDataLookup ()Lnet/minecraft/class_7871$class_7872;
 	METHOD method_51184 isActive (Lnet/minecraft/class_47$class_8487;)Z
 		ARG 1 entry
 	METHOD method_51185 table (Lnet/minecraft/class_52;)Lnet/minecraft/class_47$class_8487;

mappings/net/minecraft/loot/entry/LootTableEntry.mapping

@@ -7,23 +7,18 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry
 		ARG 3 quality
 		ARG 4 conditions
 		ARG 5 functions
-	METHOD method_428 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86;
+	METHOD method_428 builder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_85$class_86;
-		ARG 0 id
+	METHOD method_430 (Lnet/minecraft/class_5321;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85;
-	METHOD method_430 (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85;
 		ARG 1 weight
 		ARG 2 quality
 		ARG 3 conditions
 		ARG 4 functions
 	METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_52;)V
 		ARG 1 table
-	METHOD method_51223 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;)V
-		ARG 1 id
 	METHOD method_53293 (Lnet/minecraft/class_83;)Lcom/mojang/datafixers/util/Either;
 		ARG 0 entry
 	METHOD method_53294 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_57630 (Lnet/minecraft/class_47;Lnet/minecraft/class_2960;)Lnet/minecraft/class_52;
-		ARG 1 id
 	METHOD method_57631 builder (Lnet/minecraft/class_52;)Lnet/minecraft/class_85$class_86;
 		ARG 0 table
 	METHOD method_57632 (Lnet/minecraft/class_52;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85;
@@ -31,7 +26,5 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry
 		ARG 2 quality
 		ARG 3 conditions
 		ARG 4 functions
-	METHOD method_57633 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V
-		ARG 3 table
 	METHOD method_57634 (Lnet/minecraft/class_52;)Lnet/minecraft/class_52;
 		ARG 0 table

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

@@ -31,14 +31,14 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction
 			ARG 2 target
 			ARG 3 operator
 	CLASS class_3839 Operation
-		FIELD comp_1853 parsedSourcePath Lnet/minecraft/class_3837$class_8753;
+		FIELD comp_1853 parsedSourcePath Lnet/minecraft/class_2203$class_2209;
-		FIELD comp_1854 parsedTargetPath Lnet/minecraft/class_3837$class_8753;
+		FIELD comp_1854 parsedTargetPath Lnet/minecraft/class_2203$class_2209;
 		FIELD comp_1855 operator Lnet/minecraft/class_3837$class_3841;
 		FIELD field_45820 CODEC Lcom/mojang/serialization/Codec;
-		METHOD <init> (Lnet/minecraft/class_3837$class_8753;Lnet/minecraft/class_3837$class_8753;Lnet/minecraft/class_3837$class_3841;)V
+		METHOD <init> (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3837$class_3841;)V
 			ARG 3 operator
-		METHOD comp_1853 parsedSourcePath ()Lnet/minecraft/class_3837$class_8753;
+		METHOD comp_1853 parsedSourcePath ()Lnet/minecraft/class_2203$class_2209;
-		METHOD comp_1854 parsedTargetPath ()Lnet/minecraft/class_3837$class_8753;
+		METHOD comp_1854 parsedTargetPath ()Lnet/minecraft/class_2203$class_2209;
 		METHOD comp_1855 operator ()Lnet/minecraft/class_3837$class_3841;
 		METHOD method_16860 execute (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)V
 			ARG 1 itemNbtGetter
@@ -64,9 +64,3 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction
 				ARG 1 sourceNbt
 			METHOD method_16869 (Ljava/util/List;Lnet/minecraft/class_2520;)V
 				ARG 1 foundNbt
-	CLASS class_8753 Path
-		FIELD field_45822 CODEC Lcom/mojang/serialization/Codec;
-		METHOD method_53319 parse (Ljava/lang/String;)Lnet/minecraft/class_3837$class_8753;
-			ARG 0 path
-		METHOD method_53321 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
-			ARG 0 path

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

@@ -1,19 +1,18 @@
 CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunction
 	FIELD field_1032 searchRadius I
 	FIELD field_1033 skipExistingChunks Z
-	FIELD field_1034 DEFAULT_DECORATION Lnet/minecraft/class_20$class_21;
+	FIELD field_1034 DEFAULT_DECORATION Lnet/minecraft/class_6880;
 	FIELD field_1035 destination Lnet/minecraft/class_6862;
-	FIELD field_1036 decoration Lnet/minecraft/class_20$class_21;
+	FIELD field_1036 decoration Lnet/minecraft/class_6880;
 	FIELD field_1037 zoom B
 	FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_6862;
 	FIELD field_31851 DEFAULT_ZOOM B
 	FIELD field_31852 DEFAULT_SEARCH_RADIUS I
 	FIELD field_31853 DEFAULT_SKIP_EXISTING_CHUNKS Z
 	FIELD field_45826 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V
+	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_6880;BIZ)V
 		ARG 1 conditions
 		ARG 2 destination
-		ARG 3 decoration
 		ARG 4 zoom
 		ARG 5 searchRadius
 		ARG 6 skipExistingChunks
@@ -26,7 +25,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc
 		ARG 0 function
 	METHOD method_53335 (Lnet/minecraft/class_111;)Ljava/lang/Byte;
 		ARG 0 function
-	METHOD method_53336 (Lnet/minecraft/class_111;)Lnet/minecraft/class_20$class_21;
+	METHOD method_53336 (Lnet/minecraft/class_111;)Lnet/minecraft/class_6880;
 		ARG 0 function
 	METHOD method_53337 (Lnet/minecraft/class_111;)Lnet/minecraft/class_6862;
 		ARG 0 function
@@ -34,12 +33,11 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc
 		FIELD field_1039 destination Lnet/minecraft/class_6862;
 		FIELD field_1040 searchRadius I
 		FIELD field_1041 skipExistingChunks Z
-		FIELD field_1042 decoration Lnet/minecraft/class_20$class_21;
+		FIELD field_1042 decoration Lnet/minecraft/class_6880;
 		FIELD field_1043 zoom B
 		METHOD method_35521 searchRadius (I)Lnet/minecraft/class_111$class_112;
 			ARG 1 searchRadius
-		METHOD method_499 withDecoration (Lnet/minecraft/class_20$class_21;)Lnet/minecraft/class_111$class_112;
+		METHOD method_499 withDecoration (Lnet/minecraft/class_6880;)Lnet/minecraft/class_111$class_112;
-			ARG 1 decoration
 		METHOD method_500 withZoom (B)Lnet/minecraft/class_111$class_112;
 			ARG 1 zoom
 		METHOD method_502 withDestination (Lnet/minecraft/class_6862;)Lnet/minecraft/class_111$class_112;

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

@@ -1,17 +1,13 @@
 CLASS net/minecraft/class_8492 net/minecraft/loot/function/ReferenceLootFunction
 	FIELD field_44506 LOGGER Lorg/slf4j/Logger;
-	FIELD field_44507 name Lnet/minecraft/class_2960;
+	FIELD field_44507 name Lnet/minecraft/class_5321;
 	FIELD field_45828 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_2960;)V
+	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_5321;)V
 		ARG 1 conditions
-		ARG 2 name
+	METHOD method_51224 builder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_120$class_121;
-	METHOD method_51224 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_120$class_121;
+	METHOD method_51225 (Lnet/minecraft/class_5321;Ljava/util/List;)Lnet/minecraft/class_117;
-		ARG 0 name
-	METHOD method_51225 (Lnet/minecraft/class_2960;Ljava/util/List;)Lnet/minecraft/class_117;
 		ARG 1 conditions
-	METHOD method_51226 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_117;)V
+	METHOD method_53340 (Lnet/minecraft/class_8492;)Lnet/minecraft/class_5321;
-		ARG 3 itemModifier
-	METHOD method_53340 (Lnet/minecraft/class_8492;)Lnet/minecraft/class_2960;
 		ARG 0 function
 	METHOD method_53341 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance

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

@@ -1,23 +1,20 @@
 CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFunction
-	FIELD field_1116 id Lnet/minecraft/class_2960;
+	FIELD field_1116 id Lnet/minecraft/class_5321;
 	FIELD field_1117 seed J
 	FIELD field_34773 type Lnet/minecraft/class_6880;
 	FIELD field_45842 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_2960;JLnet/minecraft/class_6880;)V
+	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_5321;JLnet/minecraft/class_6880;)V
 		ARG 1 conditions
-		ARG 2 id
 		ARG 3 seed
 		ARG 5 blockEntityType
-	METHOD method_35534 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_2960;)Lnet/minecraft/class_120$class_121;
+	METHOD method_35534 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_5321;)Lnet/minecraft/class_120$class_121;
 		ARG 0 type
-		ARG 1 id
+	METHOD method_35535 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_5321;J)Lnet/minecraft/class_120$class_121;
-	METHOD method_35535 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_2960;J)Lnet/minecraft/class_120$class_121;
 		ARG 0 type
-		ARG 1 id
 		ARG 2 seed
-	METHOD method_35536 (Lnet/minecraft/class_2960;JLnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117;
+	METHOD method_35536 (Lnet/minecraft/class_5321;JLnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117;
 		ARG 4 conditions
-	METHOD method_35537 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117;
+	METHOD method_35537 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117;
 		ARG 2 conditions
 	METHOD method_53366 (Lnet/minecraft/class_144;)Lnet/minecraft/class_6880;
 		ARG 0 function
@@ -25,5 +22,5 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFuncti
 		ARG 0 instance
 	METHOD method_53368 (Lnet/minecraft/class_144;)Ljava/lang/Long;
 		ARG 0 function
-	METHOD method_53369 (Lnet/minecraft/class_144;)Lnet/minecraft/class_2960;
+	METHOD method_53369 (Lnet/minecraft/class_144;)Lnet/minecraft/class_5321;
 		ARG 0 function

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

@@ -1,12 +1,9 @@
 CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction
 	FIELD field_16231 lore Ljava/util/List;
-	FIELD field_16232 replace Z
 	FIELD field_16233 entity Ljava/util/Optional;
 	FIELD field_45847 CODEC Lcom/mojang/serialization/Codec;
-	METHOD <init> (Ljava/util/List;ZLjava/util/List;Ljava/util/Optional;)V
+	METHOD <init> (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;Ljava/util/Optional;)V
 		ARG 1 conditions
-		ARG 2 replace
-		ARG 3 lore
 		ARG 4 entity
 	METHOD method_35544 builder ()Lnet/minecraft/class_3671$class_6159;
 	METHOD method_53381 (Lnet/minecraft/class_47$class_50;)Ljava/util/Set;
@@ -17,7 +14,7 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction
 		ARG 0 instance
 	METHOD method_53384 (Lnet/minecraft/class_3671;)Ljava/util/List;
 		ARG 0 function
-	METHOD method_53385 (Lnet/minecraft/class_3671;)Ljava/lang/Boolean;
+	METHOD method_53385 (Lnet/minecraft/class_3671;)Lnet/minecraft/class_9368;
 		ARG 0 function
 	METHOD method_57658 getNewLoreTexts (Lnet/minecraft/class_9290;Lnet/minecraft/class_47;)Ljava/util/List;
 		ARG 1 current
@@ -25,12 +22,9 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction
 	METHOD method_57659 (Lnet/minecraft/class_47;Lnet/minecraft/class_9290;)Lnet/minecraft/class_9290;
 		ARG 2 component
 	CLASS class_6159 Builder
-		FIELD field_31866 replace Z
 		FIELD field_31867 target Ljava/util/Optional;
 		FIELD field_31868 lore Lcom/google/common/collect/ImmutableList$Builder;
 		METHOD method_35546 target (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3671$class_6159;
 			ARG 1 target
 		METHOD method_35547 lore (Lnet/minecraft/class_2561;)Lnet/minecraft/class_3671$class_6159;
 			ARG 1 lore
-		METHOD method_35548 replace (Z)Lnet/minecraft/class_3671$class_6159;
-			ARG 1 replace

mappings/net/minecraft/particle/EntityEffectParticleEffect.mapping

@@ -19,10 +19,6 @@ CLASS net/minecraft/class_9381 net/minecraft/particle/EntityEffectParticleEffect
 	METHOD method_58256 create (Lnet/minecraft/class_2396;I)Lnet/minecraft/class_9381;
 		ARG 0 type
 		ARG 1 color
-	METHOD method_58257 (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_9381;
-		ARG 0 type
-		ARG 1 reader
-		ARG 2 registryLookup
 	METHOD method_58258 (Lnet/minecraft/class_2396;Ljava/lang/Integer;)Lnet/minecraft/class_9381;
 		ARG 1 color
 	METHOD method_58259 getRed ()F

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

@@ -3,13 +3,13 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate
 	FIELD field_38726 FISHING_HOOK Lcom/mojang/serialization/MapCodec;
 	FIELD field_38727 PLAYER Lcom/mojang/serialization/MapCodec;
 	FIELD field_38728 SLIME Lcom/mojang/serialization/MapCodec;
-	FIELD field_38729 CAT Lnet/minecraft/class_7378$class_7380;
+	FIELD field_38729 CAT Lnet/minecraft/class_7378$class_9419;
-	FIELD field_38730 FROG Lnet/minecraft/class_7378$class_7380;
+	FIELD field_38730 FROG Lnet/minecraft/class_7378$class_9419;
 	FIELD field_41534 AXOLOTL Lnet/minecraft/class_7378$class_7380;
 	FIELD field_41535 BOAT Lnet/minecraft/class_7378$class_7380;
 	FIELD field_41536 FOX Lnet/minecraft/class_7378$class_7380;
 	FIELD field_41537 MOOSHROOM Lnet/minecraft/class_7378$class_7380;
-	FIELD field_41538 PAINTING Lnet/minecraft/class_7378$class_7380;
+	FIELD field_41538 PAINTING Lnet/minecraft/class_7378$class_9419;
 	FIELD field_41539 RABBIT Lnet/minecraft/class_7378$class_7380;
 	FIELD field_41540 HORSE Lnet/minecraft/class_7378$class_7380;
 	FIELD field_41541 LLAMA Lnet/minecraft/class_7378$class_7380;
@@ -42,10 +42,8 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate
 		ARG 0 entity
 	METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional;
 		ARG 0 entity
-	METHOD method_58153 catVariant (Lnet/minecraft/class_7375;)Lnet/minecraft/class_7376;
+	METHOD method_58153 catVariant (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7376;
-		ARG 0 catVariant
+	METHOD method_58154 frogVariant (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7376;
-	METHOD method_58154 frogVariant (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376;
-		ARG 0 frogVariant
 	METHOD method_58155 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_7380;)Lnet/minecraft/class_7378$class_7380;
 		ARG 0 id
 		ARG 1 type

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

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_8944 net/minecraft/predicate/entity/LootContextPredicateValidator
 	FIELD field_47235 errorReporter Lnet/minecraft/class_8942;
-	FIELD field_47236 conditionsLookup Lnet/minecraft/class_8489;
+	FIELD field_47236 conditionsLookup Lnet/minecraft/class_7871$class_7872;
-	METHOD <init> (Lnet/minecraft/class_8942;Lnet/minecraft/class_8489;)V
+	METHOD <init> (Lnet/minecraft/class_8942;Lnet/minecraft/class_7871$class_7872;)V
 		ARG 1 errorReporter
-		ARG 2 conditionsLookup
 	METHOD method_54961 validate (Lnet/minecraft/class_5258;Lnet/minecraft/class_176;Ljava/lang/String;)V
 		ARG 1 predicate
 		ARG 2 type

mappings/net/minecraft/recipe/Recipe.mapping

@@ -27,12 +27,11 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe
 		COMMENT {@return whether this recipe has no ingredient or has any empty ingredient}
 		COMMENT The recipe book uses this to ignore recipes for display.
 	METHOD method_49188 showNotification ()Z
-	METHOD method_8110 getResult (Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799;
+	METHOD method_8110 getResult (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1799;
 		COMMENT {@return a preview of the recipe's output}
 		COMMENT
 		COMMENT <p>The returned stack should not be modified. To obtain the actual output,
 		COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}.
-		ARG 1 registryManager
 	METHOD method_8111 getRemainder (Lnet/minecraft/class_1263;)Lnet/minecraft/class_2371;
 		COMMENT {@return the remaining stacks to be left in the {@code inventory} after the recipe is used}
 		COMMENT At each index, the remainder item stack in the list should correspond to the original
@@ -70,7 +69,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe
 			COMMENT the input inventory
 		ARG 2 world
 			COMMENT the input world
-	METHOD method_8116 craft (Lnet/minecraft/class_1263;Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799;
+	METHOD method_8116 craft (Lnet/minecraft/class_1263;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1799;
 		COMMENT Crafts this recipe.
 		COMMENT
 		COMMENT <p>This method does not perform side effects on the {@code inventory}.
@@ -80,7 +79,6 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe
 		COMMENT @return the resulting item stack
 		ARG 1 inventory
 			COMMENT the input inventory
-		ARG 2 registryManager
 	METHOD method_8117 getIngredients ()Lnet/minecraft/class_2371;
 		COMMENT {@return the ingredients accepted as inputs for this recipe} Used by the recipe book
 		COMMENT when displaying a ghost form of this recipe on the crafting grid as well as for

mappings/net/minecraft/recipe/RecipeCache.mapping

@@ -13,9 +13,8 @@ CLASS net/minecraft/class_8884 net/minecraft/recipe/RecipeCache
 	METHOD method_54470 getRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_8566;)Ljava/util/Optional;
 		ARG 1 world
 		ARG 2 inputInventory
-	METHOD method_54471 cache (Ljava/util/List;Lnet/minecraft/class_3955;)V
+	METHOD method_54471 cache (Ljava/util/List;Lnet/minecraft/class_8786;)V
 		ARG 1 inputStacks
-		ARG 2 recipe
 	CLASS class_8885 CachedRecipe
 		METHOD method_54472 matches (Ljava/util/List;)Z
 			ARG 1 inputs

mappings/net/minecraft/recipe/RepairItemRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe
 	METHOD method_24364 (Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_1887;)V
 		ARG 3 enchantment
-	METHOD method_57528 (Lnet/minecraft/class_5455;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;)V
+	METHOD method_57528 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;)V
 		ARG 3 builder

mappings/net/minecraft/registry/Registries.mapping

@@ -146,8 +146,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries
 		ARG 0 key
 		ARG 1 defaultId
 		ARG 2 initializer
-	METHOD method_47490 (Lnet/minecraft/class_2378;)Ljava/lang/Object;
-		ARG 0 registry
 	METHOD method_47491 freezeRegistries ()V
 	METHOD method_47492 (Lnet/minecraft/class_2378;)Ljava/lang/Object;
 		ARG 0 registry

mappings/net/minecraft/screen/CrafterScreenHandler.mapping

@@ -16,8 +16,6 @@ CLASS net/minecraft/class_8881 net/minecraft/screen/CrafterScreenHandler
 		ARG 2 enabled
 	METHOD method_54459 addSlots (Lnet/minecraft/class_1661;)V
 		ARG 1 playerInventory
-	METHOD method_54460 (Lnet/minecraft/class_1937;Lnet/minecraft/class_3955;)Lnet/minecraft/class_1799;
-		ARG 2 recipe
 	METHOD method_54461 isSlotDisabled (I)Z
 		ARG 1 slot
 	METHOD method_54462 isTriggered ()Z

mappings/net/minecraft/server/DataPackContents.mapping

@@ -8,7 +8,6 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 	FIELD field_25336 commandManager Lnet/minecraft/class_2170;
 	FIELD field_25337 recipeManager Lnet/minecraft/class_1863;
 	FIELD field_25338 registryTagManager Lnet/minecraft/class_3505;
-	FIELD field_25340 lootManager Lnet/minecraft/class_60;
 	FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989;
 	FIELD field_25342 functionLoader Lnet/minecraft/class_5349;
 	FIELD field_36491 LOGGER Lorg/slf4j/Logger;
@@ -23,27 +22,23 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 		COMMENT
 		COMMENT <p>Function loader loads the {@linkplain net.minecraft.server.function.CommandFunction
 		COMMENT functions} in data packs.
-	METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
+	METHOD method_29466 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_7780;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		COMMENT Reloads the data packs contents.
 		COMMENT
 		COMMENT @see MinecraftServer#reloadResources
 		ARG 0 manager
-		ARG 1 dynamicRegistryManager
 		ARG 2 enabledFeatures
 		ARG 3 environment
 		ARG 4 functionPermissionLevel
 		ARG 5 prepareExecutor
 		ARG 6 applyExecutor
-	METHOD method_29469 getLootManager ()Lnet/minecraft/class_60;
-		COMMENT @see MinecraftServer#getLootManager
 	METHOD method_29471 getRecipeManager ()Lnet/minecraft/class_1863;
 		COMMENT @see MinecraftServer#getRecipeManager
 	METHOD method_29472 getCommandManager ()Lnet/minecraft/class_2170;
 		COMMENT @see MinecraftServer#getCommandManager
 	METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989;
 		COMMENT @see MinecraftServer#getAdvancementLoader
-	METHOD method_40421 refresh (Lnet/minecraft/class_5455;)V
+	METHOD method_40421 refresh ()V
-		ARG 1 dynamicRegistryManager
 	METHOD method_40422 repopulateTags (Lnet/minecraft/class_5455;Lnet/minecraft/class_3505$class_6863;)V
 		ARG 0 dynamicRegistryManager
 		ARG 1 tags
@@ -53,7 +48,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
 		ARG 1 entry
 	METHOD method_40425 (Lnet/minecraft/class_5350;Ljava/lang/Object;)Lnet/minecraft/class_5350;
 		ARG 1 void_
-	METHOD method_40426 (Lnet/minecraft/class_5455;Lnet/minecraft/class_3505$class_6863;)V
+	METHOD method_40426 (Lnet/minecraft/class_3505$class_6863;)V
 		ARG 1 tags
 	METHOD method_40427 getContents ()Ljava/util/List;
 	METHOD method_42095 (Lnet/minecraft/class_5350;Ljava/lang/Object;Ljava/lang/Throwable;)V

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -144,8 +144,6 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_27903 adjustTrackingDistance (I)I
 		ARG 1 initialDistance
 	METHOD method_29435 getWorldRegistryKeys ()Ljava/util/Set;
-	METHOD method_29437 (Lnet/minecraft/class_5455$class_6890;Lcom/google/common/collect/ImmutableList;)Ljava/util/concurrent/CompletionStage;
-		ARG 2 resourcePacks
 	METHOD method_29439 reloadResources (Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture;
 		COMMENT Reloads this server's data packs.
 		COMMENT
@@ -370,7 +368,6 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 throwable
 	METHOD method_3855 getDataFixer ()Lcom/mojang/datafixers/DataFixer;
 	METHOD method_3856 forcePlayerSampleUpdate ()V
-	METHOD method_3857 getLootManager ()Lnet/minecraft/class_60;
 	METHOD method_3858 getPlayerNames ()[Ljava/lang/String;
 	METHOD method_38580 (Lnet/minecraft/class_6498$class_6499;)Ljava/lang/String;
 		ARG 0 module

mappings/net/minecraft/server/SaveLoading.mapping

@@ -3,8 +3,6 @@ CLASS net/minecraft/class_7237 net/minecraft/server/SaveLoading
 	METHOD method_42096 (Lnet/minecraft/class_6860;Lnet/minecraft/class_5350;Ljava/lang/Throwable;)V
 		ARG 1 dataPackContents
 		ARG 2 throwable
-	METHOD method_42097 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7237$class_7239;Lnet/minecraft/class_6860;Lnet/minecraft/class_7780;Lnet/minecraft/class_7237$class_7661;Lnet/minecraft/class_5350;)Ljava/lang/Object;
-		ARG 5 dataPackContents
 	METHOD method_42098 load (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_7237$class_6907;Lnet/minecraft/class_7237$class_7239;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 serverConfig
 		ARG 1 loadContextSupplier

mappings/net/minecraft/server/ServerAdvancementLoader.mapping

@@ -2,12 +2,10 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader
 	FIELD field_13404 advancements Ljava/util/Map;
 	FIELD field_13405 GSON Lcom/google/gson/Gson;
 	FIELD field_13406 LOGGER Lorg/slf4j/Logger;
-	FIELD field_44468 conditionManager Lnet/minecraft/class_60;
 	FIELD field_46076 manager Lnet/minecraft/class_163;
 	FIELD field_48787 registryLookup Lnet/minecraft/class_7225$class_7874;
-	METHOD <init> (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_60;)V
+	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 registryLookup
-		ARG 2 conditionManager
 	METHOD method_12893 getAdvancements ()Ljava/util/Collection;
 	METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779;
 		ARG 1 id

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

@@ -196,9 +196,8 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 1 condition
 	METHOD method_13324 (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_2520;
 		ARG 1 result
-	METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_5341;)Z
+	METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;)Z
 		ARG 0 source
-		ARG 1 condition
 	METHOD method_22830 (Lcom/mojang/brigadier/context/CommandContext;)Z
 		ARG 0 context
 	METHOD method_22831 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

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

@@ -25,29 +25,26 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand
 		ARG 2 sourceSlot
 		ARG 3 pos
 		ARG 4 slot
-	METHOD method_32712 executeBlockCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;ILnet/minecraft/class_117;)I
+	METHOD method_32712 executeBlockCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;ILnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 sourceEntity
 		ARG 2 sourceSlot
 		ARG 3 pos
 		ARG 4 slot
-		ARG 5 modifier
 	METHOD method_32713 executeEntityCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/util/Collection;I)I
 		ARG 0 source
 		ARG 1 sourceEntity
 		ARG 2 sourceSlot
 		ARG 3 targets
 		ARG 4 slot
-	METHOD method_32714 executeEntityCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/util/Collection;ILnet/minecraft/class_117;)I
+	METHOD method_32714 executeEntityCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/util/Collection;ILnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 sourceEntity
 		ARG 2 sourceSlot
 		ARG 3 targets
 		ARG 4 slot
-		ARG 5 modifier
+	METHOD method_32715 getStackWithModifier (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
-	METHOD method_32715 getStackWithModifier (Lnet/minecraft/class_2168;Lnet/minecraft/class_117;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
 		ARG 0 source
-		ARG 1 modifier
 		ARG 2 stack
 	METHOD method_32716 getStackInSlotFromInventoryAt (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_1799;
 		ARG 0 source
@@ -58,37 +55,34 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand
 		ARG 1 pos
 		ARG 2 slot
 		ARG 3 stack
-	METHOD method_32718 executeBlockModify (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_117;)I
+	METHOD method_32718 executeBlockModify (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 pos
 		ARG 2 slot
-		ARG 3 modifier
 	METHOD method_32719 executeBlockCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338;I)I
 		ARG 0 source
 		ARG 1 sourcePos
 		ARG 2 sourceSlot
 		ARG 3 pos
 		ARG 4 slot
-	METHOD method_32720 executeBlockCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338;ILnet/minecraft/class_117;)I
+	METHOD method_32720 executeBlockCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338;ILnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 sourcePos
 		ARG 2 sourceSlot
 		ARG 3 pos
 		ARG 4 slot
-		ARG 5 modifier
 	METHOD method_32721 executeEntityCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILjava/util/Collection;I)I
 		ARG 0 source
 		ARG 1 sourcePos
 		ARG 2 sourceSlot
 		ARG 3 targets
 		ARG 4 slot
-	METHOD method_32722 executeEntityCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILjava/util/Collection;ILnet/minecraft/class_117;)I
+	METHOD method_32722 executeEntityCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILjava/util/Collection;ILnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 sourcePos
 		ARG 2 sourceSlot
 		ARG 3 targets
 		ARG 4 slot
-		ARG 5 modifier
 	METHOD method_32723 getInventoryAtPos (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;)Lnet/minecraft/class_1263;
 		ARG 0 source
 		ARG 1 pos
@@ -98,11 +92,10 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand
 		ARG 1 targets
 		ARG 2 slot
 		ARG 3 stack
-	METHOD method_32725 executeEntityModify (Lnet/minecraft/class_2168;Ljava/util/Collection;ILnet/minecraft/class_117;)I
+	METHOD method_32725 executeEntityModify (Lnet/minecraft/class_2168;Ljava/util/Collection;ILnet/minecraft/class_6880;)I
 		ARG 0 source
 		ARG 1 targets
 		ARG 2 slot
-		ARG 3 modifier
 	METHOD method_32726 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 slot
 	METHOD method_32727 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;

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

@@ -9,9 +9,8 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand
 		ARG 1 slot
 	METHOD method_13179 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)V
 		ARG 2 stack
-	METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_8567;Lnet/minecraft/class_3039$class_3041;)I
+	METHOD method_13180 getFeedbackMessageSingle (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_6880;Lnet/minecraft/class_8567;Lnet/minecraft/class_3039$class_3041;)I
 		ARG 0 context
-		ARG 1 lootTable
 		ARG 2 lootContextParameters
 		ARG 3 constructor
 	METHOD method_13181 (Lnet/minecraft/class_2168;)Z
@@ -27,7 +26,7 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand
 		ARG 3 messageSender
 	METHOD method_13184 (Lnet/minecraft/class_2168;Ljava/util/List;)V
 		ARG 1 stacks
-	METHOD method_13185 (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;Ljava/util/List;)V
+	METHOD method_13185 (Lnet/minecraft/class_2168;Lnet/minecraft/class_5321;Ljava/util/List;)V
 		ARG 2 stacks
 	METHOD method_13187 executeReplace (Ljava/util/Collection;IILjava/util/List;Lnet/minecraft/class_3039$class_3040;)I
 		ARG 0 targets
@@ -55,15 +54,13 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand
 		ARG 1 targetPos
 		ARG 2 stacks
 		ARG 3 messageSender
-	METHOD method_13197 executeLoot (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_3039$class_3041;)I
+	METHOD method_13197 executeLoot (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_6880;Lnet/minecraft/class_3039$class_3041;)I
 		ARG 0 context
-		ARG 1 lootTable
 		ARG 2 constructor
 	METHOD method_13198 (Lnet/minecraft/class_3039$class_3041;Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 1 context
-	METHOD method_13199 executeFish (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_3039$class_3041;)I
+	METHOD method_13199 executeFish (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_3039$class_3041;)I
 		ARG 0 context
-		ARG 1 lootTable
 		ARG 2 pos
 		ARG 3 stack
 		ARG 4 constructor
@@ -102,10 +99,9 @@ CLASS net/minecraft/class_3039 net/minecraft/server/command/LootCommand
 		ARG 1 builder
 	METHOD method_13211 (Lnet/minecraft/class_3039$class_3041;Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 1 context
-	METHOD method_13212 sendDroppedFeedback (Lnet/minecraft/class_2168;Ljava/util/List;Lnet/minecraft/class_2960;)V
+	METHOD method_13212 sendDroppedFeedback (Lnet/minecraft/class_2168;Ljava/util/List;Lnet/minecraft/class_5321;)V
 		ARG 0 source
 		ARG 1 stacks
-		ARG 2 lootTable
 	METHOD method_13213 sendDroppedFeedback (Lnet/minecraft/class_2168;Ljava/util/List;)V
 		ARG 0 source
 		ARG 1 stacks

mappings/net/minecraft/structure/OceanRuinGenerator.mapping

@@ -39,10 +39,9 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator
 		ARG 3 holder
 		ARG 4 random
 		ARG 5 structure
-	METHOD method_49885 createArchaeologyStructureProcessor (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3491;
+	METHOD method_49885 createArchaeologyStructureProcessor (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3491;
 		ARG 0 baseBlock
 		ARG 1 suspiciousBlock
-		ARG 2 lootTableId
 	CLASS class_3410 Piece
 		FIELD field_14524 integrity F
 		FIELD field_14525 large Z

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -15,14 +15,13 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	METHOD <init> (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;)V
 		ARG 1 type
 		ARG 2 nbt
-	METHOD method_14915 addChest (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2960;)Z
+	METHOD method_14915 addChest (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;IIILnet/minecraft/class_5321;)Z
 		ARG 1 world
 		ARG 2 boundingBox
 		ARG 3 random
 		ARG 4 x
 		ARG 5 y
 		ARG 6 z
-		ARG 7 lootTableId
 	METHOD method_14916 orientateChest (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
 		ARG 0 world
 		ARG 1 pos
@@ -49,12 +48,11 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 8 maxZ
 		ARG 9 block
 		ARG 10 cantReplaceAir
-	METHOD method_14921 addChest (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Z
+	METHOD method_14921 addChest (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_5321;Lnet/minecraft/class_2680;)Z
 		ARG 1 world
 		ARG 2 boundingBox
 		ARG 3 random
 		ARG 4 pos
-		ARG 5 lootTableId
 		ARG 6 block
 	METHOD method_14922 translate (III)V
 		ARG 1 x
@@ -74,7 +72,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 3 y
 		ARG 4 z
 		ARG 5 box
-	METHOD method_14930 addDispenser (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;Lnet/minecraft/class_2960;)Z
+	METHOD method_14930 addDispenser (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;Lnet/minecraft/class_5321;)Z
 		ARG 1 world
 		ARG 2 boundingBox
 		ARG 3 random
@@ -82,7 +80,6 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 5 y
 		ARG 6 z
 		ARG 7 facing
-		ARG 8 lootTableId
 	METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 structureAccessor

mappings/net/minecraft/structure/processor/StructureProcessorLists.mapping

@@ -7,6 +7,5 @@ CLASS net/minecraft/class_5469 net/minecraft/structure/processor/StructureProces
 		ARG 0 id
 	METHOD method_46846 bootstrap (Lnet/minecraft/class_7891;)V
 		ARG 0 processorListRegisterable
-	METHOD method_51464 createTrailRuinsTowerTopProcessor (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_8243;
+	METHOD method_51464 createTrailRuinsTowerTopProcessor (Lnet/minecraft/class_5321;I)Lnet/minecraft/class_8243;
-		ARG 0 lootTableId
 		ARG 1 limit

mappings/net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier.mapping

@@ -1,12 +1,10 @@
 CLASS net/minecraft/class_8244 net/minecraft/structure/rule/blockentity/AppendLootRuleBlockEntityModifier
 	FIELD field_43336 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_43337 LOGGER Lorg/slf4j/Logger;
-	FIELD field_43338 lootTable Lnet/minecraft/class_2960;
+	FIELD field_43338 lootTable Lnet/minecraft/class_5321;
-	METHOD <init> (Lnet/minecraft/class_2960;)V
-		ARG 1 lootTable
 	METHOD method_49893 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_49894 (Lnet/minecraft/class_8244;)Lnet/minecraft/class_2960;
+	METHOD method_49894 (Lnet/minecraft/class_8244;)Lnet/minecraft/class_5321;
 		ARG 0 modifier
 	METHOD method_49895 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V
 		ARG 1 nbtx

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_9386 net/minecraft/unused/packageinfo/PackageInfo9386

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_9417 net/minecraft/unused/packageinfo/PackageInfo9417

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_9418 net/minecraft/unused/packageinfo/PackageInfo9418

mappings/net/minecraft/util/Rarity.mapping

@@ -1,4 +1,2 @@
 CLASS net/minecraft/class_1814 net/minecraft/util/Rarity
 	FIELD field_8908 formatting Lnet/minecraft/class_124;
-	METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_124;)V
-		ARG 3 formatting

mappings/net/minecraft/util/collection/ListOperation.mapping

@@ -25,12 +25,9 @@ CLASS net/minecraft/class_9368 net/minecraft/util/collection/ListOperation
 			ARG 0 instance
 	CLASS class_9373 Type
 		FIELD field_49860 CODEC Lcom/mojang/serialization/Codec;
-		FIELD field_49861 MAP_CODEC Lcom/mojang/serialization/MapCodec;
 		FIELD field_49862 id Ljava/lang/String;
 		FIELD field_49863 codec Lcom/mojang/serialization/MapCodec;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lcom/mojang/serialization/MapCodec;)V
 			ARG 3 id
 			ARG 4 codec
 		METHOD method_58197 getCodec ()Lcom/mojang/serialization/MapCodec;
-		METHOD method_58198 (Lnet/minecraft/class_9368$class_9373;)Lcom/mojang/serialization/Codec;
-			ARG 0 type

mappings/net/minecraft/village/TradeOffers.mapping

@@ -69,13 +69,12 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
 		FIELD field_18590 maxUses I
 		FIELD field_18591 experience I
 		FIELD field_37051 nameKey Ljava/lang/String;
-		FIELD field_7473 iconType Lnet/minecraft/class_20$class_21;
+		FIELD field_7473 iconType Lnet/minecraft/class_6880;
 		FIELD field_7474 structure Lnet/minecraft/class_6862;
-		METHOD <init> (ILnet/minecraft/class_6862;Ljava/lang/String;Lnet/minecraft/class_20$class_21;II)V
+		METHOD <init> (ILnet/minecraft/class_6862;Ljava/lang/String;Lnet/minecraft/class_6880;II)V
 			ARG 1 price
 			ARG 2 structure
 			ARG 3 nameKey
-			ARG 4 iconType
 			ARG 5 maxUses
 			ARG 6 experience
 	CLASS class_4160 SellDyedArmorFactory