From 7ed7a7c43fb9ca0c92b70bf899dec8ad055d7822 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 4 Apr 2024 03:15:12 +1100 Subject: [PATCH] 24w14a stuff (#3833) --- mappings/net/minecraft/block/Block.mapping | 1 + .../block/entity/BlockEntity.mapping | 6 ++++ .../block/entity/SkullBlockEntity.mapping | 15 ++++++++- .../minecraft/client/MinecraftClient.mapping | 2 ++ .../client/gui/screen/DeathScreen.mapping | 4 +++ .../RecipeAlternativesWidget.mapping | 2 ++ ...tipContext.mapping => TooltipType.mapping} | 2 +- .../type/AttributeModifierSlot.mapping | 2 ++ .../type/BundleContentsComponent.mapping | 1 + .../type/WrittenBookContentComponent.mapping | 1 - .../datafixer/TypeReferences.mapping | 2 ++ .../datafixer/fix/ChoiceTypesFix.mapping | 2 ++ .../fix/ItemStackComponentizationFix.mapping | 5 +++ .../entity/mob/PhantomEntity.mapping | 1 + .../entity/passive/FoxEntity.mapping | 1 + .../entity/passive/PolarBearEntity.mapping | 2 ++ .../entity/passive/WolfEntity.mapping | 1 + .../projectile/ProjectileEntity.mapping | 3 ++ .../entity/raid/RaiderEntity.mapping | 1 + mappings/net/minecraft/item/Item.mapping | 13 +++++++- mappings/net/minecraft/item/ItemStack.mapping | 3 ++ mappings/net/minecraft/item/MaceItem.mapping | 1 + .../SetAttributesLootFunction.mapping | 14 ++++++++ .../listener/ClientPlayPacketListener.mapping | 2 ++ .../s2c/play/ProjectilePowerS2CPacket.mapping | 19 +++++++++++ .../screen/BeaconScreenHandler.mapping | 1 + .../util/collection/ArrayListDeque.mapping | 33 +++++++++++++++++++ .../util/collection/ListDeque.mapping | 5 +++ .../util/collection/Weighted.mapping | 4 --- .../minecraft/util/math/MathHelper.mapping | 3 ++ 30 files changed, 144 insertions(+), 8 deletions(-) rename mappings/net/minecraft/client/item/{TooltipContext.mapping => TooltipType.mapping} (97%) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ProjectilePowerS2CPacket.mapping create mode 100644 mappings/net/minecraft/util/collection/ListDeque.mapping diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index d930f9a960..8fbfc66797 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -271,6 +271,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block COMMENT COMMENT @see Item#appendTooltip ARG 1 stack + ARG 2 context ARG 3 tooltip ARG 4 options METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 2922a00df8..c1897a742d 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -243,6 +243,10 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_58685 readComponents (Lnet/minecraft/class_9323;Lnet/minecraft/class_9326;)V ARG 1 defaultComponents ARG 2 components + METHOD method_58686 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 nbt + METHOD method_58687 (Ljava/lang/String;)V + ARG 0 snbt METHOD method_58688 (Lnet/minecraft/class_9323;)V ARG 1 components METHOD method_58689 (Ljava/lang/String;)V @@ -256,6 +260,8 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_58692 createComponentlessNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 registryLookup METHOD method_58693 getComponents ()Lnet/minecraft/class_9323; + METHOD method_59535 createComponentlessNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; + ARG 1 registryLookup CLASS class_9472 Components FIELD field_50176 CODEC Lcom/mojang/serialization/Codec; CLASS class_9473 ComponentsAccess diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index 7705e1c232..e477714102 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity FIELD field_49763 CUSTOM_NAME_NBT_KEY Ljava/lang/String; FIELD field_49764 LOGGER Lorg/slf4j/Logger; FIELD field_49765 customName Lnet/minecraft/class_2561; + FIELD field_51356 nameToProfileCache Lcom/google/common/cache/LoadingCache; + FIELD field_51357 uuidToProfileCache Lcom/google/common/cache/LoadingCache; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -31,10 +33,21 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity METHOD method_47888 getNoteBlockSound ()Lnet/minecraft/class_2960; METHOD method_52579 (Ljava/lang/Runnable;)V ARG 0 runnable - METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + METHOD method_52580 fetchProfileByName (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 0 name METHOD method_58126 (Lnet/minecraft/class_9296;)V ARG 1 owner + METHOD method_59536 fetchProfileByName (Ljava/lang/String;Lnet/minecraft/class_7497;)Ljava/util/concurrent/CompletableFuture; + ARG 0 name + ARG 1 apiServices + METHOD method_59539 fetchProfileByUuid (Ljava/util/UUID;)Ljava/util/concurrent/CompletableFuture; + ARG 0 uuid + METHOD method_59540 fetchProfileByUuid (Ljava/util/UUID;Lnet/minecraft/class_7497;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture; + ARG 0 uuid + ARG 1 apiServices CLASS 1 METHOD load (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 name + CLASS 2 + METHOD load (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 uuid diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index fc1ebfd25e..690d311494 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -535,6 +535,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340; METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable; ARG 1 loadingContext + METHOD method_53862 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; + ARG 0 recipeResults METHOD method_53865 (Ljava/util/List;)Lnet/minecraft/class_1123; ARG 0 stacks METHOD method_54116 formatSeconds (D)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping index 3073f66f64..b126910380 100644 --- a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping @@ -21,4 +21,8 @@ CLASS net/minecraft/class_418 net/minecraft/client/gui/screen/DeathScreen METHOD method_47940 onTitleScreenButtonClicked ()V METHOD method_49299 setButtonsActive (Z)V ARG 1 active + METHOD method_59546 fillBackgroundGradient (Lnet/minecraft/class_332;II)V + ARG 0 context + ARG 1 width + ARG 2 height CLASS class_8183 TitleScreenConfirmScreen diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index a8e96ef16d..aac40345cf 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA FIELD field_3115 craftable Z FIELD field_3116 slots Ljava/util/List; METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_8786;Z)V + ARG 1 parent ARG 2 x ARG 3 y ARG 4 recipe @@ -46,6 +47,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA FIELD field_3119 y I FIELD field_3120 stacks [Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_508$class_509;II[Lnet/minecraft/class_1799;)V + ARG 1 widget ARG 2 y ARG 3 x ARG 4 stacks diff --git a/mappings/net/minecraft/client/item/TooltipContext.mapping b/mappings/net/minecraft/client/item/TooltipType.mapping similarity index 97% rename from mappings/net/minecraft/client/item/TooltipContext.mapping rename to mappings/net/minecraft/client/item/TooltipType.mapping index 2e4951e2ae..728985c35e 100644 --- a/mappings/net/minecraft/client/item/TooltipContext.mapping +++ b/mappings/net/minecraft/client/item/TooltipType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1836 net/minecraft/client/item/TooltipContext +CLASS net/minecraft/class_1836 net/minecraft/client/item/TooltipType FIELD field_41070 BASIC Lnet/minecraft/class_1836$class_1837; FIELD field_41071 ADVANCED Lnet/minecraft/class_1836$class_1837; METHOD method_47370 isCreative ()Z diff --git a/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping b/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping index 9103a26262..d9a1a77e5d 100644 --- a/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping @@ -25,3 +25,5 @@ CLASS net/minecraft/class_9274 net/minecraft/component/type/AttributeModifierSlo ARG 0 id METHOD method_57291 (Lnet/minecraft/class_1304;)Z ARG 0 slot + METHOD method_59524 forEquipmentSlot (Lnet/minecraft/class_1304;)Lnet/minecraft/class_9274; + ARG 0 slot diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping index da2fe79e21..9f542b011a 100644 --- a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon ARG 1 stacks METHOD (Ljava/util/List;Lorg/apache/commons/lang3/math/Fraction;)V ARG 1 stacks + ARG 2 occupancy METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_57421 stream ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 17dda52567..1e399c8f65 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent - FIELD comp_2422 comp_2418 Ljava/util/List; FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I FIELD field_49376 MAX_PAGE_COUNT I FIELD field_49378 MAX_TITLE_LENGTH I diff --git a/mappings/net/minecraft/datafixer/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping index 807cf42c00..f96b959c49 100644 --- a/mappings/net/minecraft/datafixer/TypeReferences.mapping +++ b/mappings/net/minecraft/datafixer/TypeReferences.mapping @@ -57,3 +57,5 @@ CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_5730 STATS Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5731 BLOCK_NAME Lcom/mojang/datafixers/DSL$TypeReference; COMMENT A type reference which refers to a block's identifier. + METHOD method_59518 create (Ljava/lang/String;)Lcom/mojang/datafixers/DSL$TypeReference; + ARG 0 typeName diff --git a/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping b/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping index 4eb61d433f..1aedb191e7 100644 --- a/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChoiceTypesFix.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_3553 net/minecraft/datafixer/fix/ChoiceTypesFix ARG 2 name ARG 3 types METHOD method_15476 fixChoiceTypes (Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 1 inputChoiceType + ARG 2 outputChoiceType diff --git a/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping index e2e4f71441..0f1a7aeeaa 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_9267 net/minecraft/datafixer/fix/ItemStackComponentiza FIELD field_49197 ENTITY_BUCKET_ITEM_IDS Ljava/util/Set; FIELD field_49198 RELEVANT_ENTITY_NBT_KEYS Ljava/util/List; FIELD field_49199 COMMA_SPLITTER Lcom/google/common/base/Splitter; + FIELD field_51347 BOOLEAN_BLOCK_STATE_PROPERTIES Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_57208 getMapDecorationName (I)Ljava/lang/String; @@ -122,6 +123,10 @@ CLASS net/minecraft/class_9267 net/minecraft/datafixer/fix/ItemStackComponentiza ARG 0 enchantmentsDynamic METHOD method_57255 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 itemsDynamic + METHOD method_58050 fixBlockStateTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_58051 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 1 blockStateTagDynamic CLASS class_9268 StackData FIELD field_49200 itemId Ljava/lang/String; FIELD field_49201 count I diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 3258235f63..17665a10f5 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity METHOD method_7103 adjustDirection ()V CLASS class_1599 PhantomLookControl METHOD (Lnet/minecraft/class_1593;Lnet/minecraft/class_1308;)V + ARG 1 phantom ARG 2 entity CLASS class_1600 PhantomMoveControl FIELD field_7331 targetSpeed F diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 79088403c2..047b88c617 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -119,6 +119,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18306 canCalmDown ()Z CLASS class_4024 MateGoal METHOD (Lnet/minecraft/class_4019;D)V + ARG 1 fox ARG 2 chance CLASS class_4025 EatBerriesGoal FIELD field_17974 timer I diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping index f55fe71f20..eaa40e3c51 100644 --- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping @@ -24,3 +24,5 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity CLASS class_1459 PolarBearRevengeGoal CLASS class_1460 AttackGoal CLASS class_1461 PolarBearEscapeDangerGoal + METHOD (Lnet/minecraft/class_1456;)V + ARG 1 polarBear diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 57be15b4d0..8bc1fa11c1 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -70,6 +70,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 1 llama CLASS class_6859 WolfEscapeDangerGoal METHOD (Lnet/minecraft/class_1493;D)V + ARG 1 wolf ARG 2 speed CLASS class_9345 WolfData FIELD field_49723 variant Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 6e9bc9c63e..9db3a70035 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -45,6 +45,9 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity ARG 5 z ARG 7 power ARG 8 uncertainty + METHOD method_59525 onDeflected ()V + METHOD method_59526 deflectOrCollide (Lnet/minecraft/class_239;)Lnet/minecraft/class_9109; + ARG 1 hitResult 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/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index 52bd7602f0..f30f06353b 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity FIELD field_18883 raider Lnet/minecraft/class_3763; FIELD field_18884 squaredDistance F METHOD (Lnet/minecraft/class_3763;Lnet/minecraft/class_1543;F)V + ARG 1 raider ARG 2 illager ARG 3 distance CLASS class_4260 CelebrateGoal diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 37f9680d9a..7e7e223f9d 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -214,9 +214,10 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT Called by the client to append tooltips to an item. Subclasses can override COMMENT this and add custom tooltips to {@code tooltip} list. ARG 1 stack + ARG 2 context ARG 3 tooltip COMMENT the list of tooltips to show - ARG 4 context + ARG 4 type METHOD method_7852 usageTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;I)V COMMENT Called on both the server and the client every tick while an entity uses COMMENT the item. Currently used by {@link CrossbowItem} to charge the crossbow. @@ -423,3 +424,13 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT COMMENT @return this instance ARG 1 recipeRemainder + CLASS class_9635 TooltipContext + FIELD field_51353 DEFAULT Lnet/minecraft/class_1792$class_9635; + METHOD method_59527 getRegistryLookup ()Lnet/minecraft/class_7225$class_7874; + METHOD method_59528 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1792$class_9635; + ARG 0 world + METHOD method_59529 getMapState (Lnet/minecraft/class_9209;)Lnet/minecraft/class_22; + ARG 1 mapIdComponent + METHOD method_59530 create (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1792$class_9635; + ARG 0 registryLookup + METHOD method_59531 getUpdateTickRate ()F diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 03ed4f7eaf..132a64e14b 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -414,6 +414,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 2 user ARG 3 remainingUseTicks METHOD method_7950 getTooltip (Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1657;Lnet/minecraft/class_1836;)Ljava/util/List; + ARG 1 context + ARG 2 player + ARG 3 type METHOD method_7951 isSuitableFor (Lnet/minecraft/class_2680;)Z COMMENT Determines whether this item can be used as a suitable tool for mining the specified block. COMMENT

diff --git a/mappings/net/minecraft/item/MaceItem.mapping b/mappings/net/minecraft/item/MaceItem.mapping index b931ac0e3b..120feba6f5 100644 --- a/mappings/net/minecraft/item/MaceItem.mapping +++ b/mappings/net/minecraft/item/MaceItem.mapping @@ -23,3 +23,4 @@ CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem ARG 0 player ARG 1 attacked ARG 2 distance + METHOD method_59532 createAttributeModifiers ()Lnet/minecraft/class_9285; diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index c14e336783..1b4e2897a8 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunction FIELD field_1105 attributes Ljava/util/List; FIELD field_45836 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_51360 replace Z METHOD (Ljava/util/List;Ljava/util/List;Z)V ARG 1 conditions ARG 2 attributes + ARG 3 replace METHOD method_32406 (Lnet/minecraft/class_137$class_138;)Ljava/util/stream/Stream; ARG 0 attribute METHOD method_35524 attributeBuilder (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)Lnet/minecraft/class_137$class_6156; @@ -16,6 +18,11 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 0 function METHOD method_53356 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57647 (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;Lnet/minecraft/class_9285;)Lnet/minecraft/class_9285; + ARG 3 component + METHOD method_59544 applyTo (Lnet/minecraft/class_47;Lnet/minecraft/class_9285;)Lnet/minecraft/class_9285; + ARG 1 context + ARG 2 attributeModifiersComponent CLASS class_138 Attribute FIELD comp_1859 name Ljava/lang/String; FIELD comp_1860 attribute Lnet/minecraft/class_6880; @@ -35,8 +42,15 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct METHOD comp_1862 amount ()Lnet/minecraft/class_5658; METHOD comp_1863 slots ()Ljava/util/List; METHOD comp_1864 id ()Ljava/util/Optional; + METHOD method_53358 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53359 (Ljava/util/List;)Lcom/mojang/datafixers/util/Either; + ARG 0 slots CLASS class_6155 Builder FIELD field_31855 attributes Ljava/util/List; + FIELD field_51361 replace Z + METHOD (Z)V + ARG 1 replace METHOD method_35527 attribute (Lnet/minecraft/class_137$class_6156;)Lnet/minecraft/class_137$class_6155; ARG 1 attribute CLASS class_6156 AttributeBuilder diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 1c9e64df34..855e8f6b97 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -217,3 +217,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_56607 onDebugSample (Lnet/minecraft/class_9178;)V ARG 1 packet + METHOD method_59504 onProjectilePower (Lnet/minecraft/class_9632;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProjectilePowerS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProjectilePowerS2CPacket.mapping new file mode 100644 index 0000000000..2713afec10 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ProjectilePowerS2CPacket.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_9632 net/minecraft/network/packet/s2c/play/ProjectilePowerS2CPacket + FIELD field_51336 CODEC Lnet/minecraft/class_9139; + FIELD field_51337 entityId I + FIELD field_51338 powerX D + FIELD field_51339 powerY D + FIELD field_51340 powerZ D + METHOD (IDDD)V + ARG 1 entityId + ARG 2 powerX + ARG 4 powerY + ARG 6 powerZ + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_59506 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_59507 getEntityId ()I + METHOD method_59508 getPowerX ()D + METHOD method_59509 getPowerY ()D + METHOD method_59510 getPowerZ ()D diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index c4884bc1fb..d1f06e3651 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler ARG 0 id CLASS class_1705 PaymentSlot METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1263;III)V + ARG 1 screenHandler ARG 2 inventory ARG 3 index ARG 4 x diff --git a/mappings/net/minecraft/util/collection/ArrayListDeque.mapping b/mappings/net/minecraft/util/collection/ArrayListDeque.mapping index 215ef9a65e..0f512bb5b6 100644 --- a/mappings/net/minecraft/util/collection/ArrayListDeque.mapping +++ b/mappings/net/minecraft/util/collection/ArrayListDeque.mapping @@ -49,3 +49,36 @@ CLASS net/minecraft/class_8623 net/minecraft/util/collection/ArrayListDeque ARG 2 value CLASS class_8624 IteratorImpl FIELD field_45072 currentIndex I + CLASS class_9633 ReversedWrapper + FIELD field_51346 original Lnet/minecraft/class_8623; + METHOD (Lnet/minecraft/class_8623;Lnet/minecraft/class_8623;)V + ARG 2 original + METHOD add (ILjava/lang/Object;)V + ARG 1 index + ARG 2 value + METHOD contains (Ljava/lang/Object;)Z + ARG 1 value + METHOD get (I)Ljava/lang/Object; + ARG 1 index + METHOD indexOf (Ljava/lang/Object;)I + ARG 1 value + METHOD lastIndexOf (Ljava/lang/Object;)I + ARG 1 value + METHOD method_59514 getReversedIndex (I)I + ARG 1 index + METHOD offerFirst (Ljava/lang/Object;)Z + ARG 1 value + METHOD offerLast (Ljava/lang/Object;)Z + ARG 1 value + METHOD remove (I)Ljava/lang/Object; + ARG 1 index + METHOD removeFirstOccurrence (Ljava/lang/Object;)Z + ARG 1 value + METHOD removeLastOccurrence (Ljava/lang/Object;)Z + ARG 1 value + METHOD set (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 index + ARG 2 value + METHOD subList (II)Ljava/util/List; + ARG 1 start + ARG 2 end diff --git a/mappings/net/minecraft/util/collection/ListDeque.mapping b/mappings/net/minecraft/util/collection/ListDeque.mapping new file mode 100644 index 0000000000..f9ec4c0de4 --- /dev/null +++ b/mappings/net/minecraft/util/collection/ListDeque.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9634 net/minecraft/util/collection/ListDeque + METHOD addFirst (Ljava/lang/Object;)V + ARG 1 value + METHOD addLast (Ljava/lang/Object;)V + ARG 1 value diff --git a/mappings/net/minecraft/util/collection/Weighted.mapping b/mappings/net/minecraft/util/collection/Weighted.mapping index a79dd1d6ad..8740d0c51d 100644 --- a/mappings/net/minecraft/util/collection/Weighted.mapping +++ b/mappings/net/minecraft/util/collection/Weighted.mapping @@ -10,13 +10,9 @@ CLASS net/minecraft/class_6008 net/minecraft/util/collection/Weighted METHOD (Lnet/minecraft/class_6007;)V ARG 1 weight CLASS class_6010 Present - FIELD comp_2542 data Ljava/lang/Object; - FIELD comp_2543 weight Lnet/minecraft/class_6007; METHOD (Ljava/lang/Object;Lnet/minecraft/class_6007;)V ARG 1 data ARG 2 weight - METHOD comp_2542 data ()Ljava/lang/Object; - METHOD comp_2543 weight ()Lnet/minecraft/class_6007; METHOD method_34981 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 dataCodec METHOD method_34982 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 353bd27f70..ad63fa5163 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -525,3 +525,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 axis ARG 1 rotation ARG 2 result + METHOD method_59515 multiplyFraction (Lorg/apache/commons/lang3/math/Fraction;I)I + ARG 0 fraction + ARG 1 multiplier