diff --git a/mappings/chi.mapping b/mappings/chi.mapping
deleted file mode 100644
index 60055c2d3b..0000000000
--- a/mappings/chi.mapping
+++ /dev/null
@@ -1,18 +0,0 @@
-CLASS chi
-	CLASS chi$a
-		FIELD a world Luj;
-		METHOD a getWorld ()Luj;
-	CLASS chi$c EntityTarget
-		CLASS chi$c$a DeSerializer
-			METHOD a deserialize (Lcom/google/gson/stream/JsonReader;)Lchi$c;
-			METHOD a serialize (Lcom/google/gson/stream/JsonWriter;Lchi$c;)V
-		FIELD a THIS Lchi$c;
-		FIELD b KILLER Lchi$c;
-		FIELD c DIRECT_KILLER Lchi$c;
-		FIELD d KILLER_PLAYER Lchi$c;
-		FIELD e type Ljava/lang/String;
-		METHOD a fromString (Ljava/lang/String;)Lchi$c;
-	FIELD a random Ljava/util/Random;
-	FIELD c world Luj;
-	METHOD b getRandom ()Ljava/util/Random;
-	METHOD d getWorld ()Luj;
diff --git a/mappings/chn.mapping b/mappings/chn.mapping
deleted file mode 100644
index a0e26a16d0..0000000000
--- a/mappings/chn.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS chn
-	METHOD a onResourceReload (Lwc;)V
diff --git a/mappings/cjf.mapping b/mappings/cjf.mapping
deleted file mode 100644
index ca28566bfe..0000000000
--- a/mappings/cjf.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS cjf
-	FIELD a id Lpy;
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 417d5f1f04..96be5fb57d 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -30,6 +30,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	FIELD ae commandManager Lcb;
 	FIELD af recipeManager Laxz;
 	FIELD ag tagManager Lxz;
+	FIELD aj lootManager Lchn;
 	FIELD ak advancementManager Lqk;
 	FIELD al commandFunctionManager Lql;
 	FIELD ap forceWorldUpgrade Z
@@ -104,6 +105,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD aK getCommandManager ()Lcb;
 	METHOD aM getRecipeManager ()Laxz;
 	METHOD aN getTagManager ()Lxz;
+	METHOD aP getLootManager ()Lchn;
 	METHOD aQ getGameRules ()Lbam;
 	METHOD aV getProfiler ()Laeg;
 	METHOD aa areCommandBlocksEnabled ()Z
diff --git a/mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping
new file mode 100644
index 0000000000..1a36b8ee13
--- /dev/null
+++ b/mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping
@@ -0,0 +1,9 @@
+CLASS chh net/minecraft/util/BoundedIntUnaryOperator
+	CLASS chh$a Serializer
+	FIELD a min Ljava/lang/Integer;
+	FIELD b max Ljava/lang/Integer;
+	FIELD c operator Ljava/util/function/IntUnaryOperator;
+	METHOD a createMin (I)Lchh;
+	METHOD a create (II)Lchh;
+	METHOD applyAsInt (I)I
+	METHOD b createMax (I)Lchh;
diff --git a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping b/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping
index 0269283e1e..507d749456 100644
--- a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping
@@ -1,5 +1,5 @@
 CLASS che net/minecraft/world/loot/BinomialLootTableRange
-	CLASS che$a DeSerializer
+	CLASS che$a Serializer
 	FIELD d n I
 	FIELD e p F
 	METHOD a getType ()Lpy;
diff --git a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping
new file mode 100644
index 0000000000..bc50edfbb2
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping
@@ -0,0 +1,3 @@
+CLASS cjm net/minecraft/world/loot/ConditionConsumerBuilder
+	METHOD b withCondition (Lcjt$a;)Ljava/lang/Object;
+	METHOD c getThis ()Ljava/lang/Object;
diff --git a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping b/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping
index 168593a6a3..df0575e883 100644
--- a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping
@@ -1,5 +1,5 @@
 CLASS chg net/minecraft/world/loot/ConstantLootTableRange
-	CLASS chg$a DeSerializer
+	CLASS chg$a Serializer
 	FIELD d value I
 	METHOD a getType ()Lpy;
 	METHOD a create (I)Lchg;
diff --git a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping
new file mode 100644
index 0000000000..6fca9bda04
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping
@@ -0,0 +1,3 @@
+CLASS cin net/minecraft/world/loot/FunctionConsumerBuilder
+	METHOD b withFunction (Lciq$a;)Ljava/lang/Object;
+	METHOD c getThis ()Ljava/lang/Object;
diff --git a/mappings/net/minecraft/world/loot/LootChoice.mapping b/mappings/net/minecraft/world/loot/LootChoice.mapping
new file mode 100644
index 0000000000..2a5b4e11ea
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/LootChoice.mapping
@@ -0,0 +1,6 @@
+CLASS chz net/minecraft/world/loot/LootChoice
+	METHOD a getWeight (F)I
+		ARG 1 luck
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
+		ARG 1 consumer
+		ARG 2 luck
diff --git a/mappings/chs.mapping b/mappings/net/minecraft/world/loot/LootChoiceProvider.mapping
similarity index 59%
rename from mappings/chs.mapping
rename to mappings/net/minecraft/world/loot/LootChoiceProvider.mapping
index e6eb249809..c37bb437fc 100644
--- a/mappings/chs.mapping
+++ b/mappings/net/minecraft/world/loot/LootChoiceProvider.mapping
@@ -1,6 +1,7 @@
-CLASS chs
+CLASS chs net/minecraft/world/loot/LootChoiceProvider
 	FIELD a ALWAYS_FALSE Lchs;
 	FIELD b ALWAYS_TRUE Lchs;
+	METHOD a doExpand (Lchi;Ljava/util/function/Consumer;)Z
 	METHOD a and (Lchs;)Lchs;
 	METHOD b or (Lchs;)Lchs;
 	METHOD expand (Lchi;Ljava/util/function/Consumer;)Z
diff --git a/mappings/net/minecraft/world/loot/LootManager.mapping b/mappings/net/minecraft/world/loot/LootManager.mapping
new file mode 100644
index 0000000000..4fddc20fe0
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/LootManager.mapping
@@ -0,0 +1,12 @@
+CLASS chn net/minecraft/world/loot/LootManager
+	FIELD a lootTablesLength I
+	FIELD b jsonLength I
+	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD d gson Lcom/google/gson/Gson;
+	FIELD e suppliers Ljava/util/Map;
+	FIELD f supplierNames Ljava/util/Set;
+	METHOD a getSupplierNames ()Ljava/util/Set;
+	METHOD a toJson (Lchl;)Lcom/google/gson/JsonElement;
+	METHOD a check (Lchm;Lpy;Lchl;Ljava/util/function/Function;)V
+	METHOD a getSupplier (Lpy;)Lchl;
+	METHOD a onResourceReload (Lwc;)V
diff --git a/mappings/net/minecraft/world/loot/LootPool.mapping b/mappings/net/minecraft/world/loot/LootPool.mapping
new file mode 100644
index 0000000000..56cb89bffb
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/LootPool.mapping
@@ -0,0 +1,25 @@
+CLASS chk net/minecraft/world/loot/LootPool
+	CLASS chk$a Builder
+		FIELD a entries Ljava/util/List;
+		FIELD b conditions Ljava/util/List;
+		FIELD c functions Ljava/util/List;
+		FIELD d rolls Lcho;
+		FIELD e range Lchq;
+		METHOD a withRolls (Lcho;)Lchk$a;
+		METHOD a withFunction (Lciq$a;)Lchk$a;
+		METHOD a withCondition (Lcjt$a;)Lchk$a;
+		METHOD b build ()Lchk;
+		METHOD b withFunction (Lciq$a;)Ljava/lang/Object;
+		METHOD b withCondition (Lcjt$a;)Ljava/lang/Object;
+	CLASS chk$b Serializer
+	FIELD a entries [Lcia;
+	FIELD b conditions [Lcjt;
+	FIELD c predicate Ljava/util/function/Predicate;
+	FIELD d functions [Lciq;
+	FIELD e javaFunctions Ljava/util/function/BiFunction;
+	FIELD f rolls Lcho;
+	FIELD g bonusRolls Lchq;
+	METHOD a create ()Lchk$a;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
+	METHOD b supplyOnce (Ljava/util/function/Consumer;Lchi;)V
diff --git a/mappings/net/minecraft/world/loot/LootSupplier.mapping b/mappings/net/minecraft/world/loot/LootSupplier.mapping
new file mode 100644
index 0000000000..c5b0c2ddc0
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/LootSupplier.mapping
@@ -0,0 +1,27 @@
+CLASS chl net/minecraft/world/loot/LootSupplier
+	CLASS chl$a Builder
+		FIELD a pools Ljava/util/List;
+		FIELD b functions Ljava/util/List;
+		FIELD c type Lcjg;
+		METHOD a withPool (Lchk$a;)Lchl$a;
+		METHOD a withFunction (Lciq$a;)Lchl$a;
+		METHOD a withType (Lcjg;)Lchl$a;
+		METHOD b create ()Lchl;
+		METHOD b withFunction (Lciq$a;)Ljava/lang/Object;
+	CLASS chl$b Serializer
+	FIELD a EMPTY Lchl;
+	FIELD b GENERIC Lcjg;
+	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD d type Lcjg;
+	FIELD e pools [Lchk;
+	FIELD f functions [Lciq;
+	FIELD g combinedFunction Ljava/util/function/BiFunction;
+	METHOD a getType ()Lcjg;
+	METHOD a supplyInventory (Laev;Lchi;)V
+	METHOD a getFreeSlots (Laev;Ljava/util/Random;)Ljava/util/List;
+	METHOD a getDrops (Lchi;)Ljava/util/List;
+	METHOD a drop (Lchi;Ljava/util/function/Consumer;)V
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a limitedConsumer (Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
+	METHOD b create ()Lchl$a;
+	METHOD b dropLimited (Lchi;Ljava/util/function/Consumer;)V
diff --git a/mappings/net/minecraft/world/loot/LootTableRanges.mapping b/mappings/net/minecraft/world/loot/LootTableRanges.mapping
new file mode 100644
index 0000000000..db7be736fe
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/LootTableRanges.mapping
@@ -0,0 +1,4 @@
+CLASS chp net/minecraft/world/loot/LootTableRanges
+	FIELD a types Ljava/util/Map;
+	METHOD a serialize (Lcho;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+	METHOD a deserialize (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lcho;
diff --git a/mappings/net/minecraft/world/loot/LootTableReporter.mapping b/mappings/net/minecraft/world/loot/LootTableReporter.mapping
new file mode 100644
index 0000000000..3b22e79abc
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/LootTableReporter.mapping
@@ -0,0 +1,8 @@
+CLASS chm net/minecraft/world/loot/LootTableReporter
+	FIELD a messages Lcom/google/common/collect/Multimap;
+	FIELD b nameFactory Ljava/util/function/Supplier;
+	FIELD c name Ljava/lang/String;
+	METHOD a getMessages ()Lcom/google/common/collect/Multimap;
+	METHOD a report (Ljava/lang/String;)V
+	METHOD b getContext ()Ljava/lang/String;
+	METHOD b makeChild (Ljava/lang/String;)Lchm;
diff --git a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping b/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping
index 475d9e4adc..0009e3c80f 100644
--- a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping
@@ -1,11 +1,12 @@
 CLASS chq net/minecraft/world/loot/UniformLootTableRange
-	CLASS chq$a DeSerializer
+	CLASS chq$a Serializer
 		METHOD a serialize (Lchq;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
 		METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lchq;
 	FIELD d min F
 	FIELD e max F
 	METHOD <init> (FF)V
 		ARG 1 min
+		ARG 2 max
 	METHOD a getType ()Lpy;
 	METHOD a contains (I)Z
 	METHOD a next (Ljava/util/Random;)I
diff --git a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping
index f86fa93a31..eecd70f222 100644
--- a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping
@@ -6,4 +6,5 @@ CLASS cjk net/minecraft/world/loot/condition/AlternativeLootCondition
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjt;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a terms [Lcjt;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
 	METHOD a or ([Lcjt$a;)Lcjk$a;
diff --git a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping
index 8b4bccdd2e..f97d1886e5 100644
--- a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping
@@ -7,3 +7,4 @@ CLASS cjs net/minecraft/world/loot/condition/BlockStatePropertyLootCondition
 	FIELD a block Lbfr;
 	FIELD b properties Ljava/util/Map;
 	FIELD c predicate Ljava/util/function/Predicate;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping
index 1b63977099..505814c4c3 100644
--- a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping
@@ -3,3 +3,4 @@ CLASS cjn net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjt;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a predicate Laj;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping
index 80aa2cf03a..a171877773 100644
--- a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping
@@ -4,3 +4,4 @@ CLASS cjv net/minecraft/world/loot/condition/EntityPropertiesLootCondition
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a predicate Las;
 	FIELD b entity Lchi$c;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping
index 209518d22e..51e652ee44 100644
--- a/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping
@@ -6,3 +6,4 @@ CLASS cjo net/minecraft/world/loot/condition/EntityScoresLootCondition
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a scores Ljava/util/Map;
 	FIELD b target Lchi$c;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping
index f2ac00f29f..201347b4de 100644
--- a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping
@@ -3,3 +3,7 @@ CLASS cjq net/minecraft/world/loot/condition/InvertedLootCondition
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjt;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a term Lcjt;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
+	METHOD a test (Lchi;)Z
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a create (Lcjt$a;)Lcjt$a;
diff --git a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping
index b335a585a8..6f08193406 100644
--- a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping
@@ -3,3 +3,4 @@ CLASS cjw net/minecraft/world/loot/condition/KilledByPlayerLootCondition
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjt;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a INSTANCE Lcjw;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping
index d56097943c..ca96e35ea0 100644
--- a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping
@@ -3,3 +3,4 @@ CLASS cjz net/minecraft/world/loot/condition/MatchToolLootCondition
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjt;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a predicate Laz;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping
index 4c27a0ad3c..5c1ca2943c 100644
--- a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping
@@ -8,3 +8,4 @@ CLASS cjy net/minecraft/world/loot/condition/RandomChanceWithLootingLootConditio
 	FIELD b lootingMultiplier F
 	METHOD <init> (FF)V
 		ARG 1 chance
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping
index cf1b044251..32189f0fc9 100644
--- a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping
@@ -3,3 +3,4 @@ CLASS cjp net/minecraft/world/loot/condition/SurvivesExplosionLootCondition
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcjt;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a INSTANCE Lcjp;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping
index b529678bca..2c84913ece 100644
--- a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping
@@ -4,3 +4,4 @@ CLASS cjl net/minecraft/world/loot/condition/TableBonusLootCondition
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcjt;
 	FIELD a enchantment Layt;
 	FIELD b chances [F
+	METHOD a getRequiredParameters ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/world/loot/context/LootContext.mapping
new file mode 100644
index 0000000000..f24fd093ae
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/context/LootContext.mapping
@@ -0,0 +1,48 @@
+CLASS chi net/minecraft/world/loot/context/LootContext
+	CLASS chi$a Builder
+		FIELD a world Luj;
+		FIELD b parameters Ljava/util/Map;
+		FIELD c drops Ljava/util/Map;
+		FIELD d random Ljava/util/Random;
+		FIELD e luck F
+		METHOD a getWorld ()Luj;
+		METHOD a setLuck (F)Lchi$a;
+		METHOD a setRandom (J)Lchi$a;
+		METHOD a setRandom (JLjava/util/Random;)Lchi$a;
+		METHOD a get (Lcjf;)Ljava/lang/Object;
+		METHOD a put (Lcjf;Ljava/lang/Object;)Lchi$a;
+		METHOD a build (Lcjg;)Lchi;
+		METHOD a setRandom (Ljava/util/Random;)Lchi$a;
+		METHOD a putDrop (Lpy;Lchi$b;)Lchi$a;
+		METHOD b getNullable (Lcjf;)Ljava/lang/Object;
+		METHOD b putNullable (Lcjf;Ljava/lang/Object;)Lchi$a;
+	CLASS chi$b Dropper
+		METHOD add (Lchi;Ljava/util/function/Consumer;)V
+	CLASS chi$c EntityTarget
+		CLASS chi$c$a Serializer
+			METHOD a deserialize (Lcom/google/gson/stream/JsonReader;)Lchi$c;
+			METHOD a serialize (Lcom/google/gson/stream/JsonWriter;Lchi$c;)V
+		FIELD a THIS Lchi$c;
+		FIELD b KILLER Lchi$c;
+		FIELD c DIRECT_KILLER Lchi$c;
+		FIELD d KILLER_PLAYER Lchi$c;
+		FIELD e type Ljava/lang/String;
+		FIELD f identifier Lcjf;
+		METHOD a getIdentifier ()Lcjf;
+		METHOD a fromString (Ljava/lang/String;)Lchi$c;
+	FIELD a random Ljava/util/Random;
+	FIELD b luck F
+	FIELD c world Luj;
+	FIELD d manager Lchn;
+	FIELD e suppliers Ljava/util/Set;
+	FIELD f parameters Ljava/util/Map;
+	FIELD g drops Ljava/util/Map;
+	METHOD a getLootManager ()Lchn;
+	METHOD a addDrop (Lchl;)Z
+	METHOD a hasParameter (Lcjf;)Z
+	METHOD a drop (Lpy;Ljava/util/function/Consumer;)V
+	METHOD b getRandom ()Ljava/util/Random;
+	METHOD b removeDrop (Lchl;)V
+	METHOD c getLuck ()F
+	METHOD c get (Lcjf;)Ljava/lang/Object;
+	METHOD d getWorld ()Luj;
diff --git a/mappings/net/minecraft/world/loot/context/LootContextType.mapping b/mappings/net/minecraft/world/loot/context/LootContextType.mapping
new file mode 100644
index 0000000000..8e96ce1c7c
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/context/LootContextType.mapping
@@ -0,0 +1,15 @@
+CLASS cjg net/minecraft/world/loot/context/LootContextType
+	CLASS cjg$a Builder
+		FIELD a required Ljava/util/Set;
+		FIELD b allowed Ljava/util/Set;
+		METHOD a build ()Lcjg;
+		METHOD a require (Lcjf;)Lcjg$a;
+		METHOD b allow (Lcjf;)Lcjg$a;
+	FIELD a required Ljava/util/Set;
+	FIELD b allowed Ljava/util/Set;
+	METHOD <init> (Ljava/util/Set;Ljava/util/Set;)V
+		ARG 1 required
+		ARG 2 allowed
+	METHOD a getRequired ()Ljava/util/Set;
+	METHOD a check (Lchm;Lchj;)V
+	METHOD b getAllowed ()Ljava/util/Set;
diff --git a/mappings/cjh.mapping b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping
similarity index 85%
rename from mappings/cjh.mapping
rename to mappings/net/minecraft/world/loot/context/LootContextTypes.mapping
index 5dc790f3d2..65e6e9ffbc 100644
--- a/mappings/cjh.mapping
+++ b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping
@@ -1,4 +1,4 @@
-CLASS cjh
+CLASS cjh net/minecraft/world/loot/context/LootContextTypes
 	FIELD a EMPTY Lcjg;
 	FIELD b CHEST Lcjg;
 	FIELD c FISHING Lcjg;
diff --git a/mappings/net/minecraft/world/loot/context/Parameter.mapping b/mappings/net/minecraft/world/loot/context/Parameter.mapping
new file mode 100644
index 0000000000..ed87c4c8a5
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/context/Parameter.mapping
@@ -0,0 +1,3 @@
+CLASS cjf net/minecraft/world/loot/context/Parameter
+	FIELD a id Lpy;
+	METHOD a getIdentifier ()Lpy;
diff --git a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping b/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping
new file mode 100644
index 0000000000..00d14d8e1d
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping
@@ -0,0 +1,3 @@
+CLASS chj net/minecraft/world/loot/context/ParameterConsumer
+	METHOD a getRequiredParameters ()Ljava/util/Set;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
diff --git a/mappings/net/minecraft/world/loot/context/Parameters.mapping b/mappings/net/minecraft/world/loot/context/Parameters.mapping
new file mode 100644
index 0000000000..dcab9c7e02
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/context/Parameters.mapping
@@ -0,0 +1,2 @@
+CLASS cji net/minecraft/world/loot/context/Parameters
+	METHOD a register (Ljava/lang/String;)Lcjf;
diff --git a/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping
new file mode 100644
index 0000000000..19ec779627
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping
@@ -0,0 +1,9 @@
+CLASS chr net/minecraft/world/loot/entry/AlternativeEntry
+	CLASS chr$a Builder
+		FIELD a children Ljava/util/List;
+		METHOD a withChild (Lcia$a;)Lchr$a;
+		METHOD b build ()Lcia;
+		METHOD d getThisBuilder ()Lcia$a;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a combine ([Lchs;)Lchs;
+	METHOD a create ([Lcia$a;)Lchr$a;
diff --git a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping
new file mode 100644
index 0000000000..533f1cc6d1
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping
@@ -0,0 +1,14 @@
+CLASS cht net/minecraft/world/loot/entry/CombinedEntry
+	CLASS cht$1
+	CLASS cht$a Factory
+		METHOD create ([Lcia;[Lcjt;)Lcht;
+	CLASS cht$b Serializer
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcht;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcht;
+		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcia;
+	FIELD c children [Lcia;
+	FIELD d predicate Lchs;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a createSerializer (Lpy;Ljava/lang/Class;Lcht$a;)Lcht$b;
+	METHOD a combine ([Lchs;)Lchs;
diff --git a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping
new file mode 100644
index 0000000000..204ff4099d
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping
@@ -0,0 +1,8 @@
+CLASS chu net/minecraft/world/loot/entry/DynamicEntry
+	CLASS chu$a Serializer
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcib;Lcom/google/gson/JsonSerializationContext;)V
+	FIELD c instance Lpy;
+	FIELD h name Lpy;
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
+	METHOD a create (Lpy;)Lcib$a;
diff --git a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping
new file mode 100644
index 0000000000..36ee0fecb4
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping
@@ -0,0 +1,4 @@
+CLASS chv net/minecraft/world/loot/entry/EmptyEntry
+	CLASS chv$a Serializer
+	METHOD a Serializer ()Lcib$a;
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
diff --git a/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping
new file mode 100644
index 0000000000..800fe36cff
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping
@@ -0,0 +1,2 @@
+CLASS chw net/minecraft/world/loot/entry/GroupEntry
+	METHOD a combine ([Lchs;)Lchs;
diff --git a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping
new file mode 100644
index 0000000000..ffcd1cdab1
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping
@@ -0,0 +1,6 @@
+CLASS chx net/minecraft/world/loot/entry/ItemEntry
+	CLASS chx$a Serializer
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcib;Lcom/google/gson/JsonSerializationContext;)V
+	FIELD c item Lavn;
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
diff --git a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping
new file mode 100644
index 0000000000..eb81a5fae8
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping
@@ -0,0 +1,37 @@
+CLASS cib net/minecraft/world/loot/entry/LeafEntry
+	CLASS cib$1
+		METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
+			ARG 1 consumer
+			ARG 2 luck
+	CLASS cib$a Builder
+		FIELD a weight I
+		FIELD b quality I
+		FIELD c functions Ljava/util/List;
+		METHOD a getFunctions ()[Lciq;
+		METHOD a setWeight (I)Lcib$a;
+		METHOD a withFunction (Lciq$a;)Lcib$a;
+		METHOD b setQuality (I)Lcib$a;
+		METHOD b withFunction (Lciq$a;)Ljava/lang/Object;
+	CLASS cib$b BasicBuilder
+		FIELD c factory Lcib$d;
+		METHOD b build ()Lcia;
+		METHOD d getThisBuilder ()Lcia$a;
+		METHOD g getThis ()Lcib$b;
+	CLASS cib$c Choice
+		METHOD a getWeight (F)I
+			ARG 1 luck
+	CLASS cib$d Factory
+		METHOD build (II[Lcjt;[Lciq;)Lcib;
+	CLASS cib$e Serializer
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcib;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcib;
+		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcia;
+	FIELD c compiledFunctions Ljava/util/function/BiFunction;
+	FIELD d weight I
+	FIELD f quality I
+	FIELD g functions [Lciq;
+	FIELD h choice Lchz;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a create (Lcib$d;)Lcib$a;
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
diff --git a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping b/mappings/net/minecraft/world/loot/entry/LootEntries.mapping
new file mode 100644
index 0000000000..1ffd45980b
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/LootEntries.mapping
@@ -0,0 +1,6 @@
+CLASS chy net/minecraft/world/loot/entry/LootEntries
+	CLASS chy$a Serializer
+		METHOD a getSerializer (Ljava/lang/Class;)Lcia$b;
+	FIELD a idSerializers Ljava/util/Map;
+	FIELD b classSerializers Ljava/util/Map;
+	METHOD a register (Lcia$b;)V
diff --git a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping
new file mode 100644
index 0000000000..15dca58212
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping
@@ -0,0 +1,20 @@
+CLASS cia net/minecraft/world/loot/entry/LootEntry
+	CLASS cia$a Builder
+		FIELD a children Ljava/util/List;
+		METHOD a withChild (Lcia$a;)Lchr$a;
+		METHOD a withCondition (Lcjt$a;)Lcia$a;
+		METHOD b build ()Lcia;
+		METHOD b withCondition (Lcjt$a;)Ljava/lang/Object;
+		METHOD e getThis ()Lcia$a;
+		METHOD f getConditions ()[Lcjt;
+	CLASS cia$b Serializer
+		FIELD a id Lpy;
+		FIELD b type Ljava/lang/Class;
+		METHOD a getIdentifier ()Lpy;
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD b getType ()Ljava/lang/Class;
+		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcia;
+	FIELD c conditionPredicate Ljava/util/function/Predicate;
+	FIELD e conditions [Lcjt;
+	METHOD a test (Lchi;)Z
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
diff --git a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping
new file mode 100644
index 0000000000..cd3cd3d095
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping
@@ -0,0 +1,7 @@
+CLASS cic net/minecraft/world/loot/entry/LootTableEntry
+	CLASS cic$a Serializer
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcib;Lcom/google/gson/JsonSerializationContext;)V
+	FIELD c id Lpy;
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
diff --git a/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping
new file mode 100644
index 0000000000..37e32db417
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping
@@ -0,0 +1,2 @@
+CLASS cid net/minecraft/world/loot/entry/SequenceEntry
+	METHOD a combine ([Lchs;)Lchs;
diff --git a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping b/mappings/net/minecraft/world/loot/entry/TagEntry.mapping
new file mode 100644
index 0000000000..21c697b710
--- /dev/null
+++ b/mappings/net/minecraft/world/loot/entry/TagEntry.mapping
@@ -0,0 +1,13 @@
+CLASS cie net/minecraft/world/loot/entry/TagEntry
+	CLASS cie$1
+		METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
+			ARG 1 consumer
+			ARG 2 luck
+	CLASS cie$a Serializer
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcia;Lcom/google/gson/JsonSerializationContext;)V
+		METHOD a toJson (Lcom/google/gson/JsonObject;Lcib;Lcom/google/gson/JsonSerializationContext;)V
+	FIELD c name Lxx;
+	FIELD h expand Z
+	METHOD a doExpand (Lchi;Ljava/util/function/Consumer;)Z
+	METHOD a drop (Ljava/util/function/Consumer;Lchi;)V
+	METHOD b create (Lxx;)Lcib$a;
diff --git a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping
index 16509794ce..2d6a8a629d 100644
--- a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping
@@ -29,6 +29,7 @@ CLASS cig net/minecraft/world/loot/function/ApplyBonusLootFunction
 	FIELD a FACTORIES Ljava/util/Map;
 	FIELD c enchantment Layt;
 	FIELD d formula Lcig$b;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
 	METHOD a oreDrops (Layt;)Lcip$a;
diff --git a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping
index 31966f9bed..c9ab21de63 100644
--- a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping
@@ -3,6 +3,7 @@ CLASS cip net/minecraft/world/loot/function/ConditionalLootFunction
 		FIELD a conditionList Ljava/util/List;
 		METHOD a withCondition (Lcjt$a;)Lcip$a;
 			ARG 0 builder
+		METHOD b withCondition (Lcjt$a;)Ljava/lang/Object;
 		METHOD g getConditions ()[Lcjt;
 	CLASS cip$b Joiner
 		FIELD a joiner Ljava/util/function/Function;
@@ -18,4 +19,6 @@ CLASS cip net/minecraft/world/loot/function/ConditionalLootFunction
 	FIELD b conditions [Lcjt;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
+	METHOD a create (Ljava/util/function/Function;)Lcip$a;
 	METHOD b apply (Lavs;Lchi;)Lavs;
diff --git a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping
index d2c36a5a37..534f3d5b95 100644
--- a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping
@@ -9,6 +9,7 @@ CLASS cii net/minecraft/world/loot/function/CopyNameLootFunction
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lciq;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcip;
 	FIELD a source Lcii$a;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
 	METHOD a create (Lcii$a;)Lcip$a;
diff --git a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping
index 87d973b0da..4e105e57fe 100644
--- a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping
@@ -27,6 +27,7 @@ CLASS cil net/minecraft/world/loot/function/ExplorationMapLootFunction
 	FIELD f zoom B
 	FIELD g searchRadius I
 	FIELD h skipExistingChunks Z
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
 	METHOD b create ()Lcil$a;
diff --git a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping
index 5252121bfa..8e1350d16c 100644
--- a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping
@@ -4,5 +4,6 @@ CLASS cim net/minecraft/world/loot/function/FillPlayerHeadLootFunction
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lciq;Lcom/google/gson/JsonSerializationContext;)V
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcip;
 	FIELD a entity Lchi$c;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
diff --git a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping
index 78cde96139..6093f1d582 100644
--- a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping
@@ -9,5 +9,6 @@ CLASS cis net/minecraft/world/loot/function/LootingEnchantLootFunction
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcip;
 	FIELD a range Lchq;
 	FIELD c amount I
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
diff --git a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping
index d2abdf98b0..80d9eeddd4 100644
--- a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping
@@ -8,3 +8,4 @@ CLASS ciu net/minecraft/world/loot/function/SetContentsLootFunction
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcjt;)Lcip;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
diff --git a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping
index 59937c0f7e..53969eb86a 100644
--- a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping
@@ -7,3 +7,4 @@ CLASS civ net/minecraft/world/loot/function/SetLootTableLootFunction
 	FIELD c seed J
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
+	METHOD a check (Lchm;Ljava/util/function/Function;Ljava/util/Set;Lcjg;)V
diff --git a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping
index 6885692f41..d922d303ae 100644
--- a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping
@@ -6,5 +6,6 @@ CLASS ciy net/minecraft/world/loot/function/SetLoreLootFunction
 	FIELD a replace Z
 	FIELD c lore Ljava/util/List;
 	FIELD d entity Lchi$c;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack
diff --git a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping
index eb3a8d7c4f..6b48d54757 100644
--- a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping
@@ -6,5 +6,6 @@ CLASS ciz net/minecraft/world/loot/function/SetNameLootFunction
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c name Lja;
 	FIELD d entityTarget Lchi$c;
+	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a process (Lavs;Lchi;)Lavs;
 		ARG 1 stack