From 2113e36b4c54061f6b134d830971c31139e4bac5 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 2 Apr 2021 23:02:16 +1100 Subject: [PATCH] 21w13a item stuff (#2232) * item * nbt_key -> key --- mappings/net/minecraft/item/BannerItem.mapping | 1 + mappings/net/minecraft/item/BlockItem.mapping | 2 ++ mappings/net/minecraft/item/BowItem.mapping | 1 + mappings/net/minecraft/item/BundleItem.mapping | 2 ++ mappings/net/minecraft/item/CompassItem.mapping | 3 +++ mappings/net/minecraft/item/CrossbowItem.mapping | 3 +++ mappings/net/minecraft/item/DyeableItem.mapping | 3 +++ .../net/minecraft/item/EnchantedBookItem.mapping | 1 + mappings/net/minecraft/item/FilledMapItem.mapping | 2 ++ mappings/net/minecraft/item/FireworkItem.mapping | 9 +++++++++ mappings/net/minecraft/item/HoneyBottleItem.mapping | 1 + mappings/net/minecraft/item/HorseArmorItem.mapping | 1 + mappings/net/minecraft/item/Item.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 13 +++++++++++++ .../net/minecraft/item/KnowledgeBookItem.mapping | 1 + mappings/net/minecraft/item/MilkBucketItem.mapping | 1 + mappings/net/minecraft/item/PickaxeItem.mapping | 1 + mappings/net/minecraft/item/PotionItem.mapping | 1 + mappings/net/minecraft/item/ShieldItem.mapping | 1 + mappings/net/minecraft/item/SkullItem.mapping | 1 + mappings/net/minecraft/item/SpyglassItem.mapping | 1 + .../net/minecraft/item/SuspiciousStewItem.mapping | 3 +++ mappings/net/minecraft/item/WrittenBookItem.mapping | 8 ++++++++ .../net/minecraft/item/map/MapBannerMarker.mapping | 1 + 24 files changed, 62 insertions(+) diff --git a/mappings/net/minecraft/item/BannerItem.mapping b/mappings/net/minecraft/item/BannerItem.mapping index 1f67e6bab9..9dabc02299 100644 --- a/mappings/net/minecraft/item/BannerItem.mapping +++ b/mappings/net/minecraft/item/BannerItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem + FIELD field_30848 TRANSLATION_KEY_PREFIX Ljava/lang/String; METHOD method_7705 appendBannerTooltip (Lnet/minecraft/class_1799;Ljava/util/List;)V ARG 0 stack ARG 1 tooltip diff --git a/mappings/net/minecraft/item/BlockItem.mapping b/mappings/net/minecraft/item/BlockItem.mapping index 3398b6ecfc..9a4be7e18e 100644 --- a/mappings/net/minecraft/item/BlockItem.mapping +++ b/mappings/net/minecraft/item/BlockItem.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem + FIELD field_30849 BLOCK_ENTITY_TAG_KEY Ljava/lang/String; + FIELD field_30850 BLOCK_STATE_TAG_KEY Ljava/lang/String; FIELD field_7901 block Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V ARG 1 block diff --git a/mappings/net/minecraft/item/BowItem.mapping b/mappings/net/minecraft/item/BowItem.mapping index 04aac80236..3a9ce29a76 100644 --- a/mappings/net/minecraft/item/BowItem.mapping +++ b/mappings/net/minecraft/item/BowItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1753 net/minecraft/item/BowItem + FIELD field_30856 RANGE I METHOD method_20270 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657;)V ARG 1 p METHOD method_7722 getPullProgress (I)F diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index 780ec711a2..372964107d 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem FIELD field_27016 ITEM_BAR_COLOR I + FIELD field_30857 MAX_STORAGE I + FIELD field_30858 ITEMS_KEY Ljava/lang/String; METHOD method_31558 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2487;)Z ARG 1 item METHOD method_31560 addToBundle (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)I diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index 4369afcf73..9d85ffcbcd 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem FIELD field_24670 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_30860 LODESTONE_POS_KEY Ljava/lang/String; + FIELD field_30861 LODESTONE_DIMENSION_KEY Ljava/lang/String; + FIELD field_30862 LODESTONE_TRACKED_KEY Ljava/lang/String; METHOD method_26364 getLodestoneDimension (Lnet/minecraft/class_2487;)Ljava/util/Optional; ARG 0 tag METHOD method_26365 hasLodestone (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index cc28f282b6..400ab3ee59 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem + FIELD field_30863 RANGE I + FIELD field_30864 CHARGED_KEY Ljava/lang/String; + FIELD field_30865 CHARGED_PROJECTILES_KEY Ljava/lang/String; FIELD field_7936 loaded Z FIELD field_7937 charged Z METHOD method_18814 createArrow (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1665; diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping index 3e62cfd710..7d10954294 100644 --- a/mappings/net/minecraft/item/DyeableItem.mapping +++ b/mappings/net/minecraft/item/DyeableItem.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1768 net/minecraft/item/DyeableItem + FIELD field_30871 DISPLAY_KEY Ljava/lang/String; + FIELD field_30872 DEFAULT_COLOR I + FIELD field_30873 COLOR_KEY Ljava/lang/String; METHOD method_19261 blendAndSetColor (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 colors diff --git a/mappings/net/minecraft/item/EnchantedBookItem.mapping b/mappings/net/minecraft/item/EnchantedBookItem.mapping index af41b76725..e2f084d152 100644 --- a/mappings/net/minecraft/item/EnchantedBookItem.mapping +++ b/mappings/net/minecraft/item/EnchantedBookItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1772 net/minecraft/item/EnchantedBookItem + FIELD field_30874 STORED_ENCHANTMENTS_KEY Ljava/lang/String; METHOD method_7806 getEnchantmentNbt (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; ARG 0 stack METHOD method_7807 addEnchantment (Lnet/minecraft/class_1799;Lnet/minecraft/class_1889;)V diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 2b55bbef86..57526e1f50 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem + FIELD field_30909 DEFAULT_MAP_COLOR I + FIELD field_30910 MAP_KEY Ljava/lang/String; METHOD method_17440 getMapName (I)Ljava/lang/String; ARG 0 mapId METHOD method_17442 copyMap (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/item/FireworkItem.mapping b/mappings/net/minecraft/item/FireworkItem.mapping index 2d43a90e11..0c28529e34 100644 --- a/mappings/net/minecraft/item/FireworkItem.mapping +++ b/mappings/net/minecraft/item/FireworkItem.mapping @@ -1,4 +1,13 @@ CLASS net/minecraft/class_1781 net/minecraft/item/FireworkItem + FIELD field_30875 FIREWORKS_KEY Ljava/lang/String; + FIELD field_30876 EXPLOSION_KEY Ljava/lang/String; + FIELD field_30877 EXPLOSIONS_KEY Ljava/lang/String; + FIELD field_30878 FLIGHT_KEY Ljava/lang/String; + FIELD field_30879 TYPE_KEY Ljava/lang/String; + FIELD field_30880 TRAIL_KEY Ljava/lang/String; + FIELD field_30881 FLICKER_KEY Ljava/lang/String; + FIELD field_30882 COLORS_KEY Ljava/lang/String; + FIELD field_30883 FADE_COLORS_KEY Ljava/lang/String; CLASS class_1782 Type FIELD field_7971 name Ljava/lang/String; FIELD field_7972 id I diff --git a/mappings/net/minecraft/item/HoneyBottleItem.mapping b/mappings/net/minecraft/item/HoneyBottleItem.mapping index 5abd306e39..92183a33fc 100644 --- a/mappings/net/minecraft/item/HoneyBottleItem.mapping +++ b/mappings/net/minecraft/item/HoneyBottleItem.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_4480 net/minecraft/item/HoneyBottleItem + FIELD field_30885 MAX_USE_TIME I diff --git a/mappings/net/minecraft/item/HorseArmorItem.mapping b/mappings/net/minecraft/item/HorseArmorItem.mapping index 04edb1b43a..2937b20e83 100644 --- a/mappings/net/minecraft/item/HorseArmorItem.mapping +++ b/mappings/net/minecraft/item/HorseArmorItem.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4059 net/minecraft/item/HorseArmorItem FIELD field_18136 bonus I FIELD field_18137 entityTexture Ljava/lang/String; + FIELD field_30886 ENTITY_TEXTURE_PREFIX Ljava/lang/String; METHOD (ILjava/lang/String;Lnet/minecraft/class_1792$class_1793;)V ARG 1 bonus ARG 2 name diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index f3b4d89895..cae2889672 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_18672 foodComponent Lnet/minecraft/class_4174; FIELD field_21979 fireproof Z FIELD field_27017 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_30887 DEFAULT_MAX_COUNT I FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID; FIELD field_8003 BLOCK_ITEMS Ljava/util/Map; FIELD field_8004 group Lnet/minecraft/class_1761; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index bb7ff87549..6d68d086ce 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -2,6 +2,19 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_24092 LORE_STYLE Lnet/minecraft/class_2583; FIELD field_24093 holder Lnet/minecraft/class_1297; FIELD field_24671 CODEC Lcom/mojang/serialization/Codec; + FIELD field_30890 ENCHANTMENTS_KEY Ljava/lang/String; + FIELD field_30891 ID_KEY Ljava/lang/String; + FIELD field_30892 LVL_KEY Ljava/lang/String; + FIELD field_30893 DISPLAY_KEY Ljava/lang/String; + FIELD field_30894 NAME_KEY Ljava/lang/String; + FIELD field_30895 LORE_KEY Ljava/lang/String; + FIELD field_30896 DAMAGE_KEY Ljava/lang/String; + FIELD field_30897 COLOR_KEY Ljava/lang/String; + FIELD field_30898 UNBREAKABLE_KEY Ljava/lang/String; + FIELD field_30899 REPAIR_COST_KEY Ljava/lang/String; + FIELD field_30900 CAN_DESTROY_KEY Ljava/lang/String; + FIELD field_30901 CAN_PLACE_ON_KEY Ljava/lang/String; + FIELD field_30902 HIDE_FLAGS_KEY Ljava/lang/String; FIELD field_8029 MODIFIER_FORMAT Ljava/text/DecimalFormat; FIELD field_8030 cooldown I FIELD field_8031 count I diff --git a/mappings/net/minecraft/item/KnowledgeBookItem.mapping b/mappings/net/minecraft/item/KnowledgeBookItem.mapping index e6acda3cde..50fdb01546 100644 --- a/mappings/net/minecraft/item/KnowledgeBookItem.mapping +++ b/mappings/net/minecraft/item/KnowledgeBookItem.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_1801 net/minecraft/item/KnowledgeBookItem + FIELD field_30906 RECIPES_KEY Ljava/lang/String; FIELD field_8042 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/item/MilkBucketItem.mapping b/mappings/net/minecraft/item/MilkBucketItem.mapping index d71ef5d592..b9fd449dd1 100644 --- a/mappings/net/minecraft/item/MilkBucketItem.mapping +++ b/mappings/net/minecraft/item/MilkBucketItem.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_1805 net/minecraft/item/MilkBucketItem + FIELD field_30911 MAX_USE_TIME I diff --git a/mappings/net/minecraft/item/PickaxeItem.mapping b/mappings/net/minecraft/item/PickaxeItem.mapping index c6b6b7ec8e..6b7ed79397 100644 --- a/mappings/net/minecraft/item/PickaxeItem.mapping +++ b/mappings/net/minecraft/item/PickaxeItem.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1810 net/minecraft/item/PickaxeItem FIELD field_27078 BLOCK_MINING_LEVELS Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_30915 DEFAULT_MINING_LEVEL I FIELD field_8899 EFFECTIVE_BLOCKS Ljava/util/Set; METHOD (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V ARG 1 material diff --git a/mappings/net/minecraft/item/PotionItem.mapping b/mappings/net/minecraft/item/PotionItem.mapping index b4aa222dbb..0a9d0e970f 100644 --- a/mappings/net/minecraft/item/PotionItem.mapping +++ b/mappings/net/minecraft/item/PotionItem.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_1812 net/minecraft/item/PotionItem + FIELD field_30917 MAX_USE_TIME I diff --git a/mappings/net/minecraft/item/ShieldItem.mapping b/mappings/net/minecraft/item/ShieldItem.mapping index 34af2b9b67..128eab6058 100644 --- a/mappings/net/minecraft/item/ShieldItem.mapping +++ b/mappings/net/minecraft/item/ShieldItem.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_1819 net/minecraft/item/ShieldItem + FIELD field_30920 BASE_KEY Ljava/lang/String; METHOD method_8013 getColor (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1767; ARG 0 stack diff --git a/mappings/net/minecraft/item/SkullItem.mapping b/mappings/net/minecraft/item/SkullItem.mapping index ef0b2efb47..02201ad4af 100644 --- a/mappings/net/minecraft/item/SkullItem.mapping +++ b/mappings/net/minecraft/item/SkullItem.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_1809 net/minecraft/item/SkullItem + FIELD field_30916 SKULL_OWNER_KEY Ljava/lang/String; diff --git a/mappings/net/minecraft/item/SpyglassItem.mapping b/mappings/net/minecraft/item/SpyglassItem.mapping index b7dac633e8..2f13570ff1 100644 --- a/mappings/net/minecraft/item/SpyglassItem.mapping +++ b/mappings/net/minecraft/item/SpyglassItem.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5538 net/minecraft/item/SpyglassItem + FIELD field_30921 MAX_USE_TIME I METHOD method_31582 playStopUsingSound (Lnet/minecraft/class_1309;)V ARG 1 user diff --git a/mappings/net/minecraft/item/SuspiciousStewItem.mapping b/mappings/net/minecraft/item/SuspiciousStewItem.mapping index 6795ec0312..c3778126bf 100644 --- a/mappings/net/minecraft/item/SuspiciousStewItem.mapping +++ b/mappings/net/minecraft/item/SuspiciousStewItem.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1830 net/minecraft/item/SuspiciousStewItem + FIELD field_30923 EFFECTS_KEY Ljava/lang/String; + FIELD field_30924 EFFECT_ID_KEY Ljava/lang/String; + FIELD field_30925 EFFECT_DURATION_KEY Ljava/lang/String; METHOD method_8021 addEffectToStew (Lnet/minecraft/class_1799;Lnet/minecraft/class_1291;I)V ARG 0 stew ARG 1 effect diff --git a/mappings/net/minecraft/item/WrittenBookItem.mapping b/mappings/net/minecraft/item/WrittenBookItem.mapping index 5c15a873e0..6ade8c0d51 100644 --- a/mappings/net/minecraft/item/WrittenBookItem.mapping +++ b/mappings/net/minecraft/item/WrittenBookItem.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_1843 net/minecraft/item/WrittenBookItem + FIELD field_30930 MAX_TITLE_LENGTH I + FIELD field_30935 TITLE_KEY Ljava/lang/String; + FIELD field_30936 FILTERED_TITLE_KEY Ljava/lang/String; + FIELD field_30937 AUTHOR_KEY Ljava/lang/String; + FIELD field_30938 PAGES_KEY Ljava/lang/String; + FIELD field_30939 FILTERED_PAGES_KEY Ljava/lang/String; + FIELD field_30940 GENERATION_KEY Ljava/lang/String; + FIELD field_30941 RESOLVED_KEY Ljava/lang/String; METHOD method_17443 getPageCount (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8052 getGeneration (Lnet/minecraft/class_1799;)I diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index acacb850ab..473af015bd 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker ARG 3 name METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_35502 getColor ()Lnet/minecraft/class_1767; METHOD method_67 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_17; ARG 0 tag METHOD method_68 getName ()Lnet/minecraft/class_2561;