diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping
index 3e6fd36183..3cdfc7e283 100644
--- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping
+++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping
@@ -42,6 +42,9 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
 	FIELD field_24479 PLAYER_GENERATES_CONTAINER_LOOT Lnet/minecraft/class_5282;
 	FIELD field_24480 THROWN_ITEM_PICKED_UP_BY_ENTITY Lnet/minecraft/class_5279;
 	FIELD field_25694 PLAYER_INTERACTED_WITH_ENTITY Lnet/minecraft/class_5409;
+	FIELD field_33870 STARTED_RIDING Lnet/minecraft/class_6407;
+	FIELD field_33871 LIGHTNING_STRIKE Lnet/minecraft/class_6405;
+	FIELD field_33872 USING_ITEM Lnet/minecraft/class_6409;
 	METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179;
 		ARG 0 id
 	METHOD method_766 getCriteria ()Ljava/lang/Iterable;
diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping
new file mode 100644
index 0000000000..a231339443
--- /dev/null
+++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping
@@ -0,0 +1,23 @@
+CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStrikeCriterion
+	FIELD field_33925 ID Lnet/minecraft/class_2960;
+	METHOD method_37239 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47;
+		ARG 1 bystander
+	METHOD method_37240 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1538;Ljava/util/List;)V
+		ARG 1 player
+		ARG 2 lightning
+		ARG 3 bystanders
+	METHOD method_37242 (Lnet/minecraft/class_47;Ljava/util/List;Lnet/minecraft/class_6405$class_6406;)Z
+		ARG 2 conditions
+	CLASS class_6406 Conditions
+		FIELD field_33926 lightning Lnet/minecraft/class_2048$class_5258;
+		FIELD field_33927 bystander Lnet/minecraft/class_2048$class_5258;
+		METHOD <init> (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V
+			ARG 1 player
+			ARG 2 lightning
+			ARG 3 bystander
+		METHOD method_37243 create (Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406;
+			ARG 0 lightning
+			ARG 1 bystander
+		METHOD method_37244 test (Lnet/minecraft/class_47;Ljava/util/List;)Z
+			ARG 1 lightningContext
+			ARG 2 bystanderContexts
diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping
new file mode 100644
index 0000000000..f443923ddc
--- /dev/null
+++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping
@@ -0,0 +1,11 @@
+CLASS net/minecraft/class_6407 net/minecraft/advancement/criterion/StartedRidingCriterion
+	FIELD field_33932 ID Lnet/minecraft/class_2960;
+	METHOD method_37257 test (Lnet/minecraft/class_3222;)V
+		ARG 1 player
+	METHOD method_37259 (Lnet/minecraft/class_6407$class_6408;)Z
+		ARG 0 conditions
+	CLASS class_6408 Conditions
+		METHOD <init> (Lnet/minecraft/class_2048$class_5258;)V
+			ARG 1 player
+		METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_6407$class_6408;
+			ARG 0 player
diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping
new file mode 100644
index 0000000000..d150cbd31a
--- /dev/null
+++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping
@@ -0,0 +1,17 @@
+CLASS net/minecraft/class_6409 net/minecraft/advancement/criterion/UsingItemCriterion
+	FIELD field_33937 ID Lnet/minecraft/class_2960;
+	METHOD method_37262 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)V
+		ARG 1 player
+		ARG 2 stack
+	METHOD method_37263 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6409$class_6410;)Z
+		ARG 1 conditions
+	CLASS class_6410 Conditions
+		FIELD field_33938 item Lnet/minecraft/class_2073;
+		METHOD <init> (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V
+			ARG 1 player
+			ARG 2 item
+		METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_6409$class_6410;
+			ARG 0 player
+			ARG 1 item
+		METHOD method_37266 test (Lnet/minecraft/class_1799;)Z
+			ARG 1 stack