diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 59a6854e85..53ce6695c8 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable FIELD field_44892 randomSequenceId Ljava/util/Optional; FIELD field_45796 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49428 DEFAULT_SEED J FIELD field_942 type Lnet/minecraft/class_176; FIELD field_943 pools Ljava/util/List; FIELD field_944 functions Ljava/util/List; diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 7a19a3b8fc..153e3b10d4 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_56818 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_57660 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder METHOD method_755 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 9fb3898da9..e56a43cfca 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry FIELD field_45803 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49429 value Lcom/mojang/datafixers/util/Either; METHOD (Lcom/mojang/datafixers/util/Either;IILjava/util/List;Ljava/util/List;)V + ARG 1 value ARG 2 weight ARG 3 quality ARG 4 conditions @@ -12,7 +14,24 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 2 quality ARG 3 conditions ARG 4 functions + METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_52;)V + ARG 1 table + METHOD method_51223 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_53293 (Lnet/minecraft/class_83;)Lcom/mojang/datafixers/util/Either; ARG 0 entry METHOD method_53294 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57630 (Lnet/minecraft/class_47;Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 1 id + METHOD method_57631 builder (Lnet/minecraft/class_52;)Lnet/minecraft/class_85$class_86; + ARG 0 table + METHOD method_57632 (Lnet/minecraft/class_52;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; + ARG 1 weight + ARG 2 quality + ARG 3 conditions + ARG 4 functions + METHOD method_57633 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V + ARG 3 table + METHOD method_57634 (Lnet/minecraft/class_52;)Lnet/minecraft/class_52; + ARG 0 table diff --git a/mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping new file mode 100644 index 0000000000..070141e64c --- /dev/null +++ b/mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_9317 net/minecraft/loot/function/CopyComponentsLootFunction + FIELD field_49430 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49431 source Lnet/minecraft/class_9317$class_9319; + FIELD field_49432 components Ljava/util/List; + METHOD (Ljava/util/List;Lnet/minecraft/class_9317$class_9319;Ljava/util/List;)V + ARG 1 conditions + ARG 2 source + ARG 3 components + METHOD method_57637 builder (Lnet/minecraft/class_9317$class_9319;)Lnet/minecraft/class_9317$class_9318; + ARG 0 source + METHOD method_57638 (Lnet/minecraft/class_9317;)Ljava/util/List; + ARG 0 function + METHOD method_57639 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57640 (Lnet/minecraft/class_9317;)Lnet/minecraft/class_9317$class_9319; + ARG 0 function + CLASS class_9318 Builder + FIELD field_49434 source Lnet/minecraft/class_9317$class_9319; + FIELD field_49435 types Lcom/google/common/collect/ImmutableList$Builder; + METHOD (Lnet/minecraft/class_9317$class_9319;)V + ARG 1 source + METHOD method_57642 add (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9317$class_9318; + ARG 1 type + CLASS class_9319 Source + FIELD field_49437 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49438 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + METHOD method_57643 getRequiredParameters ()Ljava/util/Set; + METHOD method_57644 getComponents (Lnet/minecraft/class_47;)Lnet/minecraft/class_9323; + ARG 1 context diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index 7b2275cdfa..e3cbcef49b 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction ARG 0 instance METHOD method_53312 (Lnet/minecraft/class_4488;)Lnet/minecraft/class_6880; ARG 0 function + METHOD method_57636 (Lnet/minecraft/class_2680;Lnet/minecraft/class_9275;)Lnet/minecraft/class_9275; + ARG 2 component CLASS class_4489 Builder FIELD field_20451 block Lnet/minecraft/class_6880; FIELD field_20452 properties Lcom/google/common/collect/ImmutableSet$Builder; diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 9902ad1860..85f31c35dc 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 0 function METHOD method_53356 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57647 (Lnet/minecraft/class_47;Lnet/minecraft/class_9285;)Lnet/minecraft/class_9285; + ARG 2 component CLASS class_138 Attribute FIELD comp_1859 name Ljava/lang/String; FIELD comp_1860 attribute Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index 318b12d51b..d6feeb91e3 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct FIELD field_45839 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_9307;Z)V ARG 1 conditions + ARG 2 patterns ARG 3 append METHOD method_35531 builder (Z)Lnet/minecraft/class_5592$class_6157; ARG 0 append @@ -13,6 +14,9 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct ARG 0 instance METHOD method_53362 (Lnet/minecraft/class_5592;)Lnet/minecraft/class_9307; ARG 0 function + METHOD method_57648 (Lnet/minecraft/class_9307;Lnet/minecraft/class_9307;)Lnet/minecraft/class_9307; + ARG 0 current + ARG 1 newPatterns CLASS class_6157 Builder FIELD field_31862 patterns Lnet/minecraft/class_9307$class_3750; FIELD field_31863 append Z diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 439b4e1add..87787b8318 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio ARG 0 instance METHOD method_53365 (Lnet/minecraft/class_134;)Lnet/minecraft/class_6880; ARG 0 function + METHOD method_57653 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V ARG 2 entry METHOD method_600 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_82;)V diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index a51ae0a46e..4d8c9c89e3 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -17,6 +17,11 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 0 instance METHOD method_53372 (Lnet/minecraft/class_5642;)Ljava/util/Map; ARG 0 function + METHOD method_57656 (Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V + ARG 1 enchantment + ARG 2 level + METHOD method_57657 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_9304$class_9305;)V + ARG 2 builder CLASS class_6158 Builder FIELD field_31864 enchantments Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31865 add Z diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index a4f2d2682f..d7b2548b70 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -19,6 +19,11 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction ARG 0 function METHOD method_53385 (Lnet/minecraft/class_3671;)Ljava/lang/Boolean; ARG 0 function + METHOD method_57658 getNewLoreTexts (Lnet/minecraft/class_9290;Lnet/minecraft/class_47;)Ljava/util/List; + ARG 1 current + ARG 2 context + METHOD method_57659 (Lnet/minecraft/class_47;Lnet/minecraft/class_9290;)Lnet/minecraft/class_9290; + ARG 2 component CLASS class_6159 Builder FIELD field_31866 replace Z FIELD field_31867 target Ljava/util/Optional; diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index b4fdaedc36..6c7fe9102f 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -8,5 +8,9 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction ARG 0 function METHOD method_53392 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57654 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; + ARG 0 nbt + METHOD method_57655 (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_675 (Lnet/minecraft/class_2487;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index e3f25622eb..64befb8a88 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -6,7 +6,10 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects + METHOD method_57396 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z METHOD method_8051 finishTranslationKey (Ljava/util/Optional;Ljava/lang/String;)Ljava/lang/String; + ARG 0 potion ARG 1 prefix diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 8897ce3b14..1a1a5e4f4c 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 5 displayAutoUpdate ARG 6 numberFormat METHOD method_1169 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + ARG 1 registries METHOD method_1170 getNullableObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1171 addTeam (Ljava/lang/String;)Lnet/minecraft/class_268; @@ -60,6 +61,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 objective ARG 3 score METHOD method_1178 getKnownScoreHolders ()Ljava/util/Collection; + METHOD method_1179 (Ljava/lang/Object;)Ljava/util/List; + ARG 0 criterion2 METHOD method_1180 getOrCreateScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9014; ARG 1 scoreHolder ARG 2 objective @@ -71,6 +74,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 objective METHOD method_1188 readNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 list + ARG 2 registries METHOD method_1189 getObjectiveForSlot (Lnet/minecraft/class_8646;)Lnet/minecraft/class_266; ARG 1 slot METHOD method_1190 onScoreRemoved (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)V @@ -95,6 +99,14 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 scoreHolder ARG 2 objective ARG 3 forceWritable + METHOD method_55426 (Lnet/minecraft/class_7225$class_7874;Ljava/lang/String;Lnet/minecraft/class_2499;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V + ARG 3 objective + ARG 4 score + METHOD method_55427 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_267;)V + ARG 1 score + METHOD method_55428 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2499;Ljava/lang/String;Lnet/minecraft/class_9012;)V + ARG 2 name + ARG 3 scores METHOD method_55429 removeScores (Lnet/minecraft/class_9015;)V ARG 1 scoreHolder METHOD method_55430 getScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9013; @@ -102,6 +114,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 objective METHOD method_55431 getScores (Ljava/lang/String;)Lnet/minecraft/class_9012; ARG 1 scoreHolderName + METHOD method_55432 (Ljava/lang/String;)Lnet/minecraft/class_9012; + ARG 0 name CLASS 1 METHOD method_55433 setLocked (Z)V ARG 1 locked diff --git a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping index d59fe42335..254af9d8d0 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore ARG 1 format METHOD method_55403 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_267; ARG 0 nbt + ARG 1 registries METHOD method_55404 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 formatElement METHOD method_55405 setDisplayText (Lnet/minecraft/class_2561;)V @@ -23,3 +24,4 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore ARG 1 numberFormat METHOD method_55407 getDisplayText ()Lnet/minecraft/class_2561; METHOD method_55408 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; + ARG 1 registries diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index 4e50545319..bda7c1043d 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -8,14 +8,19 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState ARG 1 team ARG 2 nbt METHOD method_1216 objectivesToNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + ARG 1 registries METHOD method_1217 teamsToNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + ARG 1 registries METHOD method_1219 readTeamsNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt + ARG 2 registries METHOD method_1220 readObjectivesNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt + ARG 2 registries METHOD method_1221 readDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_32481 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273; ARG 1 nbt + ARG 2 registries diff --git a/mappings/net/minecraft/scoreboard/Scores.mapping b/mappings/net/minecraft/scoreboard/Scores.mapping index 6fe5462c59..ac3ff37a3f 100644 --- a/mappings/net/minecraft/scoreboard/Scores.mapping +++ b/mappings/net/minecraft/scoreboard/Scores.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_9012 net/minecraft/scoreboard/Scores METHOD method_55392 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V ARG 1 objective ARG 2 score + METHOD method_55393 (Ljava/util/function/Consumer;Ljava/lang/Object;)Lnet/minecraft/class_267; + ARG 1 objective2 METHOD method_55394 getScoresAsIntMap ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_55395 remove (Lnet/minecraft/class_266;)Z ARG 1 objective diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 01e39c06ae..454bc19613 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler ARG 1 item ARG 2 damage ARG 3 amount + METHOD method_16694 (Lnet/minecraft/class_9304$class_9305;)V + ARG 0 builder METHOD method_16695 updateResult ()V METHOD method_17415 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 2 world @@ -27,6 +29,10 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler METHOD method_20268 transferEnchantments (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 target ARG 2 source + METHOD method_57320 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9304$class_9305;)V + ARG 1 builder + METHOD method_57321 (Lnet/minecraft/class_6880;)Z + ARG 0 enchantment CLASS 4 METHOD method_16696 getExperience (Lnet/minecraft/class_1799;)I ARG 1 stack diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index d99e8aa508..f3f40f3d7a 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler METHOD method_43706 getBannerPatterns ()Ljava/util/List; METHOD method_45016 isPatternIndexValid (I)Z ARG 1 index + METHOD method_57322 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;Lnet/minecraft/class_9307;)Lnet/minecraft/class_9307; + ARG 2 component METHOD method_7647 getSelectedPattern ()I METHOD method_7648 updateOutputSlot (Lnet/minecraft/class_6880;)V ARG 1 pattern diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 7666ba486e..da32b8c2a5 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -44,5 +44,7 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler METHOD method_20700 setCanRefreshTrades (Z)V ARG 1 canRefreshTrades METHOD method_20701 canRefreshTrades ()Z + METHOD method_57323 (Lnet/minecraft/class_9306;)V + ARG 1 item METHOD method_7650 setRecipeIndex (I)V ARG 1 index diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index c663e53bac..8ac505efb0 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -15,12 +15,14 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 1 offer METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIF)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 maxUses ARG 5 merchantExperience ARG 6 priceMultiplier METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIIF)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -28,6 +30,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 7 priceMultiplier METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIIFI)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -36,6 +39,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 8 demandBonus METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIZIIFI)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -51,13 +55,14 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 4 merchantExperience ARG 5 priceMultiplier METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 stack ARG 2 buyItem METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 firstBuyStack ARG 2 secondBuyStack METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. - METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; + METHOD method_19272 getDisplayedFirstBuyItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the first buy item of this trade offer, COMMENT with its price adjusted depending on the demand bonus, the COMMENT special price and the price multiplier. @@ -125,6 +130,10 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 0 tradeOffer METHOD method_56716 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_9306; ARG 0 tradeOffer + METHOD method_57555 getFirstBuyItemCount (Lnet/minecraft/class_9306;)I + ARG 1 firstBuyItem + METHOD method_57556 getFirstBuyItem ()Lnet/minecraft/class_9306; + METHOD method_57557 getSecondBuyItem ()Ljava/util/Optional; METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V @@ -134,7 +143,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 1 increment METHOD method_8246 getOriginalFirstBuyItem ()Lnet/minecraft/class_1799; COMMENT Returns the first buy item of this trade offer. - METHOD method_8247 getSecondBuyItem ()Lnet/minecraft/class_1799; + METHOD method_8247 getDisplayedSecondBuyItem ()Lnet/minecraft/class_1799; 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 diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 52741f9832..680e65bf80 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -37,6 +37,10 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 0 item ARG 1 enchantment ARG 2 level + METHOD method_57311 createPotion (Lnet/minecraft/class_6880;)Lnet/minecraft/class_9306; + ARG 0 potion + METHOD method_57312 (Lnet/minecraft/class_6880;Lnet/minecraft/class_9329$class_9330;)Lnet/minecraft/class_9329$class_9330; + ARG 1 builder CLASS class_1648 EnchantBookFactory FIELD field_18557 experience I FIELD field_45131 possibleEnchantments Ljava/util/List; @@ -168,8 +172,12 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 7 experience ARG 8 multiplier METHOD (Lnet/minecraft/class_9306;ILnet/minecraft/class_1799;IIF)V + ARG 1 toBeProcessed ARG 2 count + ARG 3 processed + ARG 4 maxUses ARG 5 processedCount + ARG 6 multiplier CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I @@ -222,6 +230,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 2 duration ARG 3 experience METHOD (Lnet/minecraft/class_9298;IF)V + ARG 1 stewEffects ARG 2 experience ARG 3 multiplier CLASS class_4167 SellPotionHoldingItemFactory diff --git a/mappings/net/minecraft/village/TradedItem.mapping b/mappings/net/minecraft/village/TradedItem.mapping new file mode 100644 index 0000000000..86e6b0d470 --- /dev/null +++ b/mappings/net/minecraft/village/TradedItem.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_9306 net/minecraft/village/TradedItem + FIELD field_49393 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49394 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49395 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_1935;)V + ARG 1 item + METHOD (Lnet/minecraft/class_1935;I)V + ARG 1 item + ARG 2 count + METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_9329;)V + ARG 1 item + ARG 2 count + ARG 3 components + METHOD method_57551 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57552 matches (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_57553 createDisplayStack (Lnet/minecraft/class_6880;ILnet/minecraft/class_9329;)Lnet/minecraft/class_1799; + ARG 0 item + ARG 1 count + ARG 2 components + METHOD method_57554 withComponents (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_9306; + ARG 1 builderCallback