24w18a more stuff (#3863)

* More 24w18a stuff * Enchantment stuff * Apply suggestions from code review Co-authored-by: Shnupbups <[email protected]> --------- Co-authored-by: Shnupbups <[email protected]>
FabricMC · May 10, 2024 · 8c62156 · 8c62156
1 parent bdb81bf
commit 8c62156
Show file tree

Hide file tree

Showing 64 changed files with 317 additions and 11 deletions.
diff --git a/mappings/net/minecraft/block/CrafterBlock.mapping b/mappings/net/minecraft/block/CrafterBlock.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_8886 net/minecraft/block/CrafterBlock
 		ARG 0 stack
 	METHOD method_54475 getCraftingRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_9694;)Ljava/util/Optional;
 		ARG 0 world
+		ARG 1 input
 	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

diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -529,6 +529,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 1 disconnectionScreen
 	METHOD method_57017 onFontOptionsChanged ()V
 	METHOD method_58476 getMapDecorationsAtlasManager ()Lnet/minecraft/class_9443;
+	METHOD method_60320 (Lnet/minecraft/class_1078;)V
+		ARG 1 translationStorage
 	CLASS class_5859 ChatRestriction
 		COMMENT Represents the restrictions on chat on a Minecraft client.
 		COMMENT

diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping
@@ -27,3 +27,4 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo
 		ARG 0 positioner
 	METHOD method_53552 saveAndRun (Ljava/lang/Runnable;)V
 		ARG 1 callback
+	METHOD method_60323 refreshNarratorOption ()V
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping
@@ -27,6 +27,8 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	FIELD field_45460 SCROLLER_DISABLED_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_45461 TAB_TOP_UNSELECTED_TEXTURES [Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_746;Lnet/minecraft/class_7699;Z)V
+		ARG 1 player
+		ARG 2 enabledFeatures
 		ARG 3 operatorTabEnabled
 	METHOD method_15871 searchForTags (Ljava/lang/String;)V
 		ARG 1 id
@@ -65,8 +67,9 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	METHOD method_47419 shouldShowOperatorTab (Lnet/minecraft/class_1657;)Z
 		ARG 1 player
 	METHOD method_47420 updateDisplayParameters (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)V
+		ARG 1 enabledFeatures
 		ARG 2 showOperatorTab
-		ARG 3 lookup
+		ARG 3 registryLookup
 	METHOD method_47421 refreshSelectedTab (Ljava/util/Collection;)V
 		ARG 1 displayStacks
 	METHOD method_47422 getTabX (Lnet/minecraft/class_1761;)I
@@ -76,6 +79,11 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	METHOD method_47424 isInventoryTabSelected ()Z
 	METHOD method_51455 (Lnet/minecraft/class_1799;Ljava/util/List;Lnet/minecraft/class_6862;)V
 		ARG 2 tagKey
+	METHOD method_60324 populateDisplay (Lnet/minecraft/class_1124;Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)Z
+		ARG 1 searchManager
+		ARG 2 enabledFeatures
+		ARG 3 showOperatorTab
+		ARG 4 registryLookup
 	CLASS class_482 LockableSlot
 	CLASS class_483 CreativeScreenHandler
 		FIELD field_2897 itemList Lnet/minecraft/class_2371;

diff --git a/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping
@@ -1,5 +1,9 @@
 CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/option/ChatOptionsScreen
 	FIELD field_49493 TITLE_TEXT Lnet/minecraft/class_2561;
+	FIELD field_51823 narratorButton Lnet/minecraft/class_339;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 options
+	METHOD method_60326 refreshNarratorOption ()V
+	METHOD method_60327 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
+		ARG 0 gameOptions
diff --git a/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping
@@ -19,6 +19,7 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsLis
 		FIELD field_2741 bindingName Lnet/minecraft/class_2561;
 		FIELD field_2743 resetButton Lnet/minecraft/class_4185;
 		FIELD field_42497 duplicate Z
+		FIELD field_49534 RESET_TEXT Lnet/minecraft/class_2561;
 		METHOD <init> (Lnet/minecraft/class_459;Lnet/minecraft/class_304;Lnet/minecraft/class_2561;)V
 			ARG 2 binding
 			ARG 3 bindingName

diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption
 	FIELD field_21335 parent Lnet/minecraft/class_437;
 	FIELD field_21336 gameOptions Lnet/minecraft/class_315;
 	FIELD field_49503 layout Lnet/minecraft/class_8132;
+	FIELD field_51824 body Lnet/minecraft/class_353;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;)V
 		ARG 1 parent
 		ARG 2 gameOptions
@@ -10,3 +11,5 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption
 	METHOD method_57731 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_57732 initHeader ()V
+	METHOD method_60325 addOptions ()V
+	METHOD method_60329 initBody ()V
diff --git a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping
@@ -7,3 +7,7 @@ CLASS net/minecraft/class_6599 net/minecraft/client/gui/screen/option/KeybindsSc
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 gameOptions
+	METHOD method_57748 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
+	METHOD method_60342 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
diff --git a/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping
@@ -4,3 +4,8 @@ CLASS net/minecraft/class_6777 net/minecraft/client/gui/screen/option/OnlineOpti
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 gameOptions
+	METHOD method_60333 collectOptions (Lnet/minecraft/class_315;Lnet/minecraft/class_310;)[Lnet/minecraft/class_7172;
+		ARG 1 gameOptions
+		ARG 2 client
+	METHOD method_60334 (Lnet/minecraft/class_638;)Lnet/minecraft/class_7172;
+		ARG 0 world
diff --git a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping
@@ -7,9 +7,18 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption
 	FIELD field_25686 GRAPHICS_WARNING_CANCEL_TEXT Lnet/minecraft/class_2561;
 	FIELD field_25688 warningManager Lnet/minecraft/class_5407;
 	FIELD field_49515 TITLE_TEXT Lnet/minecraft/class_2561;
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_315;)V
+		ARG 1 parent
+		ARG 2 client
+		ARG 3 gameOptions
 	METHOD method_30052 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_30053 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_41846 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
 		ARG 0 gameOptions
+	METHOD method_60338 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Ljava/lang/Integer;)V
+		ARG 2 value
+	METHOD method_60339 (Lnet/minecraft/class_313;Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561;
+		ARG 1 optionText
+		ARG 2 value
diff --git a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip
 	FIELD field_41102 content Lnet/minecraft/class_2561;
 	FIELD field_41103 lines Ljava/util/List;
 	FIELD field_41104 narration Lnet/minecraft/class_2561;
+	FIELD field_51822 language Lnet/minecraft/class_2477;
 	METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
 		ARG 1 content
 		ARG 2 narration

diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
@@ -144,6 +144,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 	METHOD method_57716 getScrollbarMarginX ()I
 	METHOD method_57717 isScrollbarVisible ()Z
 	METHOD method_57718 getDefaultScrollbarX ()I
+	METHOD method_60321 setScrollAmountOnly (D)V
+		COMMENT Sets the scroll amount to {@code amount}. Unlike {@link #setScrollAmount},
+		COMMENT this has no side effects (like loading more entries).
+		ARG 1 amount
+	METHOD method_60322 refreshScroll ()V
 	CLASS class_351 Entry
 		FIELD field_22752 parentList Lnet/minecraft/class_350;
 		METHOD method_25343 render (Lnet/minecraft/class_332;IIIIIIIZF)V

diff --git a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget
 	METHOD <init> (Lnet/minecraft/class_310;ILnet/minecraft/class_4667;)V
 		ARG 1 client
 		ARG 2 width
+		ARG 3 optionsScreen
 	METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)V
 		ARG 1 option
 	METHOD method_20407 addWidgetEntry (Lnet/minecraft/class_339;Lnet/minecraft/class_339;)V

diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -36,6 +36,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_48403 secureChatEnforced Z
 	FIELD field_48933 debugSampleSubscriber Lnet/minecraft/class_9211;
 	FIELD field_51439 brewingRecipeRegistry Lnet/minecraft/class_1845;
+	FIELD field_51825 searchManager Lnet/minecraft/class_1124;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
 		ARG 1 client
 	METHOD method_16690 getSessionId ()Ljava/util/UUID;
@@ -147,3 +148,5 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 1 dead
 		ARG 2 from
 		ARG 3 to
+	METHOD method_60346 refreshSearchManager ()V
+	METHOD method_60347 getSearchManager ()Lnet/minecraft/class_1124;
diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping
@@ -64,6 +64,7 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer
 	METHOD method_54366 getCompatibility (Ljava/lang/String;)Lnet/minecraft/class_4877$class_8842;
 		ARG 0 compatibility
 	METHOD method_54367 hasParentWorld ()Z
+	METHOD method_60315 isMinigame ()Z
 	CLASS class_4319 McoServerComparator
 		FIELD field_19432 refOwner Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack
 	FIELD field_32119 UPLOADED Ljava/lang/String;
 	FIELD field_49448 selectionList Lnet/minecraft/class_4381$class_4382;
 	FIELD field_49449 layout Lnet/minecraft/class_8132;
+	FIELD field_51818 DOWNLOAD_TEXT Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;I)V
 		ARG 1 parent
 		ARG 2 serverData
@@ -29,6 +30,8 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack
 	CLASS class_4383 BackupObjectSelectionListEntry
 		FIELD field_19761 mBackup Lnet/minecraft/class_4867;
 		FIELD field_44527 buttons Ljava/util/List;
+		FIELD field_49451 changesButton Lnet/minecraft/class_4185;
+		FIELD field_49452 restoreButton Lnet/minecraft/class_4185;
 		METHOD <init> (Lnet/minecraft/class_4381;Lnet/minecraft/class_4867;)V
 			ARG 2 backup
 		METHOD method_21176 getMediumDatePresentation (Ljava/util/Date;)Ljava/lang/String;
@@ -37,3 +40,15 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack
 			ARG 1 backup
 		METHOD method_51241 addChange (Ljava/lang/String;)V
 			ARG 1 metadataKey
+		METHOD method_57668 (Lnet/minecraft/class_4185;)V
+			ARG 1 button
+		METHOD method_57669 (Ljava/util/function/Supplier;)Lnet/minecraft/class_5250;
+			ARG 1 textSupplier
+		METHOD method_57670 (Lnet/minecraft/class_4185;)V
+			ARG 1 button
+		METHOD method_57671 (Ljava/util/function/Supplier;)Lnet/minecraft/class_5250;
+			ARG 1 textSupplier
+		METHOD method_57672 getLastModifiedDate ()Ljava/lang/String;
+		METHOD method_57673 (Lnet/minecraft/class_8816;)V
+			ARG 1 popup
+		METHOD method_57674 restore ()V
diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping
@@ -53,6 +53,8 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 	FIELD field_46669 availableSnapshotServers Ljava/util/List;
 	FIELD field_46672 gameOnSnapshot Z
 	FIELD field_46673 showingSnapshotRealms Z
+	FIELD field_51815 INCOMPATIBLE_POPUP_TITLE Lnet/minecraft/class_2561;
+	FIELD field_51816 INCOMPATIBLE_RELEASE_TYPE_MESSAGE Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_437;)V
 		ARG 1 parent
 	METHOD method_20853 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V
@@ -73,9 +75,12 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 	METHOD method_20928 onRenew (Lnet/minecraft/class_4877;)V
 		ARG 1 realmsServer
 	METHOD method_24991 leaveServer (Lnet/minecraft/class_4877;)V
+		ARG 1 server
 	METHOD method_25001 isOwnedNotExpired (Lnet/minecraft/class_4877;)Z
 		ARG 1 serverData
 	METHOD method_38503 findServer ()Lnet/minecraft/class_4877;
+	METHOD method_38504 (Lnet/minecraft/class_4877;Lnet/minecraft/class_8816;)V
+		ARG 2 popup
 	METHOD method_38505 removeSelection ()V
 	METHOD method_44611 createPeriodicRunnersManager (Lnet/minecraft/class_7578;)Lnet/minecraft/class_7581$class_7584;
 		ARG 1 periodicCheckers

diff --git a/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping
@@ -15,6 +15,8 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsPrepareCon
 		ARG 1 address
 		ARG 2 id
 		ARG 3 connectingScreenCreator
+	METHOD method_32513 (Lnet/minecraft/class_4878;Ljava/util/UUID;Ljava/util/function/Function;Lnet/minecraft/class_8816;)V
+		ARG 4 popup
 	METHOD method_32515 downloadResourcePack (Lnet/minecraft/class_4878;Ljava/util/UUID;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 address
 		ARG 2 id

diff --git a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping
@@ -59,6 +59,7 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer
 		ARG 2 tickDelta
 		ARG 3 arm
 		ARG 4 stack
+		ARG 5 player
 	METHOD method_3219 renderArmHoldingItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFFLnet/minecraft/class_1306;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
@@ -123,6 +124,8 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer
 		ARG 2 tickDelta
 		ARG 3 arm
 		ARG 4 stack
+		ARG 5 player
+		ARG 6 equipProgress
 	CLASS class_5773 HandRenderType
 		FIELD field_28387 renderMainHand Z
 		FIELD field_28388 renderOffHand Z

diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping
@@ -1,10 +1,12 @@
 CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageManager
 	FIELD field_25291 ENGLISH_US Lnet/minecraft/class_1077;
+	FIELD field_51830 reloadCallback Ljava/util/function/Consumer;
 	FIELD field_5323 currentLanguageCode Ljava/lang/String;
 	FIELD field_5324 languageDefs Ljava/util/Map;
 	FIELD field_5325 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Ljava/lang/String;Ljava/util/function/Consumer;)V
 		ARG 1 languageCode
+		ARG 2 reloadCallback
 	METHOD method_29392 (Ljava/util/Map;Lnet/minecraft/class_3262;)V
 		ARG 1 pack
 	METHOD method_29393 loadAvailableLanguages (Ljava/util/stream/Stream;)Ljava/util/Map;

diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping
@@ -1,5 +1,48 @@
 CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager
 	FIELD field_46200 RECIPE_OUTPUT Lnet/minecraft/class_1124$class_1125;
+	FIELD field_51826 itemTooltipReloadFuture Ljava/util/concurrent/CompletableFuture;
+	FIELD field_51827 itemTagReloadFuture Ljava/util/concurrent/CompletableFuture;
+	FIELD field_51828 recipeOutputReloadFuture Ljava/util/concurrent/CompletableFuture;
+	FIELD field_51829 reloaders Ljava/util/Map;
 	FIELD field_5494 ITEM_TAG Lnet/minecraft/class_1124$class_1125;
 	FIELD field_5495 ITEM_TOOLTIP Lnet/minecraft/class_1124$class_1125;
+	METHOD method_60348 refresh ()V
+	METHOD method_60349 (Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1836;Lnet/minecraft/class_1799;)Ljava/util/stream/Stream;
+		ARG 2 stack
+	METHOD method_60351 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream;
+		ARG 0 stack
+	METHOD method_60352 addRecipeOutputReloader (Lnet/minecraft/class_299;Lnet/minecraft/class_5455$class_6890;)V
+		ARG 1 recipeBook
+		ARG 2 registryManager
+	METHOD method_60353 addReloader (Lnet/minecraft/class_1124$class_1125;Ljava/lang/Runnable;)V
+		ARG 1 key
+		ARG 2 reloader
+	METHOD method_60354 (Ljava/lang/String;)Z
+		ARG 0 string
+	METHOD method_60355 addItemTagReloader (Ljava/util/List;)V
+		ARG 1 stacks
+	METHOD method_60356 collectItemTooltips (Ljava/util/stream/Stream;Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1836;)Ljava/util/stream/Stream;
+		ARG 0 stacks
+		ARG 1 context
+		ARG 2 type
+	METHOD method_60357 addItemTooltipReloader (Lnet/minecraft/class_7225$class_7874;Ljava/util/List;)V
+		ARG 1 registryLookup
+		ARG 2 stacks
+	METHOD method_60358 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_8786;)Lnet/minecraft/class_2960;
+		ARG 2 recipe
+	METHOD method_60359 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_516;)Ljava/util/stream/Stream;
+		ARG 2 resultCollection
+	METHOD method_60360 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1836;Lnet/minecraft/class_516;)Ljava/util/stream/Stream;
+		ARG 3 resultCollection
+	METHOD method_60362 (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_8786;)Lnet/minecraft/class_1799;
+		ARG 1 recipe
+	METHOD method_60363 (Lnet/minecraft/class_2561;)Ljava/lang/String;
+		ARG 0 tooltip
+	METHOD method_60364 getRecipeOutputReloadFuture ()Lnet/minecraft/class_1129;
+	METHOD method_60365 (Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1836;Lnet/minecraft/class_1799;)Ljava/util/stream/Stream;
+		ARG 2 stack
+	METHOD method_60366 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream;
+		ARG 0 stack
+	METHOD method_60370 getItemTagReloadFuture ()Lnet/minecraft/class_1129;
+	METHOD method_60372 getItemTooltipReloadFuture ()Lnet/minecraft/class_1129;
 	CLASS class_1125 Key
diff --git a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping
@@ -2,3 +2,4 @@ CLASS net/minecraft/class_4074 net/minecraft/client/texture/StatusEffectSpriteMa
 	METHOD <init> (Lnet/minecraft/class_1060;)V
 		ARG 1 textureManager
 	METHOD method_18663 getSprite (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1058;
+		ARG 1 effect
diff --git a/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping b/mappings/net/minecraft/client/world/GeneratorOptionsHolder.mapping
@@ -26,5 +26,6 @@ CLASS net/minecraft/class_7193 net/minecraft/client/world/GeneratorOptionsHolder
 	METHOD method_45689 getCombinedRegistryManager ()Lnet/minecraft/class_5455$class_6890;
 	METHOD method_45690 apply (Lnet/minecraft/class_7193$class_7194;)Lnet/minecraft/class_7193;
 		ARG 1 modifier
+	METHOD method_60345 initializeIndexedFeaturesLists ()V
 	CLASS class_7194 Modifier
 	CLASS class_7195 RegistryAwareModifier
diff --git a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping
@@ -4,9 +4,14 @@ CLASS net/minecraft/class_2290 net/minecraft/command/argument/ItemStackArgument
 	FIELD field_49570 components Lnet/minecraft/class_9326;
 	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_9326;)V
 		ARG 1 item
+		ARG 2 components
 	METHOD method_41967 getIdString ()Ljava/lang/String;
+	METHOD method_57800 (Lcom/mojang/serialization/DynamicOps;Ljava/util/Map$Entry;)Ljava/util/stream/Stream;
+		ARG 1 entry
 	METHOD method_57801 componentsAsString (Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String;
 		ARG 1 registries
+	METHOD method_60378 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2520;)Ljava/lang/String;
+		ARG 1 value
 	METHOD method_9781 createStack (IZ)Lnet/minecraft/class_1799;
 		ARG 1 amount
 		ARG 2 checkOverstack