From 656e69025a0fd9c09064e10ca485187f4bca3f11 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sun, 14 Apr 2024 20:42:25 -0500 Subject: [PATCH] complete components, text, and village --- ...tipContext.mapping => TooltipType.mapping} | 2 +- .../component/DataComponentMap.mapping | 8 +++++ .../component/DataComponentPatch.mapping | 5 ++++ .../component/DataComponentType.mapping | 3 ++ .../component/PatchedDataComponentMap.mapping | 2 ++ .../type/AttributeModifiersComponent.mapping | 4 +++ .../component/type/BookContent.mapping | 4 +++ .../type/BundleContentsComponent.mapping | 3 ++ .../type/ContainerContentsComponent.mapping | 8 +++++ .../component/type/DyedColorComponent.mapping | 1 + .../type/ItemEnchantmentsComponent.mapping | 5 ++++ .../type/UnbreakableComponent.mapping | 1 + .../type/WritableBookContentComponent.mapping | 1 + .../type/WrittenBookContentComponent.mapping | 4 +++ mappings/net/minecraft/item/Item.mapping | 14 ++++++++- mappings/net/minecraft/item/ItemStack.mapping | 7 +++-- .../minecraft/item/TooltipAppender.mapping | 3 +- .../predicate/DataComponentPredicate.mapping | 17 +++++++++++ .../registry/tag/EnchantmentTags.mapping | 2 ++ .../net/minecraft/text/HoverEvent.mapping | 22 +++++++++++++- .../net/minecraft/text/TextCodecs.mapping | 30 ++++++++++++++++++- .../net/minecraft/village/TradeOffer.mapping | 5 +++- .../net/minecraft/village/TradeOffers.mapping | 4 ++- .../minecraft/village/TradeableItem.mapping | 17 +++++++++++ 24 files changed, 163 insertions(+), 9 deletions(-) rename mappings/net/minecraft/client/item/{TooltipContext.mapping => TooltipType.mapping} (97%) create mode 100644 mappings/net/minecraft/component/type/BookContent.mapping create mode 100644 mappings/net/minecraft/predicate/DataComponentPredicate.mapping create mode 100644 mappings/net/minecraft/registry/tag/EnchantmentTags.mapping create mode 100644 mappings/net/minecraft/village/TradeableItem.mapping 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 ed8036fccd..372731ccfd 100644 --- a/mappings/net/minecraft/client/item/TooltipContext.mapping +++ b/mappings/net/minecraft/client/item/TooltipType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_taebrtdw net/minecraft/client/item/TooltipContext +CLASS net/minecraft/unmapped/C_taebrtdw net/minecraft/client/item/TooltipType FIELD f_yceowjjc HIDE_ADVANCED_DETAILS Lnet/minecraft/unmapped/C_taebrtdw$C_vsiqutyg; FIELD f_zuchejxz SHOW_ADVANCED_DETAILS Lnet/minecraft/unmapped/C_taebrtdw$C_vsiqutyg; METHOD m_ecuysqaa shouldShowAdvancedDetails ()Z diff --git a/mappings/net/minecraft/component/DataComponentMap.mapping b/mappings/net/minecraft/component/DataComponentMap.mapping index 920f04eec5..578a33b730 100644 --- a/mappings/net/minecraft/component/DataComponentMap.mapping +++ b/mappings/net/minecraft/component/DataComponentMap.mapping @@ -15,11 +15,19 @@ CLASS net/minecraft/unmapped/C_kouhnfig net/minecraft/component/DataComponentMap ARG 1 type METHOD m_ueulfbom getOrDefault (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Ljava/lang/Object; ARG 2 defaultValue + METHOD m_vbomrwat of (Lnet/minecraft/unmapped/C_kouhnfig;Lnet/minecraft/unmapped/C_kouhnfig;)Lnet/minecraft/unmapped/C_kouhnfig; + ARG 0 fallback + ARG 1 base CLASS C_vfzyoahz Builder FIELD f_qqvwpxtm components Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; METHOD m_ahyovmev putAll (Lnet/minecraft/unmapped/C_kouhnfig;)Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz; ARG 1 map METHOD m_ilbrroua build ()Lnet/minecraft/unmapped/C_kouhnfig; + METHOD m_kgwncggh putUnchecked (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)V + ARG 1 type + ARG 2 value + METHOD m_xoadznbo build (Ljava/util/Map;)Lnet/minecraft/unmapped/C_kouhnfig; + ARG 0 components METHOD m_zuepxtcm put (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz; ARG 1 type ARG 2 value diff --git a/mappings/net/minecraft/component/DataComponentPatch.mapping b/mappings/net/minecraft/component/DataComponentPatch.mapping index d817fe8233..2c6c0c7502 100644 --- a/mappings/net/minecraft/component/DataComponentPatch.mapping +++ b/mappings/net/minecraft/component/DataComponentPatch.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/unmapped/C_jqyoylib net/minecraft/component/DataComponentPat FIELD f_ddzjqron patchedComponents Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; FIELD f_hfqkylly EMPTY Lnet/minecraft/unmapped/C_jqyoylib; FIELD f_xdjqkddv REMOVED_PREFIX Ljava/lang/String; + METHOD m_aootufzt matching (Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_jqyoylib; + ARG 1 predicate METHOD m_gvzwygqe get (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/Optional; ARG 1 type METHOD m_jbaewuyi toString (Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;)Ljava/lang/String; @@ -10,6 +12,7 @@ CLASS net/minecraft/unmapped/C_jqyoylib net/minecraft/component/DataComponentPat METHOD m_mmqaewwd isEmpty ()Z METHOD m_nonvnbuh builder ()Lnet/minecraft/unmapped/C_jqyoylib$C_dkdhcgqw; METHOD m_ogqcghcj size ()I + METHOD m_xjhdaptk split ()Lnet/minecraft/unmapped/C_jqyoylib$C_lyzudvpc; CLASS C_dkdhcgqw Builder FIELD f_sbbdjqom components Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; METHOD m_atrtmrrv put (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jqyoylib$C_dkdhcgqw; @@ -30,3 +33,5 @@ CLASS net/minecraft/unmapped/C_jqyoylib net/minecraft/component/DataComponentPat ARG 0 buf ARG 1 type ARG 2 value + CLASS C_lyzudvpc SplitResult + FIELD f_ddvcxnyp EMPTY Lnet/minecraft/unmapped/C_jqyoylib$C_lyzudvpc; diff --git a/mappings/net/minecraft/component/DataComponentType.mapping b/mappings/net/minecraft/component/DataComponentType.mapping index 87d61933e8..96641ff2bc 100644 --- a/mappings/net/minecraft/component/DataComponentType.mapping +++ b/mappings/net/minecraft/component/DataComponentType.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/unmapped/C_pscqxfcs net/minecraft/component/DataComponentType + FIELD f_mxhspduz VALUE_MAP_CODEC Lcom/mojang/serialization/Codec; + FIELD f_qwjysbes PERSISTENT_CODEC Lcom/mojang/serialization/Codec; + FIELD f_xrfpwkjt CODEC Lcom/mojang/serialization/Codec; METHOD m_dxcqrmbb getPacketCodec ()Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_lmuzailu isTransient ()Z METHOD m_nuhzpkbr builder ()Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle; diff --git a/mappings/net/minecraft/component/PatchedDataComponentMap.mapping b/mappings/net/minecraft/component/PatchedDataComponentMap.mapping index 07c87d69cb..d00c2d9a65 100644 --- a/mappings/net/minecraft/component/PatchedDataComponentMap.mapping +++ b/mappings/net/minecraft/component/PatchedDataComponentMap.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/unmapped/C_jvfovkxa net/minecraft/component/PatchedDataCompo ARG 0 baseComponents ARG 1 patchedComponents METHOD m_wghzngnj copy ()Lnet/minecraft/unmapped/C_jvfovkxa; + METHOD m_wpvoxche restorePatch (Lnet/minecraft/unmapped/C_jqyoylib;)V + ARG 1 patch METHOD m_xqwouufm setAll (Lnet/minecraft/unmapped/C_kouhnfig;)V ARG 1 map METHOD m_yyvpczzd applyPatch (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/util/Optional;)V diff --git a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping index 167024f62f..7af0c1e8f5 100644 --- a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping @@ -6,7 +6,11 @@ CLASS net/minecraft/unmapped/C_azfkqhlm net/minecraft/component/type/AttributeMo METHOD m_addoqghi compute (DLnet/minecraft/unmapped/C_yuycoehb;)D ARG 1 base ARG 3 slot + METHOD m_esfbwxaj withShowInTooltip (Z)Lnet/minecraft/unmapped/C_azfkqhlm; METHOD m_gdqixgmv with (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hdbqsqsm;Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_azfkqhlm; + ARG 1 attribute + ARG 2 modifier + ARG 3 group METHOD m_mjzxuzjp (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD m_pxeavngw builder ()Lnet/minecraft/unmapped/C_azfkqhlm$C_vinsjuvn; diff --git a/mappings/net/minecraft/component/type/BookContent.mapping b/mappings/net/minecraft/component/type/BookContent.mapping new file mode 100644 index 0000000000..33010cf46e --- /dev/null +++ b/mappings/net/minecraft/component/type/BookContent.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/unmapped/C_uabhlzfi net/minecraft/component/type/BookContent + METHOD m_ntdhogtz withReplacedPages (Ljava/util/List;)Ljava/lang/Object; + ARG 1 pages + METHOD m_zsyzprjm pages ()Ljava/util/List; diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping index c403e5c7aa..e815a25be2 100644 --- a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/unmapped/C_rdabfjzm net/minecraft/component/type/BundleConte METHOD m_ofbuniku stream ()Ljava/lang/Iterable; METHOD m_osbljvar (Lnet/minecraft/unmapped/C_rdabfjzm;)Ljava/util/List; ARG 0 component + METHOD m_snqazrew streamCopiedContents ()Ljava/util/stream/Stream; + METHOD m_xaoywwbi copyContents ()Ljava/lang/Iterable; CLASS C_yphifkae Builder FIELD f_jajsrtxb weight Lorg/apache/commons/lang3/math/Fraction; FIELD f_yhroaggz stacks Ljava/util/List; @@ -25,6 +27,7 @@ CLASS net/minecraft/unmapped/C_rdabfjzm net/minecraft/component/type/BundleConte METHOD m_jgvkdksp getWeight ()Lorg/apache/commons/lang3/math/Fraction; METHOD m_lrhhcvgk build ()Lnet/minecraft/unmapped/C_rdabfjzm; METHOD m_njvlfmlu tryAdd (Lnet/minecraft/unmapped/C_sddaxwyk;)I + METHOD m_sxjflkev clear ()Lnet/minecraft/unmapped/C_rdabfjzm$C_yphifkae; METHOD m_sycwuodw tryTransfer (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_jzrpycqo;)I ARG 1 slot METHOD m_tbuzppwg getMaxAllowed (Lnet/minecraft/unmapped/C_sddaxwyk;)I diff --git a/mappings/net/minecraft/component/type/ContainerContentsComponent.mapping b/mappings/net/minecraft/component/type/ContainerContentsComponent.mapping index dc5fc6ca9d..b09def6a4c 100644 --- a/mappings/net/minecraft/component/type/ContainerContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ContainerContentsComponent.mapping @@ -1,16 +1,24 @@ CLASS net/minecraft/unmapped/C_tmeipioo net/minecraft/component/type/ContainerContentsComponent FIELD f_azpkkvlz MAX_SLOTS I + FIELD f_oswdeltn NO_SLOT I FIELD f_poyutggn DEFAULT Lnet/minecraft/unmapped/C_tmeipioo; FIELD f_ydquxind stacks Lnet/minecraft/unmapped/C_rnrfftze; METHOD (Ljava/util/List;)V ARG 1 stacks + METHOD m_cbgpuegv iterateNonEmpty ()Ljava/lang/Iterable; METHOD m_ckoviecg copyTo (Lnet/minecraft/unmapped/C_rnrfftze;)V ARG 1 stacks METHOD m_fxmbjjsj copyFirstStack ()Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD m_gjwqjhtm findLastNonEmptySlot (Ljava/util/List;)I + ARG 0 stacks METHOD m_iubzqnho collectSlots ()Ljava/util/List; METHOD m_lfzvkncb stream ()Ljava/util/stream/Stream; + METHOD m_semwhbjd streamNonEmpty ()Ljava/util/stream/Stream; + METHOD m_syjjsefp fromStacks (Ljava/util/List;)Lnet/minecraft/unmapped/C_tmeipioo; + ARG 0 stacks METHOD m_tmogelgq fromSlots (Ljava/util/List;)Lnet/minecraft/unmapped/C_tmeipioo; ARG 0 slots + METHOD m_ygjxbhro iterateNonEmptyCopied ()Ljava/lang/Iterable; METHOD m_zyubyvak (Lnet/minecraft/unmapped/C_tmeipioo;)Ljava/util/List; ARG 0 component CLASS C_zuinfpgw Slot diff --git a/mappings/net/minecraft/component/type/DyedColorComponent.mapping b/mappings/net/minecraft/component/type/DyedColorComponent.mapping index b8eee236a4..be58eb67f0 100644 --- a/mappings/net/minecraft/component/type/DyedColorComponent.mapping +++ b/mappings/net/minecraft/component/type/DyedColorComponent.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_jlijuwug net/minecraft/component/type/DyedColorCo FIELD f_uvniimzo CODEC Lcom/mojang/serialization/Codec; METHOD m_kqxwsjew setColor (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/List;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 dyes + METHOD m_qbwxvbvz withShowInTooltip (Z)Lnet/minecraft/unmapped/C_jlijuwug; METHOD m_rftutjiz (Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_jlijuwug; ARG 0 rgb METHOD m_uwprebhu (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index 84a2cbf565..5e7988b228 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_qlclfxvn net/minecraft/component/type/ItemEnchantmentsComponent + FIELD f_jnmvmuou MAX_ENCHANTMENT_LEVEL I FIELD f_nekwvric FULL_CODEC Lcom/mojang/serialization/Codec; FIELD f_osezxuts DEFAULT Lnet/minecraft/unmapped/C_qlclfxvn; FIELD f_svrotkyo LEVEL_CODEC Lcom/mojang/serialization/Codec; @@ -16,8 +17,12 @@ CLASS net/minecraft/unmapped/C_qlclfxvn net/minecraft/component/type/ItemEnchant ARG 0 instance METHOD m_rqlwgwxc (Lnet/minecraft/unmapped/C_qlclfxvn;)Ljava/lang/Boolean; ARG 0 component + METHOD m_rwfsmcfy getTagOrEmpty (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_odfnijdo; + ARG 0 lookup + ARG 2 tag METHOD m_szyctegw getEnchantmentEntries ()Ljava/util/Set; COMMENT @return a map with enchantments as keys and their levels as values + METHOD m_ucwxfcxd withShownInTooltip (Z)Lnet/minecraft/unmapped/C_qlclfxvn; METHOD m_ugcgsgdf getLevel (Lnet/minecraft/unmapped/C_jxtrubuh;)I ARG 1 enchantment METHOD m_ylenfqyd (Lnet/minecraft/unmapped/C_qlclfxvn;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap; diff --git a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping index 8b900cb978..647be2ff9b 100644 --- a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping +++ b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_drqhpkfg net/minecraft/component/type/UnbreakableComponent FIELD f_iaeyiyom TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt; + METHOD m_nrzkdjww create (Z)Lnet/minecraft/unmapped/C_drqhpkfg; METHOD m_sksdhjpx (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping b/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping index af3260410e..73d5a9aec6 100644 --- a/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WritableBookContentComponent.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_caqjiyos net/minecraft/component/type/WritableBookContentComponent FIELD f_avgroxgu DEFAULT Lnet/minecraft/unmapped/C_caqjiyos; FIELD f_cxtzxoud MAX_PAGE_LENGTH I + FIELD f_mkolbqjc MAX_PAGE_COUNT I FIELD f_mulsuicq CODEC Lcom/mojang/serialization/Codec; FIELD f_npplqols PAGE_CODEC Lcom/mojang/serialization/Codec; FIELD f_vcjzexqc PAGES_CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index f786494c6d..fbf3650ff6 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -4,10 +4,13 @@ CLASS net/minecraft/unmapped/C_xfpcozbo net/minecraft/component/type/WrittenBook FIELD f_iuyztjig CODEC Lcom/mojang/serialization/Codec; FIELD f_mokxmpxm MAX_CRAFTABLE_GENERATION I FIELD f_mqoqgaui PAGES_CODEC Lcom/mojang/serialization/Codec; + FIELD f_omgwxtll PAGE_CODEC Lcom/mojang/serialization/Codec; FIELD f_umdfmcaa MAX_TITLE_LENGTH I FIELD f_wknzzapl TITLE_LENGTH I + FIELD f_znyohjhm DEFAULT Lnet/minecraft/unmapped/C_xfpcozbo; METHOD m_apubqepp (ZLnet/minecraft/unmapped/C_cihikqyk;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 1 page + METHOD m_brthpkaj createPagesCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; METHOD m_hvzjkpvt getPages (Z)Ljava/util/List; ARG 1 shouldFilter METHOD m_kvuqbnkt resolve (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_xfpcozbo; @@ -16,6 +19,7 @@ CLASS net/minecraft/unmapped/C_xfpcozbo net/minecraft/component/type/WrittenBook METHOD m_oqggvzcx (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_rdaqiwdt;)Ljava/util/Optional; ARG 2 filtered METHOD m_pscktqqc tryCraftCopy ()Lnet/minecraft/unmapped/C_xfpcozbo; + METHOD m_pstvsuuk createPageCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; METHOD m_sbeqlnvu resolvePage (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_cihikqyk;)Ljava/util/Optional; ARG 2 page METHOD m_vhgxgmih markResolved ()Lnet/minecraft/unmapped/C_xfpcozbo; diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index b85d7ba61b..036dc4b062 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -128,6 +128,7 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item COMMENT COMMENT

By default, returns true if the item has enchantments. ARG 1 stack + METHOD m_proceewu getMaxStackSize ()I METHOD m_ptxvhcty getOrCreateTranslationKey ()Ljava/lang/String; METHOD m_qibylykw getTranslationKey (Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/lang/String; COMMENT Gets the translation key of this item using the provided item stack for context. @@ -167,8 +168,9 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item ARG 2 fluidHandling METHOD m_vlpdhsgt appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/List;Lnet/minecraft/unmapped/C_taebrtdw;)V ARG 1 stack + ARG 2 context ARG 3 tooltip - ARG 4 context + ARG 4 type METHOD m_vptgdmsr getDrinkSound ()Lnet/minecraft/unmapped/C_avavozay; METHOD m_wanuqhiu isUsedOnRelease (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack @@ -220,6 +222,7 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item COMMENT COMMENT @return this instance ARG 1 recipeRemainder + METHOD m_qvwjjfqj buildAndValidateComponents ()Lnet/minecraft/unmapped/C_kouhnfig; METHOD m_robddprv maxDamage (I)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; COMMENT Sets the maximum durability of any item configured with this Settings instance. COMMENT @@ -248,3 +251,12 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item COMMENT @return this instance ARG 1 rarity COMMENT rarity to apply to items using this Settings instance + CLASS C_rdhfmrgz TooltipContext + FIELD f_kflbnvga EMPTY Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz; + METHOD m_adcyfttv create (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz; + ARG 0 lookup + METHOD m_cnghxzmx getMapState (Lnet/minecraft/unmapped/C_qqxyyzzm;)Lnet/minecraft/unmapped/C_nvpllgmg; + ARG 1 id + METHOD m_fyhcyijp getLookup ()Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; + METHOD m_iygpuvqa create (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz; + METHOD m_krwdvrdq getTickRate ()F diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 30939b94d3..85a927d0b3 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack FIELD f_lxaedfnb cooldown I FIELD f_ohakxxel LOGGER Lorg/slf4j/Logger; FIELD f_qqkxjbjo NON_AIR_ITEM_CODEC Lcom/mojang/serialization/Codec; + FIELD f_rrbqzuyq SIMPLE_ITEM_CODEC Lcom/mojang/serialization/Codec; FIELD f_tqvryqzt CODEC Lcom/mojang/serialization/Codec; FIELD f_ygsunlnh DISABLED Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_zbdizxtz holder Lnet/minecraft/unmapped/C_astfners; @@ -115,7 +116,8 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack METHOD m_hawykozc getMiningSpeedMultiplier (Lnet/minecraft/unmapped/C_txtbiemp;)F ARG 1 state METHOD m_hdopgosb appendTooltip (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_taebrtdw;)V - ARG 1 type + ARG 1 componentType + ARG 4 type METHOD m_hmrpegvi onClickedOnOther (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_qcuteihm;Lnet/minecraft/unmapped/C_jzrpycqo;)Z COMMENT Called when the stack is placed on another {@link ItemStack} in a slot. COMMENT @@ -292,8 +294,9 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack COMMENT the resulting stack's item count METHOD m_yrbtnzbt getRarity ()Lnet/minecraft/unmapped/C_mqmixksm; METHOD m_ywdqmcbk getTooltip (Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_taebrtdw;)Ljava/util/List; + ARG 1 context ARG 2 player - ARG 3 context + ARG 3 type METHOD m_zakagwqa set (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Ljava/lang/Object; METHOD m_zpjrlkav onCraftByPlayer (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;I)V ARG 1 world diff --git a/mappings/net/minecraft/item/TooltipAppender.mapping b/mappings/net/minecraft/item/TooltipAppender.mapping index a5db53a70f..bbd635748f 100644 --- a/mappings/net/minecraft/item/TooltipAppender.mapping +++ b/mappings/net/minecraft/item/TooltipAppender.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_lcgmmrzz net/minecraft/item/TooltipAppender METHOD m_eqoeoqpg appendToTooltip (Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_taebrtdw;)V + ARG 1 context ARG 2 tooltipConsumer - ARG 3 context + ARG 3 type diff --git a/mappings/net/minecraft/predicate/DataComponentPredicate.mapping b/mappings/net/minecraft/predicate/DataComponentPredicate.mapping new file mode 100644 index 0000000000..ef5016691a --- /dev/null +++ b/mappings/net/minecraft/predicate/DataComponentPredicate.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/unmapped/C_naseleda net/minecraft/predicate/DataComponentPredicate + FIELD f_hruffpzc components Ljava/util/List; + FIELD f_vukipudp EMPTY Lnet/minecraft/unmapped/C_naseleda; + METHOD m_eqjqhmqk test (Lnet/minecraft/unmapped/C_xzoqrxvu;)Z + ARG 1 component + METHOD m_qqqxxzqa create (Lnet/minecraft/unmapped/C_kouhnfig;)Lnet/minecraft/unmapped/C_naseleda; + METHOD m_rvjrhuli buildPatch ()Lnet/minecraft/unmapped/C_jqyoylib; + METHOD m_scuhuigh isEmpty ()Z + METHOD m_wgvmjswp builder ()Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp; + METHOD test (Ljava/lang/Object;)Z + ARG 1 componentMap + CLASS C_qvundqhp Builder + FIELD f_zqshleqs components Ljava/util/List; + METHOD m_dxynewgh with (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp; + ARG 1 type + ARG 2 value + METHOD m_uvpclufp build ()Lnet/minecraft/unmapped/C_naseleda; diff --git a/mappings/net/minecraft/registry/tag/EnchantmentTags.mapping b/mappings/net/minecraft/registry/tag/EnchantmentTags.mapping new file mode 100644 index 0000000000..87a9058d2e --- /dev/null +++ b/mappings/net/minecraft/registry/tag/EnchantmentTags.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/unmapped/C_xuyuhrns net/minecraft/registry/tag/EnchantmentTags + METHOD m_cquplnwn of (Ljava/lang/String;)Lnet/minecraft/unmapped/C_ednuhnnn; diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 804a622cf6..e98d7d82c5 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_qhrnrrcp net/minecraft/text/HoverEvent FIELD f_aucmuwlk CODEC Lcom/mojang/serialization/Codec; + FIELD f_newojfny data Lnet/minecraft/unmapped/C_qhrnrrcp$C_bpiuedci; METHOD (Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo;Ljava/lang/Object;)V ARG 1 action ARG 2 contents @@ -7,22 +8,37 @@ CLASS net/minecraft/unmapped/C_qhrnrrcp net/minecraft/text/HoverEvent ARG 1 o METHOD m_deouhaej getValue (Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo;)Ljava/lang/Object; ARG 1 action + METHOD m_rlsryzqa (Lnet/minecraft/unmapped/C_qhrnrrcp;)Lnet/minecraft/unmapped/C_qhrnrrcp$C_bpiuedci; + ARG 0 event METHOD m_zqghjbce getAction ()Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo; + CLASS C_bpiuedci EventData + FIELD f_ndetxqtj CODEC Lcom/mojang/serialization/MapCodec; + FIELD f_txszwtil LEGACY_CODEC Lcom/mojang/serialization/MapCodec; CLASS C_dmyxtvqo Action + FIELD f_bpaoqmos legacyCodec Lcom/mojang/serialization/MapCodec; + FIELD f_disuwyta codec Lcom/mojang/serialization/MapCodec; FIELD f_efzrdugq SHOW_TEXT Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo; FIELD f_fwdruxcl parsable Z FIELD f_orrlrmas UNSAFE_CODEC Lcom/mojang/serialization/Codec; FIELD f_uicrkmcy CODEC Lcom/mojang/serialization/Codec; FIELD f_ylfcdbhm name Ljava/lang/String; + METHOD (Ljava/lang/String;ZLcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_qhrnrrcp$C_meadaasb;)V + ARG 4 legacyParser METHOD m_gdmayogb validateAction (Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo;)Lcom/mojang/serialization/DataResult; ARG 0 action METHOD m_oesuwymv cast (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 o METHOD m_vysodxkg isParsable ()Z + CLASS C_meadaasb LegacyParser + METHOD parse parse (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_piadqmzm;)Lcom/mojang/serialization/DataResult; + ARG 1 text + ARG 2 ops CLASS C_wniylobd ItemStackContent FIELD f_cetbwirf CODEC Lcom/mojang/serialization/Codec; FIELD f_hgxuwcyy stack Lnet/minecraft/unmapped/C_sddaxwyk; + FIELD f_kslbafbi patch Lnet/minecraft/unmapped/C_jqyoylib; FIELD f_mvbikvao ITEM_STACK_CODEC Lcom/mojang/serialization/Codec; + FIELD f_omksyvzq SIMPLE_ITEM_CODEC Lcom/mojang/serialization/Codec; FIELD f_tdbuznme count I FIELD f_teswdezy item Lnet/minecraft/unmapped/C_cjzoxshv; METHOD (Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -30,8 +46,9 @@ CLASS net/minecraft/unmapped/C_qhrnrrcp net/minecraft/text/HoverEvent METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_mpzbbwwg asStack ()Lnet/minecraft/unmapped/C_sddaxwyk; - METHOD m_vnvalprc (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_piadqmzm;)Lcom/mojang/serialization/DataResult; + METHOD m_vnvalprc parseLegacy (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_piadqmzm;)Lcom/mojang/serialization/DataResult; ARG 0 text + ARG 1 ops CLASS C_yacmflmd EntityContent FIELD f_ezjcqbjx tooltip Ljava/util/List; FIELD f_jwuyehzf entityType Lnet/minecraft/unmapped/C_ogavsvbr; @@ -48,6 +65,9 @@ CLASS net/minecraft/unmapped/C_qhrnrrcp net/minecraft/text/HoverEvent METHOD m_nbyonrqc (Lnet/minecraft/unmapped/C_qhrnrrcp$C_yacmflmd;)Lnet/minecraft/unmapped/C_ogavsvbr; ARG 0 content METHOD m_pgjmmdro asTooltip ()Ljava/util/List; + METHOD m_pucgxczr parseLegacy (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_piadqmzm;)Lcom/mojang/serialization/DataResult; + ARG 0 text + ARG 1 ops METHOD m_rngnovto (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD m_ruiityjn (Lnet/minecraft/unmapped/C_qhrnrrcp$C_yacmflmd;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index ebaa6b2642..4ae80d0a4c 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -6,10 +6,38 @@ CLASS net/minecraft/unmapped/C_qrzzgymy net/minecraft/text/TextCodecs FIELD f_hltfryne UNLIMITED_TEXT_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_ptpqrytj STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; FIELD f_vzatxplp REGISTRY_OPTIONAL_TEXT_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; - METHOD m_ijnwjepp ([Lnet/minecraft/unmapped/C_lgkqzafw;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; + METHOD m_ijnwjepp dispatchingCodec ([Lnet/minecraft/unmapped/C_lgkqzafw;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; ARG 1 codecGetter ARG 2 typeGetter + ARG 3 dispatchingKey METHOD m_ndbrkyjl createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; METHOD m_rikkdtmr combineTexts (Ljava/util/List;)Lnet/minecraft/unmapped/C_npqneive; ARG 0 texts + METHOD m_zbnsyhol codec (I)Lcom/mojang/serialization/Codec; + ARG 0 maxSerializedLength + CLASS C_centaiuk + METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 text + ARG 3 prefix + METHOD m_pzwlfksi asJsonOps (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DynamicOps; + CLASS C_lrvetqzz DispatchingCodec + FIELD f_lmvlzscs typedCodec Lcom/mojang/serialization/MapCodec; + FIELD f_rblrlrcz typeFieldName Ljava/lang/String; + FIELD f_vhegtley fuzzyCodec Lcom/mojang/serialization/MapCodec; + METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 2 input + METHOD encode encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 input + ARG 3 prefix + METHOD keys keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; CLASS C_zbavalta FuzzyCodec + FIELD f_vhfezxzo codecs Ljava/util/List; + FIELD f_zjvghnjo encoderGetter Ljava/util/function/Function; + METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 2 input + METHOD encode encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 input + ARG 3 prefix + METHOD keys keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 4921adfd1b..5bbe425d6f 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/unmapped/C_argwryfu net/minecraft/village/TradeOffer COMMENT Resets the special price of this trade offer. METHOD m_gpklzshx copySellItem ()Lnet/minecraft/unmapped/C_sddaxwyk; COMMENT Returns a copy of the sell item of this trade offer. - METHOD m_isgpghfg getSecondBuyItem ()Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD m_isgpghfg getSecondBuyItemAsStack ()Lnet/minecraft/unmapped/C_sddaxwyk; COMMENT Returns the second buy item of this trade offer. COMMENT COMMENT

If there is no second buy item, this returns the {@linkplain ItemStack#EMPTY empty @@ -92,7 +92,10 @@ CLASS net/minecraft/unmapped/C_argwryfu net/minecraft/village/TradeOffer COMMENT

Checks if the number of times this trade offer has been used COMMENT is greater or equal to its maximum uses. METHOD m_wkoilegm copy ()Lnet/minecraft/unmapped/C_argwryfu; + METHOD m_xtltsmys getAdjustedPrice (Lnet/minecraft/unmapped/C_gqfxurno;)I + ARG 1 item METHOD m_xwbkhwkd getFirstBuyItem ()Lnet/minecraft/unmapped/C_gqfxurno; + METHOD m_ybscqxvx getSecondBuyItem ()Ljava/util/Optional; METHOD m_zcwmrswy disable ()V COMMENT Sets the number of times this trade offer has been used to COMMENT its maximum uses, making it disabled. diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 07821b807a..c9caeff715 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers FIELD f_xkddlaga RARE_MAX_USES I FIELD f_yxdcxrtp EXPERT_SELL_XP I FIELD f_zeisnuhl JOURNEYMAN_BUY_XP I - METHOD m_bikzaaar (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_gqfxurno; + METHOD m_bikzaaar toTradeableItem (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_gqfxurno; ARG 0 potion METHOD m_bsecffhn enchant (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_jxtrubuh;I)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 item @@ -142,6 +142,8 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers ARG 3 maxUses ARG 4 experience ARG 5 price + METHOD (Lnet/minecraft/unmapped/C_gqfxurno;III)V + ARG 1 item CLASS C_qmjmdnsj SuspiciousStewForEmeraldFactory FIELD f_ipzfjord priceMultiplier F FIELD f_qsehwyfa possibleEffects Lnet/minecraft/unmapped/C_ceasgpks; diff --git a/mappings/net/minecraft/village/TradeableItem.mapping b/mappings/net/minecraft/village/TradeableItem.mapping new file mode 100644 index 0000000000..fd144fd1f0 --- /dev/null +++ b/mappings/net/minecraft/village/TradeableItem.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/unmapped/C_gqfxurno net/minecraft/village/TradeableItem + FIELD f_gguzhqie OPTIONAL_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + FIELD f_qphcfncz PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD (Lnet/minecraft/unmapped/C_cjzoxshv;ILnet/minecraft/unmapped/C_naseleda;)V + ARG 1 item + ARG 2 count + ARG 3 predicate + METHOD (Lnet/minecraft/unmapped/C_gmbqjnle;)V + ARG 1 item + METHOD (Lnet/minecraft/unmapped/C_gmbqjnle;I)V + ARG 1 item + ARG 2 count + METHOD m_dmnorieo withComponents (Ljava/util/function/UnaryOperator;)Lnet/minecraft/unmapped/C_gqfxurno; + ARG 1 builderOperator + METHOD m_drzzrfud createStack (Lnet/minecraft/unmapped/C_cjzoxshv;ILnet/minecraft/unmapped/C_naseleda;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 2 predicate + METHOD m_rwcrwpnv matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z