diff --git a/README.md b/README.md
index 44b0d0e61a..45587b86b9 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/mappings/ag.mapping b/mappings/ag.mapping
new file mode 100644
index 0000000000..78ea4e59e1
--- /dev/null
+++ b/mappings/ag.mapping
@@ -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;
diff --git a/mappings/bd.mapping b/mappings/bd.mapping
new file mode 100644
index 0000000000..bcfae17d1f
--- /dev/null
+++ b/mappings/bd.mapping
@@ -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
diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping
index 35b2b69e6f..95645a93e5 100644
--- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping
+++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping
@@ -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
diff --git a/mappings/net/minecraft/advancement/AdvancementFrame.mapping b/mappings/net/minecraft/advancement/AdvancementFrame.mapping
index 8ef5195f89..f297133a0e 100644
--- a/mappings/net/minecraft/advancement/AdvancementFrame.mapping
+++ b/mappings/net/minecraft/advancement/AdvancementFrame.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping
index fe72b58c2a..1566885fd3 100644
--- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping
+++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping
@@ -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
diff --git a/mappings/net/minecraft/advancement/ClientAdvancementManager.mapping b/mappings/net/minecraft/advancement/ClientAdvancementManager.mapping
index 7b8a981d84..e6f78ba62b 100644
--- a/mappings/net/minecraft/advancement/ClientAdvancementManager.mapping
+++ b/mappings/net/minecraft/advancement/ClientAdvancementManager.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping
new file mode 100644
index 0000000000..5969ae8fc7
--- /dev/null
+++ b/mappings/net/minecraft/advancement/ServerAdvancementManager.mapping
@@ -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
diff --git a/mappings/net/minecraft/advancement/SimpleAdvancement.mapping b/mappings/net/minecraft/advancement/SimpleAdvancement.mapping
index b342f29a95..bbbc60b30b 100644
--- a/mappings/net/minecraft/advancement/SimpleAdvancement.mapping
+++ b/mappings/net/minecraft/advancement/SimpleAdvancement.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping
index 960cea258f..3ab50db9af 100644
--- a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping
+++ b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping b/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping
index 47350bbc74..e8d3d096da 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerBredAnimals.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping b/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping
index 41b8744f4b..5260d36556 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerBrewedPotion.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerChangedDimension.mapping b/mappings/net/minecraft/advancement/criterion/TriggerChangedDimension.mapping
index 0abb84755c..3fcc6d3eea 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerChangedDimension.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerChangedDimension.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping b/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping
index e40e32ad0d..426bf7cebf 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerConstructBeacon.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerConsumeItem.mapping b/mappings/net/minecraft/advancement/criterion/TriggerConsumeItem.mapping
index c590cc39ee..097e43c854 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerConsumeItem.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerConsumeItem.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerCuredZombieVillager.mapping b/mappings/net/minecraft/advancement/criterion/TriggerCuredZombieVillager.mapping
index 66dccd5920..189d5006ba 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerCuredZombieVillager.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerCuredZombieVillager.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerEffectsChanged.mapping b/mappings/net/minecraft/advancement/criterion/TriggerEffectsChanged.mapping
index bfa8d9527e..a74048de95 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerEffectsChanged.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerEffectsChanged.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping b/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping
index 09a688016d..40407ad3fa 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerEnchantedItem.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping b/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping
index 6aa7302626..0cd3c932da 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerEnterBlock.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerEntityHurtPlayer.mapping b/mappings/net/minecraft/advancement/criterion/TriggerEntityHurtPlayer.mapping
index 616fbaa016..3cefcf3602 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerEntityHurtPlayer.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerEntityHurtPlayer.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping b/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping
index 3de729c3c8..44ab2a12da 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerInventoryChanged.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerItemDurabilityChanged.mapping b/mappings/net/minecraft/advancement/criterion/TriggerItemDurabilityChanged.mapping
index 11c483a8ac..eaf5093b5f 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerItemDurabilityChanged.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerItemDurabilityChanged.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerLevitation.mapping b/mappings/net/minecraft/advancement/criterion/TriggerLevitation.mapping
index 6e2357d49f..76b92a1d4e 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerLevitation.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerLevitation.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerLocationArrival.mapping b/mappings/net/minecraft/advancement/criterion/TriggerLocationArrival.mapping
index 6fe78bc2cb..a9d0510484 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerLocationArrival.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerLocationArrival.mapping
@@ -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
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerNetherTravel.mapping b/mappings/net/minecraft/advancement/criterion/TriggerNetherTravel.mapping
index 61e0bdf5a5..43112cb320 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerNetherTravel.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerNetherTravel.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerOnKilled.mapping b/mappings/net/minecraft/advancement/criterion/TriggerOnKilled.mapping
index bdf84c7675..79c5143761 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerOnKilled.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerOnKilled.mapping
@@ -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
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerPlacedBlock.mapping b/mappings/net/minecraft/advancement/criterion/TriggerPlacedBlock.mapping
index f302ae1160..6f383dfc79 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerPlacedBlock.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerPlacedBlock.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerPlayerHurtEntity.mapping b/mappings/net/minecraft/advancement/criterion/TriggerPlayerHurtEntity.mapping
index 1ce5e3339a..f7185c1d13 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerPlayerHurtEntity.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerPlayerHurtEntity.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping b/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping
index 5a0487922b..0ca7420b5a 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerRecipeUnlocked.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping b/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping
index f06a9d01ad..b3e4f42d5a 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerSummonedEntity.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerTameAnimal.mapping b/mappings/net/minecraft/advancement/criterion/TriggerTameAnimal.mapping
index d7090d21e5..47169697fe 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerTameAnimal.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerTameAnimal.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerUsedTotem.mapping b/mappings/net/minecraft/advancement/criterion/TriggerUsedTotem.mapping
index f6f91b9e38..ac7d472a26 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerUsedTotem.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerUsedTotem.mapping
@@ -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;
diff --git a/mappings/net/minecraft/advancement/criterion/TriggerVillagerTrade.mapping b/mappings/net/minecraft/advancement/criterion/TriggerVillagerTrade.mapping
index 7d077b946f..c19547b76e 100644
--- a/mappings/net/minecraft/advancement/criterion/TriggerVillagerTrade.mapping
+++ b/mappings/net/minecraft/advancement/criterion/TriggerVillagerTrade.mapping
@@ -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;
diff --git a/mappings/net/minecraft/util/EntityPredicate.mapping b/mappings/net/minecraft/util/EntityPredicate.mapping
index 0536d4350a..5c30394b27 100644
--- a/mappings/net/minecraft/util/EntityPredicate.mapping
+++ b/mappings/net/minecraft/util/EntityPredicate.mapping
@@ -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