From 9dc9db0dc76b54f2bc648d9f1f3f4a511493f30c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 20 Aug 2022 23:02:27 +0900 Subject: [PATCH] 1.19.1 mapping bonanza 4: data pack stuff (#3271) * 1.19.1 mapping bonanza: advancement * 1.19.1 mapping bonanza: loot * 1.19.1 mapping bonanza: predicate * 1.19.1 mapping bonanza: recipe * 1.19.1 mapping bonanza: tag Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../advancement/AdvancementManager.mapping | 1 + .../advancement/AdvancementProgress.mapping | 2 + .../advancement/AdvancementRewards.mapping | 2 + .../advancement/CriterionMerger.mapping | 4 ++ .../condition/LootConditionManager.mapping | 3 ++ .../loot/entry/EntryCombiner.mapping | 5 ++ .../minecraft/loot/entry/GroupEntry.mapping | 1 + .../loot/function/CopyStateFunction.mapping | 2 + .../loot/function/LootFunctionManager.mapping | 5 ++ .../SetEnchantmentsLootFunction.mapping | 1 + .../SetGoatHornSoundLootFunction.mapping | 7 +++ ...ncementEntityPredicateDeserializer.mapping | 5 ++ .../predicate/entity/EntityPredicates.mapping | 2 + .../entity/LightningBoltPredicate.mapping | 3 ++ .../entity/LocationPredicate.mapping | 2 + .../entity/TypeSpecificPredicate.mapping | 2 + .../recipe/FireworkStarRecipe.mapping | 2 + .../recipe/book/RecipeBookOptions.mapping | 4 ++ mappings/net/minecraft/tag/TagEntry.mapping | 11 +++++ mappings/net/minecraft/tag/TagFile.mapping | 2 + .../net/minecraft/tag/TagGroupLoader.mapping | 49 +++++++++++++++++++ .../minecraft/tag/TagManagerLoader.mapping | 6 +++ .../minecraft/tag/TagPacketSerializer.mapping | 4 ++ 23 files changed, 125 insertions(+) diff --git a/mappings/net/minecraft/advancement/AdvancementManager.mapping b/mappings/net/minecraft/advancement/AdvancementManager.mapping index 0a99b0f450..17636a8541 100644 --- a/mappings/net/minecraft/advancement/AdvancementManager.mapping +++ b/mappings/net/minecraft/advancement/AdvancementManager.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_163 net/minecraft/advancement/AdvancementManager FIELD field_1157 advancements Ljava/util/Map; FIELD field_1158 LOGGER Lorg/slf4j/Logger; METHOD method_711 load (Ljava/util/Map;)V + ARG 1 advancements METHOD method_712 getAdvancements ()Ljava/util/Collection; METHOD method_713 removeAll (Ljava/util/Set;)V ARG 1 advancements diff --git a/mappings/net/minecraft/advancement/AdvancementProgress.mapping b/mappings/net/minecraft/advancement/AdvancementProgress.mapping index ac34c42057..8e20bc6d76 100644 --- a/mappings/net/minecraft/advancement/AdvancementProgress.mapping +++ b/mappings/net/minecraft/advancement/AdvancementProgress.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_167 net/minecraft/advancement/AdvancementProgress FIELD field_1161 requirements [[Ljava/lang/String; METHOD (Ljava/util/Map;)V ARG 1 criteriaProgresses + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 other METHOD method_33895 (Lnet/minecraft/class_2540;Lnet/minecraft/class_178;)V ARG 0 buf ARG 1 progresses diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index e9e82752be..3ba1afbcd4 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards ARG 2 loot ARG 3 recipes ARG 4 function + METHOD method_17978 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3222;Lnet/minecraft/class_2158;)V + ARG 2 function METHOD method_27912 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_170; ARG 0 json METHOD method_34898 getRecipes ()[Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/advancement/CriterionMerger.mapping b/mappings/net/minecraft/advancement/CriterionMerger.mapping index cb2012e9fe..8bd183eab4 100644 --- a/mappings/net/minecraft/advancement/CriterionMerger.mapping +++ b/mappings/net/minecraft/advancement/CriterionMerger.mapping @@ -3,3 +3,7 @@ CLASS net/minecraft/class_193 net/minecraft/advancement/CriterionMerger FIELD field_16882 AND Lnet/minecraft/class_193; METHOD createRequirements (Ljava/util/Collection;)[[Ljava/lang/String; ARG 1 criteriaNames + METHOD method_16773 (Ljava/util/Collection;)[[Ljava/lang/String; + ARG 0 criteriaNames + METHOD method_16774 (Ljava/util/Collection;)[[Ljava/lang/String; + ARG 0 criteriaNames diff --git a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping index a2f7556466..e7d4516c0f 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_4567 net/minecraft/loot/condition/LootConditionManager METHOD method_22561 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_5341;)V ARG 1 id ARG 2 condition + METHOD method_22562 (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 name + ARG 1 message 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; diff --git a/mappings/net/minecraft/loot/entry/EntryCombiner.mapping b/mappings/net/minecraft/loot/entry/EntryCombiner.mapping index b02c70ebd3..499a5c678a 100644 --- a/mappings/net/minecraft/loot/entry/EntryCombiner.mapping +++ b/mappings/net/minecraft/loot/entry/EntryCombiner.mapping @@ -4,7 +4,12 @@ CLASS net/minecraft/class_64 net/minecraft/loot/entry/EntryCombiner METHOD expand (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 choiceConsumer + METHOD method_16775 (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + ARG 0 context + ARG 1 choiceConsumer METHOD method_16776 doExpand (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + ARG 0 context + ARG 1 choiceConsumer METHOD method_16777 (Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 2 context ARG 3 lootChoiceExpander diff --git a/mappings/net/minecraft/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/loot/entry/GroupEntry.mapping index 55c03981b3..0caa4a8d60 100644 --- a/mappings/net/minecraft/loot/entry/GroupEntry.mapping +++ b/mappings/net/minecraft/loot/entry/GroupEntry.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_93 net/minecraft/loot/entry/GroupEntry METHOD method_29315 (Lnet/minecraft/class_64;Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 2 context + ARG 3 choiceConsumer METHOD method_35511 create ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_93$class_6152; ARG 0 entries METHOD method_452 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index 869e8e75a0..bb3dbcbaf0 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -22,3 +22,5 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction CLASS class_4490 Serializer METHOD method_21899 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_2769;)V ARG 1 property + METHOD method_21902 (Ljava/util/Set;Lnet/minecraft/class_2689;Lcom/google/gson/JsonElement;)V + ARG 2 property diff --git a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping b/mappings/net/minecraft/loot/function/LootFunctionManager.mapping index acf82583fd..688deea929 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionManager.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionManager.mapping @@ -13,6 +13,10 @@ CLASS net/minecraft/class_5640 net/minecraft/loot/function/LootFunctionManager ARG 2 json METHOD method_32401 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)V ARG 1 id + ARG 2 function + METHOD method_32402 (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 name + ARG 1 message METHOD method_32404 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_117; ARG 1 id METHOD method_35507 getOrDefault (Lnet/minecraft/class_2960;Lnet/minecraft/class_117;)Lnet/minecraft/class_117; @@ -20,6 +24,7 @@ CLASS net/minecraft/class_5640 net/minecraft/loot/function/LootFunctionManager ARG 2 fallback CLASS class_5641 AndFunction FIELD field_27904 functions [Lnet/minecraft/class_117; + FIELD field_27905 applier Ljava/util/function/BiFunction; METHOD ([Lnet/minecraft/class_117;)V ARG 1 functions METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index b28d5001bf..a68fa7e3e1 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu CLASS class_5643 Serializer METHOD method_32416 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;Lnet/minecraft/class_1887;Lnet/minecraft/class_5658;)V ARG 2 enchantment + ARG 3 numberProvider CLASS class_6158 Builder FIELD field_31864 enchantments Ljava/util/Map; FIELD field_31865 add Z diff --git a/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping b/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping index 6a394bb70c..e55eb06394 100644 --- a/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetGoatHornSoundLootFunction.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_7431 net/minecraft/loot/function/SetGoatHornSoundLootFunction + FIELD field_39184 options Lnet/minecraft/class_6862; + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;)V + ARG 1 conditions + ARG 2 options METHOD method_43571 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_120$class_121; + ARG 0 options + METHOD method_43743 (Lnet/minecraft/class_6862;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; + ARG 1 conditions CLASS class_7432 Serializer diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping index 60f6fbfe0f..8f050d9c04 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -11,3 +11,8 @@ CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityP ARG 1 array ARG 2 key ARG 3 contextType + METHOD method_27797 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 name + ARG 2 message + METHOD method_27798 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 0 tableId diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index e8ab4ac84e..eef3c1cb48 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -37,6 +37,8 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates ARG 0 entity METHOD method_32878 (Lnet/minecraft/class_1297;)Z ARG 0 entity + METHOD method_5906 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z + ARG 1 testedEntity METHOD method_5908 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_5909 maxDistance (DDDD)Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping index be48171c5d..7fb23ab0db 100644 --- a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredi METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)V ARG 1 blocksSetOnFire ARG 2 entityStruck + METHOD method_37235 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z + ARG 3 struckEntity METHOD method_37237 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_6404; ARG 0 blocksSetOnFire METHOD method_37238 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6404; + ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index d7eef73c3d..d9e83c5aa4 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 8 light ARG 9 block ARG 10 fluid + METHOD method_28480 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonElement;)V + ARG 1 json METHOD method_38858 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090; ARG 0 y METHOD method_9016 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index 0ece469115..c266e3db2e 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic METHOD method_43098 toJson ()Lcom/google/gson/JsonElement; METHOD method_43099 getDeserializer ()Lnet/minecraft/class_7376$class_7377; CLASS class_7377 Deserializer + METHOD deserialize (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; + ARG 1 json CLASS class_7378 Deserializers FIELD field_38724 ANY Lnet/minecraft/class_7376$class_7377; FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_7377; diff --git a/mappings/net/minecraft/recipe/FireworkStarRecipe.mapping b/mappings/net/minecraft/recipe/FireworkStarRecipe.mapping index 2967c10f00..60bfd0fc3f 100644 --- a/mappings/net/minecraft/recipe/FireworkStarRecipe.mapping +++ b/mappings/net/minecraft/recipe/FireworkStarRecipe.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_1853 net/minecraft/recipe/FireworkStarRecipe FIELD field_9012 GUNPOWDER Lnet/minecraft/class_1856; FIELD field_9013 TYPE_MODIFIER_MAP Ljava/util/Map; FIELD field_9014 FLICKER_MODIFIER Lnet/minecraft/class_1856; + METHOD method_8085 (Ljava/util/HashMap;)V + ARG 0 typeModifiers diff --git a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping index 906b2e96cb..0700e9a4d0 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping @@ -13,12 +13,16 @@ CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions METHOD method_30181 setGuiOpen (Lnet/minecraft/class_5421;Z)V ARG 1 category ARG 2 open + METHOD method_30182 (Ljava/util/EnumMap;)V + ARG 0 categoryOptions METHOD method_30183 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_5411; ARG 0 nbt METHOD method_30184 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5421;Lcom/mojang/datafixers/util/Pair;)V ARG 2 category + ARG 3 pair METHOD method_30185 (Lnet/minecraft/class_2487;Ljava/util/Map;Lnet/minecraft/class_5421;Lcom/mojang/datafixers/util/Pair;)V ARG 2 category + ARG 3 pair METHOD method_30186 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5411; ARG 0 buf METHOD method_30187 isFilteringCraftable (Lnet/minecraft/class_5421;)Z diff --git a/mappings/net/minecraft/tag/TagEntry.mapping b/mappings/net/minecraft/tag/TagEntry.mapping index b6afe0e956..8376b13e6d 100644 --- a/mappings/net/minecraft/tag/TagEntry.mapping +++ b/mappings/net/minecraft/tag/TagEntry.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3497 net/minecraft/tag/TagEntry FIELD field_15584 id Lnet/minecraft/class_2960; FIELD field_39265 CODEC Lcom/mojang/serialization/Codec; + FIELD field_39266 ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_39267 tag Z FIELD field_39268 required Z METHOD (Lnet/minecraft/class_2960;ZZ)V @@ -11,7 +12,10 @@ CLASS net/minecraft/class_3497 net/minecraft/tag/TagEntry ARG 1 id ARG 2 required METHOD method_26790 resolve (Lnet/minecraft/class_3497$class_7474;Ljava/util/function/Consumer;)Z + ARG 1 valueGetter + ARG 2 idConsumer METHOD method_32831 forEachRequiredTagId (Ljava/util/function/Consumer;)V + ARG 1 idConsumer METHOD method_32832 canAdd (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Z ARG 1 directEntryPredicate ARG 2 tagEntryPredicate @@ -22,9 +26,16 @@ CLASS net/minecraft/class_3497 net/minecraft/tag/TagEntry ARG 0 entry METHOD method_43939 (Lnet/minecraft/class_5699$class_7476;)Lnet/minecraft/class_3497; ARG 0 id + METHOD method_43940 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_3497; + ARG 0 either + METHOD method_43941 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_43942 createOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3497; ARG 0 id + METHOD method_43943 (Lnet/minecraft/class_3497;)Lnet/minecraft/class_3497; + ARG 0 entry METHOD method_43944 forEachOptionalTagId (Ljava/util/function/Consumer;)V + ARG 1 idConsumer METHOD method_43945 createTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3497; ARG 0 id METHOD method_43946 (Lnet/minecraft/class_3497;)Ljava/lang/Boolean; diff --git a/mappings/net/minecraft/tag/TagFile.mapping b/mappings/net/minecraft/tag/TagFile.mapping index c218163079..a389fb3ba4 100644 --- a/mappings/net/minecraft/tag/TagFile.mapping +++ b/mappings/net/minecraft/tag/TagFile.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7475 net/minecraft/tag/TagFile FIELD field_39269 CODEC Lcom/mojang/serialization/Codec; + METHOD method_43950 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index c5af71c7c4..43cee38f8d 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -10,10 +10,59 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader METHOD method_15194 (Lnet/minecraft/class_2960;)Z ARG 0 id METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map; + ARG 1 tags + METHOD method_32835 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 tagId + ARG 2 entries + METHOD method_32836 hasCircularDependency (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Z + ARG 0 referencedTagIdsByTagId + ARG 1 tagId + ARG 2 referencedTagId + METHOD method_32837 (Ljava/util/Map;Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2960;)V + ARG 4 resolvedTagId + METHOD method_32838 (Ljava/util/Map;Lcom/google/common/collect/Multimap;Ljava/util/Set;Lnet/minecraft/class_3497$class_7474;Ljava/util/Map;Lnet/minecraft/class_2960;)V + ARG 6 tagId + METHOD method_32839 resolveAll (Ljava/util/Map;Lcom/google/common/collect/Multimap;Ljava/util/Set;Lnet/minecraft/class_2960;Ljava/util/function/BiConsumer;)V + ARG 0 tags + ARG 1 referencedTagIdsByTagId + ARG 2 alreadyResolved + ARG 3 tagId + ARG 4 resolver + METHOD method_32840 (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/Collection;)V + ARG 2 resolvedEntries + METHOD method_32841 (Lnet/minecraft/class_3497$class_7474;Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 3 tagId2 + ARG 4 entries + METHOD method_32843 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 1 tagId + ARG 2 entries + METHOD method_32844 addReference (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 0 referencedTagIdsByTagId + ARG 1 tagId + ARG 2 referencedTagId + METHOD method_32847 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Z + ARG 2 id METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; ARG 1 manager + METHOD method_33175 (Lnet/minecraft/class_2960;Ljava/util/Collection;)V + ARG 1 missingReferences METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map; ARG 1 manager + METHOD method_43951 (Lnet/minecraft/class_2960;)Ljava/util/List; + ARG 0 id + METHOD method_43952 resolveAll (Lnet/minecraft/class_3497$class_7474;Ljava/util/List;)Lcom/mojang/datafixers/util/Either; + ARG 1 valueGetter + ARG 2 entries + METHOD method_43953 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3503$class_5145;)V + ARG 2 entry + METHOD method_43954 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_3497;)V + ARG 2 entry + METHOD method_43955 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3503$class_5145;)V + ARG 2 entry + METHOD method_43956 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 2 referencedTagId + METHOD method_43957 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 2 referencedTagId CLASS class_5145 TrackedEntry FIELD comp_324 entry Lnet/minecraft/class_3497; FIELD comp_325 source Ljava/lang/String; diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index 11734848f1..14ce6d1f48 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -9,6 +9,12 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader ARG 2 prepareExecutor ARG 3 requirement METHOD method_40096 getRegistryTags ()Ljava/util/List; + METHOD method_40097 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 2 id + METHOD method_40098 (Ljava/util/List;Ljava/lang/Void;)V + ARG 2 void_ METHOD method_40099 getPath (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 registry + METHOD method_40100 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5455$class_6892;)Ljava/util/concurrent/CompletableFuture; + ARG 3 registry CLASS class_6863 RegistryTags diff --git a/mappings/net/minecraft/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/tag/TagPacketSerializer.mapping index 4b03f56f03..f6f92871d5 100644 --- a/mappings/net/minecraft/tag/TagPacketSerializer.mapping +++ b/mappings/net/minecraft/tag/TagPacketSerializer.mapping @@ -1,8 +1,12 @@ CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer + METHOD method_40101 (Lcom/mojang/datafixers/util/Pair;)Z + ARG 0 pair METHOD method_40102 serializeTags (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6864$class_5748; ARG 0 registry METHOD method_40103 (Lnet/minecraft/class_2378;Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V ARG 2 pair + METHOD method_40104 (Lnet/minecraft/class_5455$class_6892;)Lcom/mojang/datafixers/util/Pair; + ARG 0 registry METHOD method_40105 serializeTags (Lnet/minecraft/class_5455;)Ljava/util/Map; ARG 0 dynamicRegistryManager METHOD method_40106 loadTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lnet/minecraft/class_6864$class_5748;Lnet/minecraft/class_6864$class_6865;)V