From 46214799dde6c274e9e3fa08b6cef84def1e7baa Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 29 Jan 2021 22:32:23 +1100 Subject: [PATCH] Loot package stuff (#1988) * loot stuff * more stuff --- .../net/minecraft/loot/LootManager.mapping | 6 +++ mappings/net/minecraft/loot/LootPool.mapping | 1 + .../BlockStatePropertyLootCondition.mapping | 3 ++ .../EntityScoresLootCondition.mapping | 5 ++ .../LocationCheckLootCondition.mapping | 3 ++ .../condition/LootConditionManager.mapping | 8 ++++ .../condition/ValueCheckLootCondition.mapping | 2 + .../loot/context/LootContext.mapping | 1 + .../loot/context/LootContextTypes.mapping | 8 ++++ .../loot/entry/CombinedEntry.mapping | 1 + .../loot/entry/LootPoolEntryTypes.mapping | 1 + .../loot/entry/SequenceEntry.mapping | 2 + .../net/minecraft/loot/entry/TagEntry.mapping | 4 ++ .../loot/function/CopyStateFunction.mapping | 12 +++++ .../EnchantRandomlyLootFunction.mapping | 6 +++ .../ExplorationMapLootFunction.mapping | 5 ++ .../loot/function/LootFunctionManager.mapping | 9 ++++ .../loot/function/LootFunctionTypes.mapping | 1 + .../SetAttributesLootFunction.mapping | 3 ++ .../function/SetCountLootFunction.mapping | 2 + .../function/SetDamageLootFunction.mapping | 2 + .../SetEnchantmentsLootFunction.mapping | 18 ++++++++ .../SetStewEffectLootFunction.mapping | 2 + .../operator/BoundedIntUnaryOperator.mapping | 46 +++++++++++++++++++ .../nbt/ContextLootNbtProvider.mapping | 14 ++++++ .../loot/provider/nbt/LootNbtProvider.mapping | 3 ++ .../provider/nbt/LootNbtProviderTypes.mapping | 1 + .../number/ConstantLootNumberProvider.mapping | 2 + .../number/LootNumberProviderTypes.mapping | 1 + .../number/ScoreLootNumberProvider.mapping | 7 +++ .../score/ContextLootScoreProvider.mapping | 5 ++ .../provider/score/LootScoreProvider.mapping | 1 + .../score/LootScoreProviderTypes.mapping | 1 + 33 files changed, 186 insertions(+) diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 7fa1289e72..3248c19dce 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager FIELD field_975 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_4567;)V ARG 1 conditionManager + METHOD method_20711 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 1 id + ARG 2 json METHOD method_367 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; ARG 1 id METHOD method_368 (Ljava/lang/String;Ljava/lang/String;)V @@ -17,3 +20,6 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager METHOD method_370 getTableIds ()Ljava/util/Set; METHOD method_372 toJson (Lnet/minecraft/class_52;)Lcom/google/gson/JsonElement; ARG 0 table + METHOD method_373 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V + ARG 1 id + ARG 2 lootTable diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index af64600685..39c0ac65b5 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool ARG 2 context METHOD method_347 builder ()Lnet/minecraft/class_55$class_56; METHOD method_349 validate (Lnet/minecraft/class_58;)V + ARG 1 reporter CLASS class_56 Builder FIELD field_959 rolls Lnet/minecraft/class_5658; FIELD field_960 entries Ljava/util/List; diff --git a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping index 5e1bc1109c..4f883d674e 100644 --- a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping @@ -14,4 +14,7 @@ CLASS net/minecraft/class_212 net/minecraft/loot/condition/BlockStatePropertyLoo METHOD (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_22584 properties (Lnet/minecraft/class_4559$class_4560;)Lnet/minecraft/class_212$class_213; + ARG 1 builder CLASS class_214 Serializer + METHOD method_22585 (Lnet/minecraft/class_2248;Ljava/lang/String;)V + ARG 1 propertyName diff --git a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index e3b08ab601..8fd5d2b75f 100644 --- a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -5,6 +5,11 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondi ARG 1 scores ARG 2 target 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 + ARG 3 scoreboard + ARG 4 objectiveName + ARG 5 range METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_200 Serializer diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index 0ea21f3e8d..b48130c653 100644 --- a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCond METHOD (Lnet/minecraft/class_2090;Lnet/minecraft/class_2338;)V ARG 1 predicate ARG 2 offset + 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_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/LootConditionManager.mapping b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping index d088a1d45a..d377d7822b 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping @@ -3,8 +3,16 @@ CLASS net/minecraft/class_4567 net/minecraft/loot/condition/LootConditionManager FIELD field_20754 GSON Lcom/google/gson/Gson; FIELD field_20755 conditions Ljava/util/Map; METHOD method_22559 getIds ()Ljava/util/Set; + METHOD method_22560 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 1 id + ARG 2 json + METHOD method_22561 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_5341;)V + ARG 1 id + ARG 2 condition METHOD method_22564 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; ARG 1 id + METHOD method_22566 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 0 id CLASS class_5334 AndCondition FIELD field_25202 terms [Lnet/minecraft/class_5341; FIELD field_25203 predicate Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping index 0c71c13304..c0d34e8eb0 100644 --- a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping @@ -4,4 +4,6 @@ CLASS net/minecraft/class_5644 net/minecraft/loot/condition/ValueCheckLootCondit METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)V ARG 1 value ARG 2 range + METHOD test (Ljava/lang/Object;)Z + ARG 1 context CLASS class_5645 Serializer diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index fff7c65329..02e0a139c3 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -74,6 +74,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext CLASS class_49 Dropper METHOD add (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V ARG 1 context + ARG 2 consumer CLASS class_50 EntityTarget FIELD field_938 parameter Lnet/minecraft/class_169; FIELD field_941 type Ljava/lang/String; diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 1a02753945..01ea810b46 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -4,6 +4,14 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_15971 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_22577 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_22578 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_24800 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder + METHOD method_27863 (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/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index b0046f7c16..1d775c911e 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry METHOD method_394 combine ([Lnet/minecraft/class_64;)Lnet/minecraft/class_64; ARG 1 children METHOD method_395 createSerializer (Lnet/minecraft/class_69$class_70;)Lnet/minecraft/class_79$class_5337; + ARG 0 factory CLASS class_70 Factory METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_69; ARG 1 children diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping index 5ea0bf9ddc..29bbbb5a42 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootPoolEntryTypes METHOD method_29316 createGsonSerializer ()Ljava/lang/Object; METHOD method_29317 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5338; ARG 0 id + ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping index f2d2393a88..7541b6de81 100644 --- a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping +++ b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_93 net/minecraft/loot/entry/SequenceEntry + METHOD method_29315 (Lnet/minecraft/class_64;Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + ARG 2 context METHOD method_452 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index 6dbe611f06..f4fe085f1c 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -18,4 +18,8 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry METHOD method_447 grow (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander + METHOD method_449 (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;)V + ARG 1 item CLASS class_92 Serializer + METHOD method_33283 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonParseException; + ARG 0 id diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index cf04a3fd36..9bccacc8c4 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -2,9 +2,21 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction FIELD field_20449 block Lnet/minecraft/class_2248; FIELD field_20450 properties Ljava/util/Set; METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2248;Ljava/util/Set;)V + ARG 1 conditions + ARG 2 block ARG 3 properties METHOD method_21892 getBuilder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4488$class_4489; + ARG 0 block + METHOD method_21893 getPropertyName (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)Ljava/lang/String; + ARG 0 state + ARG 1 property CLASS class_4489 Builder FIELD field_20451 block Lnet/minecraft/class_2248; FIELD field_20452 properties Ljava/util/Set; + METHOD (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_21898 addProperty (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4488$class_4489; + ARG 1 property CLASS class_4490 Serializer + METHOD method_21899 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_2769;)V + ARG 1 property diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 6475176c47..6021ec9160 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -4,6 +4,12 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun METHOD ([Lnet/minecraft/class_5341;Ljava/util/Collection;)V ARG 1 conditions ARG 2 enchantments + METHOD method_26266 addEnchantmentToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Ljava/util/Random;)Lnet/minecraft/class_1799; + ARG 0 stack + ARG 1 enchantment + ARG 2 random + METHOD method_26267 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_1887;)Z + ARG 2 enchantment METHOD method_488 ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 5e3c2dca50..1adef37167 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -6,8 +6,10 @@ 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_1038 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_3195; METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions + ARG 2 destination ARG 3 decoration ARG 4 zoom ARG 5 searchRadius @@ -24,6 +26,9 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc METHOD method_500 withZoom (B)Lnet/minecraft/class_111$class_112; ARG 1 zoom METHOD method_502 withDestination (Lnet/minecraft/class_3195;)Lnet/minecraft/class_111$class_112; + ARG 1 destination METHOD method_503 withSkipExistingChunks (Z)Lnet/minecraft/class_111$class_112; ARG 1 skipExistingChunks CLASS class_113 Serializer + METHOD method_29039 getDestination (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3195; + ARG 0 json diff --git a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping b/mappings/net/minecraft/loot/function/LootFunctionManager.mapping index b25af14588..638bb8eaf3 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionManager.mapping @@ -7,9 +7,18 @@ CLASS net/minecraft/class_5640 net/minecraft/loot/function/LootFunctionManager METHOD (Lnet/minecraft/class_4567;Lnet/minecraft/class_60;)V ARG 1 lootConditionManager ARG 2 lootManager + METHOD method_32399 getFunctionIds ()Ljava/util/Set; + METHOD method_32400 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 1 id + ARG 2 json + METHOD method_32401 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)V + ARG 1 id METHOD method_32404 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_117; ARG 1 id CLASS class_5641 AndFunction FIELD field_27904 functions [Lnet/minecraft/class_117; METHOD ([Lnet/minecraft/class_117;)V ARG 1 functions + METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 stack + ARG 2 context diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index c60735af68..3a4e5da8fa 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes METHOD method_29322 createGsonSerializer ()Ljava/lang/Object; METHOD method_29323 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5339; ARG 0 id + ARG 1 jsonSerializer 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 diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index ef7ff2d3b7..34b20f1095 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;)V ARG 1 conditions ARG 2 attributes + METHOD method_32406 (Lnet/minecraft/class_137$class_138;)Ljava/util/stream/Stream; + ARG 0 attribute CLASS class_138 Attribute FIELD field_1107 name Ljava/lang/String; FIELD field_1108 amountRange Lnet/minecraft/class_5658; @@ -12,6 +14,7 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct FIELD field_1112 slots [Lnet/minecraft/class_1304; METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V ARG 1 name + ARG 2 attribute ARG 3 operation ARG 4 amountRange ARG 5 slots diff --git a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index d42f1eeaee..dafc316d04 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction FIELD field_1114 countRange Lnet/minecraft/class_5658; + FIELD field_27909 add Z METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V ARG 1 conditions ARG 2 countRange + ARG 3 add METHOD method_620 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_621 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index 0ea5c1c921..43a41f9bc7 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction FIELD field_1120 durabilityRange Lnet/minecraft/class_5658; FIELD field_1121 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_27910 add Z METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V ARG 1 contents ARG 2 durabilityRange + ARG 3 add METHOD method_633 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange METHOD method_634 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index 0a77924e57..0a90618f1e 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -5,4 +5,22 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 1 conditions ARG 2 enchantments ARG 3 add + METHOD method_32407 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V + ARG 1 enchantment + ARG 2 level + METHOD method_32409 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; + ARG 0 numberProvider + METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_1887;Lnet/minecraft/class_5658;)V + ARG 2 enchantment + ARG 3 numberProvider + METHOD method_32411 addEnchantmentToMap (Ljava/util/Map;Lnet/minecraft/class_1887;I)V + ARG 0 map + ARG 1 enchantment + ARG 2 level + METHOD method_32412 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V + ARG 1 enchantment + ARG 2 level + METHOD method_32414 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V + ARG 1 enchantment + ARG 2 level CLASS class_5643 Serializer diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 5804381c96..3b0b9f146c 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct METHOD ([Lnet/minecraft/class_5341;Ljava/util/Map;)V ARG 1 conditions ARG 2 effects + METHOD method_32421 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; + ARG 0 numberProvider METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder FIELD field_1123 map Ljava/util/Map; diff --git a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index 947b31a4ba..f7b04aa1cd 100644 --- a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -1,13 +1,51 @@ 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_920 max Lnet/minecraft/class_5658; FIELD field_921 min Lnet/minecraft/class_5658; + METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V + ARG 1 min + ARG 2 max METHOD method_277 createMax (I)Lnet/minecraft/class_42; ARG 0 max + METHOD method_279 (Lnet/minecraft/class_47;I)I + ARG 0 context + ARG 1 value METHOD method_280 createMin (I)Lnet/minecraft/class_42; ARG 0 min METHOD method_282 create (II)Lnet/minecraft/class_42; ARG 0 min ARG 1 max + METHOD method_32386 getRequiredParameters ()Ljava/util/Set; + METHOD method_32387 create (I)Lnet/minecraft/class_42; + ARG 0 value + METHOD method_32389 apply (Lnet/minecraft/class_47;I)I + ARG 1 context + ARG 2 value + METHOD method_32390 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)Z + ARG 1 context + ARG 2 value + METHOD method_32391 (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)Z + ARG 2 context + ARG 3 value + METHOD method_32393 test (Lnet/minecraft/class_47;I)Z + ARG 1 context + ARG 2 value + METHOD method_32394 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)I + ARG 1 context + ARG 2 value + METHOD method_32395 (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)I + ARG 2 context + ARG 3 value + METHOD method_32396 (Lnet/minecraft/class_47;I)Z + ARG 0 context + ARG 1 value + METHOD method_32397 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)Z + ARG 1 context + ARG 2 value + METHOD method_32398 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)I + ARG 1 context + ARG 2 value CLASS class_62 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json @@ -17,3 +55,11 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator ARG 1 entry ARG 2 unused ARG 3 context + CLASS class_5638 Tester + METHOD test (Lnet/minecraft/class_47;I)Z + ARG 1 context + ARG 2 value + CLASS class_5639 Applier + METHOD apply (Lnet/minecraft/class_47;I)I + ARG 1 context + ARG 2 value diff --git a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping index db02c7be85..b7c1e4a746 100644 --- a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping @@ -1,3 +1,17 @@ CLASS net/minecraft/class_5646 net/minecraft/loot/provider/nbt/ContextLootNbtProvider + FIELD field_27914 BLOCK_ENTITY Lnet/minecraft/class_5646; + FIELD field_27915 BLOCK_ENTITY_TARGET Lnet/minecraft/class_5646$class_5648; + FIELD field_27916 target Lnet/minecraft/class_5646$class_5648; + 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_32431 setTarget (Ljava/lang/String;)Lnet/minecraft/class_5646; + ARG 0 target CLASS class_5647 CustomSerializer + CLASS class_5648 Target + METHOD method_32434 getName ()Ljava/lang/String; + METHOD method_32435 getNbt (Lnet/minecraft/class_47;)Lnet/minecraft/class_2520; + ARG 1 context + METHOD method_32436 getRequiredParameters ()Ljava/util/Set; CLASS class_5649 Serializer diff --git a/mappings/net/minecraft/loot/provider/nbt/LootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/LootNbtProvider.mapping index 24ceef1330..c2fdfc7afd 100644 --- a/mappings/net/minecraft/loot/provider/nbt/LootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/LootNbtProvider.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_5651 net/minecraft/loot/provider/nbt/LootNbtProvider METHOD method_32439 getType ()Lnet/minecraft/class_5650; + METHOD method_32440 getNbtTag (Lnet/minecraft/class_47;)Lnet/minecraft/class_2520; + ARG 1 context + METHOD method_32441 getRequiredParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping index 70ee5eb0e3..f75ccf997e 100644 --- a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5652 net/minecraft/loot/provider/nbt/LootNbtProviderTypes METHOD method_32443 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5650; ARG 0 id + ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping index c4cddab332..86400ade7e 100644 --- a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_44 net/minecraft/loot/provider/number/ConstantLootNumb FIELD field_922 value F METHOD (F)V ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 object METHOD method_32448 create (F)Lnet/minecraft/class_44; ARG 0 value CLASS class_5655 CustomSerializer diff --git a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping index c41ed3eb75..198690d107 100644 --- a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5659 net/minecraft/loot/provider/number/LootNumberProviderTypes METHOD method_32456 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5657; ARG 0 id + ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping index 80d1994248..b85e27755e 100644 --- a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumberProvider + FIELD field_27925 target Lnet/minecraft/class_5670; + FIELD field_27926 score Ljava/lang/String; + FIELD field_27927 scale F + METHOD (Lnet/minecraft/class_5670;Ljava/lang/String;F)V + ARG 1 target + ARG 2 score + ARG 3 scale CLASS class_5661 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping index c95ed00430..1c39237a94 100644 --- a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping @@ -1 +1,6 @@ CLASS net/minecraft/class_5664 net/minecraft/loot/provider/score/ContextLootScoreProvider + FIELD field_27930 target Lnet/minecraft/class_47$class_50; + METHOD (Lnet/minecraft/class_47$class_50;)V + ARG 1 target + CLASS class_5665 CustomSerializer + CLASS class_5666 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping index d135ef2574..d03125f74d 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_5670 net/minecraft/loot/provider/score/LootScoreProvid METHOD method_32475 getType ()Lnet/minecraft/class_5669; METHOD method_32476 getName (Lnet/minecraft/class_47;)Ljava/lang/String; ARG 1 context + METHOD method_32477 getRequiredParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping index 9526258fa7..0558c0eac3 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5671 net/minecraft/loot/provider/score/LootScoreProviderTypes METHOD method_32479 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5669; ARG 0 id + ARG 1 jsonSerializer