diff --git a/mappings/ju.mapping b/mappings/ju.mapping deleted file mode 100644 index 509223b6bd..0000000000 --- a/mappings/ju.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS ju - METHOD a readPacket (Lgb;)V - ARG 0 buf - METHOD a applyPacket (Lge;)V - METHOD a applyPacket (Lgy;)V - METHOD b writePacket (Lgb;)V - ARG 0 buf diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index cac90ee62b..cf1ebe4b02 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -8,6 +8,7 @@ CLASS r net/minecraft/advancement/AdvancementDisplay ARG 1 title ARG 2 background ARG 3 frame + METHOD a getTitle ()Lgk; METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lr; ARG 0 obj ARG 1 context diff --git a/mappings/net/minecraft/advancement/AdvancementProgress.mapping b/mappings/net/minecraft/advancement/AdvancementProgress.mapping new file mode 100644 index 0000000000..b6c7f483e8 --- /dev/null +++ b/mappings/net/minecraft/advancement/AdvancementProgress.mapping @@ -0,0 +1,30 @@ +CLASS k net/minecraft/advancement/AdvancementProgress + CLASS k$a Serializer + METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lk; + ARG 0 el + ARG 1 type + ARG 2 context + METHOD a serialize (Lk;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; + ARG 0 obj + ARG 1 type + ARG 2 context + FIELD a criteriaProgresses Ljava/util/Map; + FIELD b requirements [[Ljava/lang/String; + METHOD a isDone ()Z + METHOD a serialize (Lgb;)V + ARG 0 buf + METHOD a obtain (Ljava/lang/String;)Z + ARG 0 id + METHOD a (Ljava/util/Map;[[Ljava/lang/String;)V + ARG 0 criteria + ARG 1 requirements + METHOD b isAnyObtained ()Z + METHOD b deserialize (Lgb;)Lk; + ARG 0 buf + METHOD b reset (Ljava/lang/String;)Z + ARG 0 id + METHOD c ()F + METHOD c getCriterionProgress (Ljava/lang/String;)Lo; + ARG 0 id + METHOD d getAllUnobtained ()Ljava/lang/Iterable; + METHOD e getAllObtained ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementManager.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementManager.mapping new file mode 100644 index 0000000000..7b22eb1b50 --- /dev/null +++ b/mappings/net/minecraft/advancement/PlayerAdvancementManager.mapping @@ -0,0 +1,31 @@ +CLASS mn net/minecraft/advancement/PlayerAdvancementManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b GSON Lcom/google/gson/Gson; + FIELD c PROGRESSES_TYPE Lcom/google/gson/reflect/TypeToken; + FIELD d server Lnet/minecraft/server/MinecraftServer; + FIELD e file Ljava/io/File; + FIELD f progresses Ljava/util/Map; + FIELD j player Lnn; + METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;Lnn;)V + ARG 0 server + ARG 1 file + ARG 2 player + METHOD a clearAllTriggers ()V + METHOD a getProgress (Li;)Lk; + ARG 0 advancement + METHOD a apply (Li;Ljava/lang/String;)Z + ARG 0 advancement + ARG 1 id + METHOD a setProgress (Li;Lk;)V + ARG 0 advancement + ARG 1 progress + METHOD a setPlayer (Lnn;)V + ARG 0 player + METHOD b saveToFile ()V + METHOD b complete (Li;)V + ARG 0 advancement + METHOD b sync (Lnn;)V + ARG 0 player + METHOD d isDone (Li;)Z + ARG 0 advancement + METHOD f loadFromFile ()V diff --git a/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping new file mode 100644 index 0000000000..0fb8eb8652 --- /dev/null +++ b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping @@ -0,0 +1,9 @@ +CLASS mq net/minecraft/advancement/ServerAdvancementManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b GSON Lcom/google/gson/Gson; + FIELD d file Ljava/io/File; + METHOD (Ljava/io/File;)V + ARG 0 file + METHOD a getById (Lmd;)Li; + ARG 0 id + METHOD b getAdvancements ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/advancement/SimpleAdvancement.mapping b/mappings/net/minecraft/advancement/SimpleAdvancement.mapping index 8c749b584d..c8d2a6baff 100644 --- a/mappings/net/minecraft/advancement/SimpleAdvancement.mapping +++ b/mappings/net/minecraft/advancement/SimpleAdvancement.mapping @@ -1,10 +1,28 @@ CLASS i net/minecraft/advancement/SimpleAdvancement CLASS i$a AdvancementTask FIELD a parent Lmd; + FIELD b parentAdvancement Li; FIELD c display Lr; FIELD d rewards Ll; FIELD e criteria Ljava/util/Map; FIELD f requirements [[Ljava/lang/String; + METHOD (Lmd;Lr;Ll;Ljava/util/Map;[[Ljava/lang/String;)V + ARG 0 parent + ARG 1 display + ARG 2 rewards + ARG 3 criteria + ARG 4 requirements + METHOD a (Lcom/google/common/base/Function;)Z + ARG 0 getter + METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Li$a; + ARG 0 obj + ARG 1 context + METHOD a serialize (Lgb;)V + ARG 0 buf + METHOD a createAdvancement (Lmd;)Li; + ARG 0 id + METHOD b deserialize (Lgb;)Li$a; + ARG 0 buf FIELD a parent Li; FIELD b display Lr; FIELD c rewards Ll; @@ -23,7 +41,11 @@ CLASS i net/minecraft/advancement/SimpleAdvancement METHOD a addChild (Li;)V ARG 0 child METHOD b getParent ()Li; + METHOD c getDisplay ()Lr; + METHOD d getRewards ()Ll; METHOD e getChildren ()Ljava/lang/Iterable; METHOD equals (Ljava/lang/Object;)Z ARG 0 other + METHOD f getCriteria ()Ljava/util/Map; METHOD g getId ()Lmd; + METHOD h getRequirements ()[[Ljava/lang/String; diff --git a/mappings/net/minecraft/advancement/criterion/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AdvancementCriterion.mapping index 821cb36787..8d34c7f3f4 100644 --- a/mappings/net/minecraft/advancement/criterion/AdvancementCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AdvancementCriterion.mapping @@ -2,15 +2,19 @@ CLASS n net/minecraft/advancement/criterion/AdvancementCriterion FIELD a conditions Lq; METHOD (Lq;)V ARG 0 conditions - METHOD a (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ln; + METHOD a getConditions ()Lq; + METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ln; ARG 0 obj ARG 1 context - METHOD a (Lgb;)V + METHOD a serialize (Lgb;)V ARG 0 buf - METHOD a (Ljava/util/Map;Lgb;)V + METHOD a serialize (Ljava/util/Map;Lgb;)V + ARG 0 criteria ARG 1 buf - METHOD b (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/util/Map; + METHOD b deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/util/Map; ARG 0 obj ARG 1 context - METHOD c (Lgb;)Ljava/util/Map; + METHOD b createNew (Lgb;)Ln; + ARG 0 buf + METHOD c deserialize (Lgb;)Ljava/util/Map; ARG 0 buf diff --git a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping new file mode 100644 index 0000000000..416ab86a9a --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping @@ -0,0 +1,18 @@ +CLASS o net/minecraft/advancement/criterion/CriterionProgress + FIELD a FORMAT Ljava/text/SimpleDateFormat; + FIELD b advancement Lk; + FIELD c obtained Ljava/util/Date; + METHOD (Lk;)V + ARG 0 advancement + METHOD a isObtained ()Z + METHOD a serialize (Lgb;)V + ARG 0 buf + METHOD a deserialize (Lgb;Lk;)Lo; + ARG 0 buf + ARG 1 advancement + METHOD a create (Lk;Ljava/lang/String;)Lo; + ARG 0 advancement + ARG 1 date + METHOD b obtain ()V + METHOD c reset ()V + METHOD e serialize ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping index 1510d11c48..fbf3f6e030 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping @@ -1,5 +1,22 @@ CLASS p net/minecraft/advancement/criterion/CriterionTrigger + CLASS p$a ConditionsContainer + FIELD a conditions Lq; + FIELD b advancement Li; + FIELD c id Ljava/lang/String; + METHOD a getConditions ()Lq; + METHOD a apply (Lmn;)V + ARG 0 manager + METHOD equals (Ljava/lang/Object;)Z + ARG 0 other METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping b/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping index 832de998bb..b31d723696 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping @@ -1,4 +1,18 @@ CLASS v net/minecraft/advancement/criterion/TriggerBredAnimals + CLASS v$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD a handle (Lyp;Lyp;Lty;)V + ARG 0 parent1 + ARG 1 parent2 + ARG 2 child + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS v$b Conditions FIELD a parents [Lac; FIELD b child Lac; @@ -10,10 +24,24 @@ CLASS v net/minecraft/advancement/criterion/TriggerBredAnimals ARG 1 parent2 ARG 2 child FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Lyp;Lyp;Lty;)V + ARG 0 player + ARG 1 parent1 + ARG 2 parent2 + ARG 3 child METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping b/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping index 48498743ab..3a51bf696b 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping @@ -1,4 +1,16 @@ CLASS w net/minecraft/advancement/criterion/TriggerBrewedPotion + CLASS w$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Laiv;)V + ARG 0 potion + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS w$b Conditions FIELD a potion Laiv; METHOD (Laiv;)V @@ -6,10 +18,22 @@ CLASS w net/minecraft/advancement/criterion/TriggerBrewedPotion METHOD a matches (Laiv;)Z ARG 0 potion FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Laiv;)V + ARG 0 player + ARG 1 potion METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lw$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping b/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping index c8741ea21f..d9f39dfaaf 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping @@ -1,4 +1,16 @@ CLASS x net/minecraft/advancement/criterion/TriggerConstructBeacon + CLASS x$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Latt;)V + ARG 0 beacon + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS x$b Conditions FIELD a level Lah; METHOD (Lah;)V @@ -6,10 +18,22 @@ CLASS x net/minecraft/advancement/criterion/TriggerConstructBeacon METHOD a matches (Latt;)Z ARG 0 beacon FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Latt;)V + ARG 0 player + ARG 1 beacon METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lx$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping b/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping index 97c1608ae1..a85a7e3fad 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping @@ -1,4 +1,17 @@ CLASS z net/minecraft/advancement/criterion/TriggerEnchantedItem + CLASS z$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Lahf;I)V + ARG 0 stack + ARG 1 level + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS z$b Conditions FIELD a item Laf; FIELD b levels Lah; @@ -9,10 +22,23 @@ CLASS z net/minecraft/advancement/criterion/TriggerEnchantedItem ARG 0 stack ARG 1 level FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Lahf;I)V + ARG 0 player + ARG 1 stack + ARG 2 level METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lz$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping b/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping index aec6ad13f1..6d3975dd98 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping @@ -1,10 +1,38 @@ CLASS ab net/minecraft/advancement/criterion/TriggerEnterBlock + CLASS ab$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Lave;)V + ARG 0 state + METHOD a addConditon (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS ab$b Conditions + FIELD a block Lank; + FIELD b properties Ljava/util/Map; + METHOD (Lank;Ljava/util/Map;)V + ARG 0 block + ARG 1 properties + METHOD a test (Lave;)Z + ARG 0 state FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lab$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerImpossible.mapping b/mappings/net/minecraft/advancement/criterion/TriggerImpossible.mapping index 019f8be735..e702557143 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerImpossible.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerImpossible.mapping @@ -1,9 +1,18 @@ CLASS ad net/minecraft/advancement/criterion/TriggerImpossible + CLASS ad$a Conditions FIELD a ID Lmd; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lad$a; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping b/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping index 915848925f..c7d9471306 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping @@ -1,4 +1,16 @@ CLASS ae net/minecraft/advancement/criterion/TriggerInventoryChanged + CLASS ae$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Lact;)V + ARG 0 inv + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS ae$b Conditions FIELD a occupied Lah; FIELD b full Lah; @@ -12,10 +24,22 @@ CLASS ae net/minecraft/advancement/criterion/TriggerInventoryChanged METHOD a matches (Lact;)Z ARG 0 inv FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Lact;)V + ARG 0 player + ARG 1 inv METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lae$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerLocation.mapping b/mappings/net/minecraft/advancement/criterion/TriggerLocation.mapping index 07d107c0a9..72bd75df55 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerLocation.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerLocation.mapping @@ -1,4 +1,17 @@ CLASS ag net/minecraft/advancement/criterion/TriggerLocation + CLASS ag$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Ldx;Lalv;)V + ARG 0 pos + ARG 1 biome + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS ag$b Conditions FIELD a x Lah; FIELD b y Lah; @@ -13,10 +26,21 @@ CLASS ag net/minecraft/advancement/criterion/TriggerLocation ARG 0 pos ARG 1 biome FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;)V + ARG 0 player METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lag$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerPlayerDamaged.mapping b/mappings/net/minecraft/advancement/criterion/TriggerPlayerDamaged.mapping index 70e13fbf8a..192e52089c 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerPlayerDamaged.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerPlayerDamaged.mapping @@ -1,4 +1,18 @@ CLASS ai net/minecraft/advancement/criterion/TriggerPlayerDamaged + CLASS ai$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (Lnn;Ltm;FFZ)V + ARG 0 player + ARG 1 source + ARG 2 dealt + ARG 3 taken + ARG 4 blocked + METHOD a addCondition (Lp$a;)V + METHOD b removeCondition (Lp$a;)V CLASS ai$b Conditions FIELD a damage Ly; METHOD (Ly;)V @@ -10,10 +24,25 @@ CLASS ai net/minecraft/advancement/criterion/TriggerPlayerDamaged ARG 3 taken ARG 4 blocked FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Ltm;FFZ)V + ARG 0 player + ARG 1 source + ARG 2 dealt + ARG 3 taken + ARG 4 blocked METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lai$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerPlayerKilledEntity.mapping b/mappings/net/minecraft/advancement/criterion/TriggerPlayerKilledEntity.mapping index cfc666e064..10db8b2bca 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerPlayerKilledEntity.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerPlayerKilledEntity.mapping @@ -1,4 +1,16 @@ CLASS aj net/minecraft/advancement/criterion/TriggerPlayerKilledEntity + CLASS aj$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD a handle (Luk;)V + ARG 0 entity + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS aj$b Conditions FIELD a entity Lac; METHOD (Lac;)V @@ -6,10 +18,22 @@ CLASS aj net/minecraft/advancement/criterion/TriggerPlayerKilledEntity METHOD a matches (Luk;)Z ARG 0 entity FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Luk;)V + ARG 0 player + ARG 1 entity METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Laj$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping b/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping index ad1b4bb1bd..2e4b48318e 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping @@ -1,13 +1,37 @@ CLASS ak net/minecraft/advancement/criterion/TriggerRecipeUnlocked + CLASS ak$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manage + METHOD a isEmpty ()Z + METHOD a handle (Lmd;)V + ARG 0 id + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS ak$b Conditions FIELD a recipe Lmd; METHOD a matches (Lmd;)Z ARG 0 recipe FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Lmd;)V + ARG 0 player + ARG 1 id METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lak$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping b/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping index 7f92786a93..b09670b8e2 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping @@ -1,4 +1,16 @@ CLASS al net/minecraft/advancement/criterion/TriggerSummonedEntity + CLASS al$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD a handle (Lub;)V + ARG 0 entity + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS al$b Conditions FIELD a entity Lac; METHOD (Lac;)V @@ -6,10 +18,22 @@ CLASS al net/minecraft/advancement/criterion/TriggerSummonedEntity METHOD a matches (Lub;)Z ARG 0 entity FIELD a ID Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Lub;)V + ARG 0 player + ARG 1 entity METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lal$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/advancement/criterion/TriggerUsedEnderEye.mapping b/mappings/net/minecraft/advancement/criterion/TriggerUsedEnderEye.mapping index ada572dab8..779134bf86 100644 --- a/mappings/net/minecraft/advancement/criterion/TriggerUsedEnderEye.mapping +++ b/mappings/net/minecraft/advancement/criterion/TriggerUsedEnderEye.mapping @@ -1,4 +1,16 @@ CLASS am net/minecraft/advancement/criterion/TriggerUsedEnderEye + CLASS am$a Handler + FIELD a manager Lmn; + FIELD b conditions Ljava/util/Set; + METHOD (Lmn;)V + ARG 0 manager + METHOD a isEmpty ()Z + METHOD a handle (D)V + ARG 0 distance + METHOD a addCondition (Lp$a;)V + ARG 0 condition + METHOD b removeCondition (Lp$a;)V + ARG 0 condition CLASS am$b Conditions FIELD a distance Lah; METHOD (Lah;)V @@ -6,10 +18,22 @@ CLASS am net/minecraft/advancement/criterion/TriggerUsedEnderEye METHOD a matches (D)Z ARG 0 disatnce FIELD a id Lmd; + FIELD b handlers Ljava/util/Map; METHOD a getId ()Lmd; METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq; ARG 0 obj ARG 1 context + METHOD a removePlayer (Lmn;)V + ARG 0 manager + METHOD a addCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition + METHOD a handle (Lnn;Ldx;)V + ARG 0 player + ARG 1 dest METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lam$b; ARG 0 obj ARG 1 context + METHOD b removeCondition (Lmn;Lp$a;)V + ARG 0 manager + ARG 1 condition diff --git a/mappings/net/minecraft/client/gui/widget/WidgetAdvancementThing.mapping b/mappings/net/minecraft/client/gui/widget/WidgetAdvancement.mapping similarity index 73% rename from mappings/net/minecraft/client/gui/widget/WidgetAdvancementThing.mapping rename to mappings/net/minecraft/client/gui/widget/WidgetAdvancement.mapping index 98f2705dff..2ee4d7a116 100644 --- a/mappings/net/minecraft/client/gui/widget/WidgetAdvancementThing.mapping +++ b/mappings/net/minecraft/client/gui/widget/WidgetAdvancement.mapping @@ -1,13 +1,15 @@ -CLASS bkc net/minecraft/client/gui/widget/WidgetAdvancementThing +CLASS bkc net/minecraft/client/gui/widget/WidgetAdvancement FIELD a WIDGETS_TEX Lmd; FIELD f tree Lbka; FIELD g advancement Li; + FIELD h display Lr; FIELD k mc Lbgm; FIELD m children Ljava/util/List; METHOD (Lbka;Lbgm;Li;Lr;)V ARG 0 tree ARG 1 mc ARG 2 advancement + ARG 3 display METHOD a (II)V METHOD a getRootWidget (Li;)Lbkc; ARG 0 advancement diff --git a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping index 04f4094ee1..7cd824df0d 100644 --- a/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/client/network/handler/NetworkGameHandlerClient.mapping @@ -83,6 +83,7 @@ CLASS bqi net/minecraft/client/network/handler/NetworkGameHandlerClient METHOD a onPlayerListHeader (Ljr;)V METHOD a onItemPickupAnimation (Ljs;)V METHOD a onEntityTeleport (Ljt;)V + METHOD a onAdvancements (Lju;)V METHOD a onEntityAttributes (Ljv;)V METHOD a onEntityPotionEffect (Ljw;)V METHOD b validateResourcePackUrl (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping index fcf825917d..fae9812105 100644 --- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping +++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping @@ -5,6 +5,7 @@ CLASS nn net/minecraft/entity/player/EntityPlayerServer FIELD b server Lnet/minecraft/server/MinecraftServer; FIELD bU LOGGER Lorg/apache/logging/log4j/Logger; FIELD bV language Ljava/lang/String; + FIELD bX advancementManager Lmn; FIELD bY stats Lpk; FIELD bZ lastScoreHealth F FIELD c properties Lno; @@ -31,6 +32,7 @@ CLASS nn net/minecraft/entity/player/EntityPlayerServer METHOD G getCameraEntity ()Lub; METHOD H updatePortalCooldown ()V METHOD I getLastActionTime ()J + METHOD O getAdvancementManager ()Lmn; METHOD a hasPermission (ILjava/lang/String;)Z METHOD a shouldDamagePlayer (Lacu;)Z METHOD a respawn (Lacu;Z)V diff --git a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping index b518840cdc..5cb3631f27 100644 --- a/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping +++ b/mappings/net/minecraft/network/handler/INetworkGameHandlerClient.mapping @@ -71,5 +71,6 @@ CLASS gy net/minecraft/network/handler/INetworkGameHandlerClient METHOD a onPlayerListHeader (Ljr;)V METHOD a onItemPickupAnimation (Ljs;)V METHOD a onEntityTeleport (Ljt;)V + METHOD a onAdvancements (Lju;)V METHOD a onEntityAttributes (Ljv;)V METHOD a onEntityPotionEffect (Ljw;)V diff --git a/mappings/net/minecraft/network/packet/client/CPacketAdvancements.mapping b/mappings/net/minecraft/network/packet/client/CPacketAdvancements.mapping new file mode 100644 index 0000000000..ca3c359e5e --- /dev/null +++ b/mappings/net/minecraft/network/packet/client/CPacketAdvancements.mapping @@ -0,0 +1,15 @@ +CLASS ju net/minecraft/network/packet/client/CPacketAdvancements + FIELD b tasks Ljava/util/Map; + FIELD d progresses Ljava/util/Map; + METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V + ARG 1 tasks + ARG 3 progresses + METHOD a getTasks ()Ljava/util/Map; + METHOD a readPacket (Lgb;)V + ARG 0 buf + METHOD a applyPacket (Lge;)V + METHOD a applyPacket (Lgy;)V + ARG 0 handler + METHOD b writePacket (Lgb;)V + ARG 0 buf + METHOD c getProgresses ()Ljava/util/Map; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 1f8158ba51..597b23c7c8 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/server/MinecraftServer +CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer CLASS net/minecraft/server/MinecraftServer$1 METHOD a finish ()V METHOD a setProgress (I)V diff --git a/mappings/net/minecraft/util/PacketByteBuf.mapping b/mappings/net/minecraft/util/PacketByteBuf.mapping index 7567d2a6ba..50a4a6d4cf 100644 --- a/mappings/net/minecraft/util/PacketByteBuf.mapping +++ b/mappings/net/minecraft/util/PacketByteBuf.mapping @@ -9,6 +9,7 @@ CLASS gb net/minecraft/util/PacketByteBuf METHOD a readEnumConstant (Ljava/lang/Class;)Ljava/lang/Enum; METHOD a writeEnumConstant (Ljava/lang/Enum;)Lgb; METHOD a writeString (Ljava/lang/String;)Lgb; + METHOD a writeDate (Ljava/util/Date;)Lgb; METHOD a writeUUID (Ljava/util/UUID;)Lgb; METHOD a writeIdentifier (Lmd;)Lgb; ARG 0 id @@ -31,3 +32,4 @@ CLASS gb net/minecraft/util/PacketByteBuf METHOD j readTagCompound ()Lfc; METHOD k readItemStack ()Lahf; METHOD l readIdentifier ()Lmd; + METHOD m readDate ()Ljava/util/Date; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index fc957e1486..e8acb9d779 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -1,6 +1,7 @@ CLASS ali net/minecraft/world/World FIELD A villageManager Lyk; FIELD B lootTableHandler Lbeg; + FIELD C advancementManager Lmq; FIELD D profiler Lqi; FIELD E scoreboard Lbfv; FIELD F isRemote Z