map advancement-related code

This commit is contained in:
Adrian Siekierka 2018-10-27 13:07:57 +02:00
parent 1b13674f8a
commit 5b0775c0db
34 changed files with 187 additions and 3 deletions

View File

@ -10,7 +10,8 @@ The current version targets Minecraft version **18w43c**.
Please remember that copying and pasting mappings from alternate projects under more restrictive licenses (such as MCP) is **completely forbidden** without explicit permission from the
owners of said mappings. It is also good to consult name changes with other people - use pull requests or our IRC (#fabric @ irc.esper.net) to ask questions!
WIP mapping guidelines are available [here](https://docs.google.com/document/d/15fHL-WgK0uMPAy-WJbQtxrfOVLJNlfasjsnt_wruOXA/edit). Feel free to contribute.
Outdated mapping guidelines are available [here](https://docs.google.com/document/d/15fHL-WgK0uMPAy-WJbQtxrfOVLJNlfasjsnt_wruOXA/edit).
New ones should probably be made.
### Getting Started
1. Fork and clone the repo

6
mappings/ag.mapping Normal file
View File

@ -0,0 +1,6 @@
CLASS ag
FIELD b dealt Lbc$c;
FIELD c taken Lbc$c;
FIELD d sourceEntity Lap;
FIELD e blocked Ljava/lang/Boolean;
FIELD f type Lah;

11
mappings/bd.mapping Normal file
View File

@ -0,0 +1,11 @@
CLASS bd
CLASS bd$a
FIELD a amplifier Lbc$d;
FIELD b duration Lbc$d;
FIELD c ambient Ljava/lang/Boolean;
FIELD d visible Ljava/lang/Boolean;
FIELD a EMPTY Lbd;
METHOD a create ()Lbd;
METHOD a matches (Lafh;)Z
METHOD a matches (Lafq;)Z
METHOD a matches (Ljava/util/Map;)Z

View File

@ -1,8 +1,12 @@
CLASS u net/minecraft/advancement/AdvancementDisplay
FIELD a title Liw;
FIELD b description Liw;
FIELD c icon Lauc;
FIELD d background Lpt;
FIELD e frame Lv;
FIELD f showToast Z
FIELD g announceToChat Z
FIELD h hidden Z
METHOD <init> (Lauc;Liw;Liw;Lpt;Lv;ZZZ)V
ARG 2 title
ARG 3 background
@ -13,8 +17,12 @@ CLASS u net/minecraft/advancement/AdvancementDisplay
ARG 1 context
METHOD a writeToBuffer (Lim;)V
ARG 0 buf
METHOD b getDescription ()Liw;
METHOD b readFromBuffer (Lim;)Lu;
ARG 0 buf
METHOD c getIcon ()Lauc;
METHOD d getBackground ()Lpt;
METHOD e getFrame ()Lv;
METHOD h shouldShowToast ()Z
METHOD i shouldAnnounceToChat ()Z
METHOD j isHidden ()Z

View File

@ -1,11 +1,14 @@
CLASS v net/minecraft/advancement/AdvancementFrame
FIELD a TASK Lv;
FIELD b CHALLENGE Lv;
FIELD c GOAL Lv;
FIELD d id Ljava/lang/String;
FIELD e texV I
FIELD f titleFormat La;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;ILa;)V
ARG 0 id
ARG 1 texV
METHOD a forName (Ljava/lang/String;)Lv;
ARG 0 name
METHOD b texV ()I
METHOD c getTitleFormat ()La;

View File

@ -1,4 +1,6 @@
CLASS o net/minecraft/advancement/AdvancementRewards
CLASS o$a Builder
METHOD a build ()Lo;
CLASS o$b Deserializer
METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lo;
ARG 0 el

View File

@ -1,6 +1,11 @@
CLASS m net/minecraft/advancement/ClientAdvancementManager
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b advancements Ljava/util/Map;
METHOD a clear ()V
METHOD a removeAll (Ljava/util/Set;)V
ARG 0 set
METHOD a remove (Ll;)V
ARG 0 advancement
METHOD a getById (Lpt;)Ll;
ARG 0 id
METHOD c getAdvancements ()Ljava/util/Collection;

View File

@ -0,0 +1,8 @@
CLASS qd net/minecraft/advancement/ServerAdvancementManager
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
FIELD b GSON Lcom/google/gson/Gson;
FIELD c JSON_TYPE Lcom/google/gson/reflect/TypeToken;
FIELD d server Lnet/minecraft/server/MinecraftServer;
FIELD e advancementFile Ljava/io/File;
METHOD c save ()V
METHOD g load ()V

View File

@ -1,12 +1,33 @@
CLASS l net/minecraft/advancement/SimpleAdvancement
CLASS l$a AdvancementTask
CLASS l$a Builder
FIELD a parentId Lpt;
FIELD b parentObj Ll;
FIELD c display Lu;
FIELD d rewards Lo;
FIELD e criteria Ljava/util/Map;
FIELD f requirements [[Ljava/lang/String;
METHOD a create ()Ll$a;
METHOD a display (Layz;Liw;Liw;Lpt;Lv;ZZZ)Ll$a;
METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ll$a;
ARG 0 obj
ARG 1 context
METHOD a serialize (Lim;)V
ARG 0 buf
METHOD a criterion (Ljava/lang/String;Lq;)Ll$a;
ARG 0 id
ARG 1 criterion
METHOD a criterion (Ljava/lang/String;Lt;)Ll$a;
ARG 0 id
ARG 1 conditions
METHOD a parent (Ll;)Ll$a;
METHOD a (Lo$a;)Ll$a;
METHOD a rewards (Lo;)Ll$a;
METHOD a parent (Lpt;)Ll$a;
METHOD a display (Lu;)Ll$a;
METHOD b deserialize (Lim;)Ll$a;
ARG 0 buf
METHOD b build (Lpt;)Ll;
ARG 0 id
FIELD a parent Ll;
FIELD b display Lu;
FIELD c rewards Lo;
@ -14,6 +35,7 @@ CLASS l net/minecraft/advancement/SimpleAdvancement
FIELD e criteria Ljava/util/Map;
FIELD f requirements [[Ljava/lang/String;
FIELD g children Ljava/util/Set;
FIELD h textComponent Liw;
METHOD a createTask ()Ll$a;
METHOD a addChild (Ll;)V
ARG 0 child
@ -24,5 +46,7 @@ CLASS l net/minecraft/advancement/SimpleAdvancement
METHOD equals (Ljava/lang/Object;)Z
ARG 0 other
METHOD f getCriteria ()Ljava/util/Map;
METHOD g getRequirementCount ()I
METHOD h getId ()Lpt;
METHOD i getRequirements ()[[Ljava/lang/String;
METHOD j getTextComponent ()Liw;

View File

@ -8,4 +8,5 @@ CLASS r net/minecraft/advancement/criterion/CriterionProgress
METHOD b obtain ()V
METHOD b deserialize (Lim;)Lr;
METHOD c reset ()V
METHOD d getObtainedDate ()Ljava/util/Date;
METHOD e serialize ()Lcom/google/gson/JsonElement;

View File

@ -13,6 +13,12 @@ CLASS z net/minecraft/advancement/criterion/TriggerBredAnimals
ARG 3 child
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS z$b Conditions
FIELD a parent Lap;
FIELD b partner Lap;
FIELD c child Lap;
METHOD a matches (Lub;Lakh;Lakh;Lafe;)Z
METHOD c any ()Lz$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,10 @@ CLASS aa net/minecraft/advancement/criterion/TriggerBrewedPotion
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS aa$b Conditions
FIELD a potion Lavt;
METHOD a matches (Lavt;)Z
METHOD c any ()Laa$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -10,6 +10,11 @@ CLASS ab net/minecraft/advancement/criterion/TriggerChangedDimension
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS ab$b Conditions
FIELD a from Lbpb;
FIELD b to Lbpb;
METHOD a to (Lbpb;)Lab$b;
METHOD b matches (Lbpb;Lbpb;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,10 @@ CLASS ad net/minecraft/advancement/criterion/TriggerConstructBeacon
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS ad$b Conditions
FIELD a level Lbc$d;
METHOD a level (Lbc$d;)Lad$b;
METHOD a matches (Lbkd;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -10,6 +10,11 @@ CLASS ae net/minecraft/advancement/criterion/TriggerConsumeItem
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS ae$b Conditions
FIELD a item Law;
METHOD a matches (Lauc;)Z
METHOD a item (Layz;)Lae$b;
METHOD c any ()Lae$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -10,6 +10,11 @@ CLASS af net/minecraft/advancement/criterion/TriggerCuredZombieVillager
METHOD a handle (Lub;Laor;Laow;)V
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS af$b Conditions
FIELD a zombie Lap;
FIELD b villager Lap;
METHOD a matches (Lub;Laor;Laow;)Z
METHOD c any ()Laf$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,9 @@ CLASS aj net/minecraft/advancement/criterion/TriggerEffectsChanged
ARG 0 player
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS aj$b Conditions
FIELD a effects Lbd;
METHOD a matches (Lub;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -12,6 +12,11 @@ CLASS ak net/minecraft/advancement/criterion/TriggerEnchantedItem
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS ak$b Conditions
FIELD a item Law;
FIELD b levels Lbc$d;
METHOD a matches (Lauc;I)Z
METHOD c any ()Lak$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,11 @@ CLASS am net/minecraft/advancement/criterion/TriggerEnterBlock
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS am$b Conditions
FIELD a block Lbdx;
FIELD b state Ljava/util/Map;
METHOD a block (Lbdx;)Lam$b;
METHOD a matches (Lblz;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -13,6 +13,9 @@ CLASS ao net/minecraft/advancement/criterion/TriggerEntityHurtPlayer
ARG 3 taken
ARG 4 blocked
METHOD b removeCondition (Ls$a;)V
CLASS ao$b Conditions
FIELD a damage Lag;
METHOD a matches (Lub;Laeq;FFZ)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,14 @@ CLASS au net/minecraft/advancement/criterion/TriggerInventoryChanged
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS au$b Conditions
FIELD a occupied Lbc$d;
FIELD b full Lbc$d;
FIELD c empty Lbc$d;
FIELD d items [Law;
METHOD a matches (Lapa;)Z
METHOD a items ([Law;)Lau$b;
METHOD a items ([Layz;)Lau$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,11 @@ CLASS av net/minecraft/advancement/criterion/TriggerItemDurabilityChanged
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS av$b Conditions
FIELD a item Law;
FIELD b durability Lbc$d;
FIELD c delta Lbc$d;
METHOD a matches (Lauc;I)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -13,6 +13,10 @@ CLASS az net/minecraft/advancement/criterion/TriggerLevitation
ARG 2 duration
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS az$b Conditions
FIELD a distance Lai;
FIELD b duration Lbc$d;
METHOD a matches (Lub;Lchd;I)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -14,6 +14,9 @@ CLASS bb net/minecraft/advancement/criterion/TriggerLocationArrival
ARG 3 z
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bb$b Conditions
FIELD a location Lba;
METHOD a matches (Ltz;DDD)Z
FIELD a id Lpt;
FIELD b handlers Ljava/util/Map;
METHOD <init> (Lpt;)V

View File

@ -15,6 +15,12 @@ CLASS bf net/minecraft/advancement/criterion/TriggerNetherTravel
ARG 4 exitedZ
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bf$b Conditions
FIELD a entered Lba;
FIELD b exited Lba;
FIELD c distance Lai;
METHOD a distance (Lai;)Lbf$b;
METHOD a matches (Ltz;Lchd;DDD)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -1,4 +1,7 @@
CLASS ay net/minecraft/advancement/criterion/TriggerOnKilled
CLASS ay$a
FIELD a entity Lap;
FIELD b killingBlow Lah;
CLASS ay$b Handler
FIELD a manager Lqd;
FIELD b conditions Ljava/util/Set;
@ -11,6 +14,9 @@ CLASS ay net/minecraft/advancement/criterion/TriggerOnKilled
ARG 0 player
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS ay$c
FIELD a entity Lap;
FIELD b killingBlow Lah;
FIELD a handlers Ljava/util/Map;
FIELD b id Lpt;
METHOD <init> (Lpt;)V

View File

@ -14,6 +14,14 @@ CLASS bg net/minecraft/advancement/criterion/TriggerPlacedBlock
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bg$b Conditions
FIELD a block Lbdx;
FIELD b state Ljava/util/Map;
FIELD c location Lba;
FIELD d item Law;
METHOD a block (Lbdx;)Lbg$b;
ARG 0 block
METHOD a matches (Lblz;Leq;Ltz;Lauc;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -12,6 +12,10 @@ CLASS bh net/minecraft/advancement/criterion/TriggerPlayerHurtEntity
ARG 1 entity
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bh$b Conditions
FIELD a damage Lag;
FIELD b entity Lap;
METHOD a matches (Lub;Lafh;Laeq;FFZ)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -10,9 +10,12 @@ CLASS bi net/minecraft/advancement/criterion/TriggerRecipeUnlocked
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bi$b
CLASS bi$b Conditions
FIELD a recipe Lpt;
METHOD <init> (Lpt;)V
ARG 0 id
METHOD a matches (Lawi;)Z
ARG 0 recipe
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -10,6 +10,9 @@ CLASS bk net/minecraft/advancement/criterion/TriggerSummonedEntity
METHOD a handle (Lub;Lafh;)V
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bk$b Conditions
FIELD a entity Lap;
METHOD a matches (Lub;Lafh;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -12,6 +12,10 @@ CLASS bl net/minecraft/advancement/criterion/TriggerTameAnimal
ARG 1 entity
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bl$b Conditions
FIELD a entity Lap;
METHOD a matches (Lub;Lakh;)Z
METHOD c any ()Lbl$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -11,6 +11,9 @@ CLASS bp net/minecraft/advancement/criterion/TriggerUsedTotem
ARG 0 condition
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bp$b Conditions
FIELD a item Law;
METHOD a matches (Lauc;)Z
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -13,6 +13,11 @@ CLASS bn net/minecraft/advancement/criterion/TriggerVillagerTrade
ARG 2 item
METHOD b removeCondition (Ls$a;)V
ARG 0 condition
CLASS bn$b Conditions
FIELD a item Lap;
FIELD b villager Law;
METHOD a matches (Lub;Laow;Lauc;)Z
METHOD c any ()Lbn$b;
FIELD a ID Lpt;
FIELD b handlers Ljava/util/Map;
METHOD a getId ()Lpt;

View File

@ -1,3 +1,11 @@
CLASS ap net/minecraft/util/EntityPredicate
FIELD a ANY Lap;
FIELD b EMPTY [Lap;
FIELD c type Laq;
FIELD d distance Lai;
FIELD e location Lba;
FIELD f effects Lbd;
FIELD g nbt Lbe;
FIELD h flags Lan;
METHOD a deserialize (Lcom/google/gson/JsonElement;)Lap;
ARG 0 el