23w32a stuff

Shnupbups · Aug 9, 2023 · 2a664d8 · 2a664d8
1 parent 09474f2
commit 2a664d8
Show file tree

Hide file tree

Showing 174 changed files with 855 additions and 16 deletions.
diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping
@@ -7,4 +7,5 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCrite
 		ARG 0 managerx
 	METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Ljava/util/Optional;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195;
 		ARG 1 obj
+		ARG 2 predicate
 		ARG 3 predicateDeserializer
diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping
@@ -3,4 +3,5 @@ CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriter
 	FIELD field_24381 playerPredicate Ljava/util/Optional;
 	METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;)V
 		ARG 1 id
+		ARG 2 playerPredicate
 	METHOD method_27790 getPlayerPredicate ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping
@@ -14,12 +14,17 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro
 		FIELD field_21570 item Ljava/util/Optional;
 		FIELD field_21571 beeCount Lnet/minecraft/class_2096$class_2100;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V
+			ARG 1 playerPredicate
 			ARG 2 block
+			ARG 3 item
 			ARG 4 beeCount
 		METHOD method_23878 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)Z
 			ARG 1 state
+			ARG 2 stack
 			ARG 3 count
 		METHOD method_23879 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4708$class_4709;
 			ARG 0 block
 			ARG 1 itemPredicateBuilder
 			ARG 2 beeCountRange
+		METHOD method_53070 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2073;)V
+			ARG 1 item
diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping
@@ -11,7 +11,18 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri
 		FIELD field_1275 child Ljava/util/Optional;
 		FIELD field_1276 parent Ljava/util/Optional;
 		FIELD field_1277 partner Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 parentPredicate
+			ARG 3 partnerPredicate
+			ARG 4 childPredicate
 		METHOD method_29918 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_196$class_198;
+			ARG 0 parent
+			ARG 1 partner
+			ARG 2 child
+		METHOD method_53075 parentMatches (Ljava/util/Optional;Lnet/minecraft/class_47;)Z
+			ARG 0 parent
+			ARG 1 parentContext
 		METHOD method_860 any ()Lnet/minecraft/class_196$class_198;
 		METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_196$class_198;
 			ARG 0 child

diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC
 	CLASS class_1998 Conditions
 		FIELD field_9492 potion Lnet/minecraft/class_1842;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_1842;)V
+			ARG 1 playerPredicate
 			ARG 2 potion
 		METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z
 			ARG 1 potion

diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens
 		FIELD field_9497 from Lnet/minecraft/class_5321;
 		FIELD field_9498 to Lnet/minecraft/class_5321;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V
+			ARG 1 playerPredicate
 			ARG 2 from
 			ARG 3 to
 		METHOD method_35068 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_1999$class_2001;

diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping
@@ -9,6 +9,10 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh
 		ARG 2 victims
 	CLASS class_2004 Conditions
 		FIELD field_9503 victims Ljava/util/List;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/List;)V
+			ARG 1 playerPredicate
+			ARG 2 victims
 		METHOD method_8808 matches (Ljava/util/Collection;)Z
 			ARG 1 victims
 		METHOD method_8809 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2002$class_2004;
+			ARG 0 victims
diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac
 	CLASS class_2008 Conditions
 		FIELD field_9508 level Lnet/minecraft/class_2096$class_2100;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V
+			ARG 1 playerPredicate
 			ARG 2 level
 		METHOD method_35110 create ()Lnet/minecraft/class_2006$class_2008;
 		METHOD method_8817 matches (I)Z

diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping
@@ -7,9 +7,13 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr
 		ARG 2 stack
 	CLASS class_2012 Conditions
 		FIELD field_9513 item Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 item
 		METHOD method_35112 predicate (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2010$class_2012;
 			ARG 0 predicate
 		METHOD method_8826 matches (Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
 		METHOD method_8827 any ()Lnet/minecraft/class_2010$class_2012;
 		METHOD method_8828 item (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2010$class_2012;
 			ARG 0 item
diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping
@@ -9,5 +9,11 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi
 	CLASS class_2016 Conditions
 		FIELD field_9518 zombie Ljava/util/Optional;
 		FIELD field_9519 villager Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 zombie
+			ARG 3 villager
 		METHOD method_8836 any ()Lnet/minecraft/class_2014$class_2016;
 		METHOD method_8837 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z
+			ARG 1 zombie
+			ARG 2 villager
diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping
@@ -8,8 +8,14 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange
 	CLASS class_2029 Conditions
 		FIELD field_33909 source Ljava/util/Optional;
 		FIELD field_9562 effects Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 effects
+			ARG 3 source
 		METHOD method_37224 create (Ljava/util/Optional;)Lnet/minecraft/class_2027$class_2029;
+			ARG 0 source
 		METHOD method_8868 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;)Z
+			ARG 1 player
 			ARG 2 context
 		METHOD method_8869 create (Lnet/minecraft/class_2102$class_8748;)Lnet/minecraft/class_2027$class_2029;
 			ARG 0 effects
diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping
@@ -10,7 +10,10 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem
 		FIELD field_9567 item Ljava/util/Optional;
 		FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100;
 		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V
+			ARG 1 playerPredicate
+			ARG 2 item
 			ARG 3 levels
 		METHOD method_8877 any ()Lnet/minecraft/class_2030$class_2032;
 		METHOD method_8878 matches (Lnet/minecraft/class_1799;I)Z
+			ARG 1 stack
 			ARG 2 levels
diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping
@@ -13,7 +13,10 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri
 		FIELD field_9576 block Lnet/minecraft/class_2248;
 		FIELD field_9577 state Ljava/util/Optional;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
 			ARG 2 block
+			ARG 3 state
 		METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039;
 			ARG 0 block
 		METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z
+			ARG 1 state
diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping
@@ -10,10 +10,15 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla
 		ARG 5 conditions
 	CLASS class_2046 Conditions
 		FIELD field_9593 damage Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 damage
 		METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_2044$class_2046;
 			ARG 0 predicate
 		METHOD method_35210 create ()Lnet/minecraft/class_2044$class_2046;
 		METHOD method_8907 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z
+			ARG 1 player
+			ARG 2 damageSource
 			ARG 3 dealt
 			ARG 4 taken
 			ARG 5 blocked

diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping
@@ -7,5 +7,10 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC
 		ARG 2 stack
 	CLASS class_2056 Conditions
 		FIELD field_9616 item Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 item
 		METHOD method_8937 create (Ljava/util/Optional;)Lnet/minecraft/class_2054$class_2056;
+			ARG 0 item
 		METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping
@@ -11,6 +11,16 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo
 		FIELD field_24391 hookedEntity Ljava/util/Optional;
 		FIELD field_9621 rod Ljava/util/Optional;
 		FIELD field_9623 caughtItem Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 rod
+			ARG 3 hookedEntity
+			ARG 4 caughtItem
 		METHOD method_27810 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z
+			ARG 1 rodStack
+			ARG 2 hookedEntity
 			ARG 3 fishingLoots
 		METHOD method_8947 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2058$class_2060;
+			ARG 0 rod
+			ARG 1 hookedEntity
+			ARG 2 caughtItem
diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping
@@ -19,11 +19,15 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan
 		FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100;
 		FIELD field_9632 items Ljava/util/List;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;)V
+			ARG 1 playerPredicate
 			ARG 2 occupied
 			ARG 3 full
 			ARG 4 empty
+			ARG 5 items
 		METHOD method_24363 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2073;)Z
 			ARG 1 item
+		METHOD method_53160 items ([Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_2066$class_2068;
+			ARG 0 items
 		METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068;
 			ARG 0 items
 		METHOD method_8958 matches (Lnet/minecraft/class_1661;Lnet/minecraft/class_1799;III)Z

diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion
 		FIELD field_24495 location Ljava/util/Optional;
 		METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;Ljava/util/Optional;)V
 			ARG 1 id
+			ARG 2 playerPredicate
+			ARG 3 location
 		METHOD method_27981 createItemUsedOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712;
 			ARG 0 location
 			ARG 1 item
@@ -25,5 +27,6 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion
 		METHOD method_51710 createPlacedBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4711$class_4712;
 			ARG 0 block
 		METHOD method_51711 test (Lnet/minecraft/class_47;)Z
+			ARG 1 location
 		METHOD method_51712 createPlacedBlock ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_4711$class_4712;
 			ARG 0 locationConditions
diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping
@@ -11,11 +11,17 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit
 		FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100;
 		FIELD field_9639 delta Lnet/minecraft/class_2096$class_2100;
 		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V
+			ARG 1 playerPredicate
+			ARG 2 item
 			ARG 3 durability
 			ARG 4 delta
 		METHOD method_35229 create (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071;
+			ARG 0 item
 			ARG 1 durability
 		METHOD method_8967 create (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071;
+			ARG 0 playerPredicate
+			ARG 1 item
 			ARG 2 durability
 		METHOD method_8968 matches (Lnet/minecraft/class_1799;I)Z
+			ARG 1 stack
 			ARG 2 durability
diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross
 		FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100;
 		FIELD field_9660 victims Ljava/util/List;
 		METHOD <init> (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/class_2096$class_2100;)V
+			ARG 1 playerPredicate
+			ARG 2 victims
 			ARG 3 uniqueEntityTypes
 		METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2076$class_2078;
 			ARG 0 victimPredicates

diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping
@@ -10,9 +10,12 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri
 		FIELD field_9675 distance Ljava/util/Optional;
 		FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100;
 		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V
+			ARG 1 playerPredicate
+			ARG 2 distance
 			ARG 3 duration
 		METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2085$class_2087;
 			ARG 0 distance
 		METHOD method_9014 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)Z
 			ARG 1 player
+			ARG 2 distance
 			ARG 3 duration
diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping
@@ -11,6 +11,13 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri
 	CLASS class_6406 Conditions
 		FIELD field_33926 lightning Ljava/util/Optional;
 		FIELD field_33927 bystander Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 lightning
+			ARG 3 bystander
 		METHOD method_37243 create (Ljava/util/Optional;Ljava/util/Optional;)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 lightning
 			ARG 2 bystanders
diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping
@@ -13,29 +13,45 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite
 		FIELD field_9668 entity Ljava/util/Optional;
 		METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
 			ARG 1 id
+			ARG 2 playerPredicate
+			ARG 3 entity
+			ARG 4 killingBlow
 		METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083;
 			ARG 0 killedEntityPredicateBuilder
+			ARG 1 killingBlow
 		METHOD method_35248 createPlayerKilledEntity (Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083;
+			ARG 0 entity
 		METHOD method_35249 createPlayerKilledEntity (Ljava/util/Optional;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083;
+			ARG 0 entity
 			ARG 1 damageSourcePredicateBuilder
 		METHOD method_35250 createPlayerKilledEntity (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083;
+			ARG 0 entity
+			ARG 1 killingBlow
 		METHOD method_35251 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083;
 			ARG 0 killerEntityPredicateBuilder
 		METHOD method_35252 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083;
 			ARG 0 killerEntityPredicateBuilder
 			ARG 1 damageSourcePredicateBuilder
 		METHOD method_35253 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083;
 			ARG 0 killerEntityPredicateBuilder
+			ARG 1 killingBlow
 		METHOD method_35254 createEntityKilledPlayer (Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083;
+			ARG 0 entity
 		METHOD method_35255 createEntityKilledPlayer (Ljava/util/Optional;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083;
+			ARG 0 entity
 			ARG 1 damageSourcePredicateBuilder
 		METHOD method_35256 createEntityKilledPlayer (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083;
+			ARG 0 entity
+			ARG 1 killingBlow
 		METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_2080$class_2083;
 		METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083;
 			ARG 0 killedEntityPredicateBuilder
 		METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_2080$class_2083;
 		METHOD method_8999 createPlayerKilledEntity ()Lnet/minecraft/class_2080$class_2083;
 		METHOD method_9000 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;)Z
+			ARG 1 player
+			ARG 2 entity
+			ARG 3 killingBlow
 		METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083;
 			ARG 0 killedEntityPredicateBuilder
 			ARG 1 killingBlowBuilder
diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat
 	CLASS class_5283 Conditions
 		FIELD field_24503 lootTable Lnet/minecraft/class_2960;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2960;)V
+			ARG 1 playerPredicate
 			ARG 2 lootTable
 		METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5282$class_5283;
 			ARG 0 lootTable

diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping
@@ -12,13 +12,27 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt
 	CLASS class_2117 Conditions
 		FIELD field_9736 damage Ljava/util/Optional;
 		FIELD field_9737 entity Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 damage
+			ARG 3 entity
 		METHOD method_35294 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117;
+			ARG 0 damage
+			ARG 1 entity
 		METHOD method_35295 create (Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117;
+			ARG 0 entity
+		METHOD method_35296 create (Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117;
+			ARG 0 damage
 		METHOD method_35297 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2115$class_2117;
+			ARG 0 damage
 		METHOD method_35298 create ()Lnet/minecraft/class_2115$class_2117;
 		METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117;
-			ARG 0 damagePredicateBuilder
+			ARG 0 damage
+			ARG 1 entity
 		METHOD method_9104 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;FFZ)Z
+			ARG 1 player
+			ARG 2 entity
+			ARG 3 damageSource
 			ARG 4 dealt
 			ARG 5 taken
 			ARG 6 blocked
diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping
@@ -9,8 +9,17 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac
 	CLASS class_5410 Conditions
 		FIELD field_25700 item Ljava/util/Optional;
 		FIELD field_25701 entity Ljava/util/Optional;
+		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V
+			ARG 1 playerPredicate
+			ARG 2 item
+			ARG 3 entity
 		METHOD method_30099 create (Ljava/util/Optional;Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_5409$class_5410;
-			ARG 1 itemBuilder
+			ARG 0 playerPredicate
+			ARG 1 item
+			ARG 2 entity
 		METHOD method_30100 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z
+			ARG 1 stack
+			ARG 2 entity
 		METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_5409$class_5410;
-			ARG 0 itemBuilder
+			ARG 0 item
+			ARG 1 entity
diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted
 		FIELD field_44605 recipeId Lnet/minecraft/class_2960;
 		FIELD field_44606 ingredients Ljava/util/List;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2960;Ljava/util/List;)V
+			ARG 1 playerPredicate
 			ARG 2 recipeId
 			ARG 3 ingredients
 		METHOD method_51352 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8508$class_8509;

diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke
 	CLASS class_2121 Conditions
 		FIELD field_9742 recipe Lnet/minecraft/class_2960;
 		METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_2960;)V
+			ARG 1 playerPredicate
 			ARG 2 recipe
 		METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z
 			ARG 1 recipe