From f14d7b81100a149dacc790c5aff1b72373954882 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 3 Feb 2021 04:55:41 +1100 Subject: [PATCH] advancement stuff 2 (#2004) --- mappings/net/minecraft/advancement/Advancement.mapping | 4 ++++ .../minecraft/advancement/PlayerAdvancementTracker.mapping | 1 + .../advancement/criterion/BredAnimalsCriterion.mapping | 2 ++ .../advancement/criterion/BrewedPotionCriterion.mapping | 2 ++ .../advancement/criterion/ChangedDimensionCriterion.mapping | 2 ++ .../advancement/criterion/ChanneledLightningCriterion.mapping | 4 ++++ .../advancement/criterion/ConstructBeaconCriterion.mapping | 2 ++ .../advancement/criterion/ConsumeItemCriterion.mapping | 2 ++ .../net/minecraft/advancement/criterion/Criterion.mapping | 2 ++ .../criterion/CuredZombieVillagerCriterion.mapping | 2 ++ .../advancement/criterion/EffectsChangedCriterion.mapping | 2 ++ .../advancement/criterion/EnchantedItemCriterion.mapping | 2 ++ .../advancement/criterion/EnterBlockCriterion.mapping | 2 ++ .../advancement/criterion/EntityHurtPlayerCriterion.mapping | 2 ++ .../advancement/criterion/FilledBucketCriterion.mapping | 2 ++ .../advancement/criterion/FishingRodHookedCriterion.mapping | 4 +++- .../advancement/criterion/InventoryChangedCriterion.mapping | 2 ++ .../criterion/ItemDurabilityChangedCriterion.mapping | 2 ++ .../advancement/criterion/KilledByCrossbowCriterion.mapping | 2 ++ .../advancement/criterion/LevitationCriterion.mapping | 2 ++ .../advancement/criterion/LocationArrivalCriterion.mapping | 2 ++ .../advancement/criterion/NetherTravelCriterion.mapping | 2 ++ .../minecraft/advancement/criterion/OnKilledCriterion.mapping | 2 ++ .../advancement/criterion/PlacedBlockCriterion.mapping | 2 ++ .../criterion/PlayerGeneratesContainerLootCriterion.mapping | 2 ++ .../advancement/criterion/PlayerHurtEntityCriterion.mapping | 2 ++ .../criterion/PlayerInteractedWithEntityCriterion.mapping | 2 ++ .../advancement/criterion/RecipeUnlockedCriterion.mapping | 2 ++ .../advancement/criterion/ShotCrossbowCriterion.mapping | 2 ++ .../advancement/criterion/SummonedEntityCriterion.mapping | 2 ++ .../advancement/criterion/TameAnimalCriterion.mapping | 2 ++ .../advancement/criterion/TargetHitCriterion.mapping | 2 ++ .../criterion/ThrownItemPickedUpByEntityCriterion.mapping | 2 ++ .../net/minecraft/advancement/criterion/TickCriterion.mapping | 2 ++ .../advancement/criterion/UsedEnderEyeCriterion.mapping | 2 ++ .../advancement/criterion/UsedTotemCriterion.mapping | 2 ++ .../advancement/criterion/VillagerTradeCriterion.mapping | 2 ++ 37 files changed, 78 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index a444dc2360..22134233d4 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement METHOD method_682 getCriteria ()Ljava/util/Map; METHOD method_683 getRequirementCount ()I METHOD method_684 toHoverableText ()Lnet/minecraft/class_2561; + METHOD method_685 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style METHOD method_686 getDisplay ()Lnet/minecraft/class_185; METHOD method_687 getParent ()Lnet/minecraft/class_161; METHOD method_688 getId ()Lnet/minecraft/class_2960; @@ -78,6 +80,8 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 1 parentProvider METHOD method_701 parent (Lnet/minecraft/class_161;)Lnet/minecraft/class_161$class_162; ARG 1 parent + METHOD method_702 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161; + ARG 0 id METHOD method_703 rewards (Lnet/minecraft/class_170$class_171;)Lnet/minecraft/class_161$class_162; ARG 1 builder METHOD method_704 criteriaMerger (Lnet/minecraft/class_193;)Lnet/minecraft/class_161$class_162; diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index e92e07b347..6bfafc7585 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke METHOD (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3324;Lnet/minecraft/class_2989;Ljava/io/File;Lnet/minecraft/class_3222;)V ARG 1 dataFixer ARG 2 playerManager + ARG 3 advancementLoader ARG 4 advancementFile ARG 5 owner METHOD method_12872 rewardEmptyAdvancements (Lnet/minecraft/class_2989;)V diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index 01cfd8ddeb..05d7ae120d 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCriterion FIELD field_1271 ID Lnet/minecraft/class_2960; + METHOD method_22455 (Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_196$class_198;)Z + ARG 3 conditions METHOD method_855 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V ARG 1 player ARG 2 parent diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 12c8c385b9..b33feef19a 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionCriterion FIELD field_9488 ID Lnet/minecraft/class_2960; + METHOD method_22456 (Lnet/minecraft/class_1842;Lnet/minecraft/class_1996$class_1998;)Z + ARG 1 conditions METHOD method_8784 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1842;)V ARG 1 player ARG 2 potion diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 8977d90246..2f578f4e07 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimensionCriterion FIELD field_9493 ID Lnet/minecraft/class_2960; + METHOD method_22457 (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_1999$class_2001;)Z + ARG 2 conditions METHOD method_8794 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V ARG 1 player ARG 2 from diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 19de36d7c3..62f0796f32 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLightningCriterion FIELD field_9499 ID Lnet/minecraft/class_2960; + METHOD method_22458 (Ljava/util/List;Lnet/minecraft/class_2002$class_2004;)Z + ARG 1 conditions + METHOD method_27791 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; + ARG 1 entity METHOD method_8803 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;)V ARG 1 player ARG 2 victims diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index 617c5fb068..654d591f3b 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeaconCriterion FIELD field_9504 ID Lnet/minecraft/class_2960; + METHOD method_22459 (ILnet/minecraft/class_2006$class_2008;)Z + ARG 1 conditions METHOD method_8812 trigger (Lnet/minecraft/class_3222;I)V ARG 1 player ARG 2 level diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index d32ea27112..1949ed0785 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCriterion FIELD field_9509 ID Lnet/minecraft/class_2960; + METHOD method_22460 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2010$class_2012;)Z + ARG 1 conditions METHOD method_8821 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index d6ab49c421..f9655a027b 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion ARG 1 tracker METHOD method_792 beginTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager + ARG 2 conditions METHOD method_793 endTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager + ARG 2 conditions 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 diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index da5aa5ee28..41d401644b 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVillagerCriterion FIELD field_9514 ID Lnet/minecraft/class_2960; + METHOD method_22461 (Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_2014$class_2016;)Z + ARG 2 conditions METHOD method_8831 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1642;Lnet/minecraft/class_1646;)V ARG 1 player ARG 2 zombie diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index b58ae34559..f43b11f35b 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChangedCriterion FIELD field_9558 ID Lnet/minecraft/class_2960; + METHOD method_22462 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2027$class_2029;)Z + ARG 1 conditions METHOD method_8863 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2029 Conditions diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 9748d9efab..2e5a35c808 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItemCriterion FIELD field_9563 ID Lnet/minecraft/class_2960; + METHOD method_22463 (Lnet/minecraft/class_1799;ILnet/minecraft/class_2030$class_2032;)Z + ARG 2 conditions METHOD method_8870 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index a4e3a32891..16dad4f52d 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri FIELD field_9572 ID Lnet/minecraft/class_2960; METHOD method_22464 (Lnet/minecraft/class_2248;Ljava/lang/String;)V ARG 1 name + METHOD method_22465 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2037$class_2039;)Z + ARG 1 conditions METHOD method_22466 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; ARG 0 obj METHOD method_8885 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 8d85c62f12..73ef736f2d 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla ARG 3 dealt ARG 4 taken ARG 5 blocked + METHOD method_22468 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2044$class_2046;)Z + ARG 5 conditions CLASS class_2046 Conditions FIELD field_9593 damage Lnet/minecraft/class_2019; METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;)V diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index 9b611adc6a..c99e913ae0 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketCriterion FIELD field_9612 ID Lnet/minecraft/class_2960; + METHOD method_22471 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2054$class_2056;)Z + ARG 1 conditions METHOD method_8932 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index 51a1fae158..bf3dc896c1 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHookedCriterion FIELD field_9617 ID Lnet/minecraft/class_2960; + METHOD method_22472 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;Lnet/minecraft/class_2058$class_2060;)Z + ARG 3 conditions 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 @@ -14,7 +16,7 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo 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 + METHOD method_27810 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z ARG 1 rod ARG 2 hookedEntityContext ARG 3 fishingLoots diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 438c681628..4b420b11c5 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChangedCriterion FIELD field_9625 ID Lnet/minecraft/class_2960; + METHOD method_22476 (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;IIILnet/minecraft/class_2066$class_2068;)Z + ARG 5 conditions METHOD method_24362 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)V ARG 1 player ARG 2 inventory diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 55e87320ed..0e92644e68 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion FIELD field_9633 ID Lnet/minecraft/class_2960; + METHOD method_22477 (Lnet/minecraft/class_1799;ILnet/minecraft/class_2069$class_2071;)Z + ARG 2 conditions METHOD method_8960 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 54b3c26e11..0fbaf7372a 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCrossbowCriterion FIELD field_9655 ID Lnet/minecraft/class_2960; + METHOD method_22478 (Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_2076$class_2078;)Z + ARG 2 conditions METHOD method_8980 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;)V ARG 1 player ARG 2 piercingKilledEntities diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index 91b36701cd..1bb610ed0b 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCriterion FIELD field_9671 ID Lnet/minecraft/class_2960; + METHOD method_22480 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;ILnet/minecraft/class_2085$class_2087;)Z + ARG 3 conditions METHOD method_9008 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)V ARG 1 player ARG 2 startPos diff --git a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping index 4350bceed9..10641b3b88 100644 --- a/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2092 net/minecraft/advancement/criterion/LocationArriv FIELD field_9694 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD method_22485 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2092$class_2094;)Z + ARG 1 conditions METHOD method_9027 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2094 Conditions diff --git a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping index 4106fdb6a4..51b73cc39b 100644 --- a/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/NetherTravelCriterion FIELD field_9717 ID Lnet/minecraft/class_2960; + METHOD method_22486 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;Lnet/minecraft/class_2108$class_2110;)Z + ARG 2 conditions METHOD method_9080 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;)V ARG 1 player ARG 2 enteredPos diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 6a1f81fd54..e42e6ef817 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite FIELD field_9661 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD method_22479 (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;Lnet/minecraft/class_2080$class_2083;)Z + ARG 3 conditions METHOD method_8990 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V ARG 1 player ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping index a5945db1ed..32f77f5fa7 100644 --- a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCr FIELD field_9724 ID Lnet/minecraft/class_2960; METHOD method_22490 (Lnet/minecraft/class_2248;Ljava/lang/String;)V ARG 1 name + METHOD method_22491 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_2111$class_2113;)Z + ARG 4 conditions METHOD method_22492 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; ARG 0 obj METHOD method_9087 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index f3e3783524..b360c442e9 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion FIELD field_24502 ID Lnet/minecraft/class_2960; + METHOD method_27992 (Lnet/minecraft/class_2960;Lnet/minecraft/class_5282$class_5283;)Z + ARG 1 conditions METHOD method_27993 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_2960;)V ARG 1 player ARG 2 id diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index 4a6d9130d6..218691175d 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEntityCriterion FIELD field_9732 ID Lnet/minecraft/class_2960; + METHOD method_22493 (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2115$class_2117;)Z + ARG 6 conditions METHOD method_9097 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;FFZ)V ARG 1 player ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index 18563b304c..c499d539c2 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion FIELD field_25699 ID Lnet/minecraft/class_2960; + METHOD method_30095 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5409$class_5410;)Z + ARG 2 conditions METHOD method_30097 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index d334e3092f..73a63cbabd 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlockedCriterion FIELD field_9738 ID Lnet/minecraft/class_2960; + METHOD method_22508 (Lnet/minecraft/class_1860;Lnet/minecraft/class_2119$class_2121;)Z + ARG 1 conditions 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 diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index b0aa2c3e9c..ecaacbd160 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowCriterion FIELD field_9743 ID Lnet/minecraft/class_2960; + METHOD method_22509 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2123$class_2125;)Z + ARG 1 conditions METHOD method_9115 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 9912bbbbed..19bea0f8a2 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntityCriterion FIELD field_9748 ID Lnet/minecraft/class_2960; + METHOD method_22537 (Lnet/minecraft/class_47;Lnet/minecraft/class_2128$class_2130;)Z + ARG 1 conditions METHOD method_9124 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 29088702c9..1249bdd03e 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCriterion FIELD field_9753 ID Lnet/minecraft/class_2960; + METHOD method_22538 (Lnet/minecraft/class_47;Lnet/minecraft/class_2131$class_2133;)Z + ARG 1 conditions METHOD method_9132 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;)V ARG 1 player ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 5fd29fe84d..7a33c11260 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 2 projectile ARG 3 hitPos ARG 4 signalStrength + METHOD method_24951 (Lnet/minecraft/class_47;Lnet/minecraft/class_243;ILnet/minecraft/class_4851$class_4852;)Z + ARG 3 conditions CLASS class_4852 Conditions FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100; FIELD field_22512 projectile Lnet/minecraft/class_2048$class_5258; diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index cc714229d3..88613aa570 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic ARG 1 player ARG 2 stack ARG 3 entity + METHOD method_27976 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5279$class_5280;)Z + ARG 3 conditions CLASS class_5280 Conditions FIELD field_24493 item Lnet/minecraft/class_2073; FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258; diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 79c283f30f..cf2d84f306 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion FIELD field_9758 ID Lnet/minecraft/class_2960; + METHOD method_29964 (Lnet/minecraft/class_2135$class_2137;)Z + ARG 0 conditions METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index f9c94a0aa8..e862e4eb40 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeCriterion FIELD field_9768 ID Lnet/minecraft/class_2960; + METHOD method_22540 (DLnet/minecraft/class_2143$class_2145;)Z + ARG 2 conditions METHOD method_9157 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;)V ARG 1 player ARG 2 strongholdPos diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 846d512d6e..7addadf55b 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCriterion FIELD field_9773 ID Lnet/minecraft/class_2960; + METHOD method_22541 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2148$class_2150;)Z + ARG 1 conditions METHOD method_9165 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index 51de5a2700..974c9cfab0 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTradeCriterion FIELD field_9762 ID Lnet/minecraft/class_2960; + METHOD method_22539 (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;Lnet/minecraft/class_2140$class_2142;)Z + ARG 2 conditions METHOD method_9146 handle (Lnet/minecraft/class_3222;Lnet/minecraft/class_3988;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 merchant