From 8c4cb827a19780d8dc3b4c17c620e8e73548464d Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 10 May 2024 23:42:32 +0900 Subject: [PATCH] 24w18a more stuff (#3863) * More 24w18a stuff * Enchantment stuff * Apply suggestions from code review Co-authored-by: Shnupbups --------- Co-authored-by: Shnupbups --- .../net/minecraft/block/CrafterBlock.mapping | 1 + .../minecraft/client/MinecraftClient.mapping | 2 + .../AccessibilityOnboardingScreen.mapping | 1 + .../ingame/CreativeInventoryScreen.mapping | 10 ++++- .../screen/option/ChatOptionsScreen.mapping | 4 ++ .../screen/option/ControlsListWidget.mapping | 1 + .../screen/option/GameOptionsScreen.mapping | 3 ++ .../gui/screen/option/KeybindsScreen.mapping | 4 ++ .../screen/option/OnlineOptionsScreen.mapping | 5 +++ .../screen/option/VideoOptionsScreen.mapping | 9 ++++ .../client/gui/tooltip/Tooltip.mapping | 1 + .../client/gui/widget/EntryListWidget.mapping | 5 +++ .../gui/widget/OptionListWidget.mapping | 1 + .../network/ClientPlayNetworkHandler.mapping | 3 ++ .../client/realms/dto/RealmsServer.mapping | 1 + .../gui/screen/RealmsBackupScreen.mapping | 15 +++++++ .../gui/screen/RealmsMainScreen.mapping | 5 +++ .../task/RealmsPrepareConnectionTask.mapping | 2 + .../render/item/HeldItemRenderer.mapping | 3 ++ .../resource/language/LanguageManager.mapping | 2 + .../client/search/SearchManager.mapping | 43 +++++++++++++++++++ .../texture/StatusEffectSpriteManager.mapping | 1 + .../world/GeneratorOptionsHolder.mapping | 1 + .../argument/ItemStackArgument.mapping | 5 +++ .../command/argument/ItemStringReader.mapping | 19 +++++++- .../minecraft/enchantment/Enchantment.mapping | 2 + .../EnchantmentLevelBasedValueType.mapping | 12 ++++++ ...mapping => EnchantmentEffectEntry.mapping} | 4 +- ...EnchantmentLocationBasedEffectType.mapping | 1 + .../ExplodeEnchantmentEffectType.mapping | 2 + .../ReplaceBlockEnchantmentEffectType.mapping | 2 + .../ReplaceDiscEnchantmentEffectType.mapping | 2 + ...pawnParticlesEnchantmentEffectType.mapping | 2 + mappings/net/minecraft/entity/Entity.mapping | 5 +++ .../net/minecraft/entity/LivingEntity.mapping | 7 +++ .../goal/SkeletonHorseTrapTriggerGoal.mapping | 3 ++ .../boss/dragon/EnderDragonEntity.mapping | 2 + .../entity/decoration/LeashKnotEntity.mapping | 1 + .../net/minecraft/entity/mob/Hoglin.mapping | 2 + .../minecraft/entity/mob/MobEntity.mapping | 6 +++ .../minecraft/entity/mob/SlimeEntity.mapping | 1 + .../entity/passive/RabbitEntity.mapping | 1 + .../entity/passive/WolfVariants.mapping | 1 + .../projectile/FishingBobberEntity.mapping | 12 +++--- .../PersistentProjectileEntity.mapping | 3 ++ .../projectile/ProjectileEntity.mapping | 4 ++ .../projectile/SpectralArrowEntity.mapping | 2 + .../projectile/thrown/PotionEntity.mapping | 4 ++ mappings/net/minecraft/item/ItemStack.mapping | 3 ++ mappings/net/minecraft/item/MaceItem.mapping | 1 + .../condition/TableBonusLootCondition.mapping | 1 + .../loot/context/LootContextTypes.mapping | 10 +++++ .../function/ApplyBonusLootFunction.mapping | 4 ++ .../EnchantRandomlyLootFunction.mapping | 4 +- .../SetEnchantmentsLootFunction.mapping | 7 +++ .../net/minecraft/recipe/RecipeCache.mapping | 2 + .../minecraft/recipe/RepairItemRecipe.mapping | 5 +++ .../registry/entry/RegistryFixedCodec.mapping | 2 + .../screen/EnchantmentScreenHandler.mapping | 1 + .../net/minecraft/util/SystemDetails.mapping | 8 ++++ .../net/minecraft/village/TradeOffers.mapping | 35 +++++++++++++++ .../DimensionOptionsRegistryHolder.mapping | 6 +++ .../minecraft/world/gen/WorldPreset.mapping | 3 ++ .../world/gen/structure/Structures.mapping | 8 ++++ 64 files changed, 317 insertions(+), 11 deletions(-) rename mappings/net/minecraft/enchantment/effect/{EnchantmentEffectConditions.mapping => EnchantmentEffectEntry.mapping} (82%) diff --git a/mappings/net/minecraft/block/CrafterBlock.mapping b/mappings/net/minecraft/block/CrafterBlock.mapping index 70c40d3b7d..f1e7aecd2e 100644 --- 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 index 354b95ce4a..d0327bace1 100644 --- 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 index 78b12dad8d..6d9fde5bd2 100644 --- 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 index f6ab8d80ce..2c09b0800b 100644 --- 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 (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 index 80b3363932..3d378ca644 100644 --- 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 (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 index 24ce063232..a328d4af2d 100644 --- 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 (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 index 167f0d59a0..792c3f65d7 100644 --- 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 (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 index 8209483ad5..981440a1e6 100644 --- 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 (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 index 28cf8b54d7..78527a52d5 100644 --- 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 (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 index 57b42a0a3c..5e195b7aea 100644 --- 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 (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 index c88af69894..4e6e60d653 100644 --- 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 (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 index 34b8447c14..138868c554 100644 --- 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 index 23e2d07cd3..1c05539b28 100644 --- 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 (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 index fa859bfa90..802d18206a 100644 --- 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 (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 index 686b2a3c3b..ff3d95d053 100644 --- 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 (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 index 6f06e4a7f6..b55562b6f5 100644 --- 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 (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 (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 index cbf514ca28..330ff9419b 100644 --- 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 (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 index 2026162aa7..816a671482 100644 --- 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 index ee839f452b..5056cb23ce 100644 --- 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 index 69102f90a1..5f6a39d9d9 100644 --- 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 (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 index 9b9d556d01..d4ecea3932 100644 --- 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 index 0eb80ead7b..05977a2a4f 100644 --- 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 (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 index 5a32f4d37d..6f7218562d 100644 --- 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 index be255fe38b..d2373b1d1a 100644 --- 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 (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 diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index 0ccd78a8b0..4d295d0959 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -12,8 +12,9 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader FIELD field_50054 itemRegistry Lnet/minecraft/class_7225$class_7226; FIELD field_50055 nbtOps Lcom/mojang/serialization/DynamicOps; FIELD field_51458 MALFORMED_ITEM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_51831 EXCLAMATION_MARK C METHOD (Lnet/minecraft/class_7225$class_7874;)V - ARG 1 registriesLookup + ARG 1 registryLookup METHOD method_58517 consume (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2291$class_9219;)V ARG 1 reader ARG 2 callbacks @@ -31,6 +32,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader METHOD method_59769 validate (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_6880;Lnet/minecraft/class_9326;)V ARG 0 reader ARG 1 item + ARG 2 components METHOD method_59770 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 error METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215; @@ -61,6 +63,17 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader METHOD method_57813 suggestEqual (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder METHOD method_57814 readComponents ()V + METHOD method_60380 suggestComponents (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + ARG 2 suffix + METHOD method_60381 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/lang/String;Ljava/util/Map$Entry;)V + ARG 2 entry + METHOD method_60382 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_60383 suggestComponents (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_60384 suggestComponentsToRemove (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; @@ -71,6 +84,8 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader 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 + METHOD method_57802 onComponentAdded (Lnet/minecraft/class_9331;Ljava/lang/Object;)V ARG 1 type ARG 2 value + METHOD method_60379 onComponentRemoved (Lnet/minecraft/class_9331;)V + ARG 1 type diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index b6302f528c..3ccd2e7515 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -296,6 +296,8 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment ARG 1 effectType ARG 2 effect ARG 3 requirements + METHOD method_60068 (Lnet/minecraft/class_9331;Lnet/minecraft/class_9331;)Ljava/util/List; + ARG 2 type METHOD method_60069 getEffectsList (Lnet/minecraft/class_9331;)Ljava/util/List; ARG 1 effectType METHOD method_60070 addNonListEffect (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_1887$class_9700; diff --git a/mappings/net/minecraft/enchantment/EnchantmentLevelBasedValueType.mapping b/mappings/net/minecraft/enchantment/EnchantmentLevelBasedValueType.mapping index 6a7aedbca2..e2afb90b6c 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentLevelBasedValueType.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentLevelBasedValueType.mapping @@ -9,14 +9,26 @@ CLASS net/minecraft/class_9704 net/minecraft/enchantment/EnchantmentLevelBasedVa ARG 1 perLevelAboveFirst METHOD method_60188 getValue (I)F ARG 1 level + METHOD method_60189 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_9704; + ARG 0 either + METHOD method_60190 (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + METHOD method_60191 (Lnet/minecraft/class_9704$class_9706;)Lnet/minecraft/class_9704; + ARG 0 type + METHOD method_60192 (Lnet/minecraft/class_9704;)Lcom/mojang/datafixers/util/Either; + ARG 0 type METHOD method_60193 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; ARG 0 registry METHOD method_60194 linear (F)Lnet/minecraft/class_9704$class_9709; ARG 0 base + METHOD method_60195 (Lnet/minecraft/class_9704;)Lnet/minecraft/class_9704; + ARG 0 type CLASS class_9705 Clamped FIELD field_51691 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_60196 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_60197 (Lnet/minecraft/class_9704$class_9705;)Lcom/mojang/serialization/DataResult; + ARG 0 type CLASS class_9706 Constant FIELD field_51692 CODEC Lcom/mojang/serialization/Codec; FIELD field_51693 TYPE_CODEC Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/enchantment/effect/EnchantmentEffectConditions.mapping b/mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping similarity index 82% rename from mappings/net/minecraft/enchantment/effect/EnchantmentEffectConditions.mapping rename to mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping index 80ddbfca2a..a043d39566 100644 --- a/mappings/net/minecraft/enchantment/effect/EnchantmentEffectConditions.mapping +++ b/mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffectConditions +CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffectEntry METHOD method_60004 createCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_176;)Lcom/mojang/serialization/Codec; ARG 0 effectCodec ARG 1 lootContextType @@ -8,5 +8,7 @@ CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffec ARG 1 context METHOD method_60007 createRequirementsCodec (Lnet/minecraft/class_176;)Lcom/mojang/serialization/Codec; ARG 0 lootContextType + METHOD method_60008 (Lnet/minecraft/class_176;Lnet/minecraft/class_5341;)Lcom/mojang/serialization/DataResult; + ARG 1 condition METHOD method_60010 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 errors diff --git a/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping b/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping index 14c3251f51..ec16886ff7 100644 --- a/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_9722 net/minecraft/enchantment/effect/EnchantmentLocat ARG 3 context ARG 4 user ARG 5 pos + ARG 6 newlyApplied METHOD method_60222 remove (Lnet/minecraft/class_9699;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;I)V ARG 1 context ARG 2 user diff --git a/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping index b2788be824..586098031a 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_9724 net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType FIELD field_51710 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_60234 (ILnet/minecraft/class_9704;)Ljava/lang/Float; + ARG 1 knockbackMultiplier METHOD method_60235 getDamageSource (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)Lnet/minecraft/class_1282; ARG 1 user ARG 2 pos diff --git a/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping index e1cdc52f55..6064f3699e 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_9729 net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType FIELD field_51715 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_60242 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6646;)Ljava/lang/Boolean; + ARG 2 predicate METHOD method_60243 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping index 1e8f02598c..fbaedf0524 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_9730 net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType FIELD field_51716 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_60244 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6646;)Ljava/lang/Boolean; + ARG 2 predicate METHOD method_60245 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping index 9c27dc05f0..456040d6ad 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_9734 net/minecraft/enchantment/effect/entity/SpawnPart ARG 4 random METHOD method_60255 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_60256 (Lnet/minecraft/class_9734$class_9735;)Lcom/mojang/serialization/DataResult; + ARG 0 source CLASS class_9736 PositionSourceType FIELD field_51725 CODEC Lcom/mojang/serialization/Codec; FIELD field_51726 id Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index dceaa0a0a8..0aacf9bca3 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1097,6 +1097,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT fire protection} enchantment. COMMENT COMMENT @see net.minecraft.enchantment.ProtectionEnchantment#transformFireDuration + ARG 1 seconds METHOD method_5640 shouldRender (D)Z ARG 1 distance METHOD method_5641 updatePositionAndAngles (DDDFF)V @@ -2284,6 +2285,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 world ARG 2 regularCollisions ARG 3 movingEntityBoundingBox + METHOD method_59921 collectStepHeights (Lnet/minecraft/class_238;Ljava/util/List;FF)[F + ARG 0 collisionBox + ARG 1 collisions + ARG 3 stepHeight METHOD method_59922 getRandom ()Lnet/minecraft/class_5819; METHOD method_6034 canMoveVoluntarily ()Z METHOD method_7325 isSpectator ()Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 8b6229c4f8..b5b02ffee2 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -380,6 +380,12 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 source ARG 2 amount ARG 3 slots + METHOD method_57293 (Lnet/minecraft/class_5131;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 4 attribute + ARG 5 modifier + METHOD method_57294 (Lnet/minecraft/class_5131;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 4 attribute + ARG 5 modifier METHOD method_58150 updatePotionSwirls ()V METHOD method_5877 getHandItems ()Ljava/lang/Iterable; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z @@ -391,6 +397,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_59924 getKnockbackAgainst (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)F ARG 1 target ARG 2 damageSource + METHOD method_59925 hasLandedInFluid ()Z METHOD method_59926 getLocationBasedEnchantmentEffects ()Ljava/util/Map; METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 attribute diff --git a/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping index ca4d2d7c96..93442ad8e8 100644 --- a/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1505 net/minecraft/entity/ai/goal/SkeletonHorseTrapTri FIELD field_7002 skeletonHorse Lnet/minecraft/class_1506; METHOD (Lnet/minecraft/class_1506;)V ARG 1 skeletonHorse + METHOD method_59939 enchantEquipment (Lnet/minecraft/class_1613;Lnet/minecraft/class_1304;)V + ARG 1 rider + ARG 2 slot METHOD method_6810 getHorse (Lnet/minecraft/class_1266;)Lnet/minecraft/class_1496; ARG 1 localDifficulty METHOD method_6811 getSkeleton (Lnet/minecraft/class_1266;Lnet/minecraft/class_1496;)Lnet/minecraft/class_1613; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index d5e920d01e..8c9bbe05d8 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -71,6 +71,8 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit ARG 2 segment1 ARG 3 segment2 METHOD method_6825 launchLivingEntities (Lnet/minecraft/class_3218;Ljava/util/List;)V + ARG 1 world + ARG 2 entities METHOD method_6826 getPathOfAllPredecessors (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Lnet/minecraft/class_11; ARG 1 unused ARG 2 node diff --git a/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping b/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping index bf78bf8dd6..edb142b7fd 100644 --- a/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/LeashKnotEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1532 net/minecraft/entity/decoration/LeashKnotEntity METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos + METHOD method_59944 onPlace ()V METHOD method_6932 getOrCreate (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1532; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/entity/mob/Hoglin.mapping b/mappings/net/minecraft/entity/mob/Hoglin.mapping index 8063c2f074..7868933702 100644 --- a/mappings/net/minecraft/entity/mob/Hoglin.mapping +++ b/mappings/net/minecraft/entity/mob/Hoglin.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_5137 net/minecraft/entity/mob/Hoglin METHOD method_24657 getMovementCooldownTicks ()I METHOD method_26950 tryAttack (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 0 attacker + ARG 1 target METHOD method_26951 knockback (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V ARG 0 attacker ARG 1 target diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 7f4254bb60..ad84cce21d 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -285,6 +285,12 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5992 interactMob (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 hand + METHOD method_59927 enchantEquipment (Lnet/minecraft/class_1304;Lnet/minecraft/class_5819;FF)V + ARG 1 slot + ARG 2 random + ARG 3 chancePerPower + ARG 4 power + METHOD method_59928 playAttackSound ()V METHOD method_5993 getJumpControl ()Lnet/minecraft/class_1334; METHOD method_5994 getAmbientSound ()Lnet/minecraft/class_3414; METHOD method_5995 updateLeash ()V diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 56d4fd3f14..a75c09afab 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity METHOD method_7153 getJumpSound ()Lnet/minecraft/class_3414; METHOD method_7154 getTicksUntilNextJump ()I METHOD method_7155 damage (Lnet/minecraft/class_1309;)V + ARG 1 target METHOD method_7156 updateStretch ()V METHOD method_7157 isSmall ()Z METHOD method_7158 getDamageAmount ()F diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 135b7c4fe0..d771e50d14 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity FIELD field_30359 ESCAPE_DANGER_SPEED D FIELD field_30360 MELEE_ATTACK_SPEED D + FIELD field_51587 KILLER_BUNNY_ATTACK_DAMAGE_MODIFIER Ljava/util/UUID; FIELD field_6846 KILLER_BUNNY Lnet/minecraft/class_2960; FIELD field_6847 moreCarrotTicks I FIELD field_6848 ticksUntilJump I diff --git a/mappings/net/minecraft/entity/passive/WolfVariants.mapping b/mappings/net/minecraft/entity/passive/WolfVariants.mapping index 7b9ffeaa3e..fecf092cb2 100644 --- a/mappings/net/minecraft/entity/passive/WolfVariants.mapping +++ b/mappings/net/minecraft/entity/passive/WolfVariants.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9347 net/minecraft/entity/passive/WolfVariants + FIELD field_51588 DEFAULT Lnet/minecraft/class_5321; METHOD method_58065 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880$class_6883;)Z ARG 1 entry METHOD method_58066 of (Ljava/lang/String;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index 7f5d1b44ee..6dcfd85289 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -7,10 +7,10 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti FIELD field_36336 LOGGER Lorg/slf4j/Logger; FIELD field_7165 hookedEntity Lnet/minecraft/class_1297; FIELD field_7167 removalTimer I - FIELD field_7168 lureLevel I + FIELD field_7168 waitTimeReductionTicks I FIELD field_7169 fishAngle F FIELD field_7170 HOOK_ENTITY_ID Lnet/minecraft/class_2940; - FIELD field_7171 luckOfTheSeaLevel I + FIELD field_7171 luckBonus I FIELD field_7172 fishTravelCountdown I FIELD field_7173 hookCountdown I FIELD field_7174 waitCountdown I @@ -18,13 +18,13 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;II)V ARG 1 type ARG 2 world - ARG 3 luckOfTheSeaLevel - ARG 4 lureLevel + ARG 3 luckBonus + ARG 4 waitTimeReductionTicks METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;II)V ARG 1 thrower ARG 2 world - ARG 3 luckOfTheSeaLevel - ARG 4 lureLevel + ARG 3 luckBonus + ARG 4 waitTimeReductionTicks METHOD method_26086 isOpenOrWaterAround (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_26088 isInOpenWater ()Z diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index 15c6ffc881..34b0a2b950 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -47,6 +47,9 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject ARG 1 world ARG 2 blockHitResult ARG 3 shotFromStack + METHOD method_59957 knockback (Lnet/minecraft/class_1309;Lnet/minecraft/class_1282;)V + ARG 1 target + ARG 2 source METHOD method_59958 getShotFromStack ()Lnet/minecraft/class_1799; METHOD method_7433 setNoClip (Z)V ARG 1 noClip diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 2b2aeff4fc..116b3f95b5 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity FIELD field_23740 leftOwner Z FIELD field_28646 shot Z FIELD field_33399 owner Lnet/minecraft/class_1297; + FIELD field_51621 lastDeflectedEntity Lnet/minecraft/class_1297; METHOD method_24919 setVelocity (Lnet/minecraft/class_1297;FFFFF)V COMMENT Sets velocity and updates rotation accordingly. ARG 1 shooter @@ -55,6 +56,9 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity ARG 4 fromAttack METHOD method_59860 hitOrDeflect (Lnet/minecraft/class_239;)Lnet/minecraft/class_9109; ARG 1 hitResult + METHOD method_59959 getKnockback (Lnet/minecraft/class_1309;Lnet/minecraft/class_1282;)Lit/unimi/dsi/fastutil/doubles/DoubleDoubleImmutablePair; + ARG 1 target + ARG 2 source METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V diff --git a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping index cf1142d0a6..e8c95ba15e 100644 --- a/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping @@ -6,7 +6,9 @@ CLASS net/minecraft/class_1679 net/minecraft/entity/projectile/SpectralArrowEnti ARG 4 y ARG 6 z ARG 8 stack + ARG 9 shotFrom METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 world ARG 2 owner ARG 3 stack + ARG 4 shotFrom diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index ccb09d382c..90b578ff6a 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -10,8 +10,12 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti ARG 2 owner METHOD method_46401 (Lnet/minecraft/class_1309;)Z ARG 0 entity + METHOD method_48575 (DI)I + ARG 2 duration METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1844;)V + ARG 1 potion METHOD method_7498 applySplashPotion (Ljava/lang/Iterable;Lnet/minecraft/class_1297;)V + ARG 1 effects ARG 2 entity METHOD method_7499 extinguishFire (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 88096fd7b2..4f8532742a 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -402,6 +402,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 amount COMMENT the amount to decrement METHOD method_7935 getMaxUseTime (Lnet/minecraft/class_1309;)I + ARG 1 user METHOD method_7936 getMaxDamage ()I METHOD method_7939 setCount (I)V COMMENT Sets the count of items in this item stack. @@ -466,6 +467,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@linkplain #getMaxDamage the maximum damage}, {@code breakCallback} is run. COMMENT Callers should decrement the stack size inside the callback. ARG 1 amount + ARG 2 world ARG 3 player COMMENT the player that damaged the stack, or {@code null} if no player is involved ARG 4 breakCallback @@ -565,6 +567,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT net.minecraft.component.DataComponentTypes#ENCHANTMENTS}. COMMENT COMMENT @see net.minecraft.enchantment.EnchantmentHelper + ARG 1 enchantment ARG 2 level METHOD method_7979 postHit (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)Z ARG 1 target diff --git a/mappings/net/minecraft/item/MaceItem.mapping b/mappings/net/minecraft/item/MaceItem.mapping index 94f451fb9c..b712b9d9b0 100644 --- a/mappings/net/minecraft/item/MaceItem.mapping +++ b/mappings/net/minecraft/item/MaceItem.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem ARG 2 attacked METHOD method_58412 createToolComponent ()Lnet/minecraft/class_9424; METHOD method_58659 shouldDealAdditionalDamage (Lnet/minecraft/class_1309;)Z + ARG 0 attacker METHOD method_58660 getKnockbackPredicate (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)Ljava/util/function/Predicate; ARG 0 player ARG 1 attacked diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index 3b5210fc39..400f48b6bd 100644 --- a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_182 net/minecraft/loot/condition/TableBonusLootConditi METHOD method_53405 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_800 builder (Lnet/minecraft/class_6880;[F)Lnet/minecraft/class_5341$class_210; + ARG 0 enchantment ARG 1 chances METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 153e3b10d4..5a73ea7c1d 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -25,6 +25,16 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_57660 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_58741 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_60299 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_60300 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_60301 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_60302 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder METHOD method_755 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index edb2a90c60..957de20125 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -12,16 +12,20 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction METHOD method_453 (Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_455 oreDrops (Lnet/minecraft/class_6880;)Lnet/minecraft/class_120$class_121; + ARG 0 enchantment METHOD method_456 uniformBonusCount (Lnet/minecraft/class_6880;)Lnet/minecraft/class_120$class_121; + ARG 0 enchantment METHOD method_457 (Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_459 (Lnet/minecraft/class_6880;IFLjava/util/List;)Lnet/minecraft/class_117; ARG 3 conditions METHOD method_461 uniformBonusCount (Lnet/minecraft/class_6880;I)Lnet/minecraft/class_120$class_121; + ARG 0 enchantment ARG 1 bonusMultiplier METHOD method_462 (Lnet/minecraft/class_6880;ILjava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions METHOD method_463 binomialWithBonusCount (Lnet/minecraft/class_6880;FI)Lnet/minecraft/class_120$class_121; + ARG 0 enchantment ARG 1 probability ARG 2 extra METHOD method_53298 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 2f935aa269..1fdb561731 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun FIELD field_51793 onlyCompatible Z METHOD (Ljava/util/List;Ljava/util/Optional;Z)V ARG 1 conditions - ARG 2 enchantments + ARG 2 options ARG 3 onlyCompatible METHOD method_26266 addEnchantmentToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1799; ARG 0 stack @@ -18,6 +18,8 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun ARG 0 function METHOD method_60290 (Lnet/minecraft/class_109;)Ljava/lang/Boolean; ARG 0 function + METHOD method_60291 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Z + ARG 2 entry METHOD method_60292 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_4954 Builder diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index 7b7fe3cd82..0f25ef366d 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -14,12 +14,19 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 0 instance METHOD method_53372 (Lnet/minecraft/class_5642;)Ljava/util/Map; ARG 0 function + METHOD method_57656 (Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_47;Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)V + ARG 2 enchantment + ARG 3 level METHOD method_57657 (Lnet/minecraft/class_47;Lnet/minecraft/class_9304$class_9305;)V ARG 2 builder + METHOD method_60297 (Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_47;Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)V + ARG 2 enchantment + ARG 3 level CLASS class_6158 Builder FIELD field_31864 enchantments Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31865 add Z METHOD (Z)V ARG 1 add METHOD method_35539 enchantment (Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)Lnet/minecraft/class_5642$class_6158; + ARG 1 enchantment ARG 2 level diff --git a/mappings/net/minecraft/recipe/RecipeCache.mapping b/mappings/net/minecraft/recipe/RecipeCache.mapping index 0cbe5213b3..5e51100e14 100644 --- a/mappings/net/minecraft/recipe/RecipeCache.mapping +++ b/mappings/net/minecraft/recipe/RecipeCache.mapping @@ -6,11 +6,13 @@ CLASS net/minecraft/class_8884 net/minecraft/recipe/RecipeCache METHOD method_54467 sendToFront (I)V ARG 1 index METHOD method_54468 getAndCacheRecipe (Lnet/minecraft/class_9694;Lnet/minecraft/class_1937;)Ljava/util/Optional; + ARG 1 input ARG 2 world METHOD method_54469 validateRecipeManager (Lnet/minecraft/class_1937;)V ARG 1 world METHOD method_54470 getRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_9694;)Ljava/util/Optional; ARG 1 world + ARG 2 input METHOD method_54471 cache (Ljava/util/List;Lnet/minecraft/class_8786;)V ARG 1 inputStacks ARG 2 recipe diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index 9d1c2eb825..70540fc480 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -1,7 +1,12 @@ 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_6880$class_6883;)V + ARG 3 enchantment 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 METHOD method_58438 findPair (Lnet/minecraft/class_9694;)Lcom/mojang/datafixers/util/Pair; + ARG 1 input METHOD method_58439 canCombineStacks (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 first ARG 1 second + METHOD method_59994 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 enchantment diff --git a/mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping b/mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping index f367b613a1..508982977e 100644 --- a/mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryFixedCodec.mapping @@ -15,5 +15,7 @@ CLASS net/minecraft/class_6899 net/minecraft/registry/entry/RegistryFixedCodec ARG 1 value METHOD method_40400 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6899; ARG 0 registry + METHOD method_44141 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880$class_6883;)Lcom/mojang/datafixers/util/Pair; + ARG 1 value METHOD method_44142 (Ljava/util/Optional;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 2 pair diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index a418b6a58b..60666f66c6 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler ARG 3 pos METHOD method_17413 getSeed ()I METHOD method_7637 generateEnchantments (Lnet/minecraft/class_5455;Lnet/minecraft/class_1799;II)Ljava/util/List; + ARG 1 registryManager ARG 2 stack ARG 3 slot ARG 4 level diff --git a/mappings/net/minecraft/util/SystemDetails.mapping b/mappings/net/minecraft/util/SystemDetails.mapping index 541d14bd28..611bfdb7f4 100644 --- a/mappings/net/minecraft/util/SystemDetails.mapping +++ b/mappings/net/minecraft/util/SystemDetails.mapping @@ -48,3 +48,11 @@ CLASS net/minecraft/class_6396 net/minecraft/util/SystemDetails ARG 1 virtualMemory METHOD method_37137 addGraphicsCardGroup (Ljava/util/List;)V ARG 1 graphicsCards + METHOD method_59895 toMebibytes (J)F + ARG 0 bytes + METHOD method_59896 addStorageSection (Ljava/lang/String;)V + ARG 1 property + METHOD method_59897 addStorageGroup ()V + METHOD method_59899 addStorageSection (Ljava/lang/String;Ljava/util/function/Supplier;)V + ARG 1 name + ARG 2 pathSupplier diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 913c3b56f9..32b362b244 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -46,8 +46,10 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 1 experience ARG 2 minLevel ARG 3 maxLevel + ARG 4 possibleEnchantments METHOD (ILnet/minecraft/class_6862;)V ARG 1 experience + ARG 2 possibleEnchantments CLASS class_1652 Factory COMMENT A factory to create trade offers. METHOD method_7246 create (Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1914; @@ -145,6 +147,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_18568 maxUses I FIELD field_18569 experience I FIELD field_18570 multiplier F + FIELD field_51618 enchantmentProviderKey Ljava/util/Optional; METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIF)V ARG 1 item ARG 2 count @@ -163,6 +166,16 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 multiplier + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1935;IIIFLnet/minecraft/class_5321;)V + ARG 1 item + ARG 2 count + ARG 3 price + ARG 4 processed + ARG 5 processedCount + ARG 6 maxUses + ARG 7 experience + ARG 8 multiplier + ARG 9 enchantmentProviderKey METHOD (Lnet/minecraft/class_9306;ILnet/minecraft/class_1799;IIFLjava/util/Optional;)V ARG 1 toBeProcessed ARG 2 count @@ -170,12 +183,16 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 maxUses ARG 5 processedCount ARG 6 multiplier + ARG 7 enchantmentProviderKey + METHOD method_59950 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;Lnet/minecraft/class_5321;)V + ARG 3 key CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I FIELD field_18574 maxUses I FIELD field_18575 experience I FIELD field_18576 multiplier F + FIELD field_51619 enchantmentProviderKey Ljava/util/Optional; METHOD (Lnet/minecraft/class_1792;III)V ARG 1 item ARG 2 price @@ -194,12 +211,27 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 maxUses ARG 5 experience ARG 6 multiplier + METHOD (Lnet/minecraft/class_1792;IIIIFLnet/minecraft/class_5321;)V + ARG 1 item + ARG 2 price + ARG 3 count + ARG 4 maxUses + ARG 5 experience + ARG 6 multiplier + ARG 7 enchantmentProviderKey METHOD (Lnet/minecraft/class_1799;IIII)V ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience + METHOD (Lnet/minecraft/class_1799;IIIIF)V + ARG 1 stack + ARG 2 price + ARG 3 count + ARG 4 maxUses + ARG 5 experience + ARG 6 multiplier METHOD (Lnet/minecraft/class_1799;IIIIFLjava/util/Optional;)V ARG 1 sell ARG 2 price @@ -207,12 +239,15 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 maxUses ARG 5 experience ARG 6 multiplier + ARG 7 enchantmentProviderKey METHOD (Lnet/minecraft/class_2248;IIII)V ARG 1 block ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience + METHOD method_59951 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;Lnet/minecraft/class_5321;)V + ARG 3 key CLASS class_4166 SellSuspiciousStewFactory FIELD field_18579 experience I FIELD field_18580 multiplier F diff --git a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping index c5dc3d86b5..2e0ab9aad9 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptionsRegistryHolder.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg FIELD field_40363 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_40364 VANILLA_KEYS Ljava/util/Set; FIELD field_40365 VANILLA_KEY_COUNT I + METHOD (Lnet/minecraft/class_2378;)V + ARG 1 dimensionOptionsRegistry METHOD method_45513 getChunkGenerator ()Lnet/minecraft/class_2794; METHOD method_45514 getOrEmpty (Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 key @@ -15,9 +17,12 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg METHOD method_45518 toConfig (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7723$class_7725; ARG 1 existingRegistry METHOD method_45519 createRegistry (Ljava/util/Map;Lnet/minecraft/class_6880;Lnet/minecraft/class_2794;)Ljava/util/Map; + ARG 0 dimensionOptions + ARG 1 overworld ARG 2 chunkGenerator METHOD method_45520 createRegistry (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2794;)Ljava/util/Map; ARG 0 dynamicRegistry + ARG 1 dimensionOptions ARG 2 chunkGenerator METHOD method_45521 (Lnet/minecraft/class_2378;Ljava/util/List;Lnet/minecraft/class_5321;)V ARG 3 key @@ -46,6 +51,7 @@ CLASS net/minecraft/class_7723 net/minecraft/world/dimension/DimensionOptionsReg METHOD method_45534 (Lnet/minecraft/class_5363;)Lnet/minecraft/class_31$class_7729; ARG 0 overworldEntry CLASS class_7724 Entry + METHOD method_57014 toEntryInfo ()Lnet/minecraft/class_9248; CLASS class_7725 DimensionsConfig METHOD method_45536 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_45537 toDynamicRegistryManager ()Lnet/minecraft/class_5455$class_6890; diff --git a/mappings/net/minecraft/world/gen/WorldPreset.mapping b/mappings/net/minecraft/world/gen/WorldPreset.mapping index a6a0bd9353..b36331207b 100644 --- a/mappings/net/minecraft/world/gen/WorldPreset.mapping +++ b/mappings/net/minecraft/world/gen/WorldPreset.mapping @@ -12,3 +12,6 @@ CLASS net/minecraft/class_7145 net/minecraft/world/gen/WorldPreset METHOD method_44351 validate (Lnet/minecraft/class_7145;)Lcom/mojang/serialization/DataResult; ARG 0 preset METHOD method_45546 createDimensionsRegistryHolder ()Lnet/minecraft/class_7723; + METHOD method_57015 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;)V + ARG 2 dimensionKey + METHOD method_57016 collectDimensions ()Lcom/google/common/collect/ImmutableMap; diff --git a/mappings/net/minecraft/world/gen/structure/Structures.mapping b/mappings/net/minecraft/world/gen/structure/Structures.mapping index af02408eb9..8b8c30df62 100644 --- a/mappings/net/minecraft/world/gen/structure/Structures.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structures.mapping @@ -13,3 +13,11 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/Structures ARG 1 spawns ARG 2 featureStep ARG 3 terrainAdaptation + METHOD method_46847 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_7061; + ARG 0 spawnGroup + METHOD method_46848 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1311; + ARG 0 spawnGroup + METHOD method_60421 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_7061; + ARG 0 spawnGroup + METHOD method_60422 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1311; + ARG 0 spawnGroup