diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index bf266783bd..7a5377cb03 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -53,10 +53,12 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 8 hidden METHOD method_692 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_161$class_162; ARG 0 obj + ARG 1 predicateDeserializer METHOD method_693 display (Lnet/minecraft/class_185;)Lnet/minecraft/class_161$class_162; ARG 1 display METHOD method_694 build (Ljava/util/function/Consumer;Ljava/lang/String;)Lnet/minecraft/class_161; METHOD method_695 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; + ARG 1 id METHOD method_696 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_161$class_162; ARG 0 buf METHOD method_697 display (Lnet/minecraft/class_1935;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_189;ZZZ)Lnet/minecraft/class_161$class_162; @@ -70,7 +72,9 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 8 hidden METHOD method_698 toJson ()Lcom/google/gson/JsonObject; METHOD method_699 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_700 findParent (Ljava/util/function/Function;)Z + ARG 1 parentProvider METHOD method_701 parent (Lnet/minecraft/class_161;)Lnet/minecraft/class_161$class_162; ARG 1 parent METHOD method_703 rewards (Lnet/minecraft/class_170$class_171;)Lnet/minecraft/class_161$class_162; diff --git a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping index a82a921da7..db9c416b14 100644 --- a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping +++ b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping @@ -2,17 +2,20 @@ CLASS net/minecraft/class_175 net/minecraft/advancement/AdvancementCriterion FIELD field_1214 conditions Lnet/minecraft/class_184; METHOD (Lnet/minecraft/class_184;)V ARG 1 conditions - METHOD method_768 fromPacket (Lnet/minecraft/class_2540;)Ljava/util/Map; + METHOD method_768 criteriaFromPacket (Lnet/minecraft/class_2540;)Ljava/util/Map; ARG 0 buf - METHOD method_769 createNew (Lnet/minecraft/class_2540;)Lnet/minecraft/class_175; + METHOD method_769 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_175; ARG 0 buf - METHOD method_770 deserialize (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_175; + METHOD method_770 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_175; ARG 0 obj - METHOD method_771 serialize (Lnet/minecraft/class_2540;)V - METHOD method_772 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Ljava/util/Map; + ARG 1 predicateDeserializer + METHOD method_771 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_772 criteriaFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Ljava/util/Map; ARG 0 obj + ARG 1 predicateDeserializer METHOD method_773 toJson ()Lcom/google/gson/JsonElement; METHOD method_774 getConditions ()Lnet/minecraft/class_184; - METHOD method_775 serialize (Ljava/util/Map;Lnet/minecraft/class_2540;)V + METHOD method_775 criteriaToPacket (Ljava/util/Map;Lnet/minecraft/class_2540;)V ARG 0 criteria ARG 1 buf diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index 8708a6409d..bf968badce 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_811 getTitle ()Lnet/minecraft/class_2561; METHOD method_812 getBackground ()Lnet/minecraft/class_2960; METHOD method_813 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_814 toJson ()Lcom/google/gson/JsonElement; METHOD method_815 getFrame ()Lnet/minecraft/class_189; METHOD method_816 setPosition (FF)V @@ -37,5 +38,6 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay ARG 0 buf METHOD method_821 getIcon ()Lnet/minecraft/class_1799; METHOD method_822 iconFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1799; + ARG 0 json METHOD method_823 shouldShowToast ()Z METHOD method_824 isHidden ()Z diff --git a/mappings/net/minecraft/advancement/AdvancementManager.mapping b/mappings/net/minecraft/advancement/AdvancementManager.mapping index 8c79982985..9a2573b75d 100644 --- a/mappings/net/minecraft/advancement/AdvancementManager.mapping +++ b/mappings/net/minecraft/advancement/AdvancementManager.mapping @@ -7,11 +7,15 @@ CLASS net/minecraft/class_163 net/minecraft/advancement/AdvancementManager METHOD method_711 load (Ljava/util/Map;)V METHOD method_712 getAdvancements ()Ljava/util/Collection; METHOD method_713 removeAll (Ljava/util/Set;)V + ARG 1 advancements METHOD method_714 clear ()V METHOD method_715 getRoots ()Ljava/lang/Iterable; METHOD method_716 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; + ARG 1 id METHOD method_717 setListener (Lnet/minecraft/class_163$class_164;)V + ARG 1 listener METHOD method_718 remove (Lnet/minecraft/class_161;)V + ARG 1 advancement CLASS class_164 Listener METHOD method_719 onDependentRemoved (Lnet/minecraft/class_161;)V ARG 1 dependent diff --git a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping index 34958b3e38..94414b74c8 100644 --- a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping +++ b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_194 net/minecraft/advancement/AdvancementPositioner FIELD field_1268 relativeRowInSiblings F FIELD field_1269 row F METHOD (Lnet/minecraft/class_161;Lnet/minecraft/class_194;Lnet/minecraft/class_194;II)V + ARG 1 advancement ARG 2 parent ARG 3 previousSibling ARG 4 childrenSize diff --git a/mappings/net/minecraft/advancement/AdvancementProgress.mapping b/mappings/net/minecraft/advancement/AdvancementProgress.mapping index 912009cfe5..8e13fbf33d 100644 --- a/mappings/net/minecraft/advancement/AdvancementProgress.mapping +++ b/mappings/net/minecraft/advancement/AdvancementProgress.mapping @@ -6,18 +6,22 @@ CLASS net/minecraft/class_167 net/minecraft/advancement/AdvancementProgress ARG 2 requirements METHOD method_728 getProgressBarFraction ()Ljava/lang/String; METHOD method_729 reset (Ljava/lang/String;)Z + ARG 1 name METHOD method_731 getUnobtainedCriteria ()Ljava/lang/Iterable; METHOD method_732 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_167; ARG 0 buf METHOD method_733 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_734 getObtainedCriteria ()Ljava/lang/Iterable; METHOD method_735 getProgressBarPercentage ()F METHOD method_736 countObtainedRequirements ()I METHOD method_737 getCriterionProgress (Ljava/lang/String;)Lnet/minecraft/class_178; + ARG 1 name METHOD method_740 isDone ()Z METHOD method_741 getEarliestProgressObtainDate ()Ljava/util/Date; METHOD method_742 isAnyObtained ()Z METHOD method_743 obtain (Ljava/lang/String;)Z + ARG 1 name CLASS class_168 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index ac26aba7f6..a3ee71bd0c 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -8,8 +8,12 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards ARG 1 experience ARG 2 loot ARG 3 recipes + ARG 4 function + METHOD method_27912 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_170; + ARG 0 json METHOD method_747 toJson ()Lcom/google/gson/JsonElement; METHOD method_748 apply (Lnet/minecraft/class_3222;)V + ARG 1 player CLASS class_171 Builder FIELD field_1168 recipes Ljava/util/List; FIELD field_1169 experience I diff --git a/mappings/net/minecraft/advancement/CriteriaMerger.mapping b/mappings/net/minecraft/advancement/CriteriaMerger.mapping index 527273d7cc..6dc42ba28e 100644 --- a/mappings/net/minecraft/advancement/CriteriaMerger.mapping +++ b/mappings/net/minecraft/advancement/CriteriaMerger.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_193 net/minecraft/advancement/CriteriaMerger FIELD field_1257 OR Lnet/minecraft/class_193; FIELD field_16882 AND Lnet/minecraft/class_193; + METHOD createRequirements (Ljava/util/Collection;)[[Ljava/lang/String; + ARG 1 criteriaNames diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index a999e26367..c1c07333c2 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -22,11 +22,12 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke METHOD method_12875 setOwner (Lnet/minecraft/class_3222;)V ARG 1 owner METHOD method_12876 sendUpdate (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_12877 hasChildrenDone (Lnet/minecraft/class_161;)Z ARG 1 advancement METHOD method_12878 grantCriterion (Lnet/minecraft/class_161;Ljava/lang/String;)Z ARG 1 advancement - ARG 2 criterion + ARG 2 criterionName METHOD method_12879 canSee (Lnet/minecraft/class_161;)Z ARG 1 advancement METHOD method_12880 endTrackingCompleted (Lnet/minecraft/class_161;)V @@ -36,7 +37,7 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke ARG 1 advancement METHOD method_12883 revokeCriterion (Lnet/minecraft/class_161;Ljava/lang/String;)Z ARG 1 advancement - ARG 2 criterion + ARG 2 criterionName METHOD method_12884 initProgress (Lnet/minecraft/class_161;Lnet/minecraft/class_167;)V ARG 1 advancement ARG 2 progress diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index e6027cd3eb..24480215cd 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCriterion FIELD field_20735 progressions Ljava/util/Map; METHOD method_22510 test (Lnet/minecraft/class_3222;Ljava/util/function/Predicate;)V + ARG 1 player ARG 2 tester METHOD method_22511 grant (Lnet/minecraft/class_2985;)V ARG 1 tracker + METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; + ARG 1 obj + ARG 2 playerPredicate + ARG 3 predicateDeserializer diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping index 6fcb4a3776..dec71fa3fe 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions FIELD field_1270 id Lnet/minecraft/class_2960; + FIELD field_24381 playerPredicate Lnet/minecraft/class_2048$class_5258; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;)V ARG 1 id + ARG 2 playerPredicate + METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_2048$class_5258; diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index 5375c7e723..0e5eec7107 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -13,6 +13,11 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro FIELD field_21569 block Lnet/minecraft/class_2248; FIELD field_21570 item Lnet/minecraft/class_2073; FIELD field_21571 beeCount Lnet/minecraft/class_2096$class_2100; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 player + ARG 2 block + ARG 3 item + ARG 4 beeCount METHOD method_23878 test (Lnet/minecraft/class_2248;Lnet/minecraft/class_1799;I)Z ARG 1 block ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping index 55ebef9d4b..ec14826144 100644 --- a/mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping @@ -14,6 +14,10 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/BlockUsedCrit FIELD field_21579 item Lnet/minecraft/class_2073; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_4550;Lnet/minecraft/class_4559;Lnet/minecraft/class_2073;)V ARG 1 id + ARG 2 player + ARG 3 block + ARG 4 state + ARG 5 item METHOD method_23891 create (Lnet/minecraft/class_4550$class_4710;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; ARG 0 blockPredicateBuilder ARG 1 itemPredicateBuilder diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 8fa8644b21..12c8c385b9 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC ARG 2 potion CLASS class_1998 Conditions FIELD field_9492 potion Lnet/minecraft/class_1842; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_1842;)V + ARG 1 player + ARG 2 potion METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z ARG 1 potion METHOD method_8791 any ()Lnet/minecraft/class_1996$class_1998; diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 40685d9c97..6c569f23c4 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens CLASS class_2001 Conditions FIELD field_9497 from Lnet/minecraft/class_2874; FIELD field_9498 to Lnet/minecraft/class_2874; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)V + ARG 1 player + ARG 2 from + ARG 3 to METHOD method_8799 to (Lnet/minecraft/class_2874;)Lnet/minecraft/class_1999$class_2001; ARG 0 to METHOD method_8800 matches (Lnet/minecraft/class_2874;Lnet/minecraft/class_2874;)Z diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 052da74015..19de36d7c3 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLightningCriterion FIELD field_9499 ID Lnet/minecraft/class_2960; METHOD method_8803 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;)V + ARG 1 player + ARG 2 victims CLASS class_2004 Conditions FIELD field_9503 victims [Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;[Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 victims METHOD method_8808 matches (Ljava/util/Collection;)Z + ARG 1 victims METHOD method_8809 create ([Lnet/minecraft/class_2048;)Lnet/minecraft/class_2002$class_2004; ARG 0 victims diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index abe112abfc..e606ce64a4 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -5,6 +5,10 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 2 beacon CLASS class_2008 Conditions FIELD field_9508 level Lnet/minecraft/class_2096$class_2100; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 player + ARG 2 level METHOD method_8817 matches (Lnet/minecraft/class_2580;)Z ARG 1 beacon METHOD method_8818 level (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2006$class_2008; + ARG 0 level diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index b0a5ab9156..d32ea27112 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 2 stack CLASS class_2012 Conditions FIELD field_9513 item Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 item METHOD method_8826 matches (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_8827 any ()Lnet/minecraft/class_2010$class_2012; diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index 55779df591..d6ab49c421 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion METHOD method_794 getId ()Lnet/minecraft/class_2960; METHOD method_795 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_184; ARG 1 obj + ARG 2 predicateDeserializer CLASS class_180 ConditionsContainer FIELD field_1221 id Ljava/lang/String; FIELD field_1222 advancement Lnet/minecraft/class_161; diff --git a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping index 5803f7f176..f40987c768 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_184 net/minecraft/advancement/criterion/CriterionConditions METHOD method_806 getId ()Lnet/minecraft/class_2960; METHOD method_807 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonObject; + ARG 1 predicateSerializer diff --git a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping index 5af99d75c7..a984a49f3b 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping @@ -4,8 +4,10 @@ CLASS net/minecraft/class_178 net/minecraft/advancement/criterion/CriterionProgr METHOD method_783 toJson ()Lcom/google/gson/JsonElement; METHOD method_784 isObtained ()Z METHOD method_785 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_178; + ARG 0 buf METHOD method_786 getObtainedDate ()Ljava/util/Date; METHOD method_787 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_788 obtainedAt (Ljava/lang/String;)Lnet/minecraft/class_178; ARG 0 datetime METHOD method_789 obtain ()V diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 293fc51159..da5aa5ee28 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -1,8 +1,17 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVillagerCriterion FIELD field_9514 ID Lnet/minecraft/class_2960; METHOD method_8831 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V + ARG 1 player + ARG 2 zombie + ARG 3 villager CLASS class_2016 Conditions FIELD field_9518 zombie Lnet/minecraft/class_2048$class_5258; FIELD field_9519 villager Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 zombie + ARG 3 villager METHOD method_8836 any ()Lnet/minecraft/class_2014$class_2016; METHOD method_8837 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z + ARG 1 zombieContext + ARG 2 villagerContext diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 5230b2f987..b58ae34559 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 1 player CLASS class_2029 Conditions FIELD field_9562 effects Lnet/minecraft/class_2102; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2102;)V + ARG 1 player + ARG 2 effects METHOD method_8868 matches (Lnet/minecraft/class_3222;)Z ARG 1 player METHOD method_8869 create (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2027$class_2029; diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 714c45cb05..9748d9efab 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem CLASS class_2032 Conditions FIELD field_9567 item Lnet/minecraft/class_2073; FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 player + ARG 2 item + ARG 3 levels METHOD method_8877 any ()Lnet/minecraft/class_2030$class_2032; METHOD method_8878 matches (Lnet/minecraft/class_1799;I)Z ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index b907446e42..a4e3a32891 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -10,6 +10,10 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri CLASS class_2039 Conditions FIELD field_9576 block Lnet/minecraft/class_2248; FIELD field_9577 state Lnet/minecraft/class_4559; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V + ARG 1 player + ARG 2 block + ARG 3 state METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; ARG 0 block METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index b11b5d9cc3..8d85c62f12 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla ARG 5 blocked CLASS class_2046 Conditions FIELD field_9593 damage Lnet/minecraft/class_2019; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;)V + ARG 1 player + ARG 2 damage METHOD method_8907 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 source @@ -15,3 +18,4 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla ARG 4 taken ARG 5 blocked METHOD method_8908 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2044$class_2046; + ARG 0 damageBuilder diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index 648d4b7250..9b611adc6a 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 2 stack CLASS class_2056 Conditions FIELD field_9616 item Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 item METHOD method_8937 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2054$class_2056; ARG 0 item METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index b084da91ff..51a1fae158 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -1,10 +1,23 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHookedCriterion FIELD field_9617 ID Lnet/minecraft/class_2960; METHOD method_8939 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1536;Ljava/util/Collection;)V + ARG 1 player + ARG 2 rod + ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions + FIELD field_24391 hookedEntity Lnet/minecraft/class_2048$class_5258; FIELD field_9621 rod Lnet/minecraft/class_2073; FIELD field_9623 caughtItem Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 rod + ARG 3 hookedEntity + ARG 4 caughtItem + METHOD method_27810 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z + ARG 1 rod + ARG 2 hookedEntityContext + ARG 3 fishingLoots METHOD method_8947 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2048;Lnet/minecraft/class_2073;)Lnet/minecraft/class_2058$class_2060; ARG 0 rod ARG 1 bobber diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 4ef5c53b19..438c681628 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -1,13 +1,34 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChangedCriterion FIELD field_9625 ID Lnet/minecraft/class_2960; + METHOD method_24362 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)V + ARG 1 player + ARG 2 inventory + ARG 3 stack + ARG 4 full + ARG 5 empty + ARG 6 occupied METHOD method_8950 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 inventory + ARG 3 stack CLASS class_2068 Conditions FIELD field_9629 occupied Lnet/minecraft/class_2096$class_2100; FIELD field_9630 full Lnet/minecraft/class_2096$class_2100; FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100; FIELD field_9632 items [Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 occupied + ARG 3 full + ARG 4 empty + ARG 5 items METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; ARG 0 items METHOD method_8958 matches (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)Z + ARG 1 inventory + ARG 2 stack + ARG 3 full + ARG 4 empty + ARG 5 occupied METHOD method_8959 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; ARG 0 items diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 4f3fc9d9c8..248a130385 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -8,6 +8,11 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit FIELD field_9637 item Lnet/minecraft/class_2073; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9639 delta Lnet/minecraft/class_2096$class_2100; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 player + ARG 2 item + ARG 3 durability + ARG 4 delta METHOD method_8967 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; ARG 0 item ARG 1 durability diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 2ee19af449..54b3c26e11 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -1,10 +1,19 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCrossbowCriterion FIELD field_9655 ID Lnet/minecraft/class_2960; METHOD method_8980 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;)V + ARG 1 player + ARG 2 piercingKilledEntities CLASS class_2078 Conditions FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; FIELD field_9660 victims [Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;[Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 player + ARG 2 victims + ARG 3 uniqueEntityTypes METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2076$class_2078; + ARG 0 victimPredicates METHOD method_8987 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2076$class_2078; ARG 0 uniqueEntityTypes METHOD method_8988 matches (Ljava/util/Collection;I)Z + ARG 1 victimContexts + ARG 2 uniqueEntityTypeCount diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index e81fb13bb7..91b36701cd 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri CLASS class_2087 Conditions FIELD field_9675 distance Lnet/minecraft/class_2025; FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2025;Lnet/minecraft/class_2096$class_2100;)V + ARG 1 player + ARG 2 distance + ARG 3 duration METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2085$class_2087; ARG 0 distance METHOD method_9014 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)Z diff --git a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping index 9941239c5c..4350bceed9 100644 --- a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_2092 net/minecraft/advancement/criterion/LocationArriv FIELD field_9698 location Lnet/minecraft/class_2090; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;)V ARG 1 id + ARG 2 player + ARG 3 location METHOD method_20400 createHeroOfTheVillage ()Lnet/minecraft/class_2092$class_2094; METHOD method_9032 createSleptInBed ()Lnet/minecraft/class_2092$class_2094; METHOD method_9033 matches (Lnet/minecraft/class_3218;DDD)Z diff --git a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping index 977469b8f1..4106fdb6a4 100644 --- a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping @@ -7,6 +7,11 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/NetherTravelC FIELD field_9721 enteredPos Lnet/minecraft/class_2090; FIELD field_9722 exitedPos Lnet/minecraft/class_2090; FIELD field_9723 distance Lnet/minecraft/class_2025; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V + ARG 1 player + ARG 2 enteredPos + ARG 3 exitedPos + ARG 4 distance METHOD method_9085 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2108$class_2110; ARG 0 distance METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;DDD)Z diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 156eba82b3..6a1f81fd54 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -3,14 +3,25 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite METHOD (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_8990 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V + ARG 1 player + ARG 2 entity + ARG 3 killingDamage CLASS class_2083 Conditions FIELD field_9667 killingBlow Lnet/minecraft/class_2022; FIELD field_9668 entity Lnet/minecraft/class_2048$class_5258; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2022;)V ARG 1 id + ARG 2 player + ARG 3 entity + ARG 4 killingBlow METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083; + ARG 0 killedEntityPredicateBuilder METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_2080$class_2083; METHOD method_8999 createPlayerKilledEntity ()Lnet/minecraft/class_2080$class_2083; METHOD method_9000 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;)Z + ARG 1 player + ARG 2 killedEntityContext ARG 3 killingBlow METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; + ARG 0 killedEntityPredicateBuilder + ARG 1 killingBlowBuilder diff --git a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping index 9b5dd8ebd7..a5945db1ed 100644 --- a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping @@ -13,6 +13,12 @@ CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCr FIELD field_9729 location Lnet/minecraft/class_2090; FIELD field_9730 state Lnet/minecraft/class_4559; FIELD field_9731 item Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 block + ARG 3 state + ARG 4 location + ARG 5 item METHOD method_9094 matches (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)Z ARG 1 state ARG 2 pos diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index f1be587081..4a6d9130d6 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -1,14 +1,24 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEntityCriterion FIELD field_9732 ID Lnet/minecraft/class_2960; METHOD method_9097 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V + ARG 1 player + ARG 2 entity + ARG 3 damage ARG 4 dealt ARG 5 taken ARG 6 blocked CLASS class_2117 Conditions FIELD field_9736 damage Lnet/minecraft/class_2019; FIELD field_9737 entity Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 damage + ARG 3 entity METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2115$class_2117; + ARG 0 hurtEntityPredicateBuilder METHOD method_9104 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;FFZ)Z + ARG 1 player + ARG 2 entityContext ARG 3 source ARG 4 dealt ARG 5 taken diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 189bd7eeca..d334e3092f 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -1,9 +1,14 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlockedCriterion FIELD field_9738 ID Lnet/minecraft/class_2960; + METHOD method_27847 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2119$class_2121; + ARG 0 id METHOD method_9107 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)V ARG 1 player ARG 2 recipe CLASS class_2121 Conditions FIELD field_9742 recipe Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;)V + ARG 1 player + ARG 2 recipe METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z ARG 1 recipe diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index 56380f5917..b0aa2c3e9c 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC ARG 2 stack CLASS class_2125 Conditions FIELD field_9747 item Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 item METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2123$class_2125; ARG 0 item METHOD method_9121 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index ff04815217..70128249aa 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBloc CLASS class_4714 Conditions FIELD field_21587 block Lnet/minecraft/class_2248; FIELD field_21588 state Lnet/minecraft/class_4559; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V + ARG 1 player + ARG 2 block + ARG 3 state METHOD method_23912 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4713$class_4714; ARG 0 block METHOD method_23913 test (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index ed11c3b477..9912bbbbed 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -1,7 +1,14 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntityCriterion FIELD field_9748 ID Lnet/minecraft/class_2960; METHOD method_9124 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V + ARG 1 player + ARG 2 entity CLASS class_2130 Conditions FIELD field_9752 entity Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 entity METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2128$class_2130; + ARG 0 summonedEntityPredicateBuilder METHOD method_9130 matches (Lnet/minecraft/class_47;)Z + ARG 1 summonedEntityContext diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 763db29953..29088702c9 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCriterion FIELD field_9753 ID Lnet/minecraft/class_2960; METHOD method_9132 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V + ARG 1 player + ARG 2 entity CLASS class_2133 Conditions FIELD field_9757 entity Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 entity METHOD method_16114 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2131$class_2133; ARG 0 entity METHOD method_9138 any ()Lnet/minecraft/class_2131$class_2133; METHOD method_9139 matches (Lnet/minecraft/class_47;)Z + ARG 1 tamedEntityContext diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index ed3b03f371..e679bcdd20 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -1,8 +1,20 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCriterion FIELD field_22429 ID Lnet/minecraft/class_2960; METHOD method_24861 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;I)V + ARG 1 player + ARG 2 projectile + ARG 3 hitPos + ARG 4 signalStrength CLASS class_4852 Conditions FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100; FIELD field_22512 projectile Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 signalStrength + ARG 3 projectile METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4851$class_4852; ARG 0 signalStrength + METHOD method_24952 test (Lnet/minecraft/class_47;Lnet/minecraft/class_243;I)Z + ARG 1 projectileContext + ARG 2 hitPos + ARG 3 signalStrength diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 9f9cf289f4..79c283f30f 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions + METHOD (Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index 7fec208046..f9c94a0aa8 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeCriterion - FIELD field_9768 id Lnet/minecraft/class_2960; + FIELD field_9768 ID Lnet/minecraft/class_2960; METHOD method_9157 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V ARG 1 player ARG 2 strongholdPos CLASS class_2145 Conditions FIELD field_9772 distance Lnet/minecraft/class_2096$class_2099; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2099;)V + ARG 1 player + ARG 2 distance METHOD method_9162 matches (D)Z ARG 1 distance diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index dee51997b3..846d512d6e 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit ARG 2 stack CLASS class_2150 Conditions FIELD field_9777 item Lnet/minecraft/class_2073; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 item METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2148$class_2150; ARG 0 item METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index b2b818c173..eeb17cf75d 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -1,9 +1,17 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTradeCriterion FIELD field_9762 ID Lnet/minecraft/class_2960; METHOD method_9146 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 trader ARG 3 stack CLASS class_2142 Conditions FIELD field_9766 item Lnet/minecraft/class_2073; FIELD field_9767 villager Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + ARG 1 player + ARG 2 villager + ARG 3 item METHOD method_9153 any ()Lnet/minecraft/class_2140$class_2142; METHOD method_9154 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;)Z + ARG 1 traderContext + ARG 2 stack diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index 73d794d628..6d1a47a74a 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti ARG 2 end METHOD method_26342 getPositionType (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1536$class_4984; ARG 1 pos + METHOD method_26957 getHookedEntity ()Lnet/minecraft/class_1297; METHOD method_6947 getOwner ()Lnet/minecraft/class_1657; METHOD method_6949 tickFishingLogic (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/loot/LootGsons.mapping b/mappings/net/minecraft/loot/LootGsons.mapping new file mode 100644 index 0000000000..1a41cabb8f --- /dev/null +++ b/mappings/net/minecraft/loot/LootGsons.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5270 net/minecraft/loot/LootGsons + METHOD method_27860 getConditionGsonBuilder ()Lcom/google/gson/GsonBuilder; + METHOD method_27861 getFunctionGsonBuilder ()Lcom/google/gson/GsonBuilder; + METHOD method_27862 getTableGsonBuilder ()Lcom/google/gson/GsonBuilder; diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 4791f1cf48..3cecc83d29 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -2,30 +2,42 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter FIELD field_20756 contextType Lnet/minecraft/class_176; FIELD field_20757 conditionGetter Ljava/util/function/Function; FIELD field_20758 conditions Ljava/util/Set; - FIELD field_20759 supplierGetter Ljava/util/function/Function; - FIELD field_20760 suppliers Ljava/util/Set; + FIELD field_20759 tableGetter Ljava/util/function/Function; + FIELD field_20760 tables Ljava/util/Set; FIELD field_964 name Ljava/lang/String; FIELD field_965 messages Lcom/google/common/collect/Multimap; FIELD field_966 nameFactory Ljava/util/function/Supplier; + METHOD (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;Lnet/minecraft/class_176;Ljava/util/function/Function;Ljava/util/Set;Ljava/util/function/Function;Ljava/util/Set;)V + ARG 1 messages + ARG 2 nameFactory + ARG 3 contextType + ARG 4 conditionGetter + ARG 5 conditions + ARG 6 tableGetter + ARG 7 tables + METHOD (Lnet/minecraft/class_176;Ljava/util/function/Function;Ljava/util/function/Function;)V + ARG 1 contextType + ARG 2 conditionGetter + ARG 3 tableFactory METHOD method_22567 checkContext (Lnet/minecraft/class_46;)V ARG 1 contextAware METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58; ARG 1 contextType - METHOD method_22569 withSupplier (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; + METHOD method_22569 withTable (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; ARG 1 name ARG 2 id - METHOD method_22570 hasSupplier (Lnet/minecraft/class_2960;)Z + METHOD method_22570 hasTable (Lnet/minecraft/class_2960;)Z ARG 1 id METHOD method_22571 withCondition (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; ARG 1 name ARG 2 id METHOD method_22572 hasCondition (Lnet/minecraft/class_2960;)Z ARG 1 id - METHOD method_22574 getSupplier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + METHOD method_22574 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; ARG 1 id METHOD method_22576 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; ARG 1 id - METHOD method_359 getContext ()Ljava/lang/String; + METHOD method_359 getName ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V ARG 1 message METHOD method_361 getMessages ()Lcom/google/common/collect/Multimap; diff --git a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index b07b7b8ecd..344402a6f6 100644 --- a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootC ARG 2 entity METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_4570$class_210; ARG 0 entity + METHOD method_27865 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048;)Lnet/minecraft/class_4570$class_210; + ARG 0 entity + ARG 1 predicate METHOD method_917 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_4570$class_210; ARG 0 entity ARG 1 predicateBuilder diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index dbc72bfce5..7c19f556de 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -17,8 +17,9 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate ARG 3 dealt ARG 4 taken ARG 5 blocked - METHOD method_8839 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2019; - METHOD method_8840 serialize ()Lcom/google/gson/JsonElement; + METHOD method_8839 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2019; + ARG 0 json + METHOD method_8840 toJson ()Lcom/google/gson/JsonElement; CLASS class_2020 Builder FIELD field_9526 blocked Ljava/lang/Boolean; FIELD field_9527 taken Lnet/minecraft/class_2096$class_2099; @@ -28,5 +29,6 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate METHOD method_8841 blocked (Ljava/lang/Boolean;)Lnet/minecraft/class_2019$class_2020; ARG 1 blocked METHOD method_8842 type (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2019$class_2020; + ARG 1 builder METHOD method_8843 build ()Lnet/minecraft/class_2019; METHOD method_8844 create ()Lnet/minecraft/class_2019$class_2020; diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping new file mode 100644 index 0000000000..5f19fd239a --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer + FIELD field_24383 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_24384 advancementId Lnet/minecraft/class_2960; + FIELD field_24385 conditionManager Lnet/minecraft/class_4567; + FIELD field_24386 gson Lcom/google/gson/Gson; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4567;)V + ARG 1 advancementId + ARG 2 conditionManager + METHOD method_27795 getAdvancementId ()Lnet/minecraft/class_2960; + METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)[Lnet/minecraft/class_4570; + ARG 1 array + ARG 2 key + ARG 3 contextType diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping new file mode 100644 index 0000000000..da5f4b7e39 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5267 net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer + FIELD field_24420 INSTANCE Lnet/minecraft/class_5267; + FIELD field_24421 gson Lcom/google/gson/Gson; + METHOD method_27849 conditionsToJson ([Lnet/minecraft/class_4570;)Lcom/google/gson/JsonElement; + ARG 1 conditions diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index f6c96b8cdd..8ba7a4841c 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -25,12 +25,12 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic ARG 1 world ARG 2 pos ARG 3 damageSource - METHOD method_8846 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2022; - ARG 0 element + METHOD method_8846 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2022; + ARG 0 json METHOD method_8847 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;)Z ARG 1 player ARG 2 damageSource - METHOD method_8848 serialize ()Lcom/google/gson/JsonElement; + METHOD method_8848 toJson ()Lcom/google/gson/JsonElement; METHOD method_8849 getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; ARG 0 obj ARG 1 name diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index 5939df4aa0..813e12e96a 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -13,9 +13,15 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate ARG 5 absolute METHOD method_8856 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 y - METHOD method_8857 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2025; - ARG 0 el + METHOD method_8857 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2025; + ARG 0 json METHOD method_8858 toJson ()Lcom/google/gson/JsonElement; METHOD method_8859 test (DDDDDD)Z + ARG 1 x0 + ARG 3 y0 + ARG 5 z0 + ARG 7 x1 + ARG 9 y1 + ARG 11 z1 METHOD method_8860 horizontal (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 horizontal diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 29ff99ad80..43c2dded82 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -6,7 +6,9 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic METHOD method_9062 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9063 test (Ljava/util/Map;)Z - METHOD method_9064 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2102; + ARG 1 effects + METHOD method_9064 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2102; + ARG 0 json METHOD method_9065 withEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102; ARG 1 statusEffect METHOD method_9066 create ()Lnet/minecraft/class_2102; @@ -25,6 +27,6 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic ARG 4 visible METHOD method_9069 test (Lnet/minecraft/class_1293;)Z ARG 1 statusEffectInstance - METHOD method_9070 deserialize (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2102$class_2103; + METHOD method_9070 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2102$class_2103; ARG 0 json - METHOD method_9071 serialize ()Lcom/google/gson/JsonElement; + METHOD method_9071 toJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index 6c9979254c..8fa562703e 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -14,7 +14,8 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre ARG 4 feet ARG 5 mainhand ARG 6 offhand - METHOD method_16224 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3735; + METHOD method_16224 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3735; + ARG 0 json METHOD method_16225 toJson ()Lcom/google/gson/JsonElement; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping index 6e94ae522b..25afc2e9d6 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping @@ -13,13 +13,13 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredica ARG 5 isBaby METHOD method_8892 test (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_8893 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2040; - ARG 0 element + METHOD method_8893 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2040; + ARG 0 json METHOD method_8894 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8895 deserializeBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; + METHOD method_8895 nullableBooleanFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; ARG 0 json ARG 1 key - METHOD method_8896 serializeBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V + METHOD method_8896 nullableBooleanToJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V ARG 1 json ARG 2 key ARG 3 value diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index a857010899..b0836c25b0 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -23,13 +23,16 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 9 fishingHook ARG 10 team ARG 11 catType + METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; + ARG 0 player + ARG 1 target METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world ARG 2 pos ARG 3 entity METHOD method_8912 toJson ()Lcom/google/gson/JsonElement; METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; - ARG 0 el + ARG 0 json METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z ARG 1 player ARG 2 entity @@ -75,3 +78,38 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 effects METHOD method_8924 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2048$class_2049; ARG 1 distance + CLASS class_5258 Extended + FIELD field_24388 EMPTY Lnet/minecraft/class_2048$class_5258; + FIELD field_24389 conditions [Lnet/minecraft/class_4570; + FIELD field_24390 combinedCondition Ljava/util/function/Predicate; + METHOD ([Lnet/minecraft/class_4570;)V + ARG 1 conditions + METHOD method_27803 ofLegacy (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_5258; + ARG 0 predicate + METHOD method_27804 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; + ARG 1 predicateSerializer + METHOD method_27805 getInJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Lnet/minecraft/class_2048$class_5258; + COMMENT Parses an extended entity check in a sub-value in JSON, accepting objects + COMMENT as simple entity predicates or array as list of loot conditions. + COMMENT + COMMENT @see + COMMENT Mojang description + ARG 0 root + ARG 1 key + ARG 2 predicateDeserializer + METHOD method_27806 test (Lnet/minecraft/class_47;)Z + ARG 1 context + METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048$class_5258; + ARG 0 key + ARG 1 predicateDeserializer + ARG 2 json + METHOD method_27808 toPredicatesJsonArray ([Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; + ARG 0 predicates + ARG 1 predicateSerializer + METHOD method_27809 requireInJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)[Lnet/minecraft/class_2048$class_5258; + COMMENT Parses an extended entity check in a sub-value in JSON. The value must + COMMENT be absent, JSON null, or an array, or the parser will error. In other + COMMENT words, it does not accept object sub-values. + ARG 0 root + ARG 1 key + ARG 2 predicateDeserializer diff --git a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index c109d60640..4636b7d7b8 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicat METHOD method_8926 create (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2050; ARG 0 tag METHOD method_8927 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8928 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2050; - ARG 0 element + METHOD method_8928 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2050; + ARG 0 json METHOD method_8929 create (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2050; ARG 0 type CLASS class_2051 Tagged diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index f00a1300c3..f7699e663e 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 3 y ARG 4 z METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; - ARG 0 element + ARG 0 json METHOD method_9022 biome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_2090; ARG 0 biome CLASS class_2091 Builder diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 93048a8829..dc7e9cd8e8 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader FIELD field_13404 manager Lnet/minecraft/class_163; FIELD field_13405 GSON Lcom/google/gson/Gson; FIELD field_13406 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_24452 conditionManager Lnet/minecraft/class_4567; + METHOD (Lnet/minecraft/class_4567;)V + ARG 1 conditionManager METHOD method_12893 getAdvancements ()Ljava/util/Collection; METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; ARG 1 id