Some advancement mappings (#378)

mappings/net/minecraft/advancement/AdvancementCriterion.mapping

@@ -8,10 +8,11 @@ CLASS s net/minecraft/advancement/AdvancementCriterion
 	METHOD a serialize (Ljava/util/Map;Lit;)V
 		ARG 0 criteria
 		ARG 1 buf
-	METHOD b deserializeCriteria (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/util/Map;
+	METHOD b toJson ()Lcom/google/gson/JsonElement;
+	METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/util/Map;
 		ARG 0 obj
 		ARG 1 context
 	METHOD b createNew (Lit;)Ls;
 		ARG 0 buf
-	METHOD c deserialize (Lit;)Ljava/util/Map;
+	METHOD c fromPacket (Lit;)Ljava/util/Map;
 		ARG 0 buf

mappings/net/minecraft/advancement/AdvancementDisplay.mapping

@@ -19,9 +19,9 @@ CLASS w net/minecraft/advancement/AdvancementDisplay
 	METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lw;
 		ARG 0 obj
 		ARG 1 context
-	METHOD a writeToBuffer (Lit;)V
+	METHOD a toPacket (Lit;)V
 	METHOD b getDescription ()Ljd;
-	METHOD b readFromBuffer (Lit;)Lw;
+	METHOD b fromPacket (Lit;)Lw;
 		ARG 0 buf
 	METHOD c getIcon ()Lawo;
 	METHOD d getBackground ()Lqc;
@@ -32,3 +32,4 @@ CLASS w net/minecraft/advancement/AdvancementDisplay
 	METHOD i shouldAnnounceToChat ()Z
 	METHOD j isHidden ()Z
 	METHOD k toJson ()Lcom/google/gson/JsonElement;
+	METHOD l iconToJson ()Lcom/google/gson/JsonObject;

mappings/net/minecraft/advancement/AdvancementManager.mapping

@@ -1,8 +1,20 @@
 CLASS o net/minecraft/advancement/AdvancementManager
+	CLASS o$a Listener
+		METHOD a onClear ()V
+		METHOD a onRootAdded (Ln;)V
+		METHOD b onRootRemoved (Ln;)V
+		METHOD c onDependentAdded (Ln;)V
+		METHOD d onDependentRemoved (Ln;)V
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b advancements Ljava/util/Map;
+	FIELD c roots Ljava/util/Set;
+	FIELD d dependents Ljava/util/Set;
+	FIELD e listener Lo$a;
 	METHOD a clear ()V
+	METHOD a load (Ljava/util/Map;)V
 	METHOD a removeAll (Ljava/util/Set;)V
 	METHOD a remove (Ln;)V
+	METHOD a setListener (Lo$a;)V
 	METHOD a get (Lqc;)Ln;
+	METHOD b getRoots ()Ljava/lang/Iterable;
 	METHOD c getAdvancements ()Ljava/util/Collection;

mappings/net/minecraft/advancement/AdvancementPosition.mapping

@@ -0,0 +1,32 @@
+CLASS z net/minecraft/advancement/AdvancementPosition
+	FIELD a advancement Ln;
+	FIELD b parent Lz;
+	FIELD c previousSibling Lz;
+	FIELD d childrenSize I
+	FIELD e children Ljava/util/List;
+	FIELD f optionalLast Lz;
+	FIELD g substituteChild Lz;
+	FIELD h depth I
+	FIELD i row F
+	FIELD j relativeRowInSiblings F
+	METHOD a initRecursively ()V
+		ARG 2 rowAverage
+	METHOD a increaseRow (F)V
+		ARG 1 deltaRow
+	METHOD a positMinRow (FIF)F
+		ARG 1 deltaRow
+		ARG 2 depth
+		ARG 3 minRow
+	METHOD a arrangeForRoot (Ln;)V
+	METHOD a adjust (Ln;Lz;)Lz;
+		ARG 2 childPosition
+	METHOD a postInit (Lz;)Lz;
+		ARG 1 last
+		ARG 2 firstDescendent
+		ARG 3 lastDescendent
+		ARG 4 previousSiblingLastDescendent
+		ARG 5 parentFirstDescendent
+	METHOD a getLast (Lz;Lz;)Lz;
+	METHOD c getFirstChild ()Lz;
+	METHOD d getLastChild ()Lz;
+	METHOD e apply ()V

mappings/net/minecraft/advancement/AdvancementProgress.mapping

@@ -9,14 +9,19 @@ CLASS p net/minecraft/advancement/AdvancementProgress
 	FIELD a criteriaProgresses Ljava/util/Map;
 	FIELD b requirements [[Ljava/lang/String;
 	METHOD a isDone ()Z
-	METHOD a serialize (Lit;)V
+	METHOD a toPacket (Lit;)V
 	METHOD a obtain (Ljava/lang/String;)Z
-	METHOD a (Ljava/util/Map;[[Ljava/lang/String;)V
+	METHOD a init (Ljava/util/Map;[[Ljava/lang/String;)V
 		ARG 1 criteria
+	METHOD a compareDate (Lp;)I
 	METHOD b isAnyObtained ()Z
-	METHOD b deserialize (Lit;)Lp;
+	METHOD b fromPacket (Lit;)Lp;
 		ARG 0 buf
 	METHOD b reset (Ljava/lang/String;)Z
+	METHOD c getProgressBarPercentage ()F
 	METHOD c getCriterionProgress (Ljava/lang/String;)Lt;
-	METHOD e getAllUnobtained ()Ljava/lang/Iterable;
+	METHOD d getProgressBarFraction ()Ljava/lang/String;
-	METHOD f getAllObtained ()Ljava/lang/Iterable;
+	METHOD e getUnobtainedCriteria ()Ljava/lang/Iterable;
+	METHOD f getObtainedCriteria ()Ljava/lang/Iterable;
+	METHOD g getEarliestProgressObtainDate ()Ljava/util/Date;
+	METHOD h countObtainedRequirements ()I

mappings/net/minecraft/advancement/AdvancementRewards.mapping

@@ -1,6 +1,14 @@
 CLASS q net/minecraft/advancement/AdvancementRewards
 	CLASS q$a Builder
+		FIELD a experience I
+		FIELD b loot Ljava/util/List;
+		FIELD c recipes Ljava/util/List;
+		FIELD d function Lqc;
 		METHOD a build ()Lq;
+		METHOD a experience (I)Lq$a;
+		METHOD b setExperience (I)Lq$a;
+		METHOD c recipe (Lqc;)Lq$a;
+		METHOD d addRecipe (Lqc;)Lq$a;
 	CLASS q$b Deserializer
 		METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lq;
 			ARG 1 type
@@ -9,8 +17,10 @@ CLASS q net/minecraft/advancement/AdvancementRewards
 	FIELD b experience I
 	FIELD c loot [Lqc;
 	FIELD d recipes [Lqc;
+	FIELD e function Lbx$a;
 	METHOD <init> (I[Lqc;[Lqc;Lbx$a;)V
 		ARG 1 experience
 		ARG 2 loot
 		ARG 3 recipes
 	METHOD a apply (Lus;)V
+	METHOD b toJson ()Lcom/google/gson/JsonElement;

mappings/net/minecraft/advancement/CriteriaMerger.mapping

@@ -0,0 +1,3 @@
+CLASS y net/minecraft/advancement/CriteriaMerger
+	FIELD a AND Ly;
+	FIELD b OR Ly;

mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping

@@ -0,0 +1,34 @@
+CLASS qm net/minecraft/advancement/PlayerAdvancementTracker
+	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;
+	FIELD f advancementToProgress Ljava/util/Map;
+	FIELD g visibleAdvancements Ljava/util/Set;
+	FIELD h visibilityUpdates Ljava/util/Set;
+	FIELD i progressUpdates Ljava/util/Set;
+	FIELD j owner Lus;
+	FIELD k currentDisplayTab Ln;
+	FIELD l dirty Z
+	METHOD a clearCriterions ()V
+	METHOD a setDisplayTab (Ln;)V
+	METHOD a grantCriterion (Ln;Ljava/lang/String;)Z
+		ARG 2 criterion
+	METHOD a initProgress (Ln;Lp;)V
+	METHOD a setOwner (Lus;)V
+	METHOD b reload ()V
+	METHOD b getProgress (Ln;)Lp;
+	METHOD b revokeCriterion (Ln;Ljava/lang/String;)Z
+		ARG 2 criterion
+	METHOD b sendUpdate (Lus;)V
+	METHOD c save ()V
+	METHOD c beginTracking (Ln;)V
+	METHOD d beginTrackingAllAdvancements ()V
+	METHOD d endTrackingCompleted (Ln;)V
+	METHOD e updateCompleted ()V
+	METHOD e updateDisplay (Ln;)V
+	METHOD f rewardEmptyAdvancements ()V
+	METHOD f canSee (Ln;)Z
+	METHOD g load ()V
+	METHOD g hasChildrenDone (Ln;)Z

mappings/net/minecraft/advancement/ServerAdvancementManager.mapping

@@ -1,10 +0,0 @@
-CLASS qm 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 a onAdvancement (Ln;Ljava/lang/String;)Z
-	METHOD b reload ()V
-	METHOD c save ()V
-	METHOD g load ()V

mappings/net/minecraft/advancement/SimpleAdvancement.mapping

@@ -6,6 +6,7 @@ CLASS n net/minecraft/advancement/SimpleAdvancement
 		FIELD d rewards Lq;
 		FIELD e criteria Ljava/util/Map;
 		FIELD f requirements [[Ljava/lang/String;
+		FIELD g merger Ly;
 		METHOD a create ()Ln$a;
 		METHOD a display (Lbbo;Ljd;Ljd;Lqc;Lx;ZZZ)Ln$a;
 		METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ln$a;
@@ -16,13 +17,19 @@ CLASS n net/minecraft/advancement/SimpleAdvancement
 			ARG 1 criterion
 		METHOD a criterion (Ljava/lang/String;Lv;)Ln$a;
 			ARG 1 conditions
+		METHOD a build (Ljava/util/function/Consumer;Ljava/lang/String;)Ln;
+		METHOD a findParent (Ljava/util/function/Function;)Z
 		METHOD a parent (Ln;)Ln$a;
+		METHOD a rewards (Lq$a;)Ln$a;
 		METHOD a rewards (Lq;)Ln$a;
 		METHOD a parent (Lqc;)Ln$a;
 		METHOD a display (Lw;)Ln$a;
+		METHOD a criteriaMerger (Ly;)Ln$a;
+		METHOD b toJson ()Lcom/google/gson/JsonObject;
 		METHOD b deserialize (Lit;)Ln$a;
 			ARG 0 buf
 		METHOD b build (Lqc;)Ln;
+		METHOD c getCriteria ()Ljava/util/Map;
 	FIELD a parent Ln;
 	FIELD b display Lw;
 	FIELD c rewards Lq;

mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping

@@ -14,14 +14,15 @@ CLASS ab net/minecraft/advancement/criterion/BredAnimalsCriterion
 		FIELD b partner Las;
 		FIELD c child Las;
 		METHOD a matches (Lus;Lama;Lama;Lags;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lab$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lama;Lama;Lags;)V
 		ARG 1 player
@@ -29,5 +30,5 @@ CLASS ab net/minecraft/advancement/criterion/BredAnimalsCriterion
 		ARG 3 parent2
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lab$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping

@@ -9,18 +9,19 @@ CLASS ac net/minecraft/advancement/criterion/BrewedPotionCriterion
 	CLASS ac$b Conditions
 		FIELD a potion Layf;
 		METHOD a matches (Layf;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lac$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Layf;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lac$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping

@@ -10,18 +10,19 @@ CLASS ad net/minecraft/advancement/criterion/ChangedDimensionCriterion
 		FIELD a from Lbsg;
 		FIELD b to Lbsg;
 		METHOD a to (Lbsg;)Lad$b;
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD b matches (Lbsg;Lbsg;)Z
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lbsg;Lbsg;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lad$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping

@@ -4,14 +4,15 @@ CLASS ae net/minecraft/advancement/criterion/ChanneledLightningCriterion
 		METHOD a matches (Lus;Ljava/util/Collection;)Z
 		METHOD a create ([Las;)Lae$b;
 			ARG 0 victims
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lae$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping

@@ -10,17 +10,18 @@ CLASS af net/minecraft/advancement/criterion/ConstructBeaconCriterion
 		FIELD a level Lbf$d;
 		METHOD a level (Lbf$d;)Laf$b;
 		METHOD a matches (Lbnm;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lbnm;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Laf$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping

@@ -10,18 +10,19 @@ CLASS ag net/minecraft/advancement/criterion/ConsumeItemCriterion
 		FIELD a item Laz;
 		METHOD a matches (Lawo;)Z
 		METHOD a item (Lbbo;)Lag$b;
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lag$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lawo;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lag$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/Criterion.mapping

@@ -8,8 +8,8 @@ CLASS u net/minecraft/advancement/criterion/Criterion
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping

@@ -1,2 +1,3 @@
 CLASS v net/minecraft/advancement/criterion/CriterionConditions
 	METHOD a getId ()Lqc;
+	METHOD b toJson ()Lcom/google/gson/JsonElement;

mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping

@@ -10,19 +10,20 @@ CLASS ah net/minecraft/advancement/criterion/CuredZombieVillagerCriterion
 		FIELD a zombie Las;
 		FIELD b villager Las;
 		METHOD a matches (Lus;Laqm;Laqr;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lah$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Laqm;Laqr;)V
 		ARG 1 player
 		ARG 2 zombie
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lah$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping

@@ -9,16 +9,17 @@ CLASS al net/minecraft/advancement/criterion/EffectsChangedCriterion
 	CLASS al$b Conditions
 		FIELD a effects Lbg;
 		METHOD a matches (Lus;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;)V
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lal$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping

@@ -11,19 +11,20 @@ CLASS am net/minecraft/advancement/criterion/EnchantedItemCriterion
 		FIELD a item Laz;
 		FIELD b levels Lbf$d;
 		METHOD a matches (Lawo;I)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lam$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lawo;I)V
 		ARG 1 player
 		ARG 2 stack
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lam$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping

@@ -11,15 +11,16 @@ CLASS ao net/minecraft/advancement/criterion/EnterBlockCriterion
 		FIELD b state Ljava/util/Map;
 		METHOD a block (Lbgs;)Lao$b;
 		METHOD a matches (Lbpm;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lao$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping

@@ -13,13 +13,14 @@ CLASS ar net/minecraft/advancement/criterion/EntityHurtPlayerCriterion
 	CLASS ar$b Conditions
 		FIELD a damage Lai;
 		METHOD a matches (Lus;Lage;FFZ)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lage;FFZ)V
 		ARG 1 player
@@ -28,5 +29,5 @@ CLASS ar net/minecraft/advancement/criterion/EntityHurtPlayerCriterion
 		ARG 4 taken
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lar$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping

@@ -3,14 +3,15 @@ CLASS au net/minecraft/advancement/criterion/FilledBucketCriterion
 		FIELD a item Laz;
 		METHOD a matches (Lawo;)Z
 		METHOD a create (Laz;)Lau$b;
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lau$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping

@@ -8,14 +8,15 @@ CLASS av net/minecraft/advancement/criterion/FishingRodHookedCriterion
 			ARG 2 item
 		METHOD a create (Laz;Las;Laz;)Lav$b;
 		METHOD a matches (Lus;Lawo;Laos;Ljava/util/Collection;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lav$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping

@@ -4,10 +4,10 @@ CLASS aw net/minecraft/advancement/criterion/ImpossibleCriterion
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Law$a;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping

@@ -14,17 +14,18 @@ CLASS ax net/minecraft/advancement/criterion/InventoryChangedCriterion
 		METHOD a matches (Lara;)Z
 		METHOD a items ([Laz;)Lax$b;
 		METHOD a items ([Lbbo;)Lax$b;
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lara;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lax$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping

@@ -11,18 +11,19 @@ CLASS ay net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion
 		FIELD b durability Lbf$d;
 		FIELD c delta Lbf$d;
 		METHOD a matches (Lawo;I)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lawo;I)V
 		ARG 1 player
 		ARG 2 item
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lay$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping

@@ -3,14 +3,15 @@ CLASS ba net/minecraft/advancement/criterion/KilledByCrossbowCriterion
 		FIELD a victims [Las;
 		FIELD b uniqueEntityTypes Lbf$d;
 		METHOD a matches (Lus;Ljava/util/Collection;I)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lba$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping

@@ -12,18 +12,19 @@ CLASS bc net/minecraft/advancement/criterion/LevitationCriterion
 		FIELD a distance Lak;
 		FIELD b duration Lbf$d;
 		METHOD a matches (Lus;Lcmd;I)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lcmd;I)V
 		ARG 1 player
 		ARG 2 coord
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbc$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping

@@ -11,16 +11,17 @@ CLASS be net/minecraft/advancement/criterion/LocationArrivalCriterion
 	CLASS be$b Conditions
 		FIELD a location Lbd;
 		METHOD a matches (Luq;DDD)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a id Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;)V
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbe$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping

@@ -15,17 +15,18 @@ CLASS bi net/minecraft/advancement/criterion/NetherTravelCriterion
 		FIELD c distance Lak;
 		METHOD a distance (Lak;)Lbi$b;
 		METHOD a matches (Luq;Lcmd;DDD)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lcmd;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbi$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping

@@ -1,7 +1,9 @@
 CLASS bb net/minecraft/advancement/criterion/OnKilledCriterion
-	CLASS bb$a
+	CLASS bb$a InCodeConditions
 		FIELD a entity Las;
 		FIELD b killingBlow Laj;
+		METHOD a createKill (Las$a;Laj$a;)Lbb$a;
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	CLASS bb$b Handler
 		FIELD a manager Lqm;
 		FIELD b conditions Ljava/util/Set;
@@ -9,21 +11,24 @@ CLASS bb net/minecraft/advancement/criterion/OnKilledCriterion
 		METHOD a addCondition (Lu$a;)V
 		METHOD a handle (Lus;Lagv;Lage;)V
 		METHOD b removeCondition (Lu$a;)V
-	CLASS bb$c
+	CLASS bb$c Conditions
 		FIELD a entity Las;
 		FIELD b killingBlow Laj;
+		METHOD a createKill (Las$a;)Lbb$c;
+		METHOD a test (Lus;Lagv;Lage;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a handlers Ljava/util/Map;
 	FIELD b id Lqc;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lagv;Lage;)V
 		ARG 1 player
 		ARG 2 entity
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbb$c;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping

@@ -17,18 +17,19 @@ CLASS bj net/minecraft/advancement/criterion/PlacedBlockCriterion
 		METHOD a block (Lbgs;)Lbj$b;
 			ARG 0 block
 		METHOD a matches (Lbpm;Let;Luq;Lawo;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Let;Lawo;)V
 		ARG 1 player
 		ARG 2 blockPos
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbj$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping

@@ -11,17 +11,18 @@ CLASS bk net/minecraft/advancement/criterion/PlayerHurtEntityCriterion
 		FIELD a damage Lai;
 		FIELD b entity Las;
 		METHOD a matches (Lus;Lagv;Lage;FFZ)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lagv;Lage;FFZ)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbk$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping

@@ -9,17 +9,18 @@ CLASS bl net/minecraft/advancement/criterion/RecipeUnlockedCriterion
 	CLASS bl$b Conditions
 		FIELD a recipe Lqc;
 		METHOD a matches (Layw;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Layw;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbl$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping

@@ -3,14 +3,15 @@ CLASS bm net/minecraft/advancement/criterion/ShotCrossbowCriterion
 		FIELD a item Laz;
 		METHOD a matches (Lawo;)Z
 		METHOD a create (Lbbo;)Lbm$b;
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbm$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping

@@ -9,17 +9,18 @@ CLASS bn net/minecraft/advancement/criterion/SummonedEntityCriterion
 	CLASS bn$b Conditions
 		FIELD a entity Las;
 		METHOD a matches (Lus;Lagv;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lagv;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbn$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping

@@ -10,18 +10,19 @@ CLASS bo net/minecraft/advancement/criterion/TameAnimalCriterion
 	CLASS bo$b Conditions
 		FIELD a entity Las;
 		METHOD a matches (Lus;Lama;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lbo$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lama;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbo$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/TickCriterion.mapping

@@ -12,11 +12,11 @@ CLASS bp net/minecraft/advancement/criterion/TickCriterion
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;)V
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbp$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping

@@ -14,12 +14,12 @@ CLASS br net/minecraft/advancement/criterion/UsedEnderEyeCriterion
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Let;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbr$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping

@@ -9,17 +9,18 @@ CLASS bs net/minecraft/advancement/criterion/UsedTotemCriterion
 	CLASS bs$b Conditions
 		FIELD a item Laz;
 		METHOD a matches (Lawo;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Lawo;)V
 		ARG 1 player
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbs$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping

@@ -12,19 +12,20 @@ CLASS bq net/minecraft/advancement/criterion/VillagerTradeCriterion
 		FIELD a item Las;
 		FIELD b villager Laz;
 		METHOD a matches (Lus;Laqr;Lawo;)Z
+		METHOD b toJson ()Lcom/google/gson/JsonElement;
 		METHOD c any ()Lbq$b;
 	FIELD a ID Lqc;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a getId ()Lqc;
 	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lv;
 		ARG 1 obj
-	METHOD a removePlayer (Lqm;)V
+	METHOD a endTracking (Lqm;)V
-	METHOD a addCondition (Lqm;Lu$a;)V
+	METHOD a beginTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager
 	METHOD a handle (Lus;Laqr;Lawo;)V
 		ARG 1 player
 		ARG 2 villager
 	METHOD b deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lbq$b;
 		ARG 1 obj
-	METHOD b removeCondition (Lqm;Lu$a;)V
+	METHOD b endTrackingCondition (Lqm;Lu$a;)V
 		ARG 1 manager

mappings/net/minecraft/client/gui/menu/AdvancementsGui.mapping

@@ -4,6 +4,7 @@ CLASS cue net/minecraft/client/gui/menu/AdvancementsGui
 	FIELD g advancementHandler Ldbc;
 	FIELD h widgetMap Ljava/util/Map;
 	FIELD i selectedWidget Lcua;
+	METHOD a onClear ()V
 	METHOD a mouseClicked (DDI)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -21,15 +22,19 @@ CLASS cue net/minecraft/client/gui/menu/AdvancementsGui
 		ARG 1 keyCode
 		ARG 2 scanCode
 		ARG 3 modifiers
+	METHOD a onRootAdded (Ln;)V
 	METHOD b drawWidgets (II)V
 		ARG 1 x
+	METHOD b onRootRemoved (Ln;)V
 	METHOD c onInitialized ()V
 	METHOD c drawAdvancementTree (IIII)V
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 x
+	METHOD c onDependentAdded (Ln;)V
 	METHOD d drawWidgetTooltip (IIII)V
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 x
+	METHOD d onDependentRemoved (Ln;)V
 	METHOD n onClosed ()V

mappings/net/minecraft/client/gui/widget/AdvancementTabType.mapping

@@ -1,4 +1,4 @@
-CLASS cub net/minecraft/advancement/AdvancementTabType
+CLASS cub net/minecraft/client/gui/widget/AdvancementTabType
 	METHOD a drawIcon (IIILdjo;Lawo;)V
 		ARG 1 x
 		ARG 2 y

mappings/net/minecraft/command/EntitySelector.mapping

@@ -1,5 +1,5 @@
 CLASS dz net/minecraft/command/EntitySelector
-	FIELD a limit I
+	FIELD a count I
 	FIELD b includesEntities Z
 	FIELD d basePredicate Ljava/util/function/Predicate;
 	FIELD e distance Lbf$c;
@@ -10,7 +10,7 @@ CLASS dz net/minecraft/command/EntitySelector
 	FIELD k entityId Ljava/util/UUID;
 	FIELD l type Ljava/lang/Class;
 	FIELD m checkPermissions Z
-	METHOD a getLimit ()I
+	METHOD a getCount ()I
 	METHOD a getEntity (Lca;)Lagv;
 	METHOD a getPositionPredicate (Lcmd;)Ljava/util/function/Predicate;
 	METHOD a getEntities (Lcmd;Ljava/util/List;)Ljava/util/List;

mappings/net/minecraft/command/arguments/EntityArgumentType.mapping

@@ -1,7 +1,10 @@
 CLASS ci net/minecraft/command/arguments/EntityArgumentType
 	CLASS ci$a Serializer
+		METHOD a toJson (Lci;Lcom/google/gson/JsonObject;)V
+		METHOD a toPacket (Lci;Lit;)V
 		METHOD a toJson (Lcom/mojang/brigadier/arguments/ArgumentType;Lcom/google/gson/JsonObject;)V
 		METHOD a toPacket (Lcom/mojang/brigadier/arguments/ArgumentType;Lit;)V
+		METHOD a fromPacket (Lit;)Lci;
 		METHOD b fromPacket (Lit;)Lcom/mojang/brigadier/arguments/ArgumentType;
 	FIELD a TOO_MANY_ENTITIES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD b TOO_MANY_PLAYERS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
@@ -10,4 +13,10 @@ CLASS ci net/minecraft/command/arguments/EntityArgumentType
 	FIELD e PLAYER_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD f NOT_ALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD g EXAMPLES Ljava/util/Collection;
-	METHOD a create ()Lci;
+	FIELD h singleTarget Z
+	FIELD i playerOnly Z
+	METHOD a oneEntity ()Lci;
+	METHOD a parse (Lcom/mojang/brigadier/StringReader;)Ldz;
+	METHOD b multipleEntities ()Lci;
+	METHOD c onePlayer ()Lci;
+	METHOD d multiplePlayer ()Lci;

mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping

@@ -1,3 +1,4 @@
 CLASS co net/minecraft/command/arguments/NbtPathArgumentType
+	CLASS co$g
 	FIELD c EXAMPLES Ljava/util/Collection;
 	METHOD a create ()Lco;

mappings/net/minecraft/data/DataCache.mapping

@@ -1,7 +1,15 @@
 CLASS ga net/minecraft/data/DataCache
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b root Ljava/nio/file/Path;
+	FIELD c recordFile Ljava/nio/file/Path;
+	FIELD d unchanged I
+	FIELD e oldSha1 Ljava/util/Map;
+	FIELD f newSha1 Ljava/util/Map;
+	FIELD g ignores Ljava/util/Set;
 	METHOD a write ()V
+	METHOD a getOldSha1 (Ljava/nio/file/Path;)Ljava/lang/String;
+	METHOD a updateSha1 (Ljava/nio/file/Path;Ljava/lang/String;)V
 	METHOD b deleteAll ()V
 	METHOD b contains (Ljava/nio/file/Path;)Z
-	METHOD c paths ()Ljava/util/stream/Stream;
+	METHOD c files ()Ljava/util/stream/Stream;
+	METHOD c ignore (Ljava/nio/file/Path;)V

mappings/net/minecraft/data/DataProvider.mapping

@@ -1,7 +1,8 @@
 CLASS fz net/minecraft/data/DataProvider
 	FIELD a SHA1 Lcom/google/common/hash/HashFunction;
 	METHOD a getName ()Ljava/lang/String;
-	METHOD a (Lcom/google/gson/Gson;Lga;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V
+	METHOD a writeToPath (Lcom/google/gson/Gson;Lga;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V
 		ARG 0 gson
 		ARG 1 cache
+		ARG 2 output
 	METHOD a run (Lga;)V

mappings/net/minecraft/data/server/AdvancementsProvider.mapping

@@ -2,6 +2,7 @@ CLASS gb net/minecraft/data/server/AdvancementsProvider
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c GSON Lcom/google/gson/Gson;
 	FIELD d root Lfy;
+	FIELD e tabGenerators Ljava/util/List;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
 	METHOD a getOutput (Ljava/nio/file/Path;Ln;)Ljava/nio/file/Path;

mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping

@@ -0,0 +1,4 @@
+CLASS gc net/minecraft/data/server/AdventureTabAdvancementGenerator
+	FIELD a BIOMES [Lbco;
+	FIELD b MONSTERS [Lagz;
+	METHOD a accept (Ljava/util/function/Consumer;)V

mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping

@@ -0,0 +1,2 @@
+CLASS gn net/minecraft/data/server/ChestLootTableGenerator
+	METHOD a accept (Ljava/util/function/BiConsumer;)V

mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping

@@ -0,0 +1,2 @@
+CLASS gg net/minecraft/data/server/EndTabAdvancementGenerator
+	METHOD a accept (Ljava/util/function/Consumer;)V

mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping

@@ -0,0 +1,2 @@
+CLASS gd net/minecraft/data/server/HusbandryTabAdvancementGenerator
+	METHOD a accept (Ljava/util/function/Consumer;)V

mappings/net/minecraft/data/server/ItemTagsProvider.mapping

@@ -1,4 +1,7 @@
 CLASS hk net/minecraft/data/server/ItemTagsProvider
+	FIELD e LOG Lorg/apache/logging/log4j/Logger;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a getOutput (Lqc;)Ljava/nio/file/Path;
+	METHOD a convert (Lye$b;)Lye$b;
+	METHOD a copy (Lye;Lye;)V
 	METHOD b configure ()V

mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping

@@ -0,0 +1,2 @@
+CLASS ge net/minecraft/data/server/NetherTabAdvancementGenerator
+	METHOD a accept (Ljava/util/function/Consumer;)V

mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping

@@ -0,0 +1,2 @@
+CLASS gf net/minecraft/data/server/StoryTabAdvancementGenerator
+	METHOD a accept (Ljava/util/function/Consumer;)V

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -31,7 +31,8 @@ CLASS arb net/minecraft/entity/player/PlayerEntity
 	FIELD bY enchantmentTableSeed I
 	FIELD bw PLAYER_MODEL_BIT_MASK Lpr;
 	FIELD bx MAIN_HAND Lpr;
-	FIELD bz SHOULDER_ENTITY_RIGHT Lpr;
+	FIELD by LEFT_SHOULDER_ENTITY Lpr;
+	FIELD bz RIGHT_SHOULDER_ENTITY Lpr;
 	FIELD cF renderOffsetY F
 	FIELD c sleepTimer I
 	FIELD ca fishHook Laos;

mappings/net/minecraft/predicate/NbtPredicate.mapping

@@ -7,5 +7,5 @@ CLASS bh net/minecraft/predicate/NbtPredicate
 	METHOD a deserialize (Lcom/google/gson/JsonElement;)Lbh;
 		ARG 0 element
 	METHOD a test (Lij;)Z
-	METHOD b (Lagv;)Lhs;
+	METHOD b entityToTag (Lagv;)Lhs;
 		ARG 0 entity

mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS bg net/minecraft/predicate/entity/EntityEffectPredicate
-	CLASS bg$a
+	CLASS bg$a EffectData
 		FIELD a amplifier Lbf$d;
 		FIELD b duration Lbf$d;
 		FIELD c ambient Ljava/lang/Boolean;
@@ -15,6 +15,7 @@ CLASS bg net/minecraft/predicate/entity/EntityEffectPredicate
 	FIELD a EMPTY Lbg;
 	FIELD b effects Ljava/util/Map;
 	METHOD a create ()Lbg;
+	METHOD a withEffect (Lagn;)Lbg;
 	METHOD a test (Lagv;)Z
 	METHOD a test (Lahe;)Z
 	METHOD a deserialize (Lcom/google/gson/JsonElement;)Lbg;

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -110,6 +110,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD aF reload ()V
 	METHOD aG getDataManager ()Lwh;
 	METHOD aK getCommandManager ()Lcb;
+	METHOD aL getCommandSource ()Lca;
 	METHOD aM getRecipeManager ()Layx;
 	METHOD aN getTagManager ()Lyg;
 	METHOD aO getScoreboard ()Lqr;

mappings/net/minecraft/server/ServerAdvancementLoader.mapping

@@ -1,10 +1,12 @@
-CLASS qo net/minecraft/server/ServerAdvancementManager
+CLASS qo net/minecraft/server/ServerAdvancementLoader
-	FIELD a pathPrefixLength I
+	FIELD a PATH_PREFIX_LENGTH I
-	FIELD b fileExtensionLength I
+	FIELD b FILE_EXTENSION_LENGTH I
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD d GSON Lcom/google/gson/Gson;
 	FIELD e MANAGER Lo;
+	FIELD f errored Z
 	METHOD a get (Lqc;)Ln;
 	METHOD a onResourceReload (Lwj;)V
 		ARG 1 manager
 	METHOD b getAdvancements ()Ljava/util/Collection;
+	METHOD b scanAdvancements (Lwj;)Ljava/util/Map;

mappings/net/minecraft/server/command/AdvancementCommand.mapping

@@ -1,3 +1,28 @@
 CLASS qx net/minecraft/server/command/AdvancementCommand
+	CLASS qx$a Operation
+		CLASS qx$a$1
+			METHOD a processEach (Lus;Ln;)Z
+			METHOD a processEachCriterion (Lus;Ln;Ljava/lang/String;)Z
+				ARG 3 criterion
+		CLASS qx$a$2
+			METHOD a processEach (Lus;Ln;)Z
+			METHOD a processEachCriterion (Lus;Ln;Ljava/lang/String;)Z
+				ARG 3 criterion
+		FIELD a GRANT Lqx$a;
+		FIELD b REVOKE Lqx$a;
+		FIELD c commandPrefix Ljava/lang/String;
+		METHOD a getCommandPrefix ()Ljava/lang/String;
+		METHOD a processAll (Lus;Ljava/lang/Iterable;)I
+		METHOD a processEach (Lus;Ln;)Z
+		METHOD a processEachCriterion (Lus;Ln;Ljava/lang/String;)Z
+			ARG 3 criterion
+	CLASS qx$b Selection
+		FIELD f before Z
+		FIELD g after Z
 	FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider;
+	METHOD a executeAdvancement (Lca;Ljava/util/Collection;Lqx$a;Ljava/util/Collection;)I
+	METHOD a executeCriterion (Lca;Ljava/util/Collection;Lqx$a;Ln;Ljava/lang/String;)I
+		ARG 4 criterion
 	METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V
+	METHOD a searchAndAdd (Ln;Ljava/util/List;)V
+	METHOD a select (Ln;Lqx$b;)Ljava/util/List;

mappings/net/minecraft/server/function/CommandFunction.mapping

@@ -1,3 +1,22 @@
 CLASS bx net/minecraft/server/function/CommandFunction
+	CLASS bx$a LazyContainer
+		FIELD a EMPTY Lbx$a;
+		FIELD b id Lqc;
+		FIELD c initialized Z
+		FIELD d function Lbx;
+		METHOD a getId ()Lqc;
+		METHOD a get (Lqp;)Lbx;
+	CLASS bx$b CommandElement
+		FIELD a parsed Lcom/mojang/brigadier/ParseResults;
+		METHOD a execute (Lqp;Lca;Ljava/util/ArrayDeque;I)V
+	CLASS bx$c Element
+		METHOD a execute (Lqp;Lca;Ljava/util/ArrayDeque;I)V
+	CLASS bx$d FunctionElement
+		FIELD a function Lbx$a;
+		METHOD a execute (Lqp;Lca;Ljava/util/ArrayDeque;I)V
+	FIELD a elements [Lbx$c;
 	FIELD b id Lqc;
 	METHOD a getId ()Lqc;
+	METHOD a create (Lqc;Lqp;Ljava/util/List;)Lbx;
+		ARG 2 fileLines
+	METHOD b getElements ()[Lbx$c;

mappings/net/minecraft/server/function/CommandFunctionManager.mapping

@@ -1,6 +1,8 @@
 CLASS qp net/minecraft/server/function/CommandFunctionManager
-	CLASS qp$a
+	CLASS qp$a Entry
 		FIELD a manager Lqp;
+		FIELD c element Lbx$c;
+		METHOD a execute (Ljava/util/ArrayDeque;I)V
 	FIELD a PATH_PREFIX_LENGTH I
 	FIELD b EXTENSION_LENGTH I
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
@@ -8,15 +10,22 @@ CLASS qp net/minecraft/server/function/CommandFunctionManager
 	FIELD e LOAD_FUNCTION Lqc;
 	FIELD f server Lnet/minecraft/server/MinecraftServer;
 	FIELD g idMap Ljava/util/Map;
+	FIELD h chain Ljava/util/ArrayDeque;
+	FIELD j tags Lyf;
 	FIELD k tickFunctions Ljava/util/List;
+	FIELD l justLoaded Z
 	METHOD a getServer ()Lnet/minecraft/server/MinecraftServer;
+	METHOD a execute (Lbx;Lca;)I
 	METHOD a load (Lbx;Ljava/lang/Throwable;Lqc;)Lbx;
 		ARG 1 function
 		ARG 2 exception
 	METHOD a getFunction (Lqc;)Lbx;
 	METHOD a onResourceReload (Lwj;)V
 		ARG 1 manager
+	METHOD a readLines (Lwj;Lqc;)Ljava/util/List;
 	METHOD b getMaxCommandChainLength ()I
 	METHOD c getFunctions ()Ljava/util/Map;
 	METHOD d getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD e tick ()V
+	METHOD f getFunctionCommandSource ()Lca;
+	METHOD g getTags ()Lyf;

mappings/net/minecraft/world/loot/LootPool.mapping

@@ -6,6 +6,7 @@ CLASS cix net/minecraft/world/loot/LootPool
 		FIELD d rolls Lcjb;
 		FIELD e range Lcjd;
 		METHOD a withRolls (Lcjb;)Lcix$a;
+		METHOD a withEntry (Lcjn$a;)Lcix$a;
 		METHOD a withFunction (Lcke$a;)Lcix$a;
 		METHOD a withCondition (Lclh$a;)Lcix$a;
 		METHOD b build ()Lcix;

mappings/net/minecraft/world/loot/UniformLootTableRange.mapping

@@ -7,6 +7,7 @@ CLASS cjd net/minecraft/world/loot/UniformLootTableRange
 	METHOD <init> (FF)V
 		ARG 1 min
 	METHOD a getType ()Lqc;
+	METHOD a between (FF)Lcjd;
 	METHOD a contains (I)Z
 	METHOD a next (Ljava/util/Random;)I
 	METHOD b getMinValue ()F

mappings/net/minecraft/world/loot/entry/ItemEntry.mapping

@@ -3,4 +3,5 @@ CLASS cjk net/minecraft/world/loot/entry/ItemEntry
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjn;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjo;Lcom/google/gson/JsonSerializationContext;)V
 	FIELD c item Lawj;
+	METHOD a builder (Lbbo;)Lcjo$a;
 	METHOD a drop (Ljava/util/function/Consumer;Lciv;)V

mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping

@@ -6,3 +6,4 @@ CLASS ckk net/minecraft/world/loot/function/SetCountLootFunction
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lclh;)Lckd;
 	METHOD a process (Lawo;Lciv;)Lawo;
 		ARG 1 stack
+	METHOD a builder (Lcjb;)Lckd$a;

mappings/y.mapping

@@ -1,3 +0,0 @@
-CLASS y
-	FIELD a AND Ly;
-	FIELD b OR Ly;