From 6052a35a79bfb33a429fe259c5317c959fbf2957 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sat, 23 Jan 2021 04:39:37 +1100 Subject: [PATCH] advancement stuff (#1971) --- .../minecraft/advancement/Advancement.mapping | 3 +++ .../advancement/AdvancementPositioner.mapping | 2 ++ .../PlayerAdvancementTracker.mapping | 7 +++++++ .../criterion/BeeNestDestroyedCriterion.mapping | 2 ++ .../criterion/BredAnimalsCriterion.mapping | 17 +++++++++++++++++ .../criterion/ConstructBeaconCriterion.mapping | 2 ++ .../ItemDurabilityChangedCriterion.mapping | 7 +++++-- .../criterion/ItemUsedOnBlockCriterion.mapping | 3 +++ .../criterion/TargetHitCriterion.mapping | 1 + .../ThrownItemPickedUpByEntityCriterion.mapping | 5 +++++ 10 files changed, 47 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index dd73293bf0..a444dc2360 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -57,6 +57,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement 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; + ARG 2 id 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; @@ -78,10 +79,12 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement 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; + ARG 1 builder METHOD method_704 criteriaMerger (Lnet/minecraft/class_193;)Lnet/minecraft/class_161$class_162; ARG 1 merger METHOD method_705 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_161$class_162; ARG 1 name + ARG 2 criterion METHOD method_706 rewards (Lnet/minecraft/class_170;)Lnet/minecraft/class_161$class_162; ARG 1 rewards METHOD method_707 create ()Lnet/minecraft/class_161$class_162; diff --git a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping index 94414b74c8..46bbaa5575 100644 --- a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping +++ b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping @@ -26,9 +26,11 @@ CLASS net/minecraft/class_194 net/minecraft/advancement/AdvancementPositioner METHOD method_844 getLastChild ()Lnet/minecraft/class_194; METHOD method_845 getLast (Lnet/minecraft/class_194;Lnet/minecraft/class_194;)Lnet/minecraft/class_194; METHOD method_846 findChildrenRecursively (Lnet/minecraft/class_161;Lnet/minecraft/class_194;)Lnet/minecraft/class_194; + ARG 1 advancement ARG 2 lastChild METHOD method_847 calculateRecursively ()V METHOD method_848 pushDown (Lnet/minecraft/class_194;F)V + ARG 1 positioner ARG 2 extraRowDistance METHOD method_849 getFirstChild ()Lnet/minecraft/class_194; METHOD method_850 onFinishChildrenCalculation ()V diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index 3a7dde8b86..e92e07b347 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -10,6 +10,13 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke FIELD field_13394 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13395 GSON Lcom/google/gson/Gson; FIELD field_13396 dirty Z + FIELD field_25324 dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD field_25325 playerManager Lnet/minecraft/class_3324; + 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 4 advancementFile + ARG 5 owner METHOD method_12872 rewardEmptyAdvancements (Lnet/minecraft/class_2989;)V ARG 1 advancementLoader METHOD method_12873 load (Lnet/minecraft/class_2989;)V diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index f3fe1dea45..fd2817911f 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 0 root METHOD method_23875 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)V ARG 1 player + ARG 2 state ARG 3 stack ARG 4 beeCount CLASS class_4709 Conditions @@ -18,6 +19,7 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 3 item ARG 4 beeCount METHOD method_23878 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)Z + ARG 1 state ARG 2 stack ARG 3 count METHOD method_23879 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4708$class_4709; diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index dd84c28dcc..01cfd8ddeb 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -1,10 +1,27 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCriterion FIELD field_1271 ID Lnet/minecraft/class_2960; 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 + ARG 3 partner + ARG 4 child CLASS class_198 Conditions FIELD field_1275 child Lnet/minecraft/class_2048$class_5258; FIELD field_1276 parent Lnet/minecraft/class_2048$class_5258; FIELD field_1277 partner 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;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 parent + ARG 3 partner + ARG 4 child + METHOD method_29918 create (Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)Lnet/minecraft/class_196$class_198; + ARG 0 parent + ARG 1 partner + ARG 2 child METHOD method_860 any ()Lnet/minecraft/class_196$class_198; METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_196$class_198; + ARG 0 child METHOD method_862 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z + ARG 1 parentContext + ARG 2 partnerContext + ARG 3 childContext diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index 12b1979e81..617c5fb068 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -2,11 +2,13 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac FIELD field_9504 ID Lnet/minecraft/class_2960; METHOD method_8812 trigger (Lnet/minecraft/class_3222;I)V ARG 1 player + ARG 2 level 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 (I)Z + ARG 1 level 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/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 4f7060bb0c..55e87320ed 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit METHOD method_8960 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V ARG 1 player ARG 2 stack - ARG 3 damage + ARG 3 durability CLASS class_2071 Conditions FIELD field_9637 item Lnet/minecraft/class_2073; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; @@ -14,6 +14,9 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 3 durability ARG 4 delta METHOD method_8967 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; + ARG 0 player + ARG 1 item + ARG 2 durability METHOD method_8968 matches (Lnet/minecraft/class_1799;I)Z ARG 1 stack - ARG 2 damage + ARG 2 durability diff --git a/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping index 3bb490aa5d..c1be57ad36 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlo FIELD field_21579 item Lnet/minecraft/class_2073; FIELD field_24495 location Lnet/minecraft/class_2090; METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V + ARG 1 player ARG 2 location ARG 3 item METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z @@ -18,3 +19,5 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlo ARG 3 pos ARG 4 stack METHOD method_27981 create (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; + ARG 0 location + ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index cf4e44d9e0..5fd29fe84d 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 3 projectile METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_4851$class_4852; ARG 0 signalStrength + ARG 1 projectile METHOD method_24952 test (Lnet/minecraft/class_47;Lnet/minecraft/class_243;I)Z ARG 1 projectileContext ARG 2 hitPos diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index c8b98cd5c8..cc714229d3 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -8,9 +8,14 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic FIELD field_24493 item Lnet/minecraft/class_2073; FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258; METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player ARG 2 item ARG 3 entity METHOD method_27978 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; + ARG 0 player + ARG 1 item + ARG 2 entity METHOD method_27979 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z ARG 1 player ARG 2 stack + ARG 3 entityContext