From 51b5b982a7baaf5bd235917ea3a455108a3663b5 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 10 Nov 2022 05:18:05 +1100 Subject: [PATCH] 22w45a itemgroups (#3392) --- .../net/minecraft/block/LightBlock.mapping | 3 + .../minecraft/client/MinecraftClient.mapping | 2 + .../ingame/CreativeInventoryScreen.mapping | 17 ++++ .../client/item/TooltipContext.mapping | 6 +- .../client/option/GameOptions.mapping | 2 + .../minecraft/item/FireworkRocketItem.mapping | 4 + mappings/net/minecraft/item/ItemGroup.mapping | 69 ++++++++++++++ .../net/minecraft/item/ItemGroups.mapping | 92 ++++++++++++++++++- mappings/net/minecraft/item/Items.mapping | 2 + 9 files changed, 191 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/block/LightBlock.mapping b/mappings/net/minecraft/block/LightBlock.mapping index 7101d872c9..53d532d6cf 100644 --- a/mappings/net/minecraft/block/LightBlock.mapping +++ b/mappings/net/minecraft/block/LightBlock.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_6089 net/minecraft/block/LightBlock FIELD field_31189 STATE_TO_LUMINANCE Ljava/util/function/ToIntFunction; METHOD method_35281 (Lnet/minecraft/class_2680;)I ARG 0 state + METHOD method_47377 addNbtForLevel (Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1799; + ARG 0 stack + ARG 1 level diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 7e84535b1f..3c99eaa739 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -498,6 +498,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_45573 getDefaultResourcePack ()Lnet/minecraft/class_3268; METHOD method_45574 getDefaultResourceSupplier ([Ljava/lang/String;)Lnet/minecraft/class_7367; ARG 1 segments + METHOD method_46740 (Ljava/util/List;)V + ARG 1 stacks CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 60eed4bf73..19f1310667 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -21,8 +21,11 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv FIELD field_32341 SCROLLBAR_WIDTH I FIELD field_32342 SCROLLBAR_HEIGHT I FIELD field_32343 WHITE I + FIELD field_41112 operatorTabEnabled Z METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_7699;Z)V + ARG 1 player ARG 2 enabledFeatures + ARG 3 operatorTabEnabled METHOD method_15871 searchForTags (Ljava/lang/String;)V ARG 1 id METHOD method_15872 (Lnet/minecraft/class_1799;Ljava/util/List;Lnet/minecraft/class_6862;)V @@ -39,6 +42,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 2 restore ARG 3 save METHOD method_2463 isClickInTab (Lnet/minecraft/class_1761;DD)Z + ARG 1 group ARG 2 mouseX ARG 4 mouseY METHOD method_2464 search ()V @@ -55,8 +59,21 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 1 slot METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;II)Z ARG 1 matrices + ARG 2 group ARG 3 mouseX ARG 4 mouseY + METHOD method_47419 shouldShowOperatorTab (Lnet/minecraft/class_1657;)Z + ARG 1 player + METHOD method_47420 updateDisplayParameters (Lnet/minecraft/class_7699;Z)V + ARG 1 enabledFeatures + ARG 2 showOperatorTab + METHOD method_47421 refreshSelectedTab (Lnet/minecraft/class_7708;)V + ARG 1 stacks + METHOD method_47422 getTabX (Lnet/minecraft/class_1761;)I + ARG 1 group + METHOD method_47423 getTabY (Lnet/minecraft/class_1761;)I + ARG 1 group + METHOD method_47424 isInventoryTabSelected ()Z CLASS class_482 LockableSlot CLASS class_483 CreativeScreenHandler FIELD field_2897 itemList Lnet/minecraft/class_2371; diff --git a/mappings/net/minecraft/client/item/TooltipContext.mapping b/mappings/net/minecraft/client/item/TooltipContext.mapping index 2f3bb2368d..2e4951e2ae 100644 --- a/mappings/net/minecraft/client/item/TooltipContext.mapping +++ b/mappings/net/minecraft/client/item/TooltipContext.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1836 net/minecraft/client/item/TooltipContext + 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 METHOD method_8035 isAdvanced ()Z CLASS class_1837 Default - FIELD comp_1152 advanced Z - METHOD comp_1152 advanced ()Z + METHOD method_47371 withCreative ()Lnet/minecraft/class_1836$class_1837; diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index f30c67a9dd..7662874591 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -208,6 +208,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_39320 ONLY_SHOW_SECURE_CHAT_TOOLTIP Lnet/minecraft/class_2561; FIELD field_39321 onlyShowSecureChat Lnet/minecraft/class_7172; FIELD field_40382 panoramaSpeed Lnet/minecraft/class_7172; + FIELD field_41094 operatorItemsTab Lnet/minecraft/class_7172; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile @@ -556,6 +557,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_45580 (Ljava/lang/Double;)V ARG 0 value METHOD method_45581 getPanoramaSpeed ()Lnet/minecraft/class_7172; + METHOD method_47395 getOperatorItemsTab ()Lnet/minecraft/class_7172; CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/item/FireworkRocketItem.mapping b/mappings/net/minecraft/item/FireworkRocketItem.mapping index efc5541f41..47cb8ec0f2 100644 --- a/mappings/net/minecraft/item/FireworkRocketItem.mapping +++ b/mappings/net/minecraft/item/FireworkRocketItem.mapping @@ -9,6 +9,10 @@ CLASS net/minecraft/class_1781 net/minecraft/item/FireworkRocketItem FIELD field_30882 COLORS_KEY Ljava/lang/String; FIELD field_30883 FADE_COLORS_KEY Ljava/lang/String; FIELD field_30884 OFFSET_POS_MULTIPLIER D + FIELD field_41064 FLIGHT_VALUES [B + METHOD method_47368 setFlight (Lnet/minecraft/class_1799;B)V + ARG 0 stack + ARG 1 flight CLASS class_1782 Type FIELD field_7971 name Ljava/lang/String; FIELD field_7972 id I diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping index ed3ad4fb05..d8da839263 100644 --- a/mappings/net/minecraft/item/ItemGroup.mapping +++ b/mappings/net/minecraft/item/ItemGroup.mapping @@ -3,12 +3,41 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup FIELD field_26391 displayName Lnet/minecraft/class_2561; FIELD field_40859 displayStacks Lnet/minecraft/class_7708; FIELD field_40860 searchTabStacks Lnet/minecraft/class_7708; + FIELD field_41031 special Z + FIELD field_41032 row Lnet/minecraft/class_1761$class_7915; + FIELD field_41033 column I + FIELD field_41034 type Lnet/minecraft/class_1761$class_7916; + FIELD field_41035 searchProviderReloader Ljava/util/function/Consumer; + FIELD field_41036 iconSupplier Ljava/util/function/Supplier; + FIELD field_41037 entryCollector Lnet/minecraft/class_1761$class_7914; FIELD field_7917 renderName Z FIELD field_7919 texture Ljava/lang/String; FIELD field_7920 scrollbar Z FIELD field_7934 icon Lnet/minecraft/class_1799; + METHOD (Lnet/minecraft/class_1761$class_7915;ILnet/minecraft/class_1761$class_7916;Lnet/minecraft/class_2561;Ljava/util/function/Supplier;Lnet/minecraft/class_1761$class_7914;)V + ARG 1 row + ARG 2 column + ARG 3 type + ARG 4 displayName + ARG 5 iconSupplier + ARG 6 entryCollector METHOD method_45412 contains (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_45414 getSearchTabStacks ()Lnet/minecraft/class_7708; + METHOD method_47306 updateEntries (Lnet/minecraft/class_7699;Z)V + ARG 1 enabledFeatures + ARG 2 operatorEnabled + METHOD method_47307 create (Lnet/minecraft/class_1761$class_7915;I)Lnet/minecraft/class_1761$class_7913; + ARG 0 location + ARG 1 column + METHOD method_47308 setSearchProviderReloader (Ljava/util/function/Consumer;)V + ARG 1 searchProviderReloader + METHOD method_47309 getRow ()Lnet/minecraft/class_1761$class_7915; + METHOD method_47310 hasStacks ()Z + METHOD method_47311 shouldDisplay ()Z + METHOD method_47312 getType ()Lnet/minecraft/class_1761$class_7916; + METHOD method_47313 getDisplayStacks ()Lnet/minecraft/class_7708; + METHOD method_47314 reloadSearchProvider ()V METHOD method_7737 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_7742 getTexture ()Ljava/lang/String; METHOD method_7743 getColumn ()I @@ -48,3 +77,43 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup ARG 1 stacks ARG 2 visibility CLASS class_7705 StackVisibility + CLASS class_7913 Builder + FIELD field_41038 EMPTY_ENTRIES Lnet/minecraft/class_1761$class_7914; + FIELD field_41039 row Lnet/minecraft/class_1761$class_7915; + FIELD field_41040 column I + FIELD field_41041 displayName Lnet/minecraft/class_2561; + FIELD field_41042 iconSupplier Ljava/util/function/Supplier; + FIELD field_41043 entryCollector Lnet/minecraft/class_1761$class_7914; + FIELD field_41044 scrollbar Z + FIELD field_41045 renderName Z + FIELD field_41046 special Z + FIELD field_41047 type Lnet/minecraft/class_1761$class_7916; + FIELD field_41048 texture Ljava/lang/String; + METHOD (Lnet/minecraft/class_1761$class_7915;I)V + ARG 1 row + ARG 2 column + METHOD method_47315 special ()Lnet/minecraft/class_1761$class_7913; + METHOD method_47316 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47317 entries (Lnet/minecraft/class_1761$class_7914;)Lnet/minecraft/class_1761$class_7913; + ARG 1 entryCollector + METHOD method_47318 type (Lnet/minecraft/class_1761$class_7916;)Lnet/minecraft/class_1761$class_7913; + ARG 1 type + METHOD method_47319 texture (Ljava/lang/String;)Lnet/minecraft/class_1761$class_7913; + ARG 1 texture + METHOD method_47320 icon (Ljava/util/function/Supplier;)Lnet/minecraft/class_1761$class_7913; + ARG 1 iconSupplier + METHOD method_47321 displayName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_1761$class_7913; + ARG 1 displayName + METHOD method_47322 noRenderedName ()Lnet/minecraft/class_1761$class_7913; + METHOD method_47323 noScrollbar ()Lnet/minecraft/class_1761$class_7913; + METHOD method_47324 build ()Lnet/minecraft/class_1761; + CLASS class_7914 EntryCollector + METHOD accept (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 1 enabledFeatures + ARG 2 entries + ARG 3 operatorEnabled + CLASS class_7915 Row + CLASS class_7916 Type diff --git a/mappings/net/minecraft/item/ItemGroups.mapping b/mappings/net/minecraft/item/ItemGroups.mapping index 71f4ebf562..9087e856c7 100644 --- a/mappings/net/minecraft/item/ItemGroups.mapping +++ b/mappings/net/minecraft/item/ItemGroups.mapping @@ -9,20 +9,104 @@ CLASS net/minecraft/class_7706 net/minecraft/item/ItemGroups FIELD field_40206 INVENTORY Lnet/minecraft/class_1761; FIELD field_40207 GROUPS Ljava/util/List; FIELD field_40743 NATURAL Lnet/minecraft/class_1761; + FIELD field_41057 enabledFeatures Lnet/minecraft/class_7699; + FIELD field_41058 operatorEnabled Z + FIELD field_41059 COLORED_BLOCKS Lnet/minecraft/class_1761; + FIELD field_41060 TOOLS Lnet/minecraft/class_1761; + FIELD field_41061 FOOD_AND_DRINK Lnet/minecraft/class_1761; + FIELD field_41062 INGREDIENTS Lnet/minecraft/class_1761; + FIELD field_41063 OPERATOR Lnet/minecraft/class_1761; METHOD method_45426 addInstruments (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1792;Lnet/minecraft/class_6862;Lnet/minecraft/class_1761$class_7705;)V - ARG 0 adder + ARG 0 entries ARG 1 item ARG 2 instrumentTag ARG 3 visibility METHOD method_45427 addPotions (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1792;Lnet/minecraft/class_1761$class_7705;)V - ARG 0 adder + ARG 0 entries ARG 1 item ARG 2 visibility METHOD method_45428 addMaxLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V - ARG 0 adder + ARG 0 entries ARG 1 targets ARG 2 visibility METHOD method_45430 addAllLevelEnchantedBooks (Lnet/minecraft/class_1761$class_7704;Ljava/util/Set;Lnet/minecraft/class_1761$class_7705;)V - ARG 0 adder + ARG 0 entries ARG 1 targets ARG 2 visibility + METHOD method_47328 getDefaultTab ()Lnet/minecraft/class_1761; + METHOD method_47329 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47330 updateDisplayParameters (Lnet/minecraft/class_7699;Z)Z + ARG 0 enabledFeatures + ARG 1 operatorEnabled + METHOD method_47331 (Lnet/minecraft/class_7699;ZLnet/minecraft/class_1761;)V + ARG 2 group + METHOD method_47332 addSuspiciousStews (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 visibility + METHOD method_47333 (Lnet/minecraft/class_1761;)Z + ARG 0 group + METHOD method_47334 collect ([Lnet/minecraft/class_1761;)Ljava/util/List; + ARG 0 groups + METHOD method_47335 getGroupsToDisplay ()Ljava/util/List; + METHOD method_47336 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47337 updateEntries (Lnet/minecraft/class_7699;Z)V + ARG 0 enabledFeatures + ARG 1 operatorEnabled + METHOD method_47338 (Lnet/minecraft/class_7699;ZLnet/minecraft/class_1761;)V + ARG 2 group + METHOD method_47339 addFireworkRockets (Lnet/minecraft/class_1761$class_7704;Lnet/minecraft/class_1761$class_7705;)V + ARG 0 entries + ARG 1 visibility + METHOD method_47340 (Lnet/minecraft/class_1761;)Z + ARG 0 group + METHOD method_47341 getGroups ()Ljava/util/List; + METHOD method_47342 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47343 displayParametersMatch (Lnet/minecraft/class_7699;Z)Z + ARG 0 enabledFeatures + ARG 1 operatorEnabled + METHOD method_47344 getSearchGroup ()Lnet/minecraft/class_1761; + METHOD method_47345 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47347 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47349 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47351 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47353 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47355 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47357 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47359 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled + METHOD method_47361 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1761$class_7704;Z)V + ARG 0 enabledFeatures + ARG 1 entries + ARG 2 operatorEnabled diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 26272ff6cb..c8656c193a 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -335,6 +335,8 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_40223 BAMBOO_BUTTON Lnet/minecraft/class_1792; FIELD field_40226 BAMBOO_TRAPDOOR Lnet/minecraft/class_1792; FIELD field_40227 BAMBOO_FENCE_GATE Lnet/minecraft/class_1792; + FIELD field_41065 STRIPPED_BAMBOO_BLOCK Lnet/minecraft/class_1792; + FIELD field_41066 BAMBOO_BLOCK Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;