diff --git a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping b/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping
index 9862a96ef8..faad0049e9 100644
--- a/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping
@@ -1,7 +1,18 @@
 CLASS cnx net/minecraft/world/loot/BinomialLootTableRange
 	CLASS cnx$a Serializer
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 valueJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 range
+			ARG 2 unused
+			ARG 3 context
 	FIELD d n I
 	FIELD e p F
+	METHOD <init> (IF)V
+		ARG 1 n
+		ARG 2 p
 	METHOD a create (IF)Lcnx;
 		ARG 0 n
 		ARG 1 p
diff --git a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping
index e502a6d90d..4acb8a3354 100644
--- a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping
+++ b/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping
@@ -1,3 +1,4 @@
 CLASS cqh net/minecraft/world/loot/ConditionConsumerBuilder
 	METHOD b withCondition (Lcqo$a;)Ljava/lang/Object;
+		ARG 1 builder
 	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 0d783135d2..a90843a196 100644
--- a/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping
@@ -1,5 +1,15 @@
 CLASS cnz net/minecraft/world/loot/ConstantLootTableRange
 	CLASS cnz$a Serializer
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 valueJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 range
+			ARG 2 unused
+			ARG 3 context
 	FIELD d value I
+	METHOD <init> (I)V
+		ARG 1 value
 	METHOD a create (I)Lcnz;
 		ARG 0 value
diff --git a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping
index 4caf2c8b27..0b470907fe 100644
--- a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping
+++ b/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping
@@ -1,3 +1,4 @@
 CLASS cpi net/minecraft/world/loot/FunctionConsumerBuilder
 	METHOD b withFunction (Lcpl$a;)Ljava/lang/Object;
+		ARG 1 lootFunctionBuilder
 	METHOD c getThis ()Ljava/lang/Object;
diff --git a/mappings/net/minecraft/world/loot/LootChoice.mapping b/mappings/net/minecraft/world/loot/LootChoice.mapping
index 14c5c7cce6..46c3cb1cd9 100644
--- a/mappings/net/minecraft/world/loot/LootChoice.mapping
+++ b/mappings/net/minecraft/world/loot/LootChoice.mapping
@@ -1,4 +1,6 @@
 CLASS cot net/minecraft/world/loot/LootChoice
 	METHOD a getWeight (F)I
+		ARG 1 luck
 	METHOD a drop (Ljava/util/function/Consumer;Lcob;)V
-		ARG 1 consumer
+		ARG 1 itemDropper
+		ARG 2 context
diff --git a/mappings/net/minecraft/world/loot/LootChoiceProvider.mapping b/mappings/net/minecraft/world/loot/LootChoiceProvider.mapping
index 603405691e..9398acfeb8 100644
--- a/mappings/net/minecraft/world/loot/LootChoiceProvider.mapping
+++ b/mappings/net/minecraft/world/loot/LootChoiceProvider.mapping
@@ -3,4 +3,15 @@ CLASS col net/minecraft/world/loot/LootChoiceProvider
 	FIELD b ALWAYS_TRUE Lcol;
 	METHOD a doExpand (Lcob;Ljava/util/function/Consumer;)Z
 	METHOD a and (Lcol;)Lcol;
+		ARG 1 other
+	METHOD a (Lcol;Lcob;Ljava/util/function/Consumer;)Z
+		ARG 2 context
+		ARG 3 lootChoiceExpander
 	METHOD b or (Lcol;)Lcol;
+		ARG 1 other
+	METHOD b (Lcol;Lcob;Ljava/util/function/Consumer;)Z
+		ARG 2 context
+		ARG 3 lootChoiceExpander
+	METHOD expand (Lcob;Ljava/util/function/Consumer;)Z
+		ARG 1 context
+		ARG 2 lootChoiceExpander
diff --git a/mappings/net/minecraft/world/loot/LootManager.mapping b/mappings/net/minecraft/world/loot/LootManager.mapping
index ae61349f19..5a0644fd34 100644
--- a/mappings/net/minecraft/world/loot/LootManager.mapping
+++ b/mappings/net/minecraft/world/loot/LootManager.mapping
@@ -7,5 +7,19 @@ CLASS cog net/minecraft/world/loot/LootManager
 	FIELD f supplierNames Ljava/util/Set;
 	METHOD a getSupplierNames ()Ljava/util/Set;
 	METHOD a toJson (Lcoe;)Lcom/google/gson/JsonElement;
+		ARG 0 supplier
+	METHOD a (Lcof;Lqs;Lcoe;)V
+		ARG 2 id
+		ARG 3 supplier
 	METHOD a check (Lcof;Lqs;Lcoe;Ljava/util/function/Function;)V
+		ARG 0 reporter
+		ARG 1 id
+		ARG 2 supplier
+		ARG 3 supplierGetter
+	METHOD a (Ljava/lang/String;)Z
+		ARG 0 ressourcePath
+	METHOD a (Ljava/lang/String;Ljava/lang/String;)V
+		ARG 0 key
+		ARG 1 value
 	METHOD a getSupplier (Lqs;)Lcoe;
+		ARG 1 id
diff --git a/mappings/net/minecraft/world/loot/LootPool.mapping b/mappings/net/minecraft/world/loot/LootPool.mapping
index 6da9a7a625..15bf5660ca 100644
--- a/mappings/net/minecraft/world/loot/LootPool.mapping
+++ b/mappings/net/minecraft/world/loot/LootPool.mapping
@@ -3,20 +3,46 @@ CLASS cod net/minecraft/world/loot/LootPool
 		FIELD a entries Ljava/util/List;
 		FIELD b conditions Ljava/util/List;
 		FIELD c functions Ljava/util/List;
-		FIELD d rolls Lcoh;
-		FIELD e range Lcoj;
+		FIELD d rollsRange Lcoh;
+		FIELD e bonusRollsRange Lcoj;
 		METHOD a withRolls (Lcoh;)Lcod$a;
+			ARG 1 rollsRange
 		METHOD a withEntry (Lcou$a;)Lcod$a;
+			ARG 1 entryBuilder
 		METHOD b build ()Lcod;
 	CLASS cod$b Serializer
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 poolJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 pool
+			ARG 2 unused
+			ARG 3 context
 	FIELD a entries [Lcou;
 	FIELD b conditions [Lcqo;
 	FIELD c predicate Ljava/util/function/Predicate;
 	FIELD d functions [Lcpl;
 	FIELD e javaFunctions Ljava/util/function/BiFunction;
-	FIELD f rolls Lcoh;
-	FIELD g bonusRolls Lcoj;
-	METHOD a create ()Lcod$a;
+	FIELD f rollsRange Lcoh;
+	FIELD g bonusRollsRange Lcoj;
+	METHOD <init> ([Lcou;[Lcqo;[Lcpl;Lcoh;Lcoj;)V
+		ARG 1 entries
+		ARG 2 conditions
+		ARG 3 functions
+		ARG 4 rollsRange
+		ARG 5 bonusRollsRange
+	METHOD a builder ()Lcod$a;
+	METHOD a (Lcob;Ljava/util/List;Lorg/apache/commons/lang3/mutable/MutableInt;Lcot;)V
+		ARG 3 choice
 	METHOD a check (Lcof;Ljava/util/function/Function;Ljava/util/Set;Lcqb;)V
+		ARG 1 reporter
+		ARG 2 supplierGetter
+		ARG 3 parentLootTables
+		ARG 4 contextType
 	METHOD a drop (Ljava/util/function/Consumer;Lcob;)V
+		ARG 1 itemDropper
+		ARG 2 context
 	METHOD b supplyOnce (Ljava/util/function/Consumer;Lcob;)V
+		ARG 1 itemDropper
+		ARG 2 context
diff --git a/mappings/net/minecraft/world/loot/LootSupplier.mapping b/mappings/net/minecraft/world/loot/LootSupplier.mapping
index 6c7bed3f72..e0cb5c222e 100644
--- a/mappings/net/minecraft/world/loot/LootSupplier.mapping
+++ b/mappings/net/minecraft/world/loot/LootSupplier.mapping
@@ -4,9 +4,19 @@ CLASS coe net/minecraft/world/loot/LootSupplier
 		FIELD b functions Ljava/util/List;
 		FIELD c type Lcqb;
 		METHOD a withPool (Lcod$a;)Lcoe$a;
+			ARG 1 poolBuilder
 		METHOD a withType (Lcqb;)Lcoe$a;
+			ARG 1 context
 		METHOD b create ()Lcoe;
 	CLASS coe$b Serializer
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 lootTableRootJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 supplier
+			ARG 2 unused
+			ARG 3 context
 	FIELD a EMPTY Lcoe;
 	FIELD b GENERIC Lcqb;
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
@@ -14,12 +24,36 @@ CLASS coe net/minecraft/world/loot/LootSupplier
 	FIELD e pools [Lcod;
 	FIELD f functions [Lcpl;
 	FIELD g combinedFunction Ljava/util/function/BiFunction;
+	METHOD <init> (Lcqb;[Lcod;[Lcpl;)V
+		ARG 1 contextType
+		ARG 2 pools
+		ARG 3 functions
 	METHOD a getType ()Lcqb;
 	METHOD a supplyInventory (Lago;Lcob;)V
+		ARG 1 inventory
+		ARG 2 context
 	METHOD a getFreeSlots (Lago;Ljava/util/Random;)Ljava/util/List;
+		ARG 1 inventory
+		ARG 2 random
 	METHOD a getDrops (Lcob;)Ljava/util/List;
+		ARG 1 context
 	METHOD a drop (Lcob;Ljava/util/function/Consumer;)V
+		ARG 1 context
+		ARG 2 itemDropper
 	METHOD a check (Lcof;Ljava/util/function/Function;Ljava/util/Set;Lcqb;)V
+		ARG 1 reporter
+		ARG 2 supplierGetter
+		ARG 3 parentLootTables
+		ARG 4 contextType
+	METHOD a shuffle (Ljava/util/List;ILjava/util/Random;)V
+		ARG 1 drops
+		ARG 2 freeSlots
+		ARG 3 random
 	METHOD a limitedConsumer (Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
-	METHOD b create ()Lcoe$a;
+		ARG 0 itemDropper
+	METHOD a (Ljava/util/function/Consumer;Lbbr;)V
+		ARG 1 stack
+	METHOD b builder ()Lcoe$a;
 	METHOD b dropLimited (Lcob;Ljava/util/function/Consumer;)V
+		ARG 1 context
+		ARG 2 dropItemConsumer
diff --git a/mappings/net/minecraft/world/loot/LootTableRange.mapping b/mappings/net/minecraft/world/loot/LootTableRange.mapping
index ff9a23e615..62a5a4848d 100644
--- a/mappings/net/minecraft/world/loot/LootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/LootTableRange.mapping
@@ -4,3 +4,4 @@ CLASS coh net/minecraft/world/loot/LootTableRange
 	FIELD c BINOMIAL Lqs;
 	METHOD a getType ()Lqs;
 	METHOD a next (Ljava/util/Random;)I
+		ARG 1 random
diff --git a/mappings/net/minecraft/world/loot/LootTableRanges.mapping b/mappings/net/minecraft/world/loot/LootTableRanges.mapping
index f3e147e63b..1ff5748a62 100644
--- a/mappings/net/minecraft/world/loot/LootTableRanges.mapping
+++ b/mappings/net/minecraft/world/loot/LootTableRanges.mapping
@@ -1,4 +1,8 @@
 CLASS coi net/minecraft/world/loot/LootTableRanges
 	FIELD a types Ljava/util/Map;
 	METHOD a serialize (Lcoh;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+		ARG 0 range
+		ARG 1 context
 	METHOD a deserialize (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lcoh;
+		ARG 0 rangeJson
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/LootTableReporter.mapping b/mappings/net/minecraft/world/loot/LootTableReporter.mapping
index 15929904e8..5cb2c35590 100644
--- a/mappings/net/minecraft/world/loot/LootTableReporter.mapping
+++ b/mappings/net/minecraft/world/loot/LootTableReporter.mapping
@@ -2,7 +2,12 @@ CLASS cof 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 <init> (Lcom/google/common/collect/Multimap;Ljava/util/function/Supplier;)V
+		ARG 1 messages
+		ARG 2 nameFactory
 	METHOD a getMessages ()Lcom/google/common/collect/Multimap;
 	METHOD a report (Ljava/lang/String;)V
+		ARG 1 message
 	METHOD b getContext ()Ljava/lang/String;
 	METHOD b makeChild (Ljava/lang/String;)Lcof;
+		ARG 1 childTag
diff --git a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping b/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping
index db4df519b6..8da381082f 100644
--- a/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping
+++ b/mappings/net/minecraft/world/loot/UniformLootTableRange.mapping
@@ -1,11 +1,26 @@
 CLASS coj net/minecraft/world/loot/UniformLootTableRange
 	CLASS coj$a Serializer
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 valueJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 valueJson
+			ARG 2 unused
+			ARG 3 context
 	FIELD d min F
 	FIELD e max F
+	METHOD <init> (F)V
+		ARG 1 value
 	METHOD <init> (FF)V
 		ARG 1 min
+		ARG 2 max
 	METHOD a between (FF)Lcoj;
+		ARG 0 min
+		ARG 1 max
 	METHOD a contains (I)Z
+		ARG 1 value
 	METHOD b getMinValue ()F
 	METHOD b nextFloat (Ljava/util/Random;)F
+		ARG 1 random
 	METHOD c getMaxValue ()F
diff --git a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping
index b70be1fa6c..8923b6fa0d 100644
--- a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping
@@ -1,6 +1,14 @@
 CLASS cqf net/minecraft/world/loot/condition/AlternativeLootCondition
 	CLASS cqf$a Builder
+		FIELD a terms Ljava/util/List;
+		METHOD <init> ([Lcqo$a;)V
+			ARG 1 terms
 	CLASS cqf$b Factory
 	FIELD a terms [Lcqo;
 	FIELD b predicate Ljava/util/function/Predicate;
-	METHOD a or ([Lcqo$a;)Lcqf$a;
+	METHOD <init> ([Lcqo;)V
+		ARG 1 terms
+	METHOD a builder ([Lcqo$a;)Lcqf$a;
+		ARG 0 terms
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping
index c44f81e21b..a6727ff578 100644
--- a/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping
@@ -1,5 +1,38 @@
 CLASS cqn net/minecraft/world/loot/condition/BlockStatePropertyLootCondition
+	CLASS cqn$a Builder
+		FIELD a block Lbmb;
+		FIELD b availableProperties Ljava/util/Set;
+		FIELD c propertyValues Ljava/util/Map;
+		METHOD <init> (Lbmb;)V
+			ARG 1 block
+		METHOD a withBlockStateProperty (Lbwc;Ljava/lang/Comparable;)Lcqn$a;
+			ARG 1 property
+			ARG 2 value
 	CLASS cqn$b Factory
+		METHOD a getPropertyValueString (Lbwc;Ljava/lang/Object;)Ljava/lang/String;
+			ARG 0 property
+			ARG 1 value
+		METHOD a (Lcom/google/gson/JsonObject;Lbwc;Ljava/lang/Object;)V
+			ARG 1 property
+			ARG 2 value
 	FIELD a block Lbmb;
 	FIELD b properties Ljava/util/Map;
 	FIELD c predicate Ljava/util/function/Predicate;
+	METHOD <init> (Lbmb;Ljava/util/Map;)V
+		ARG 1 block
+		ARG 2 properties
+	METHOD a builder (Lbmb;)Lcqn$a;
+		ARG 0 block
+	METHOD a (Lbmb;Lbuz;)Z
+		ARG 1 blockState
+	METHOD a (Lbmb;Ljava/lang/Object;Lbwc;Lbuz;)Z
+		ARG 3 blockState
+	METHOD a getBlockState (Lbmb;Ljava/util/Map;)Ljava/util/function/Predicate;
+		ARG 0 block
+		ARG 1 properties
+	METHOD a (Ljava/lang/Object;Lbwc;Lbuz;)Z
+		ARG 2 blockState
+	METHOD b (Lbmb;Lbuz;)Z
+		ARG 1 blockState
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping
index eaa2a2c781..fd99b59238 100644
--- a/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping
@@ -1,3 +1,9 @@
 CLASS cqi net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition
 	CLASS cqi$a Factory
 	FIELD a predicate Lam;
+	METHOD <init> (Lam;)V
+		ARG 1 predicate
+	METHOD a builder (Lam$a;)Lcqo$a;
+		ARG 0 builder
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping
index c7d88c7273..db5f6907ee 100644
--- a/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping
@@ -2,3 +2,13 @@ CLASS cqq net/minecraft/world/loot/condition/EntityPropertiesLootCondition
 	CLASS cqq$a Factory
 	FIELD a predicate Lav;
 	FIELD b entity Lcob$c;
+	METHOD <init> (Lav;Lcob$c;)V
+		ARG 1 predicate
+		ARG 2 entity
+	METHOD a create (Lcob$c;)Lcqo$a;
+		ARG 0 entity
+	METHOD a builder (Lcob$c;Lav$a;)Lcqo$a;
+		ARG 0 entity
+		ARG 1 predicateBuilder
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping
index 0403017af7..91b53f6826 100644
--- a/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping
@@ -2,3 +2,13 @@ CLASS cqj net/minecraft/world/loot/condition/EntityScoresLootCondition
 	CLASS cqj$b Factory
 	FIELD a scores Ljava/util/Map;
 	FIELD b target Lcob$c;
+	METHOD <init> (Ljava/util/Map;Lcob$c;)V
+		ARG 1 scores
+		ARG 2 target
+	METHOD a entityScoreIsInRange (Laia;Lcsl;Ljava/lang/String;Lcoj;)Z
+		ARG 1 entity
+		ARG 2 scoreboard
+		ARG 3 objective
+		ARG 4 scoreRange
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping
index 8db67cfc5c..39adfee11a 100644
--- a/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping
@@ -1,4 +1,9 @@
 CLASS cql net/minecraft/world/loot/condition/InvertedLootCondition
 	CLASS cql$a Factory
 	FIELD a term Lcqo;
-	METHOD a create (Lcqo$a;)Lcqo$a;
+	METHOD <init> (Lcqo;)V
+		ARG 1 term
+	METHOD a builder (Lcqo$a;)Lcqo$a;
+		ARG 0 conditionBuilder
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping
index 07b509ff75..efc140c9db 100644
--- a/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping
@@ -1,3 +1,6 @@
 CLASS cqr net/minecraft/world/loot/condition/KilledByPlayerLootCondition
 	CLASS cqr$a Factory
 	FIELD a INSTANCE Lcqr;
+	METHOD b builder ()Lcqo$a;
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping
index 59020224c9..242559157d 100644
--- a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping
@@ -1,3 +1,9 @@
 CLASS cqm net/minecraft/world/loot/condition/LocationCheckLootCondition
 	CLASS cqm$a Factory
-	FIELD a location Lbg;
+	FIELD a predicate Lbg;
+	METHOD <init> (Lbg;)V
+		ARG 1 predicate
+	METHOD a builder (Lbg$a;)Lcqo$a;
+		ARG 0 predicateBuilder
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/LootCondition.mapping b/mappings/net/minecraft/world/loot/condition/LootCondition.mapping
index b26c2a7197..fdadbd7712 100644
--- a/mappings/net/minecraft/world/loot/condition/LootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/LootCondition.mapping
@@ -1,11 +1,20 @@
 CLASS cqo net/minecraft/world/loot/condition/LootCondition
 	CLASS cqo$a Builder
 		METHOD a invert ()Lcqo$a;
-		METHOD a or (Lcqo$a;)Lcqf$a;
+		METHOD a withCondition (Lcqo$a;)Lcqf$a;
+			ARG 1 conditionBuilder
 	CLASS cqo$b Factory
 		FIELD a id Lqs;
 		FIELD b conditionClass Ljava/lang/Class;
+		METHOD <init> (Lqs;Ljava/lang/Class;)V
+			ARG 1 id
+			ARG 2 conditionClass
 		METHOD a getId ()Lqs;
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcqo;Lcom/google/gson/JsonSerializationContext;)V
+			ARG 1 conditionJson
+			ARG 2 condition
+			ARG 3 context
 		METHOD b getConditionClass ()Ljava/lang/Class;
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcqo;
+			ARG 1 conditionJson
+			ARG 2 context
diff --git a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping b/mappings/net/minecraft/world/loot/condition/LootConditions.mapping
index 6e3fff6e84..4a1c447e4e 100644
--- a/mappings/net/minecraft/world/loot/condition/LootConditions.mapping
+++ b/mappings/net/minecraft/world/loot/condition/LootConditions.mapping
@@ -1,9 +1,30 @@
 CLASS cqp net/minecraft/world/loot/condition/LootConditions
 	CLASS cqp$a Factory
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 conditionsJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 condition
+			ARG 2 unused
+			ARG 3 context
 	FIELD a byId Ljava/util/Map;
 	FIELD b byClass Ljava/util/Map;
 	METHOD a register (Lcqo$b;)V
+		ARG 0 conditionFactory
 	METHOD a getFactory (Lcqo;)Lcqo$b;
+		ARG 0 condition
+	METHOD a (Ljava/lang/Object;)Z
+		ARG 0 predicates
 	METHOD a get (Lqs;)Lcqo$b;
+		ARG 0 id
 	METHOD a joinAnd ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate;
+		ARG 0 predicates
+	METHOD a ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z
+		ARG 1 operand
+	METHOD b (Ljava/lang/Object;)Z
+		ARG 0 predicates
 	METHOD b joinOr ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate;
+		ARG 0 predicates
+	METHOD b ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z
+		ARG 1 operand
diff --git a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping
index f4cf666f4c..be6d634751 100644
--- a/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping
@@ -1,3 +1,9 @@
 CLASS cqu net/minecraft/world/loot/condition/MatchToolLootCondition
 	CLASS cqu$a Factory
 	FIELD a predicate Lbc;
+	METHOD <init> (Lbc;)V
+		ARG 1 predicate
+	METHOD a builder (Lbc$a;)Lcqo$a;
+		ARG 0 predicateBuilder
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping
index a990662ef9..19e1ba09e7 100644
--- a/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping
@@ -1,3 +1,9 @@
 CLASS cqs net/minecraft/world/loot/condition/RandomChanceLootCondition
 	CLASS cqs$a Factory
 	FIELD a chance F
+	METHOD <init> (F)V
+		ARG 1 chance
+	METHOD a builder (F)Lcqo$a;
+		ARG 0 chance
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping
index 880b3758cd..cb0d9d2bee 100644
--- a/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping
@@ -4,3 +4,9 @@ CLASS cqt net/minecraft/world/loot/condition/RandomChanceWithLootingLootConditio
 	FIELD b lootingMultiplier F
 	METHOD <init> (FF)V
 		ARG 1 chance
+		ARG 2 lootingMultiplier
+	METHOD a builder (FF)Lcqo$a;
+		ARG 0 chance
+		ARG 1 lootingMultiplier
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping
index 185cfff2f6..0818df1625 100644
--- a/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping
@@ -1,3 +1,6 @@
 CLASS cqk net/minecraft/world/loot/condition/SurvivesExplosionLootCondition
 	CLASS cqk$a Factory
 	FIELD a INSTANCE Lcqk;
+	METHOD b builder ()Lcqo$a;
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping
index f50e044d35..cc60c6909c 100644
--- a/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping
@@ -2,3 +2,11 @@ CLASS cqg net/minecraft/world/loot/condition/TableBonusLootCondition
 	CLASS cqg$a Factory
 	FIELD a enchantment Lbez;
 	FIELD b chances [F
+	METHOD <init> (Lbez;[F)V
+		ARG 1 enchantment
+		ARG 2 chances
+	METHOD a builder (Lbez;[F)Lcqo$a;
+		ARG 0 enchantment
+		ARG 1 chances
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping
index b2ce3f206d..d164118d2a 100644
--- a/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping
+++ b/mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping
@@ -2,3 +2,8 @@ CLASS cqv net/minecraft/world/loot/condition/WeatherCheckLootCondition
 	CLASS cqv$b Factory
 	FIELD a raining Ljava/lang/Boolean;
 	FIELD b thundering Ljava/lang/Boolean;
+	METHOD <init> (Ljava/lang/Boolean;Ljava/lang/Boolean;)V
+		ARG 1 isRainig
+		ARG 2 isThundering
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/world/loot/context/LootContext.mapping
index d925ce7daf..8145a64856 100644
--- a/mappings/net/minecraft/world/loot/context/LootContext.mapping
+++ b/mappings/net/minecraft/world/loot/context/LootContext.mapping
@@ -5,28 +5,55 @@ CLASS cob net/minecraft/world/loot/context/LootContext
 		FIELD c drops Ljava/util/Map;
 		FIELD d random Ljava/util/Random;
 		FIELD e luck F
+		METHOD <init> (Lvf;)V
+			ARG 1 world
 		METHOD a getWorld ()Lvf;
 		METHOD a setLuck (F)Lcob$a;
+			ARG 1 luck
 		METHOD a setRandom (J)Lcob$a;
+			ARG 1 seed
 		METHOD a setRandom (JLjava/util/Random;)Lcob$a;
+			ARG 1 seed
+			ARG 3 random
 		METHOD a get (Lcqa;)Ljava/lang/Object;
+			ARG 1 parameter
 		METHOD a put (Lcqa;Ljava/lang/Object;)Lcob$a;
+			ARG 1 key
+			ARG 2 value
 		METHOD a build (Lcqb;)Lcob;
+			ARG 1 contextType
 		METHOD a setRandom (Ljava/util/Random;)Lcob$a;
+			ARG 1 random
 		METHOD a putDrop (Lqs;Lcob$b;)Lcob$a;
+			ARG 1 id
+			ARG 2 value
 		METHOD b getNullable (Lcqa;)Ljava/lang/Object;
+			ARG 1 parameter
 		METHOD b putNullable (Lcqa;Ljava/lang/Object;)Lcob$a;
+			ARG 1 key
+			ARG 2 value
 	CLASS cob$b Dropper
+		METHOD add (Lcob;Ljava/util/function/Consumer;)V
+			ARG 1 context
 	CLASS cob$c EntityTarget
 		CLASS cob$c$a Serializer
+			METHOD read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
+				ARG 1 reader
+			METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V
+				ARG 1 writer
+				ARG 2 entity
 		FIELD a THIS Lcob$c;
 		FIELD b KILLER Lcob$c;
 		FIELD c DIRECT_KILLER Lcob$c;
 		FIELD d KILLER_PLAYER Lcob$c;
 		FIELD e type Ljava/lang/String;
 		FIELD f identifier Lcqa;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lcqa;)V
+			ARG 3 type
+			ARG 4 parameter
 		METHOD a getIdentifier ()Lcqa;
 		METHOD a fromString (Ljava/lang/String;)Lcob$c;
+			ARG 0 type
 	FIELD a random Ljava/util/Random;
 	FIELD b luck F
 	FIELD c world Lvf;
@@ -34,12 +61,25 @@ CLASS cob net/minecraft/world/loot/context/LootContext
 	FIELD e suppliers Ljava/util/Set;
 	FIELD f parameters Ljava/util/Map;
 	FIELD g drops Ljava/util/Map;
+	METHOD <init> (Ljava/util/Random;FLvf;Lcog;Ljava/util/Map;Ljava/util/Map;)V
+		ARG 1 random
+		ARG 2 luck
+		ARG 3 world
+		ARG 4 manager
+		ARG 5 parameters
+		ARG 6 drops
 	METHOD a getLootManager ()Lcog;
 	METHOD a addDrop (Lcoe;)Z
+		ARG 1 supplier
 	METHOD a hasParameter (Lcqa;)Z
+		ARG 1 parameter
 	METHOD a drop (Lqs;Ljava/util/function/Consumer;)V
+		ARG 1 id
+		ARG 2 itemDropper
 	METHOD b getRandom ()Ljava/util/Random;
 	METHOD b removeDrop (Lcoe;)V
+		ARG 1 supplier
 	METHOD c getLuck ()F
 	METHOD c get (Lcqa;)Ljava/lang/Object;
+		ARG 1 parameter
 	METHOD d getWorld ()Lvf;
diff --git a/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping b/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping
index 51b8c426d4..b2a2fc6deb 100644
--- a/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping
+++ b/mappings/net/minecraft/world/loot/context/LootContextParameter.mapping
@@ -1,3 +1,5 @@
 CLASS cqa net/minecraft/world/loot/context/LootContextParameter
 	FIELD a id Lqs;
+	METHOD <init> (Lqs;)V
+		ARG 1 id
 	METHOD a getIdentifier ()Lqs;
diff --git a/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping b/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping
index 0aada4d914..a609222a8e 100644
--- a/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping
+++ b/mappings/net/minecraft/world/loot/context/LootContextParameters.mapping
@@ -1,2 +1,3 @@
 CLASS cqd net/minecraft/world/loot/context/LootContextParameters
 	METHOD a register (Ljava/lang/String;)Lcqa;
+		ARG 0 name
diff --git a/mappings/net/minecraft/world/loot/context/LootContextType.mapping b/mappings/net/minecraft/world/loot/context/LootContextType.mapping
index 09b819bc94..49f183c9d2 100644
--- a/mappings/net/minecraft/world/loot/context/LootContextType.mapping
+++ b/mappings/net/minecraft/world/loot/context/LootContextType.mapping
@@ -4,11 +4,18 @@ CLASS cqb net/minecraft/world/loot/context/LootContextType
 		FIELD b allowed Ljava/util/Set;
 		METHOD a build ()Lcqb;
 		METHOD a require (Lcqa;)Lcqb$a;
+			ARG 1 parameter
 		METHOD b allow (Lcqa;)Lcqb$a;
+			ARG 1 parameter
 	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 (Lcof;Lcoc;)V
+		ARG 1 reporter
+		ARG 2 parameterConsumer
 	METHOD b getAllowed ()Ljava/util/Set;
+	METHOD b (Lcqa;)Ljava/lang/String;
+		ARG 1 parameter
diff --git a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping
index 45cbb4c592..e0c79ead76 100644
--- a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping
+++ b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping
@@ -8,6 +8,26 @@ CLASS cqc net/minecraft/world/loot/context/LootContextTypes
 	FIELD g GENERIC Lcqb;
 	FIELD h BLOCK Lcqb;
 	FIELD i MAP Lcom/google/common/collect/BiMap;
+	METHOD a (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
 	METHOD a getId (Lcqb;)Lqs;
+		ARG 0 contextType
 	METHOD a register (Ljava/lang/String;Ljava/util/function/Consumer;)Lcqb;
+		ARG 0 type
+		ARG 1 contextTypeBuilder
 	METHOD a get (Lqs;)Lcqb;
+		ARG 0 id
+	METHOD b (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
+	METHOD c (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
+	METHOD d (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
+	METHOD e (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
+	METHOD f (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
+	METHOD g (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
+	METHOD h (Lcqb$a;)V
+		ARG 0 contextTypeBuilder
diff --git a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping b/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping
index d36b35798e..78e50869e2 100644
--- a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping
+++ b/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping
@@ -1,3 +1,7 @@
 CLASS coc net/minecraft/world/loot/context/ParameterConsumer
 	METHOD a getRequiredParameters ()Ljava/util/Set;
 	METHOD a check (Lcof;Ljava/util/function/Function;Ljava/util/Set;Lcqb;)V
+		ARG 1 reporter
+		ARG 2 supplierGetter
+		ARG 3 parentLootTables
+		ARG 4 contextType
diff --git a/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping
index 952333b8ba..2fcfe710ca 100644
--- a/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping
@@ -1,4 +1,10 @@
 CLASS cok net/minecraft/world/loot/entry/AlternativeEntry
 	CLASS cok$a Builder
 		FIELD a children Ljava/util/List;
-	METHOD a create ([Lcou$a;)Lcok$a;
+		METHOD <init> ([Lcou$a;)V
+			ARG 1 children
+	METHOD a ([Lcol;Lcob;Ljava/util/function/Consumer;)Z
+		ARG 1 context
+		ARG 2 lootChoiceExpander
+	METHOD a builder ([Lcou$a;)Lcok$a;
+		ARG 0 children
diff --git a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping
index f5058e0cbc..c4e69312a2 100644
--- a/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping
@@ -1,7 +1,22 @@
 CLASS com net/minecraft/world/loot/entry/CombinedEntry
 	CLASS com$a Factory
+		METHOD create ([Lcou;[Lcqo;)Lcom;
+			ARG 1 children
+			ARG 2 conditions
 	CLASS com$b Serializer
+		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcou;[Lcqo;)Lcom;
+			ARG 1 entryJsonObject
+			ARG 2 context
+			ARG 3 children
+			ARG 4 conditions
 	FIELD c children [Lcou;
 	FIELD e predicate Lcol;
+	METHOD <init> ([Lcou;[Lcqo;)V
+		ARG 1 children
+		ARG 2 conditions
 	METHOD a createSerializer (Lqs;Ljava/lang/Class;Lcom$a;)Lcom$b;
+		ARG 0 id
+		ARG 1 type
+		ARG 2 combinedEntryFactory
 	METHOD a combine ([Lcol;)Lcol;
+		ARG 1 children
diff --git a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping
index 7df3a7d3bf..438808eac0 100644
--- a/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping
@@ -2,4 +2,16 @@ CLASS coo net/minecraft/world/loot/entry/DynamicEntry
 	CLASS coo$a Serializer
 	FIELD c instance Lqs;
 	FIELD h name Lqs;
-	METHOD a create (Lqs;)Lcov$a;
+	METHOD <init> (Lqs;II[Lcqo;[Lcpl;)V
+		ARG 1 name
+		ARG 2 weight
+		ARG 3 quality
+		ARG 4 conditions
+		ARG 5 functions
+	METHOD a builder (Lqs;)Lcov$a;
+		ARG 0 name
+	METHOD a (Lqs;II[Lcqo;[Lcpl;)Lcov;
+		ARG 1 weight
+		ARG 2 quality
+		ARG 3 conditions
+		ARG 4 functions
diff --git a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping
index b0816cadd7..d38bc543e1 100644
--- a/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping
@@ -1,3 +1,8 @@
 CLASS cop net/minecraft/world/loot/entry/EmptyEntry
 	CLASS cop$a Serializer
+	METHOD <init> (II[Lcqo;[Lcpl;)V
+		ARG 1 weight
+		ARG 2 quality
+		ARG 3 conditions
+		ARG 4 functions
 	METHOD a Serializer ()Lcov$a;
diff --git a/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping
index aace09b141..2c38d169eb 100644
--- a/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/GroupEntry.mapping
@@ -1 +1,7 @@
 CLASS coq net/minecraft/world/loot/entry/GroupEntry
+	METHOD a (Lcol;Lcol;Lcob;Ljava/util/function/Consumer;)Z
+		ARG 2 context
+		ARG 3 lootChoiceExpander
+	METHOD a ([Lcol;Lcob;Ljava/util/function/Consumer;)Z
+		ARG 1 context
+		ARG 2 lootChoiceExpander
diff --git a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping
index e1fa1257c9..627446384d 100644
--- a/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/ItemEntry.mapping
@@ -1,4 +1,16 @@
 CLASS cor net/minecraft/world/loot/entry/ItemEntry
 	CLASS cor$a Serializer
 	FIELD c item Lbbm;
+	METHOD <init> (Lbbm;II[Lcqo;[Lcpl;)V
+		ARG 1 item
+		ARG 2 weight
+		ARG 3 quality
+		ARG 4 conditions
+		ARG 5 functions
 	METHOD a builder (Lbgw;)Lcov$a;
+		ARG 0 itemProvider
+	METHOD a (Lbgw;II[Lcqo;[Lcpl;)Lcov;
+		ARG 1 weight
+		ARG 2 quality
+		ARG 3 conditions
+		ARG 4 functions
diff --git a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping
index 0b4b66000c..595aeef276 100644
--- a/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/LeafEntry.mapping
@@ -5,16 +5,40 @@ CLASS cov net/minecraft/world/loot/entry/LeafEntry
 		FIELD c functions Ljava/util/List;
 		METHOD a getFunctions ()[Lcpl;
 		METHOD a setWeight (I)Lcov$a;
+			ARG 1 weight
 		METHOD b setQuality (I)Lcov$a;
+			ARG 1 quality
 	CLASS cov$b BasicBuilder
 		FIELD c factory Lcov$d;
+		METHOD <init> (Lcov$d;)V
+			ARG 1 leafEntryFactory
 	CLASS cov$c Choice
 	CLASS cov$d Factory
+		METHOD build (II[Lcqo;[Lcpl;)Lcov;
+			ARG 1 weight
+			ARG 2 quality
+			ARG 3 conditions
+			ARG 4 functions
 	CLASS cov$e Serializer
+		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lcqo;[Lcpl;)Lcov;
+			ARG 1 entryJson
+			ARG 2 context
+			ARG 3 weight
+			ARG 4 quality
+			ARG 5 conditions
+			ARG 6 functions
 	FIELD c compiledFunctions Ljava/util/function/BiFunction;
 	FIELD e weight I
 	FIELD f quality I
 	FIELD g functions [Lcpl;
 	FIELD h choice Lcot;
-	METHOD a create (Lcov$d;)Lcov$a;
+	METHOD <init> (II[Lcqo;[Lcpl;)V
+		ARG 1 weight
+		ARG 2 quality
+		ARG 3 conditions
+		ARG 4 functions
+	METHOD a builder (Lcov$d;)Lcov$a;
+		ARG 0 leafEntryFactory
 	METHOD a drop (Ljava/util/function/Consumer;Lcob;)V
+		ARG 1 itemDropper
+		ARG 2 context
diff --git a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping b/mappings/net/minecraft/world/loot/entry/LootEntries.mapping
index b871ad52e9..871a37a382 100644
--- a/mappings/net/minecraft/world/loot/entry/LootEntries.mapping
+++ b/mappings/net/minecraft/world/loot/entry/LootEntries.mapping
@@ -1,6 +1,16 @@
 CLASS cos net/minecraft/world/loot/entry/LootEntries
 	CLASS cos$a Serializer
 		METHOD a getSerializer (Ljava/lang/Class;)Lcou$b;
+			ARG 0 clazz
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 entryJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 entry
+			ARG 2 unused
+			ARG 3 context
 	FIELD a idSerializers Ljava/util/Map;
 	FIELD b classSerializers Ljava/util/Map;
 	METHOD a register (Lcou$b;)V
+		ARG 0 entrySerializer
diff --git a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping
index 2abcc83665..3b1f80cd30 100644
--- a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping
@@ -2,17 +2,34 @@ CLASS cou net/minecraft/world/loot/entry/LootEntry
 	CLASS cou$a Builder
 		FIELD a children Ljava/util/List;
 		METHOD a withChild (Lcou$a;)Lcok$a;
+			ARG 1 builder
 		METHOD b build ()Lcou;
 		METHOD d getThisBuilder ()Lcou$a;
 		METHOD f getConditions ()[Lcqo;
 	CLASS cou$b Serializer
 		FIELD a id Lqs;
 		FIELD b type Ljava/lang/Class;
+		METHOD <init> (Lqs;Ljava/lang/Class;)V
+			ARG 1 id
+			ARG 2 type
 		METHOD a getIdentifier ()Lqs;
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcou;Lcom/google/gson/JsonSerializationContext;)V
+			ARG 1 entryJson
+			ARG 2 entry
+			ARG 3 context
 		METHOD b getType ()Ljava/lang/Class;
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcqo;)Lcou;
+			ARG 1 entryJson
+			ARG 2 context
+			ARG 3 conditions
 	FIELD c conditionPredicate Ljava/util/function/Predicate;
 	FIELD d conditions [Lcqo;
+	METHOD <init> ([Lcqo;)V
+		ARG 1 conditions
 	METHOD a test (Lcob;)Z
+		ARG 1 context
 	METHOD a check (Lcof;Ljava/util/function/Function;Ljava/util/Set;Lcqb;)V
+		ARG 1 reporter
+		ARG 2 supplierGetter
+		ARG 3 parentLootTables
+		ARG 4 contextType
diff --git a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping
index 572f27dcb7..c8395699ed 100644
--- a/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping
@@ -1,3 +1,16 @@
 CLASS cow net/minecraft/world/loot/entry/LootTableEntry
 	CLASS cow$a Serializer
 	FIELD c id Lqs;
+	METHOD <init> (Lqs;II[Lcqo;[Lcpl;)V
+		ARG 1 id
+		ARG 2 weight
+		ARG 3 quality
+		ARG 4 conditions
+		ARG 5 functions
+	METHOD a builder (Lqs;)Lcov$a;
+		ARG 0 id
+	METHOD a (Lqs;II[Lcqo;[Lcpl;)Lcov;
+		ARG 1 weight
+		ARG 2 quality
+		ARG 3 conditions
+		ARG 4 functions
diff --git a/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping
index 534d5013d0..1025fadb3b 100644
--- a/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/SequenceEntry.mapping
@@ -1 +1,4 @@
 CLASS cox net/minecraft/world/loot/entry/SequenceEntry
+	METHOD a ([Lcol;Lcob;Ljava/util/function/Consumer;)Z
+		ARG 1 context
+		ARG 2 lootChoiceExpander
diff --git a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping b/mappings/net/minecraft/world/loot/entry/TagEntry.mapping
index 131dfb2c1d..613657c8b6 100644
--- a/mappings/net/minecraft/world/loot/entry/TagEntry.mapping
+++ b/mappings/net/minecraft/world/loot/entry/TagEntry.mapping
@@ -2,4 +2,20 @@ CLASS coy net/minecraft/world/loot/entry/TagEntry
 	CLASS coy$a Serializer
 	FIELD c name Lza;
 	FIELD h expand Z
-	METHOD b create (Lza;)Lcov$a;
+	METHOD <init> (Lza;ZII[Lcqo;[Lcpl;)V
+		ARG 1 name
+		ARG 2 expand
+		ARG 3 weight
+		ARG 4 quality
+		ARG 5 conditions
+		ARG 6 functions
+	METHOD a expand (Lcob;Ljava/util/function/Consumer;)Z
+		ARG 1 context
+		ARG 2 lootChoiceExpander
+	METHOD a (Lza;II[Lcqo;[Lcpl;)Lcov;
+		ARG 1 weight
+		ARG 2 quality
+		ARG 3 conditions
+		ARG 4 functions
+	METHOD b builder (Lza;)Lcov$a;
+		ARG 0 name
diff --git a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping
index eea3d41341..ff4d441969 100644
--- a/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping
@@ -1,23 +1,64 @@
 CLASS cpa net/minecraft/world/loot/function/ApplyBonusLootFunction
 	CLASS cpa$a BinomialWithBonusCount
 		FIELD a ID Lqs;
+		FIELD b extra I
+		FIELD c probability F
+		METHOD <init> (IF)V
+			ARG 1 extra
+			ARG 2 probability
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpa$b;
+			ARG 0 parametersJson
+			ARG 1 context
 	CLASS cpa$b Formula
 		METHOD a getId ()Lqs;
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V
+			ARG 1 parametersJson
+			ARG 2 context
 		METHOD a getValue (Ljava/util/Random;II)I
+			ARG 1 random
+			ARG 2 initialCount
+			ARG 3 enchantmentLevel
 	CLASS cpa$c FormulaFactory
+		METHOD deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpa$b;
+			ARG 1 functionJson
+			ARG 2 context
 	CLASS cpa$d OreDrops
 		FIELD a ID Lqs;
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpa$b;
+			ARG 0 parametersJson
+			ARG 1 context
 	CLASS cpa$e Factory
 	CLASS cpa$f UniformBonusCount
 		FIELD a ID Lqs;
+		FIELD b bonusMultiplier I
+		METHOD <init> (I)V
+			ARG 1 bonusMultiplier
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpa$b;
+			ARG 0 parametersJson
+			ARG 1 context
 	FIELD a FACTORIES Ljava/util/Map;
 	FIELD c enchantment Lbez;
 	FIELD d formula Lcpa$b;
+	METHOD <init> ([Lcqo;Lbez;Lcpa$b;)V
+		ARG 1 conditions
+		ARG 2 enchantment
+		ARG 3 formula
 	METHOD a oreDrops (Lbez;)Lcpk$a;
+		ARG 0 enchantment
 	METHOD a binomialWithBonusCount (Lbez;FI)Lcpk$a;
-	METHOD a builder (Lbez;I)Lcpk$a;
-	METHOD b one (Lbez;)Lcpk$a;
+		ARG 0 enchantment
+		ARG 1 probability
+		ARG 2 extra
+	METHOD a uniformBonusCount (Lbez;I)Lcpk$a;
+		ARG 0 enchantment
+		ARG 1 bonusMultiplier
+	METHOD a (Lbez;IF[Lcqo;)Lcpl;
+		ARG 3 conditions
+	METHOD a (Lbez;I[Lcqo;)Lcpl;
+		ARG 2 conditions
+	METHOD a (Lbez;[Lcqo;)Lcpl;
+		ARG 1 conditions
+	METHOD b uniformBonusCount (Lbez;)Lcpk$a;
+		ARG 0 enchantment
+	METHOD b (Lbez;[Lcqo;)Lcpl;
+		ARG 1 conditions
diff --git a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping
index 6063a7a8d8..c9cf573d50 100644
--- a/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping
@@ -1,14 +1,26 @@
 CLASS cpk net/minecraft/world/loot/function/ConditionalLootFunction
 	CLASS cpk$a Builder
 		FIELD a conditionList Ljava/util/List;
-		METHOD d build ()Lcpk$a;
+		METHOD d getThisBuilder ()Lcpk$a;
 		METHOD g getConditions ()[Lcqo;
 	CLASS cpk$b Joiner
 		FIELD a joiner Ljava/util/function/Function;
+		METHOD <init> (Ljava/util/function/Function;)V
+			ARG 1 joiner
 	CLASS cpk$c Factory
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcqo;)Lcpk;
+			ARG 1 functionJson
+			ARG 2 context
+			ARG 3 conditions
 	FIELD a predicate Ljava/util/function/Predicate;
 	FIELD b conditions [Lcqo;
+	METHOD <init> ([Lcqo;)V
+		ARG 1 conditions
 	METHOD a process (Lbbr;Lcob;)Lbbr;
 		ARG 1 stack
-	METHOD a create (Ljava/util/function/Function;)Lcpk$a;
+		ARG 2 context
+	METHOD a builder (Ljava/util/function/Function;)Lcpk$a;
+		ARG 0 joiner
+	METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 1 itemStack
+		ARG 2 context
diff --git a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping
index b20859198f..0ce294792d 100644
--- a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping
@@ -6,8 +6,17 @@ CLASS cpc net/minecraft/world/loot/function/CopyNameLootFunction
 		FIELD d BLOCK_ENTITY Lcpc$a;
 		FIELD e name Ljava/lang/String;
 		FIELD f parameter Lcqa;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lcqa;)V
+			ARG 3 name
+			ARG 4 parameter
 		METHOD a get (Ljava/lang/String;)Lcpc$a;
+			ARG 0 name
 	CLASS cpc$b Factory
 	FIELD a source Lcpc$a;
-	METHOD a create (Lcpc$a;)Lcpk$a;
+	METHOD <init> ([Lcqo;Lcpc$a;)V
+		ARG 1 conditions
+		ARG 2 source
+	METHOD a builder (Lcpc$a;)Lcpk$a;
 		ARG 0 source
+	METHOD a (Lcpc$a;[Lcqo;)Lcpl;
+		ARG 1 conditions
diff --git a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping
index 5da7efdb85..bd55cfcfee 100644
--- a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping
@@ -1,17 +1,81 @@
 CLASS cpd net/minecraft/world/loot/function/CopyNbtLootFunction
+	CLASS cpd$a Builder
+		FIELD a source Lcpd$c;
+		FIELD b operations Ljava/util/List;
+		METHOD <init> (Lcpd$c;)V
+			ARG 1 source
+		METHOD a withOperation (Ljava/lang/String;Ljava/lang/String;)Lcpd$a;
+			ARG 1 source
+			ARG 2 target
+		METHOD a withOperation (Ljava/lang/String;Ljava/lang/String;Lcpd$d;)Lcpd$a;
+			ARG 1 source
+			ARG 2 target
+			ARG 3 operator
+	CLASS cpd$b Operation
+		FIELD a sourcePath Ljava/lang/String;
+		FIELD b parsedSourcePath Lcr$h;
+		FIELD c targetPath Ljava/lang/String;
+		FIELD d parsedTargetPath Lcr$h;
+		FIELD e operator Lcpd$d;
+		METHOD <init> (Ljava/lang/String;Ljava/lang/String;Lcpd$d;)V
+			ARG 1 source
+			ARG 2 target
+			ARG 3 operator
+		METHOD a toJson ()Lcom/google/gson/JsonObject;
+		METHOD a fromJson (Lcom/google/gson/JsonObject;)Lcpd$b;
+			ARG 0 operationJson
+		METHOD a execute (Ljava/util/function/Supplier;Lis;)V
+			ARG 1 itemTagTagGetter
+			ARG 2 sourceEntityTag
 	CLASS cpd$c Source
 		FIELD e name Ljava/lang/String;
 		FIELD f parameter Lcqa;
 		FIELD g getter Ljava/util/function/Function;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lcqa;Ljava/util/function/Function;)V
+			ARG 3 name
+			ARG 4 parameter
+			ARG 5 operator
+		METHOD a (Lcqa;Ljava/util/function/Function;Lcob;)Lis;
+			ARG 2 context
 		METHOD a get (Ljava/lang/String;)Lcpd$c;
-	CLASS cpd$d MergeStrategy
+			ARG 0 name
+	CLASS cpd$d Operator
+		CLASS cpd$d$2
+			METHOD a (Lis;Lis;)V
+				ARG 1 listTag
+			METHOD a (Ljava/util/List;Lis;)V
+				ARG 1 foundTag
+		CLASS cpd$d$3
+			METHOD a (Lis;Lis;)V
+				ARG 1 compoundTag
+			METHOD a (Ljava/util/List;Lis;)V
+				ARG 1 foundTag
 		FIELD a REPLACE Lcpd$d;
 		FIELD b APPEND Lcpd$d;
 		FIELD c MERGE Lcpd$d;
 		FIELD d name Ljava/lang/String;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
+			ARG 3 name
 		METHOD a merge (Lis;Lcr$h;Ljava/util/List;)V
+			ARG 1 itemTag
+			ARG 2 tragetPath
+			ARG 3 tagsFromSource
 		METHOD a get (Ljava/lang/String;)Lcpd$d;
+			ARG 0 name
 	CLASS cpd$e Factory
 	FIELD a source Lcpd$c;
+	FIELD c operations Ljava/util/List;
 	FIELD d ENTITY_TAG_GETTER Ljava/util/function/Function;
 	FIELD e BLOCK_ENTITY_TAG_GETTER Ljava/util/function/Function;
+	METHOD <init> ([Lcqo;Lcpd$c;Ljava/util/List;)V
+		ARG 1 conditions
+		ARG 2 source
+		ARG 3 operations
+	METHOD a (Lbbr;Lis;Lcpd$b;)V
+		ARG 2 operation
+	METHOD a (Lbtc;)Lis;
+		ARG 0 blockEntity
+	METHOD a builder (Lcpd$c;)Lcpd$a;
+		ARG 0 source
+	METHOD b parseNbtPath (Ljava/lang/String;)Lcr$h;
+		ARG 0 nbtPath
diff --git a/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping
index f37175e9bc..d0d67f29ee 100644
--- a/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping
@@ -2,3 +2,9 @@ CLASS cpe net/minecraft/world/loot/function/EnchantRandomlyLootFunction
 	CLASS cpe$b Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c enchantments Ljava/util/List;
+	METHOD <init> ([Lcqo;Ljava/util/Collection;)V
+		ARG 1 conditions
+		ARG 2 enchantments
+	METHOD a ([Lcqo;)Lcpl;
+		ARG 0 conditions
+	METHOD c builder ()Lcpk$a;
diff --git a/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping
index f128ad7cdd..c24674aeff 100644
--- a/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping
@@ -1,3 +1,16 @@
 CLASS cpf net/minecraft/world/loot/function/EnchantWithLevelsLootFunction
+	CLASS cpf$a Builder
+		FIELD a range Lcoh;
+		FIELD b treasureEnchantmentsAllowed Z
+		METHOD <init> (Lcoh;)V
+			ARG 1 range
+		METHOD e allowTreasureEnchantments ()Lcpf$a;
 	CLASS cpf$b Factory
+	FIELD a range Lcoh;
 	FIELD c treasureEnchantmentsAllowed Z
+	METHOD <init> ([Lcqo;Lcoh;Z)V
+		ARG 1 conditions
+		ARG 2 range
+		ARG 3 treasureEnchantmentsAllowed
+	METHOD a builder (Lcoh;)Lcpf$a;
+		ARG 0 range
diff --git a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping
index ba7204506a..15c417213c 100644
--- a/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping
@@ -5,10 +5,14 @@ CLASS cpg net/minecraft/world/loot/function/ExplorationMapLootFunction
 		FIELD c zoom B
 		FIELD d searchRadius I
 		FIELD e skipExistingChunks Z
-		METHOD a zoom (B)Lcpg$a;
-		METHOD a decoration (Lcni$a;)Lcpg$a;
-		METHOD a destination (Ljava/lang/String;)Lcpg$a;
-		METHOD a skipExistingChunks (Z)Lcpg$a;
+		METHOD a withZoom (B)Lcpg$a;
+			ARG 1 zoom
+		METHOD a withDecoration (Lcni$a;)Lcpg$a;
+			ARG 1 decoration
+		METHOD a withDestination (Ljava/lang/String;)Lcpg$a;
+			ARG 1 destination
+		METHOD a withSkipExistingChunks (Z)Lcpg$a;
+			ARG 1 skipExistingChunks
 	CLASS cpg$b Factory
 	FIELD a DEFAULT_DECORATION Lcni$a;
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
@@ -17,4 +21,11 @@ CLASS cpg net/minecraft/world/loot/function/ExplorationMapLootFunction
 	FIELD f zoom B
 	FIELD g searchRadius I
 	FIELD h skipExistingChunks Z
+	METHOD <init> ([Lcqo;Ljava/lang/String;Lcni$a;BIZ)V
+		ARG 1 conditions
+		ARG 2 destination
+		ARG 3 decoration
+		ARG 4 zoom
+		ARG 5 searchRadius
+		ARG 6 skipExistingChunks
 	METHOD b create ()Lcpg$a;
diff --git a/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping
index f60d4ff999..15ddfb1854 100644
--- a/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping
@@ -1,2 +1,5 @@
 CLASS cpb net/minecraft/world/loot/function/ExplosionDecayLootFunction
 	CLASS cpb$a Factory
+	METHOD <init> ([Lcqo;)V
+		ARG 1 conditions
+	METHOD b builder ()Lcpk$a;
diff --git a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping
index 6211a00e07..504a604260 100644
--- a/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping
@@ -1,3 +1,6 @@
 CLASS cph net/minecraft/world/loot/function/FillPlayerHeadLootFunction
 	CLASS cph$a Factory
 	FIELD a entity Lcob$c;
+	METHOD <init> ([Lcqo;Lcob$c;)V
+		ARG 1 conditions
+		ARG 2 entity
diff --git a/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping
index 64c87f6fb9..212d0b28ee 100644
--- a/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping
@@ -1,3 +1,6 @@
 CLASS cpx net/minecraft/world/loot/function/FurnaceSmeltLootFunction
 	CLASS cpx$a Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD <init> ([Lcqo;)V
+		ARG 1 conditions
+	METHOD b builder ()Lcpk$a;
diff --git a/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping
index 6f5813a0c5..85a6aaad65 100644
--- a/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping
@@ -1,3 +1,10 @@
 CLASS cpj net/minecraft/world/loot/function/LimitCountLootFunction
 	CLASS cpj$a Factory
 	FIELD a limit Lcoa;
+	METHOD <init> ([Lcqo;Lcoa;)V
+		ARG 1 conditions
+		ARG 2 limit
+	METHOD a builder (Lcoa;)Lcpk$a;
+		ARG 0 limit
+	METHOD a (Lcoa;[Lcqo;)Lcpl;
+		ARG 1 conditions
diff --git a/mappings/net/minecraft/world/loot/function/LootFunction.mapping b/mappings/net/minecraft/world/loot/function/LootFunction.mapping
index 113c46644f..7e7f3d5844 100644
--- a/mappings/net/minecraft/world/loot/function/LootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/LootFunction.mapping
@@ -4,8 +4,21 @@ CLASS cpl net/minecraft/world/loot/function/LootFunction
 	CLASS cpl$b Factory
 		FIELD a id Lqs;
 		FIELD b functionClass Ljava/lang/Class;
+		METHOD <init> (Lqs;Ljava/lang/Class;)V
+			ARG 1 id
+			ARG 2 functionClass
 		METHOD a getId ()Lqs;
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcpl;Lcom/google/gson/JsonSerializationContext;)V
+			ARG 1 functionJson
+			ARG 2 function
+			ARG 3 context
 		METHOD b getFunctionClass ()Ljava/lang/Class;
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpl;
+			ARG 1 functionJson
+			ARG 2 context
 	METHOD a apply (Ljava/util/function/BiFunction;Ljava/util/function/Consumer;Lcob;)Ljava/util/function/Consumer;
+		ARG 0 itemApplier
+		ARG 1 itemDropper
+		ARG 2 context
+	METHOD a (Ljava/util/function/Consumer;Ljava/util/function/BiFunction;Lcob;Lbbr;)V
+		ARG 3 stack
diff --git a/mappings/net/minecraft/world/loot/function/LootFunctions.mapping b/mappings/net/minecraft/world/loot/function/LootFunctions.mapping
index 3eefa7a50d..91efd4b9c6 100644
--- a/mappings/net/minecraft/world/loot/function/LootFunctions.mapping
+++ b/mappings/net/minecraft/world/loot/function/LootFunctions.mapping
@@ -1,11 +1,30 @@
 CLASS cpm net/minecraft/world/loot/function/LootFunctions
 	CLASS cpm$a Factory
+		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
+			ARG 1 functionJson
+			ARG 2 unused
+			ARG 3 context
+		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
+			ARG 1 function
+			ARG 2 unused
+			ARG 3 context
 	FIELD a NOOP Ljava/util/function/BiFunction;
 	FIELD b byId Ljava/util/Map;
 	FIELD c byClass Ljava/util/Map;
+	METHOD a (Lbbr;Lcob;)Lbbr;
+		ARG 0 stack
+		ARG 1 context
 	METHOD a register (Lcpl$b;)V
+		ARG 0 lootFunctionFactory
 	METHOD a getFactory (Lcpl;)Lcpl$b;
 		ARG 0 function
+	METHOD a (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lbbr;Lcob;)Lbbr;
+		ARG 2 stack
+		ARG 3 context
 	METHOD a get (Lqs;)Lcpl$b;
 		ARG 0 id
 	METHOD a join ([Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction;
+		ARG 0 lootFunctions
+	METHOD a ([Ljava/util/function/BiFunction;Lbbr;Lcob;)Lbbr;
+		ARG 1 stack
+		ARG 2 context
diff --git a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping
index 8d2199aa7b..776f2df5ed 100644
--- a/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping
@@ -1,4 +1,18 @@
 CLASS cpn net/minecraft/world/loot/function/LootingEnchantLootFunction
+	CLASS cpn$a Builder
+		FIELD a countRange Lcoj;
+		FIELD b limit I
+		METHOD <init> (Lcoj;)V
+			ARG 1 countRange
+		METHOD a withLimit (I)Lcpn$a;
+			ARG 1 limit
 	CLASS cpn$b Factory
-	FIELD a range Lcoj;
-	FIELD c amount I
+	FIELD a countRange Lcoj;
+	FIELD c limit I
+	METHOD <init> ([Lcqo;Lcoj;I)V
+		ARG 1 conditions
+		ARG 2 countRange
+		ARG 3 limit
+	METHOD a builder (Lcoj;)Lcpn$a;
+		ARG 0 countRange
+	METHOD b hasLimit ()Z
diff --git a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping
index 118f1b02ab..fad9b453d3 100644
--- a/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping
@@ -2,9 +2,28 @@ CLASS cpo net/minecraft/world/loot/function/SetAttributesLootFunction
 	CLASS cpo$b Attribute
 		FIELD a name Ljava/lang/String;
 		FIELD b attribute Ljava/lang/String;
+		FIELD c operation Lajb$a;
 		FIELD d amountRange Lcoj;
 		FIELD e id Ljava/util/UUID;
 		FIELD f slots [Laif;
+		METHOD <init> (Ljava/lang/String;Ljava/lang/String;Lajb$a;Lcoj;[Laif;Ljava/util/UUID;)V
+			ARG 1 name
+			ARG 2 attribute
+			ARG 3 operation
+			ARG 4 amountRange
+			ARG 5 slots
+			ARG 6 id
+		METHOD a getName (Lajb$a;)Ljava/lang/String;
+			ARG 0 operation
 		METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpo$b;
+			ARG 0 attributeJson
+			ARG 1 context
 		METHOD a serialize (Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonObject;
+			ARG 1 context
+		METHOD a fromName (Ljava/lang/String;)Lajb$a;
+			ARG 0 name
 	CLASS cpo$d Factory
+	FIELD a attributes Ljava/util/List;
+	METHOD <init> ([Lcqo;Ljava/util/List;)V
+		ARG 1 conditions
+		ARG 2 attributes
diff --git a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping
index 0d8f0e0f4e..6a0aa0ff8d 100644
--- a/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping
@@ -1,2 +1,15 @@
 CLASS cpp net/minecraft/world/loot/function/SetContentsLootFunction
+	CLASS cpp$a Builer
+		FIELD a entries Ljava/util/List;
+		METHOD a withEntry (Lcou$a;)Lcpp$a;
+			ARG 1 entryBuilder
 	CLASS cpp$b Factory
+	FIELD a entries Ljava/util/List;
+	METHOD <init> ([Lcqo;Ljava/util/List;)V
+		ARG 1 conditions
+		ARG 2 entries
+	METHOD a (Lcob;Lfj;Lcou;)V
+		ARG 2 entry
+	METHOD a (Lfj;Lcob;Lcot;)V
+		ARG 2 choice
+	METHOD b builder ()Lcpp$a;
diff --git a/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping
index a9bc9ae413..49b8da66d9 100644
--- a/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping
@@ -1,3 +1,10 @@
 CLASS cpr net/minecraft/world/loot/function/SetCountLootFunction
 	CLASS cpr$a Factory
+	FIELD a countRange Lcoh;
+	METHOD <init> ([Lcqo;Lcoh;)V
+		ARG 1 conditions
+		ARG 2 countRange
 	METHOD a builder (Lcoh;)Lcpk$a;
+		ARG 0 countRange
+	METHOD a (Lcoh;[Lcqo;)Lcpl;
+		ARG 1 conditions
diff --git a/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping
index c63cd8afbe..8d7394d892 100644
--- a/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping
@@ -2,3 +2,10 @@ CLASS cps net/minecraft/world/loot/function/SetDamageLootFunction
 	CLASS cps$a Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c durabilityRange Lcoj;
+	METHOD <init> ([Lcqo;Lcoj;)V
+		ARG 1 contents
+		ARG 2 durabilityRange
+	METHOD a builder (Lcoj;)Lcpk$a;
+		ARG 0 durabilityRange
+	METHOD a (Lcoj;[Lcqo;)Lcpl;
+		ARG 1 conditions
diff --git a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping
index 3b541770b4..83c08f0103 100644
--- a/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping
@@ -2,3 +2,7 @@ CLASS cpq net/minecraft/world/loot/function/SetLootTableLootFunction
 	CLASS cpq$a Factory
 	FIELD a id Lqs;
 	FIELD c seed J
+	METHOD <init> ([Lcqo;Lqs;J)V
+		ARG 1 conditions
+		ARG 2 id
+		ARG 3 seed
diff --git a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping
index 9045dce7f3..24450e7c94 100644
--- a/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping
@@ -3,3 +3,11 @@ CLASS cpt net/minecraft/world/loot/function/SetLoreLootFunction
 	FIELD a replace Z
 	FIELD c lore Ljava/util/List;
 	FIELD d entity Lcob$c;
+	METHOD <init> ([Lcqo;ZLjava/util/List;Lcob$c;)V
+		ARG 1 conditions
+		ARG 2 replace
+		ARG 3 lore
+		ARG 4 entity
+	METHOD a getLoreTag (Lbbr;Z)Lii;
+		ARG 1 stack
+		ARG 2 loreToBeAddedIsNotEmpty
diff --git a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping
index 6383e01677..52b0d6168c 100644
--- a/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping
@@ -2,4 +2,15 @@ CLASS cpu net/minecraft/world/loot/function/SetNameLootFunction
 	CLASS cpu$a Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c name Ljm;
-	FIELD d entityTarget Lcob$c;
+	FIELD d entity Lcob$c;
+	METHOD <init> ([Lcqo;Ljm;Lcob$c;)V
+		ARG 1 conditions
+		ARG 2 name
+		ARG 3 entity
+	METHOD a (Lcd;Laia;Ljm;)Ljm;
+		ARG 2 textComponent
+	METHOD a applySourceEntity (Lcob;Lcob$c;)Ljava/util/function/UnaryOperator;
+		ARG 0 context
+		ARG 1 sourceEntity
+	METHOD b (Ljm;)Ljm;
+		ARG 0 textComponent
diff --git a/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping
index 63e8c651f7..ba63a0abf5 100644
--- a/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping
+++ b/mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping
@@ -2,6 +2,11 @@ CLASS cpw net/minecraft/world/loot/function/SetStewEffectLootFunction
 	CLASS cpw$a Builder
 		FIELD a map Ljava/util/Map;
 		METHOD a withEffect (Lahs;Lcoj;)Lcpw$a;
+			ARG 1 effect
+			ARG 2 durationRange
 	CLASS cpw$b Factory
 	FIELD a effects Ljava/util/Map;
-	METHOD b create ()Lcpw$a;
+	METHOD <init> ([Lcqo;Ljava/util/Map;)V
+		ARG 1 conditions
+		ARG 2 effects
+	METHOD b builder ()Lcpw$a;
diff --git a/mappings/net/minecraft/world/loot/function/SetTagLootFunction.mapping b/mappings/net/minecraft/world/loot/function/SetTagLootFunction.mapping
deleted file mode 100644
index c8d9cba822..0000000000
--- a/mappings/net/minecraft/world/loot/function/SetTagLootFunction.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS cpv net/minecraft/world/loot/function/SetTagLootFunction
-	CLASS cpv$a Factory
-	FIELD a tag Lib;