From aa1f7c199da402871dee9b5f46638e1ac11845a1 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 11 Oct 2023 08:18:14 +0900 Subject: [PATCH] Map loot codecs (#3690) * Map loot codecs * Rename AndFunction --- .../net/minecraft/loot/AndFunction.mapping | 11 -------- .../net/minecraft/loot/LootDataType.mapping | 2 ++ mappings/net/minecraft/loot/LootPool.mapping | 12 ++++++++ .../loot/condition/AllOfLootCondition.mapping | 1 + .../AlternativeLootCondition.mapping | 4 ++- .../BlockStatePropertyLootCondition.mapping | 6 ++-- ...amageSourcePropertiesLootCondition.mapping | 4 +-- .../EntityPropertiesLootCondition.mapping | 4 +-- .../EntityScoresLootCondition.mapping | 10 ++++--- .../condition/InvertedLootCondition.mapping | 4 +-- .../LocationCheckLootCondition.mapping | 10 +++---- .../loot/condition/LootConditionTypes.mapping | 1 + .../condition/MatchToolLootCondition.mapping | 4 +-- .../RandomChanceLootCondition.mapping | 2 ++ ...ndomChanceWithLootingLootCondition.mapping | 4 +-- .../condition/ReferenceLootCondition.mapping | 2 ++ .../condition/TableBonusLootCondition.mapping | 4 +-- .../condition/TimeCheckLootCondition.mapping | 6 ++-- .../condition/ValueCheckLootCondition.mapping | 4 +-- .../WeatherCheckLootCondition.mapping | 2 ++ .../loot/context/LootContextTypes.mapping | 2 ++ .../loot/entry/CombinedEntry.mapping | 8 ++++++ .../minecraft/loot/entry/DynamicEntry.mapping | 4 +++ .../minecraft/loot/entry/EmptyEntry.mapping | 2 ++ .../minecraft/loot/entry/ItemEntry.mapping | 4 +++ .../minecraft/loot/entry/LeafEntry.mapping | 10 +++++++ .../loot/entry/LootPoolEntry.mapping | 4 +++ .../loot/entry/LootTableEntry.mapping | 4 +++ .../net/minecraft/loot/entry/TagEntry.mapping | 6 ++++ .../loot/function/AndLootFunction.mapping | 18 ++++++++++++ .../function/ApplyBonusLootFunction.mapping | 28 +++++++++++++++++++ .../function/ConditionalLootFunction.mapping | 4 +++ .../function/CopyNameLootFunction.mapping | 6 ++++ .../loot/function/CopyNbtLootFunction.mapping | 11 ++++++++ .../loot/function/CopyStateFunction.mapping | 6 ++++ .../EnchantRandomlyLootFunction.mapping | 11 ++++++++ .../EnchantWithLevelsLootFunction.mapping | 6 ++++ .../ExplorationMapLootFunction.mapping | 15 ++++++++++ .../ExplosionDecayLootFunction.mapping | 2 ++ .../FillPlayerHeadLootFunction.mapping | 6 ++++ .../function/FurnaceSmeltLootFunction.mapping | 2 ++ .../function/LimitCountLootFunction.mapping | 4 +++ .../loot/function/LootFunctionTypes.mapping | 4 +++ .../LootingEnchantLootFunction.mapping | 7 +++++ .../function/ReferenceLootFunction.mapping | 4 +++ .../SetAttributesLootFunction.mapping | 4 +++ .../function/SetBannerPatternFunction.mapping | 6 ++++ .../function/SetContentsLootFunction.mapping | 6 ++++ .../function/SetCountLootFunction.mapping | 6 ++++ .../function/SetDamageLootFunction.mapping | 6 ++++ .../SetEnchantmentsLootFunction.mapping | 6 ++++ .../SetInstrumentLootFunction.mapping | 4 +++ .../function/SetLootTableLootFunction.mapping | 8 ++++++ .../loot/function/SetLoreLootFunction.mapping | 10 +++++++ .../loot/function/SetNameLootFunction.mapping | 10 +++++++ .../loot/function/SetNbtLootFunction.mapping | 4 +++ .../function/SetPotionLootFunction.mapping | 4 +++ .../SetStewEffectLootFunction.mapping | 4 +++ .../operator/BoundedIntUnaryOperator.mapping | 12 ++++++++ .../nbt/ContextLootNbtProvider.mapping | 10 +++++++ .../provider/nbt/LootNbtProviderTypes.mapping | 4 +++ .../nbt/StorageLootNbtProvider.mapping | 2 ++ .../number/BinomialLootNumberProvider.mapping | 6 ++-- .../number/ConstantLootNumberProvider.mapping | 5 ++-- .../number/LootNumberProviderTypes.mapping | 4 +++ .../number/ScoreLootNumberProvider.mapping | 8 ++---- .../number/UniformLootNumberProvider.mapping | 6 ++-- .../score/ContextLootScoreProvider.mapping | 5 ++-- .../score/FixedLootScoreProvider.mapping | 4 +-- .../score/LootScoreProviderTypes.mapping | 4 +++ 70 files changed, 360 insertions(+), 63 deletions(-) delete mode 100644 mappings/net/minecraft/loot/AndFunction.mapping create mode 100644 mappings/net/minecraft/loot/function/AndLootFunction.mapping diff --git a/mappings/net/minecraft/loot/AndFunction.mapping b/mappings/net/minecraft/loot/AndFunction.mapping deleted file mode 100644 index 31056664c1..0000000000 --- a/mappings/net/minecraft/loot/AndFunction.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_5641 net/minecraft/loot/AndFunction - FIELD field_27904 terms Ljava/util/List; - FIELD field_27905 applier Ljava/util/function/BiFunction; - FIELD field_45834 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/List;)V - ARG 1 terms - METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 stack - ARG 2 context - METHOD method_53353 create (Ljava/util/List;)Lnet/minecraft/class_5641; - ARG 0 terms diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index e168a64908..bf7a07a123 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType METHOD method_51215 stream ()Ljava/util/stream/Stream; METHOD method_51216 validator ()Lnet/minecraft/class_8490$class_8491; METHOD method_51217 tableValidator ()Lnet/minecraft/class_8490$class_8491; + METHOD method_53267 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 2 result CLASS class_8491 Validator METHOD run (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V ARG 1 reporter diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index 0ad664bc13..42f59fea42 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -24,6 +24,18 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool METHOD method_347 builder ()Lnet/minecraft/class_55$class_56; METHOD method_349 validate (Lnet/minecraft/class_58;)V ARG 1 reporter + METHOD method_53268 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53269 (Lnet/minecraft/class_55;)Lnet/minecraft/class_5658; + ARG 0 pool + METHOD method_53270 (Lnet/minecraft/class_55;)Lnet/minecraft/class_5658; + ARG 0 pool + METHOD method_53271 (Lnet/minecraft/class_55;)Ljava/util/List; + ARG 0 pool + METHOD method_53272 (Lnet/minecraft/class_55;)Ljava/util/List; + ARG 0 pool + METHOD method_53273 (Lnet/minecraft/class_55;)Ljava/util/List; + ARG 0 pool CLASS class_56 Builder FIELD field_959 rolls Lnet/minecraft/class_5658; FIELD field_960 entries Lcom/google/common/collect/ImmutableList$Builder; diff --git a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping index ccf3f498b4..3d79569590 100644 --- a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_8548 net/minecraft/loot/condition/AllOfLootCondition FIELD field_45857 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45858 INLINE_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;)V ARG 1 terms METHOD method_51723 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8548$class_8549; diff --git a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping index 3dfd534408..ea45dd4526 100644 --- a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping @@ -8,9 +8,11 @@ CLASS net/minecraft/class_186 net/minecraft/loot/condition/AlternativeLootCondit ARG 0 condition METHOD method_53407 createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 termsToCondition + METHOD method_53408 (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance METHOD method_53409 (Lnet/minecraft/class_186;)Ljava/util/List; ARG 0 condition - METHOD method_53410 (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + METHOD method_53410 createInlineCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 termsToCondition METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping index b9eb8d8604..a611924486 100644 --- a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_212 net/minecraft/loot/condition/BlockStatePropertyLootCondition - FIELD comp_1876 block Lnet/minecraft/class_6880; - FIELD comp_1877 properties Ljava/util/Optional; FIELD field_45868 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1876 block ()Lnet/minecraft/class_6880; - METHOD comp_1877 properties ()Ljava/util/Optional; + METHOD method_53417 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_53418 validateHasProperties (Lnet/minecraft/class_212;)Lcom/mojang/serialization/DataResult; ARG 0 condition METHOD method_53419 (Lnet/minecraft/class_212;Lnet/minecraft/class_4559;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping index f3ff703450..43a88a1a71 100644 --- a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_190 net/minecraft/loot/condition/DamageSourcePropertiesLootCondition - FIELD comp_1870 predicate Ljava/util/Optional; FIELD field_45862 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1870 predicate ()Ljava/util/Optional; + METHOD method_53412 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_5341$class_210; ARG 0 builder METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index aa6f5d5874..e3efc6009c 100644 --- a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootCondition - FIELD comp_1879 predicate Ljava/util/Optional; FIELD comp_1880 entity Lnet/minecraft/class_47$class_50; FIELD field_45871 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_47$class_50;)V ARG 2 entity - METHOD comp_1879 predicate ()Ljava/util/Optional; METHOD comp_1880 entity ()Lnet/minecraft/class_47$class_50; METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5341$class_210; ARG 0 entity METHOD method_27865 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048;)Lnet/minecraft/class_5341$class_210; ARG 0 entity ARG 1 predicate + METHOD method_53423 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_917 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_5341$class_210; ARG 0 entity ARG 1 predicateBuilder diff --git a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index 65f5653f43..5646bdc42c 100644 --- a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -1,14 +1,16 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondition - FIELD comp_1871 scores Ljava/util/Map; - FIELD comp_1872 target Lnet/minecraft/class_47$class_50; + FIELD comp_1872 entity Lnet/minecraft/class_47$class_50; FIELD field_45863 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;Lnet/minecraft/class_47$class_50;)V ARG 1 scores ARG 2 target - METHOD comp_1871 scores ()Ljava/util/Map; - METHOD comp_1872 target ()Lnet/minecraft/class_47$class_50; + METHOD comp_1872 entity ()Lnet/minecraft/class_47$class_50; + METHOD method_32422 (Lnet/minecraft/class_42;)Ljava/util/stream/Stream; + ARG 0 operator METHOD method_35557 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_199$class_6163; ARG 0 target + METHOD method_53413 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_865 entityScoreIsInRange (Lnet/minecraft/class_47;Lnet/minecraft/class_1297;Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_42;)Z ARG 1 context ARG 2 entity diff --git a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping index cba66e38b0..7e796647aa 100644 --- a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_207 net/minecraft/loot/condition/InvertedLootCondition - FIELD comp_1873 term Lnet/minecraft/class_5341; FIELD field_45865 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5341;)V ARG 1 term - METHOD comp_1873 term ()Lnet/minecraft/class_5341; + METHOD method_53414 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_889 builder (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_5341$class_210; ARG 0 term METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index 76e049e151..dc12661e77 100644 --- a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -1,15 +1,15 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCondition - FIELD comp_1874 predicate Ljava/util/Optional; - FIELD comp_1875 offset Lnet/minecraft/class_2338; FIELD field_45866 CODEC Lcom/mojang/serialization/Codec; - FIELD field_45867 BLOCK_POS_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_45867 OFFSET_CODEC Lcom/mojang/serialization/MapCodec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2338;)V ARG 2 offset - METHOD comp_1874 predicate ()Ljava/util/Optional; - METHOD comp_1875 offset ()Lnet/minecraft/class_2338; METHOD method_30151 builder (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5341$class_210; ARG 0 predicateBuilder ARG 1 pos + METHOD method_53415 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53416 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_884 builder (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_5341$class_210; ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index e0319baeae..e589af981e 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes METHOD method_925 matchingAny (Ljava/util/List;)Ljava/util/function/Predicate; COMMENT Returns a predicate that returns true if any its element predicates COMMENT return true, as if applied by logical or. + ARG 0 predicates METHOD method_927 (Ljava/util/List;Ljava/lang/Object;)Z ARG 1 operand METHOD method_928 (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping index e398dc7629..77a10b0af9 100644 --- a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_223 net/minecraft/loot/condition/MatchToolLootCondition - FIELD comp_1884 predicate Ljava/util/Optional; FIELD field_45875 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1884 predicate ()Ljava/util/Optional; + METHOD method_53426 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_5341$class_210; ARG 0 predicate METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping index c0030632c6..bf4304ea52 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_219 net/minecraft/loot/condition/RandomChanceLootCondi METHOD (F)V ARG 1 chance METHOD comp_1881 chance ()F + METHOD method_53424 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_932 builder (F)Lnet/minecraft/class_5341$class_210; ARG 0 chance METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping index 37ec1b2889..268b46d452 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_225 net/minecraft/loot/condition/RandomChanceWithLootingLootCondition FIELD comp_1882 chance F - FIELD comp_1883 lootingMultiplier F FIELD field_45874 CODEC Lcom/mojang/serialization/Codec; METHOD (FF)V ARG 1 chance ARG 2 lootingMultiplier METHOD comp_1882 chance ()F - METHOD comp_1883 lootingMultiplier ()F + METHOD method_53425 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_953 builder (FF)Lnet/minecraft/class_5341$class_210; ARG 0 chance ARG 1 lootingMultiplier diff --git a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping index 7ac1f52ec2..d57c099115 100644 --- a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping @@ -9,5 +9,7 @@ CLASS net/minecraft/class_4568 net/minecraft/loot/condition/ReferenceLootConditi ARG 0 id METHOD method_51230 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_5341;)V ARG 3 predicate + METHOD method_53411 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index 2b9b9cacaf..3b284e29ba 100644 --- a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_182 net/minecraft/loot/condition/TableBonusLootCondition - FIELD comp_1867 enchantment Lnet/minecraft/class_6880; FIELD comp_1868 chances Ljava/util/List; FIELD field_45860 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_1867 enchantment ()Lnet/minecraft/class_6880; METHOD comp_1868 chances ()Ljava/util/List; + METHOD method_53405 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_5341$class_210; ARG 0 enchantment ARG 1 chances diff --git a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping index 9f8057ebad..1dfa01ad79 100644 --- a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping @@ -1,13 +1,11 @@ CLASS net/minecraft/class_4571 net/minecraft/loot/condition/TimeCheckLootCondition - FIELD comp_1885 period Ljava/util/Optional; - FIELD comp_1886 value Lnet/minecraft/class_42; FIELD field_45876 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_42;)V ARG 2 value - METHOD comp_1885 period ()Ljava/util/Optional; - METHOD comp_1886 value ()Lnet/minecraft/class_42; METHOD method_35559 create (Lnet/minecraft/class_42;)Lnet/minecraft/class_4571$class_6164; ARG 0 value + METHOD method_53427 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_6164 Builder diff --git a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping index de89aa94af..347c9b73b7 100644 --- a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_5644 net/minecraft/loot/condition/ValueCheckLootCondition FIELD comp_1887 value Lnet/minecraft/class_5658; - FIELD comp_1888 range Lnet/minecraft/class_42; FIELD field_45877 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)V ARG 1 value ARG 2 range METHOD comp_1887 value ()Lnet/minecraft/class_5658; - METHOD comp_1888 range ()Lnet/minecraft/class_42; METHOD method_35562 builder (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)Lnet/minecraft/class_5341$class_210; ARG 0 value ARG 1 range + METHOD method_53428 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping index 0cdb2a9257..0aa50341dc 100644 --- a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_227 net/minecraft/loot/condition/WeatherCheckLootCondi METHOD comp_1889 raining ()Ljava/util/Optional; METHOD comp_1890 thundering ()Ljava/util/Optional; METHOD method_35564 create ()Lnet/minecraft/class_227$class_6165; + METHOD method_53429 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_6165 Builder diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 1aa614471e..ee64bf6985 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_51722 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_53401 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 0 id 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/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index b16919db69..c05035df0e 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -5,6 +5,14 @@ CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry ARG 1 terms ARG 2 conditions METHOD method_394 combine (Ljava/util/List;)Lnet/minecraft/class_64; + ARG 1 terms METHOD method_53279 createCodec (Lnet/minecraft/class_69$class_70;)Lcom/mojang/serialization/Codec; ARG 0 factory + METHOD method_53280 (Lnet/minecraft/class_69$class_70;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance + METHOD method_53281 (Lnet/minecraft/class_69;)Ljava/util/List; + ARG 0 entry CLASS class_70 Factory + METHOD create (Ljava/util/List;Ljava/util/List;)Lnet/minecraft/class_69; + ARG 1 terms + ARG 2 conditions diff --git a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping index 4b247f8a3b..51b8b15ad9 100644 --- a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping @@ -14,3 +14,7 @@ CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry ARG 2 quality ARG 3 conditions ARG 4 functions + METHOD method_53282 (Lnet/minecraft/class_67;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_53283 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping index e8c637f302..6624d347c9 100644 --- a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_73 net/minecraft/loot/entry/EmptyEntry ARG 3 conditions ARG 4 functions METHOD method_401 builder ()Lnet/minecraft/class_85$class_86; + METHOD method_53284 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/loot/entry/ItemEntry.mapping index f014b60236..d59448970c 100644 --- a/mappings/net/minecraft/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/loot/entry/ItemEntry.mapping @@ -14,3 +14,7 @@ CLASS net/minecraft/class_77 net/minecraft/loot/entry/ItemEntry ARG 4 functions METHOD method_411 builder (Lnet/minecraft/class_1935;)Lnet/minecraft/class_85$class_86; ARG 0 drop + METHOD method_53285 (Lnet/minecraft/class_77;)Lnet/minecraft/class_6880; + ARG 0 entry + METHOD method_53286 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping index eef751f03d..a92c440c9f 100644 --- a/mappings/net/minecraft/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry + FIELD field_31847 DEFAULT_WEIGHT I + FIELD field_31848 DEFAULT_QUALITY I FIELD field_994 quality I FIELD field_995 weight I FIELD field_996 functions Ljava/util/List; @@ -14,6 +16,14 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry ARG 2 context METHOD method_434 builder (Lnet/minecraft/class_85$class_89;)Lnet/minecraft/class_85$class_86; ARG 0 factory + METHOD method_53289 (Lnet/minecraft/class_85;)Ljava/util/List; + ARG 0 entry + METHOD method_53290 addLeafFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P4; + ARG 0 instance + METHOD method_53291 (Lnet/minecraft/class_85;)Ljava/lang/Integer; + ARG 0 entry + METHOD method_53292 (Lnet/minecraft/class_85;)Ljava/lang/Integer; + ARG 0 entry CLASS class_86 Builder FIELD field_1000 quality I FIELD field_1001 weight I diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping index c97ab3606e..b8a5896f22 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -8,6 +8,10 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry ARG 1 context METHOD method_415 validate (Lnet/minecraft/class_58;)V ARG 1 reporter + METHOD method_53287 addConditionsField (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P1; + ARG 0 instance + METHOD method_53288 (Lnet/minecraft/class_79;)Ljava/util/List; + ARG 0 entry CLASS class_80 Builder FIELD field_990 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_35513 sequenceEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_93$class_6152; diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index e0d1270b2e..506d89a1c0 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -16,3 +16,7 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 4 functions METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V ARG 3 table + METHOD method_53293 (Lnet/minecraft/class_83;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_53294 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index e9673aa733..f5a9cde8fe 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -28,3 +28,9 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry ARG 2 lootChoiceExpander METHOD method_449 (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)V ARG 1 entry + METHOD method_53295 (Lnet/minecraft/class_91;)Ljava/lang/Boolean; + ARG 0 entry + METHOD method_53296 (Lnet/minecraft/class_91;)Lnet/minecraft/class_6862; + ARG 0 entry + METHOD method_53297 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/AndLootFunction.mapping b/mappings/net/minecraft/loot/function/AndLootFunction.mapping new file mode 100644 index 0000000000..0f7221604d --- /dev/null +++ b/mappings/net/minecraft/loot/function/AndLootFunction.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_5641 net/minecraft/loot/function/AndLootFunction + FIELD field_27904 terms Ljava/util/List; + FIELD field_27905 applier Ljava/util/function/BiFunction; + FIELD field_45834 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45835 INLINE_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 terms + METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 stack + ARG 2 context + METHOD method_53351 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53352 (Lnet/minecraft/class_5641;)Ljava/util/List; + ARG 0 function + METHOD method_53353 create (Ljava/util/List;)Lnet/minecraft/class_5641; + ARG 0 terms + METHOD method_53354 (Lnet/minecraft/class_5641;)Ljava/util/List; + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 335b363916..ee99370a6e 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction FIELD field_1010 FACTORIES Ljava/util/Map; FIELD field_1011 enchantment Lnet/minecraft/class_6880; FIELD field_45806 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45807 TYPE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_45808 FORMULA_CODEC Lcom/mojang/serialization/MapCodec; METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_94$class_96;)V ARG 1 conditions ARG 2 enchantment @@ -26,6 +28,32 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 enchantment ARG 1 probability ARG 2 extra + METHOD method_53298 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 0 id + METHOD method_53299 (Lnet/minecraft/class_94;)Lnet/minecraft/class_94$class_96; + ARG 0 function + METHOD method_53301 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53302 (Lnet/minecraft/class_94;)Lnet/minecraft/class_6880; + ARG 0 function + CLASS 1 + FIELD field_45809 FORMULA_KEY Ljava/lang/String; + FIELD field_45810 PARAMETERS_KEY Ljava/lang/String; + METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 formula + ARG 2 ops + ARG 3 prefix + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops + METHOD method_53303 encodeFormula (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_94$class_96;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; + ARG 1 typeCodec + ARG 2 formula + ARG 3 ops + METHOD method_53305 (Lcom/mojang/serialization/MapLike;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + ARG 2 pair CLASS class_95 BinomialWithBonusCount FIELD comp_1848 extra I FIELD comp_1849 probability F diff --git a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index 8091ffc215..0756431b4a 100644 --- a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunctio METHOD method_522 process (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 context + METHOD method_53344 addConditionsField (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P1; + ARG 0 instance + METHOD method_53345 (Lnet/minecraft/class_120;)Ljava/util/List; + ARG 0 function CLASS class_121 Builder FIELD field_1049 conditionList Lcom/google/common/collect/ImmutableList$Builder; METHOD method_523 getThisBuilder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping index e7edcccb0b..98bf1de366 100644 --- a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping @@ -6,6 +6,12 @@ CLASS net/minecraft/class_101 net/minecraft/loot/function/CopyNameLootFunction ARG 2 source METHOD method_473 builder (Lnet/minecraft/class_101$class_102;)Lnet/minecraft/class_120$class_121; ARG 0 source + METHOD method_474 (Lnet/minecraft/class_101$class_102;Ljava/util/List;)Lnet/minecraft/class_117; + ARG 1 conditions + METHOD method_53313 (Lnet/minecraft/class_101;)Lnet/minecraft/class_101$class_102; + ARG 0 function + METHOD method_53314 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_102 Source FIELD field_1024 parameter Lnet/minecraft/class_169; FIELD field_1025 name Ljava/lang/String; diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 08bce41df6..4da3e4ab6f 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -12,6 +12,12 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 0 source METHOD method_35519 builder (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3837$class_3838; ARG 0 target + METHOD method_53315 (Lnet/minecraft/class_3837;)Ljava/util/List; + ARG 0 function + METHOD method_53316 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53317 (Lnet/minecraft/class_3837;)Lnet/minecraft/class_5651; + ARG 0 function CLASS class_3838 Builder FIELD field_17017 source Lnet/minecraft/class_5651; FIELD field_17018 operations Ljava/util/List; @@ -37,6 +43,8 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction METHOD method_16860 execute (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)V ARG 1 itemNbtGetter ARG 2 sourceEntityNbt + METHOD method_53318 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_3841 Operator FIELD field_17035 name Ljava/lang/String; FIELD field_45821 CODEC Lcom/mojang/serialization/Codec; @@ -59,3 +67,6 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction CLASS class_8753 Path FIELD field_45822 CODEC Lcom/mojang/serialization/Codec; METHOD method_53319 parse (Ljava/lang/String;)Lnet/minecraft/class_3837$class_8753; + ARG 0 path + METHOD method_53321 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 path diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index d9062963df..d2d558613f 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -15,6 +15,12 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction METHOD method_21893 getPropertyName (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)Ljava/lang/String; ARG 0 state ARG 1 property + METHOD method_53310 (Lnet/minecraft/class_4488;)Ljava/util/List; + ARG 0 function + METHOD method_53311 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53312 (Lnet/minecraft/class_4488;)Lnet/minecraft/class_6880; + ARG 0 function 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/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index f4a48b3f2d..ac50893e8a 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun FIELD field_1030 enchantments Ljava/util/Optional; FIELD field_1031 LOGGER Lorg/slf4j/Logger; FIELD field_45823 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45824 ENCHANTMENT_LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Ljava/util/Optional;)V ARG 1 conditions ARG 2 enchantments @@ -13,8 +14,18 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun METHOD method_488 (Ljava/util/List;)Lnet/minecraft/class_117; ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; + METHOD method_53322 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885;)Ljava/util/Optional; + ARG 1 enchantments + METHOD method_53324 (Lnet/minecraft/class_109;)Ljava/util/Optional; + ARG 0 function + METHOD method_53325 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 enchantment + METHOD method_53326 (Lnet/minecraft/class_6885;)Ljava/util/List; + ARG 0 enchantments METHOD method_53327 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_6880$class_6883;)Z ARG 2 enchantment + METHOD method_53328 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_4954 Builder FIELD field_23090 enchantments Ljava/util/List; METHOD method_25992 add (Lnet/minecraft/class_1887;)Lnet/minecraft/class_109$class_4954; diff --git a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index 1d3aa30963..f877cdfbae 100644 --- a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -8,6 +8,12 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootF ARG 3 treasureEnchantmentsAllowed METHOD method_481 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_106$class_107; ARG 0 range + METHOD method_53329 (Lnet/minecraft/class_106;)Ljava/lang/Boolean; + ARG 0 function + METHOD method_53330 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53331 (Lnet/minecraft/class_106;)Lnet/minecraft/class_5658; + ARG 0 function CLASS class_107 Builder FIELD field_1028 range Lnet/minecraft/class_5658; FIELD field_1029 treasureEnchantmentsAllowed Z diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 8be451819f..b6f89ce41b 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_6862; + FIELD field_31851 DEFAULT_ZOOM B + FIELD field_31852 DEFAULT_SEARCH_RADIUS I + FIELD field_31853 DEFAULT_SKIP_EXISTING_CHUNKS Z FIELD field_45826 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions @@ -15,6 +18,18 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc ARG 5 searchRadius ARG 6 skipExistingChunks METHOD method_492 builder ()Lnet/minecraft/class_111$class_112; + METHOD method_53332 (Lnet/minecraft/class_111;)Ljava/lang/Boolean; + ARG 0 function + METHOD method_53333 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53334 (Lnet/minecraft/class_111;)Ljava/lang/Integer; + ARG 0 function + METHOD method_53335 (Lnet/minecraft/class_111;)Ljava/lang/Byte; + ARG 0 function + METHOD method_53336 (Lnet/minecraft/class_111;)Lnet/minecraft/class_20$class_21; + ARG 0 function + METHOD method_53337 (Lnet/minecraft/class_111;)Lnet/minecraft/class_6862; + ARG 0 function CLASS class_112 Builder FIELD field_1039 destination Lnet/minecraft/class_6862; FIELD field_1040 searchRadius I diff --git a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping index e4ce04ef73..b8150357f5 100644 --- a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_104 net/minecraft/loot/function/ExplosionDecayLootFunc METHOD (Ljava/util/List;)V ARG 1 conditions METHOD method_478 builder ()Lnet/minecraft/class_120$class_121; + METHOD method_53309 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping index e0f4b659de..c1de0504e3 100644 --- a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping @@ -6,3 +6,9 @@ CLASS net/minecraft/class_3668 net/minecraft/loot/function/FillPlayerHeadLootFun ARG 2 entity METHOD method_35522 builder (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_120$class_121; ARG 0 target + METHOD method_35523 (Lnet/minecraft/class_47$class_50;Ljava/util/List;)Lnet/minecraft/class_117; + ARG 1 conditons + METHOD method_53338 (Lnet/minecraft/class_3668;)Lnet/minecraft/class_47$class_50; + ARG 0 function + METHOD method_53339 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping index 0a6048ce4e..3d61d6cb1e 100644 --- a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping @@ -3,4 +3,6 @@ CLASS net/minecraft/class_165 net/minecraft/loot/function/FurnaceSmeltLootFuncti FIELD field_45855 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;)V ARG 1 conditions + METHOD method_53400 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_724 builder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping index 2cff8bd5fd..446f0d6038 100644 --- a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_114 net/minecraft/loot/function/LimitCountLootFunction ARG 0 limit METHOD method_508 (Lnet/minecraft/class_42;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions + METHOD method_53342 (Lnet/minecraft/class_114;)Lnet/minecraft/class_42; + ARG 0 function + METHOD method_53343 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index d662e3e920..692bd091cc 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes METHOD method_29323 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5339; ARG 0 id ARG 1 codec + METHOD method_53347 (Ljava/util/List;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; + ARG 1 stack + ARG 2 context METHOD method_591 (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 2 stack ARG 3 context @@ -12,3 +15,4 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes ARG 0 stack ARG 1 context METHOD method_594 join (Ljava/util/List;)Ljava/util/function/BiFunction; + ARG 0 terms diff --git a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index 00a932f765..9fed00c5bb 100644 --- a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -1,11 +1,18 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunction FIELD field_1082 countRange Lnet/minecraft/class_5658; FIELD field_1083 limit I + FIELD field_31854 DEFAULT_LIMIT I FIELD field_45833 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_5658;I)V ARG 1 conditions ARG 2 countRange ARG 3 limit + METHOD method_53348 (Lnet/minecraft/class_125;)Ljava/lang/Integer; + ARG 0 function + METHOD method_53349 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53350 (Lnet/minecraft/class_125;)Lnet/minecraft/class_5658; + ARG 0 function METHOD method_547 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_125$class_126; ARG 0 countRange METHOD method_549 hasLimit ()Z diff --git a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping index 8fd7fefa95..595396d58b 100644 --- a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping @@ -11,3 +11,7 @@ CLASS net/minecraft/class_8492 net/minecraft/loot/function/ReferenceLootFunction ARG 1 conditions METHOD method_51226 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_117;)V ARG 3 itemModifier + METHOD method_53340 (Lnet/minecraft/class_8492;)Lnet/minecraft/class_2960; + ARG 0 function + METHOD method_53341 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index ac71673d3b..c996f63f48 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 2 operation ARG 3 amountRange METHOD method_35525 builder ()Lnet/minecraft/class_137$class_6155; + METHOD method_53355 (Lnet/minecraft/class_137;)Ljava/util/List; + ARG 0 function + METHOD method_53356 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance 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 cf88f80595..0a7a3e0a97 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -9,6 +9,12 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct ARG 3 append METHOD method_35531 builder (Z)Lnet/minecraft/class_5592$class_6157; ARG 0 append + METHOD method_53360 (Lnet/minecraft/class_5592;)Ljava/lang/Boolean; + ARG 0 function + METHOD method_53361 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53362 (Lnet/minecraft/class_5592;)Ljava/util/List; + ARG 0 function CLASS class_6157 Builder FIELD field_31862 patterns Lcom/google/common/collect/ImmutableList$Builder; FIELD field_31863 append Z diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index e0f8b48901..439b4e1add 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -6,6 +6,12 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio ARG 1 conditions ARG 2 blockEntityType ARG 3 entries + METHOD method_53363 (Lnet/minecraft/class_134;)Ljava/util/List; + ARG 0 function + METHOD method_53364 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53365 (Lnet/minecraft/class_134;)Lnet/minecraft/class_6880; + ARG 0 function 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/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 9fcf8836de..0928529cbe 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -9,5 +9,11 @@ CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction METHOD method_35540 builder (Lnet/minecraft/class_5658;Z)Lnet/minecraft/class_120$class_121; ARG 0 countRange ARG 1 add + METHOD method_53375 (Lnet/minecraft/class_141;)Ljava/lang/Boolean; + ARG 0 function + METHOD method_53376 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53377 (Lnet/minecraft/class_141;)Lnet/minecraft/class_5658; + ARG 0 function METHOD method_621 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 countRange diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index 44491163cd..08a36eae80 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -12,6 +12,12 @@ CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction ARG 1 add METHOD method_35543 (Lnet/minecraft/class_5658;ZLjava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions + METHOD method_53378 (Lnet/minecraft/class_149;)Ljava/lang/Boolean; + ARG 0 function + METHOD method_53379 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53380 (Lnet/minecraft/class_149;)Lnet/minecraft/class_5658; + ARG 0 function METHOD method_633 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange METHOD method_634 (Lnet/minecraft/class_5658;Ljava/util/List;)Lnet/minecraft/class_117; diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index fafb4a8340..b0ed41e5ce 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -24,6 +24,12 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu METHOD method_32414 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V ARG 1 enchantment ARG 2 level + METHOD method_53370 (Lnet/minecraft/class_5642;)Ljava/lang/Boolean; + ARG 0 function + METHOD method_53371 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53372 (Lnet/minecraft/class_5642;)Ljava/util/Map; + ARG 0 function 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/SetInstrumentLootFunction.mapping b/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping index c087f5d61c..525a4297db 100644 --- a/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_7431 net/minecraft/loot/function/SetInstrumentLootFunc ARG 0 options METHOD method_43743 (Lnet/minecraft/class_6862;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions + METHOD method_53373 (Lnet/minecraft/class_7431;)Lnet/minecraft/class_6862; + ARG 0 function + METHOD method_53374 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index 2dc9a762da..205bd58498 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -19,3 +19,11 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFuncti ARG 4 conditions METHOD method_35537 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117; ARG 2 conditions + METHOD method_53366 (Lnet/minecraft/class_144;)Lnet/minecraft/class_6880; + ARG 0 function + METHOD method_53367 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53368 (Lnet/minecraft/class_144;)Ljava/lang/Long; + ARG 0 function + METHOD method_53369 (Lnet/minecraft/class_144;)Lnet/minecraft/class_2960; + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index ca97bacedb..bb5c910ee6 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -12,6 +12,16 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction ARG 1 stack ARG 2 otherLoreExists METHOD method_35544 builder ()Lnet/minecraft/class_3671$class_6159; + METHOD method_53381 (Lnet/minecraft/class_47$class_50;)Ljava/util/Set; + ARG 0 entity + METHOD method_53382 (Lnet/minecraft/class_3671;)Ljava/util/Optional; + ARG 0 function + METHOD method_53383 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53384 (Lnet/minecraft/class_3671;)Ljava/util/List; + ARG 0 function + METHOD method_53385 (Lnet/minecraft/class_3671;)Ljava/lang/Boolean; + ARG 0 function CLASS class_6159 Builder FIELD field_31866 replace Z FIELD field_31867 target Ljava/util/Optional; diff --git a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping index 088fabe82b..8848cf3cbc 100644 --- a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping @@ -23,3 +23,13 @@ CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction ARG 2 conditions METHOD method_35552 (Lnet/minecraft/class_2561;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions + METHOD method_53386 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_2561;)V + ARG 3 name + METHOD method_53387 (Lnet/minecraft/class_47$class_50;)Ljava/util/Set; + ARG 0 entity + METHOD method_53388 (Lnet/minecraft/class_3670;)Ljava/util/Optional; + ARG 0 function + METHOD method_53389 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53390 (Lnet/minecraft/class_3670;)Ljava/util/Optional; + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index 4b48961219..d68bfb4f13 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction METHOD (Ljava/util/List;Lnet/minecraft/class_2487;)V ARG 1 conditions ARG 2 nbt + METHOD method_53391 (Lnet/minecraft/class_159;)Lnet/minecraft/class_2487; + ARG 0 function + METHOD method_53392 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_675 (Lnet/minecraft/class_2487;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index ab8ea7d2ee..06c57d2de6 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction ARG 0 potion METHOD method_38928 (Lnet/minecraft/class_1842;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions + METHOD method_53393 (Lnet/minecraft/class_6662;)Lnet/minecraft/class_6880; + ARG 0 function + METHOD method_53394 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index bfdb5ff63f..993ae07607 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -7,8 +7,12 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct ARG 2 stewEffects METHOD method_32421 (Lnet/minecraft/class_152$class_8754;)Ljava/util/stream/Stream; ARG 0 stewEffect + METHOD method_53395 (Lnet/minecraft/class_152;)Ljava/util/List; + ARG 0 function METHOD method_53396 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; ARG 0 stewEffects + METHOD method_53397 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; diff --git a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index 5708c0c98d..68f8d25216 100644 --- a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator FIELD field_27897 applier Lnet/minecraft/class_42$class_5639; FIELD field_27898 tester Lnet/minecraft/class_42$class_5638; FIELD field_45790 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45791 OPERATOR_CODEC Lcom/mojang/serialization/Codec; FIELD field_920 max Lnet/minecraft/class_5658; FIELD field_921 min Lnet/minecraft/class_5658; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V @@ -50,6 +51,17 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator METHOD method_32398 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)I ARG 1 context ARG 2 value + METHOD method_53260 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_42; + ARG 0 either + METHOD method_53261 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53262 (Lnet/minecraft/class_42;)Lcom/mojang/datafixers/util/Either; + ARG 0 operator + METHOD method_53263 getConstantValue ()Ljava/util/OptionalInt; + METHOD method_53264 (Lnet/minecraft/class_42;)Ljava/util/Optional; + ARG 0 operator + METHOD method_53265 (Lnet/minecraft/class_42;)Ljava/util/Optional; + ARG 0 operator CLASS class_5638 Tester METHOD test (Lnet/minecraft/class_47;I)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping index d2280dcccd..fcb97c9b5b 100644 --- a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping @@ -4,12 +4,22 @@ CLASS net/minecraft/class_5646 net/minecraft/loot/provider/nbt/ContextLootNbtPro FIELD field_27916 target Lnet/minecraft/class_5646$class_5648; FIELD field_31875 BLOCK_ENTITY_TARGET_NAME Ljava/lang/String; FIELD field_45879 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45880 INLINE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_45881 TARGET_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5646$class_5648;)V ARG 1 target METHOD method_32430 getTarget (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5646$class_5648; ARG 0 entityTarget METHOD method_35568 fromTarget (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5651; ARG 0 target + METHOD method_53430 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_53431 (Lnet/minecraft/class_5646;)Lnet/minecraft/class_5646$class_5648; + ARG 0 provider + METHOD method_53432 (Ljava/lang/String;)Lnet/minecraft/class_5646$class_5648; + ARG 0 type + METHOD method_53433 (Lnet/minecraft/class_5646;)Lnet/minecraft/class_5646$class_5648; + ARG 0 provider CLASS class_5648 Target METHOD method_32434 getName ()Ljava/lang/String; METHOD method_32435 getNbt (Lnet/minecraft/class_47;)Lnet/minecraft/class_2520; diff --git a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping index b918198158..4981b08eb9 100644 --- a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping @@ -4,3 +4,7 @@ CLASS net/minecraft/class_5652 net/minecraft/loot/provider/nbt/LootNbtProviderTy METHOD method_32443 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5650; ARG 0 id ARG 1 codec + METHOD method_53435 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5651; + ARG 0 either + METHOD method_53436 (Lnet/minecraft/class_5651;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider diff --git a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping index c966016263..66654eb2d9 100644 --- a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_5653 net/minecraft/loot/provider/nbt/StorageLootNbtPro METHOD (Lnet/minecraft/class_2960;)V ARG 1 source METHOD comp_1892 source ()Lnet/minecraft/class_2960; + METHOD method_53437 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping index 9b3e4fcc56..2db68a125e 100644 --- a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_40 net/minecraft/loot/provider/number/BinomialLootNumberProvider - FIELD comp_1893 n Lnet/minecraft/class_5658; - FIELD comp_1894 p Lnet/minecraft/class_5658; FIELD field_45885 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 n ARG 2 p - METHOD comp_1893 n ()Lnet/minecraft/class_5658; - METHOD comp_1894 p ()Lnet/minecraft/class_5658; METHOD method_273 create (IF)Lnet/minecraft/class_40; ARG 0 n ARG 1 p + METHOD method_53438 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping index 801387275a..ef4c667fe1 100644 --- a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_44 net/minecraft/loot/provider/number/ConstantLootNumberProvider - FIELD comp_1895 value F FIELD field_45886 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45887 INLINE_CODEC Lcom/mojang/serialization/Codec; METHOD (F)V ARG 1 value - METHOD comp_1895 value ()F METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_32448 create (F)Lnet/minecraft/class_44; ARG 0 value + METHOD method_53439 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping index 3cb4ee832a..cf5c5fb3a5 100644 --- a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping @@ -4,3 +4,7 @@ CLASS net/minecraft/class_5659 net/minecraft/loot/provider/number/LootNumberProv METHOD method_32456 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5657; ARG 0 id ARG 1 codec + METHOD method_53441 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5658; + ARG 0 either + METHOD method_53442 (Lnet/minecraft/class_5658;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider diff --git a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping index 49c54fa0db..cc0a463823 100644 --- a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumberProvider - FIELD comp_1897 target Lnet/minecraft/class_5670; - FIELD comp_1898 score Ljava/lang/String; - FIELD comp_1899 scale F FIELD field_45890 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5670;Ljava/lang/String;F)V ARG 1 target ARG 2 score ARG 3 scale - METHOD comp_1897 target ()Lnet/minecraft/class_5670; - METHOD comp_1898 score ()Ljava/lang/String; - METHOD comp_1899 scale ()F METHOD method_35569 create (Lnet/minecraft/class_47$class_50;Ljava/lang/String;)Lnet/minecraft/class_5660; ARG 0 target ARG 1 score @@ -17,3 +11,5 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumbe ARG 0 target ARG 1 score ARG 2 scale + METHOD method_53443 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping index 5211670f44..c8b6717ebf 100644 --- a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_5662 net/minecraft/loot/provider/number/UniformLootNumberProvider - FIELD comp_1900 min Lnet/minecraft/class_5658; - FIELD comp_1901 max Lnet/minecraft/class_5658; FIELD field_45891 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 min ARG 2 max - METHOD comp_1900 min ()Lnet/minecraft/class_5658; - METHOD comp_1901 max ()Lnet/minecraft/class_5658; METHOD method_32462 create (FF)Lnet/minecraft/class_5662; ARG 0 min ARG 1 max + METHOD method_53444 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping index dd0797fd28..fc745fbfe5 100644 --- a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_5664 net/minecraft/loot/provider/score/ContextLootScoreProvider - FIELD comp_1902 target Lnet/minecraft/class_47$class_50; FIELD field_45892 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45893 INLINE_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_47$class_50;)V ARG 1 target - METHOD comp_1902 target ()Lnet/minecraft/class_47$class_50; METHOD method_35571 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5670; ARG 0 target + METHOD method_53445 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping index 1d9c053b67..09846fd49b 100644 --- a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5667 net/minecraft/loot/provider/score/FixedLootScoreProvider - FIELD comp_1903 name Ljava/lang/String; FIELD field_45894 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;)V ARG 1 name - METHOD comp_1903 name ()Ljava/lang/String; METHOD method_35572 create (Ljava/lang/String;)Lnet/minecraft/class_5670; ARG 0 name + METHOD method_53446 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping index 52de9d2ca2..1bc471a865 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping @@ -4,3 +4,7 @@ CLASS net/minecraft/class_5671 net/minecraft/loot/provider/score/LootScoreProvid METHOD method_32479 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5669; ARG 0 id ARG 1 codec + METHOD method_53448 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5670; + ARG 0 either + METHOD method_53449 (Lnet/minecraft/class_5670;)Lcom/mojang/datafixers/util/Either; + ARG 0 provider