From 010653ee616798b6275b332516b8e5523a6c3911 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 3 Mar 2024 01:16:43 +1100 Subject: [PATCH] 24w09a a little bit more --- .../minecraft/client/MinecraftClient.mapping | 1 + .../minecraft/client/gui/DrawContext.mapping | 7 + .../client/gui/screen/CreditsScreen.mapping | 2 + .../screen/option/ChatOptionsScreen.mapping | 1 + .../gui/screen/option/KeybindsScreen.mapping | 1 + .../screen/option/OnlineOptionsScreen.mapping | 1 + .../gui/screen/option/OptionsScreen.mapping | 3 + .../client/gui/widget/ClickableWidget.mapping | 6 + .../gui/widget/OptionListWidget.mapping | 13 ++ .../gui/widget/TextIconButtonWidget.mapping | 4 + .../net/minecraft/datafixer/FixUtil.mapping | 18 ++ .../fix/ItemStackComponentizationFix.mapping | 167 ++++++++++++++++++ .../entity/AreaEffectCloudEntity.mapping | 4 + .../minecraft/entity/EntityStatuses.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 4 + .../entity/projectile/ArrowEntity.mapping | 4 + .../PersistentProjectileEntity.mapping | 3 + .../SetAttributesLootFunction.mapping | 1 + ...ping => SetCustomDataLootFunction.mapping} | 2 +- unpick-definitions/entity_status.unpick | 1 + 20 files changed, 243 insertions(+), 1 deletion(-) rename mappings/net/minecraft/loot/function/{SetNbtLootFunction.mapping => SetCustomDataLootFunction.mapping} (89%) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 0573065dcc..27da3c02cb 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -187,6 +187,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_46552 startTime J FIELD field_46553 uptimeInTicks J FIELD field_47680 userPropertiesFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_49473 NBT_TOOLTIP_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping index ca7f63f0d0..52062e542d 100644 --- a/mappings/net/minecraft/client/gui/DrawContext.mapping +++ b/mappings/net/minecraft/client/gui/DrawContext.mapping @@ -458,6 +458,13 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 2 x ARG 3 y ARG 4 seed + METHOD method_57709 fillWithLayer (Lnet/minecraft/class_1921;IIIII)V + ARG 1 layer + ARG 2 startX + ARG 3 startY + ARG 4 endX + ARG 5 endY + ARG 6 z CLASS class_8214 ScissorStack FIELD field_43099 stack Ljava/util/Deque; METHOD method_49699 pop ()Lnet/minecraft/class_8030; diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index d066200fb7..0ce1ca382e 100644 --- a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen ARG 2 reader METHOD method_39776 readCredits (Ljava/io/Reader;)V ARG 1 reader + METHOD method_57738 renderVignette (Lnet/minecraft/class_332;)V + ARG 1 context CLASS class_6824 CreditsReader METHOD read (Ljava/io/Reader;)V ARG 1 reader diff --git a/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping index 010c884eb1..80b3363932 100644 --- a/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/option/ChatOptionsScreen + FIELD field_49493 TITLE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options diff --git a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping index c3b362b6bc..86103f7bde 100644 --- a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_6599 net/minecraft/client/gui/screen/option/KeybindsSc FIELD field_34800 lastKeyCodeUpdateTime J FIELD field_34801 controlsList Lnet/minecraft/class_459; FIELD field_34802 resetAllButton Lnet/minecraft/class_4185; + FIELD field_49536 TITLE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping index 759967d5f4..d6bda9d4db 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OnlineOptionsScreen.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_6777 net/minecraft/client/gui/screen/option/OnlineOptionsScreen FIELD field_41344 difficulty Lnet/minecraft/class_7172; + FIELD field_49500 TITLE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;[Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V ARG 1 parent ARG 2 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index 333550a1b4..333824be3a 100644 --- a/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -14,7 +14,10 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre FIELD field_41353 TELEMETRY_TEXT Lnet/minecraft/class_2561; FIELD field_41354 COLUMNS I FIELD field_43145 CREDITS_AND_ATTRIBUTION_TEXT Lnet/minecraft/class_2561; + FIELD field_49501 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_49502 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V + ARG 1 parent ARG 2 gameOptions METHOD method_20374 lockDifficulty (Z)V ARG 1 difficultyLocked diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 404852b0ef..99b7294675 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -108,3 +108,9 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_55445 setDimensions (II)V ARG 1 width ARG 2 height + METHOD method_57719 drawBackground (Lnet/minecraft/class_332;IIII)V + ARG 1 context + ARG 2 startX + ARG 3 startY + ARG 4 endX + ARG 5 endY diff --git a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping index 9b02a2ad91..fe72ac4ce5 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping @@ -1,7 +1,13 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget + FIELD field_49483 optionsScreen Lnet/minecraft/class_4667; + METHOD (Lnet/minecraft/class_310;IILnet/minecraft/class_4667;)V + ARG 1 client + ARG 2 width + ARG 4 optionsScreen METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)V ARG 1 option METHOD method_20407 addOptionEntry (Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V + ARG 1 firstOption ARG 2 secondOption METHOD method_20408 addAll ([Lnet/minecraft/class_7172;)V ARG 1 options @@ -13,9 +19,16 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget CLASS class_354 WidgetEntry FIELD field_18214 widgets Ljava/util/List; FIELD field_27983 optionsToWidgets Ljava/util/Map; + FIELD field_49485 optionsScreen Lnet/minecraft/class_4667; METHOD (Ljava/util/Map;Lnet/minecraft/class_4667;)V ARG 1 optionsToWidgets + ARG 2 optionsScreen METHOD method_20409 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_354; ARG 0 options + ARG 1 option + ARG 2 optionsSCreen METHOD method_20410 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_354; ARG 0 options + ARG 1 firstOption + ARG 2 secondOption + ARG 3 optionsScreen diff --git a/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping index a1a84c5b13..587026c03b 100644 --- a/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextIconButtonWidget.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_8662 net/minecraft/client/gui/widget/TextIconButtonWid ARG 5 textureHeight ARG 6 texture ARG 7 onPress + ARG 8 narrationSupplier METHOD method_52723 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Z)Lnet/minecraft/class_8662$class_8663; ARG 0 text ARG 1 onPress @@ -26,6 +27,7 @@ CLASS net/minecraft/class_8662 net/minecraft/client/gui/widget/TextIconButtonWid FIELD field_45387 texture Lnet/minecraft/class_2960; FIELD field_45388 textureWidth I FIELD field_45389 textureHeight I + FIELD field_49486 narrationSupplier Lnet/minecraft/class_4185$class_7841; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Z)V ARG 1 text ARG 2 onPress @@ -40,5 +42,7 @@ CLASS net/minecraft/class_8662 net/minecraft/client/gui/widget/TextIconButtonWid ARG 1 texture ARG 2 width ARG 3 height + METHOD method_57722 narration (Lnet/minecraft/class_4185$class_7841;)Lnet/minecraft/class_8662$class_8663; + ARG 1 narrationSupplier CLASS class_8664 IconOnly CLASS class_8665 WithText diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping index 8d940608b9..04f31eb247 100644 --- a/mappings/net/minecraft/datafixer/FixUtil.mapping +++ b/mappings/net/minecraft/datafixer/FixUtil.mapping @@ -19,3 +19,21 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil ARG 0 dynamic ARG 1 key ARG 2 value + METHOD method_57184 copyValue (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 from + ARG 1 fromKey + ARG 2 to + ARG 3 toKey + METHOD method_57185 copyAndTransformValue (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/Dynamic; + ARG 0 from + ARG 1 fromKey + ARG 2 to + ARG 3 toKey + ARG 4 valueTransformer + METHOD method_57186 getBoolean (Lcom/mojang/serialization/DynamicLike;)Lcom/mojang/serialization/DataResult; + ARG 0 dynamicLike + METHOD method_57187 getBoolean (Lcom/mojang/serialization/DynamicLike;Z)Z + ARG 0 dynamicLike + ARG 1 fallback + METHOD method_57189 getBoolean (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; + ARG 0 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping index 052aef5ef4..10f031dae3 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemStackComponentizationFix.mapping @@ -1,7 +1,174 @@ CLASS net/minecraft/class_9267 net/minecraft/datafixer/fix/ItemStackComponentizationFix + FIELD field_49188 HIDE_ENCHANTMENTS_FLAG I + FIELD field_49189 HIDE_MODIFIERS_FLAG I + FIELD field_49190 HIDE_UNBREAKABLE_FLAG I + FIELD field_49191 HIDE_CAN_DESTROY_FLAG I + FIELD field_49192 HIDE_CAN_PLACE_FLAG I + FIELD field_49193 HIDE_ADDITIONAL_FLAG I + FIELD field_49194 HIDE_DYED_FLAG I + FIELD field_49195 HIDE_UPGRADE_FLAG I FIELD field_49196 POTION_ITEM_IDS Ljava/util/Set; 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; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema + METHOD method_57208 getMapDecorationName (I)Ljava/lang/String; + ARG 0 index + METHOD method_57209 fixExplosion (Lnet/minecraft/class_9267$class_9268;)V + ARG 0 data + METHOD method_57210 (Lnet/minecraft/class_9267$class_9268;ILcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 displayDynamic + METHOD method_57211 fixStack (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 0 data + ARG 1 dynamic + METHOD method_57212 fixDisplay (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;I)Lcom/mojang/serialization/Dynamic; + ARG 0 data + ARG 1 dynamic + ARG 2 hideFlags + METHOD method_57213 fixBlockEntityData (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 data + ARG 1 dynamic + ARG 2 blockEntityId + METHOD method_57214 fixEnchantments (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Z)V + ARG 0 data + ARG 1 dynamic + ARG 2 nbtKey + ARG 3 componentId + ARG 4 hideInTooltip + METHOD method_57215 getEnchantmentAndLevelPair (Lcom/mojang/serialization/Dynamic;)Ljava/util/Optional; + ARG 0 dynamic + METHOD method_57216 createBlockPredicateListDynamic (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 listAsString + METHOD method_57217 createFilterableTextDynamic (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 unfiltered + ARG 2 filtered + METHOD method_57218 createPropertiesDynamic (Lcom/mojang/serialization/OptionalDynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 optionalDynamic + METHOD method_57221 (Ljava/lang/String;)Z + ARG 0 potionId + METHOD method_57222 (Ljava/lang/String;Ljava/lang/Number;)Lcom/mojang/datafixers/util/Pair; + ARG 0 enchantmentId + ARG 1 level + METHOD method_57223 fixFireworks (Lnet/minecraft/class_9267$class_9268;)V + ARG 0 data + METHOD method_57224 fixPotionContents (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 0 data + ARG 1 dynamic + METHOD method_57225 fixAdventureModePredicates (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;I)V + ARG 0 data + ARG 1 dynamic + ARG 2 hideFlags + METHOD method_57226 fixBlockPredicateList (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Z)V + ARG 0 data + ARG 1 dynamic + ARG 2 nbtKey + ARG 3 componentId + ARG 4 hideInTooltip + METHOD method_57227 fixAttributeModifier (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_57229 (Lnet/minecraft/class_9267$class_9268;)Lcom/mojang/serialization/Dynamic; + ARG 0 data + METHOD method_57230 fixWritableBookContent (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 0 data + ARG 1 dynamic + METHOD method_57231 fixAttributeModifiers (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;I)V + ARG 0 data + ARG 1 dynamic + ARG 2 hideFlags + METHOD method_57232 fixMapDecorations (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/datafixers/util/Pair; + ARG 0 dynamic + METHOD method_57233 fixWrittenBookContent (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 0 data + ARG 1 dynamic + METHOD method_57234 fixExplosion (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_57235 fixBookPages (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data + ARG 1 dynamic + METHOD method_57236 createProfileDynamic (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_57237 fixBucketEntityData (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 0 data + ARG 1 dynamic + METHOD method_57238 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_57239 fixLodestoneTarget (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 0 data + ARG 1 dynamic + METHOD method_57241 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 fireworksDynamic + METHOD method_57243 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 explosionDynamic + METHOD method_57245 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)V + ARG 1 skullOwnerDynamic + METHOD method_57246 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 typeDynamic + METHOD method_57247 (Lnet/minecraft/class_9267$class_9268;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 blockEntityTagDynamic + METHOD method_57248 (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; + ARG 0 filteredPagesValueDynamic + METHOD method_57249 (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; + ARG 0 filteredPagesKeyDynamic + METHOD method_57250 (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; + ARG 0 pagesDynamic + METHOD method_57252 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 operationDynamic + METHOD method_57253 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 predicatesDynamic + METHOD method_57254 (Lcom/mojang/serialization/Dynamic;)Ljava/util/stream/Stream; + ARG 0 enchantmentsDynamic + METHOD method_57255 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 itemsDynamic + CLASS class_9268 StackData + FIELD field_49200 itemId Ljava/lang/String; + FIELD field_49201 count I + FIELD field_49202 components Lcom/mojang/serialization/Dynamic; + FIELD field_49203 leftoverNbt Lcom/mojang/serialization/Dynamic; + FIELD field_49204 nbt Lcom/mojang/serialization/Dynamic; + METHOD (Ljava/lang/String;ILcom/mojang/serialization/Dynamic;)V + ARG 1 itemId + ARG 2 count + ARG 3 dynamic + METHOD method_57256 finalize ()Lcom/mojang/serialization/Dynamic; + METHOD method_57257 fromDynamic (Lcom/mojang/serialization/Dynamic;)Ljava/util/Optional; + ARG 0 dynamic + METHOD method_57258 mergeLeftoverNbt (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data + ARG 1 leftoverNbt + METHOD method_57259 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/Number;)Lnet/minecraft/class_9267$class_9268; + ARG 1 itemId + ARG 2 count + METHOD method_57262 getAndRemove (Ljava/lang/String;)Lcom/mojang/serialization/OptionalDynamic; + ARG 1 key + METHOD method_57263 setComponent (Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)V + ARG 1 key + ARG 2 value + METHOD method_57264 moveToComponent (Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 nbtKey + ARG 2 components + ARG 3 componentId + METHOD method_57265 setComponent (Ljava/lang/String;Lcom/mojang/serialization/OptionalDynamic;)V + ARG 1 key + ARG 2 optionalValue + METHOD method_57266 moveToComponent (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 nbtKey + ARG 2 componentId + METHOD method_57267 moveToComponent (Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)V + ARG 1 nbtKey + ARG 2 componentId + ARG 3 defaultValue + METHOD method_57268 applyFixer (Ljava/lang/String;ZLjava/util/function/UnaryOperator;)V + ARG 1 nbtKey + ARG 2 removeIfEmpty + ARG 3 fixer + METHOD method_57269 itemMatches (Ljava/util/Set;)Z + ARG 1 itemIds + METHOD method_57270 itemEquals (Ljava/lang/String;)Z + ARG 1 itemId + METHOD method_57271 (Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)V + ARG 2 nbt + METHOD method_57272 (Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)V + ARG 2 value diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 778261422b..78a866f92b 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity FIELD field_29971 MAX_RADIUS F + FIELD field_49209 potionContentsComponent Lnet/minecraft/class_1844; FIELD field_5929 radiusOnUse F FIELD field_5930 radiusGrowth F FIELD field_5931 PARTICLE_ID Lnet/minecraft/class_2940; @@ -49,4 +50,7 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_5609 setRadiusOnUse (F)V ARG 1 radiusOnUse METHOD method_5610 addEffect (Lnet/minecraft/class_1293;)V + ARG 1 effect METHOD method_5611 isWaiting ()Z + METHOD method_57280 setPotionContents (Lnet/minecraft/class_1844;)V + ARG 1 potionContentsComponent diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 5895a4bcfb..0df6f840d9 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -56,3 +56,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_38847 SONIC_BOOM B FIELD field_42621 START_DIGGING B FIELD field_49074 PEEKING B + FIELD field_49215 BREAK_BODY B diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index b3d23f85de..53dc533b29 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -382,6 +382,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 health METHOD method_56994 getJumpVelocity (F)F ARG 1 strength + METHOD method_57292 damageEquipment (Lnet/minecraft/class_1282;F[Lnet/minecraft/class_1304;)V + ARG 1 source + ARG 2 amount + ARG 3 slots METHOD method_57293 (Lnet/minecraft/class_5131;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V ARG 1 attribute ARG 2 modifier diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index 4dab5f91d0..f39c9925e1 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -13,8 +13,12 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity ARG 1 world ARG 2 owner ARG 3 stack + METHOD method_57315 getPotionContents ()Lnet/minecraft/class_1844; + METHOD method_57316 setPotionContents (Lnet/minecraft/class_1844;)V + ARG 1 potionContentsComponent METHOD method_7460 getColor ()I METHOD method_7461 spawnParticles (I)V ARG 1 amount METHOD method_7462 initColor ()V METHOD method_7463 addEffect (Lnet/minecraft/class_1293;)V + ARG 1 effect diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index f7afb1c430..b1fbb1a269 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -44,6 +44,9 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT

This is the original stack used to spawn the projectile. {@link #asItemStack} COMMENT returns a copy of that stack which can be safely changed. Additionally, COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID. + METHOD method_57313 setStack (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_57314 getDefaultItemStack ()Lnet/minecraft/class_1799; METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 85f31c35dc..812051bffa 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -55,5 +55,6 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 4 amount METHOD method_35528 build ()Lnet/minecraft/class_137$class_138; METHOD method_35529 slot (Lnet/minecraft/class_9274;)Lnet/minecraft/class_137$class_6156; + ARG 1 slot METHOD method_35530 uuid (Ljava/util/UUID;)Lnet/minecraft/class_137$class_6156; ARG 1 uuid diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCustomDataLootFunction.mapping similarity index 89% rename from mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping rename to mappings/net/minecraft/loot/function/SetCustomDataLootFunction.mapping index 6c7fe9102f..8059a625ad 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCustomDataLootFunction.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction +CLASS net/minecraft/class_159 net/minecraft/loot/function/SetCustomDataLootFunction FIELD field_1138 nbt Lnet/minecraft/class_2487; FIELD field_45849 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_2487;)V diff --git a/unpick-definitions/entity_status.unpick b/unpick-definitions/entity_status.unpick index 7a8cba5fb9..b7d0040e76 100644 --- a/unpick-definitions/entity_status.unpick +++ b/unpick-definitions/entity_status.unpick @@ -57,6 +57,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses EARS_TWITCH constant entity_statuses net/minecraft/entity/EntityStatuses SONIC_BOOM constant entity_statuses net/minecraft/entity/EntityStatuses START_DIGGING constant entity_statuses net/minecraft/entity/EntityStatuses PEEKING +constant entity_statuses net/minecraft/entity/EntityStatuses BREAK_BODY target_method net/minecraft/entity/Entity handleStatus (B)V param 0 entity_statuses