Merge branch '1.21.3' into entities

QuiltMC · Nov 4, 2024 · b468c2e · b468c2e
2 parents d982504 + 06e6440
commit b468c2e
Show file tree

Hide file tree

Showing 65 changed files with 578 additions and 54 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -77,11 +77,14 @@ with [RFC 39](https://github.com/QuiltMC/rfcs/blob/master/structure/0039-pr-poli
 To avoid conflicts and make the process faster, the FCP may be ended early when a new Minecraft version is released and
 QM is updated.
 
+>[!NOTE]
+> These number of required approvals has been temporarily lowered to compensate for a lack of reviewers. If you'd like to help us keep our mappings high-quality and reduce the burden on our team, feel free to start reviewing and contact us on [Discord](https://discord.quiltmc.org/) to become an official triage team member. Thank you!
+
 ### `T: new`
 
 **Description**: Used for pull requests that focus mainly on adding new mappings.
 
-**Required Approvals**: 2
+**Required Approvals**: 1
 - At least 1 approval must come directly from a Mappings team member.
 
 **Final Comment Period**: 2 days (1 day for snapshots if the PR has 3+ approvals)
@@ -93,8 +96,8 @@ QM is updated.
 
 **Description**: Used for pull request that focus mainly on changing the names of existing mappings.
 
-**Required Approvals**: 3
-- At least 2 approvals must come directly from a Mappings team member.
+**Required Approvals**: 2
+- At least 1 approval must come directly from a Mappings team member.
 
 **Final Comment Period**:
 - `S: small` and below: 2 days
@@ -105,7 +108,7 @@ QM is updated.
 
 **Description**: Used for pull requests that focus mainly on adding or changing documentation.
 
-**Required Approvals**: 2
+**Required Approvals**: 1
 - At least 1 approval must come directly from a Mappings team member.
 
 **Final Comment Period**: 2 days (1 day for snapshots if the PR has 3+ approvals)

diff --git a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_drqhpkfg net/minecraft/component/type/Unbreakable
 	FIELD f_iaeyiyom TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_ivwonplx shownInTooltip Z
 	METHOD m_nnvtyjlt shownInTooltip ()Z
-	METHOD m_nrzkdjww create (Z)Lnet/minecraft/unmapped/C_drqhpkfg;
+	METHOD m_nrzkdjww withShownInTooltip (Z)Lnet/minecraft/unmapped/C_drqhpkfg;
 		ARG 1 shownInTooltip
 	METHOD m_sksdhjpx (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
diff --git a/mappings/net/minecraft/data/server/LootTablesProvider.mapping b/mappings/net/minecraft/data/server/LootTablesProvider.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProv
 		ARG 1 dataPackOutput
 	METHOD m_cvuljxmh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 writer
-		ARG 2 lookupProvider
+		ARG 2 registries
 	METHOD m_iccnzkqh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage;
 		ARG 2 provider
 	METHOD m_pkqhglxx (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/Map;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;)V

diff --git a/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping
@@ -1,7 +1,10 @@
 CLASS net/minecraft/unmapped/C_egeqzyvk net/minecraft/data/server/loot_table/EntityLootTableGenerator
 	FIELD f_lyzsfsde lootTables Ljava/util/Map;
 	FIELD f_pordewqu allowedFeatures Lnet/minecraft/unmapped/C_czxxrbcp;
+	FIELD f_qjcpnzik registries Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
 	FIELD f_xwhijief requiredFeatures Lnet/minecraft/unmapped/C_czxxrbcp;
+	METHOD <init> (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
+		ARG 1 requiredFeatures
 	METHOD m_dmtatuce frogDamageSource (Lnet/minecraft/unmapped/C_pzdchrcy;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
 	METHOD m_ltaoqnev generate ()V
 	METHOD m_nxkzkqkr putLootTable (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V

diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -225,7 +225,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	METHOD m_cqjiujoa getUuidAsString ()Ljava/lang/String;
 	METHOD m_crbtimbo getFacing ()Lnet/minecraft/unmapped/C_xpuuihxf;
 	METHOD m_csskrddd updateVelocity (FLnet/minecraft/unmapped/C_vgpupfxx;)V
-		ARG 1 speed
+		ARG 1 accelerationFactor
 		ARG 2 movementInput
 	METHOD m_ctegebek isInRange (Lnet/minecraft/unmapped/C_astfners;D)Z
 		ARG 1 entity
@@ -663,9 +663,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	METHOD m_ozpbkkuu updateMovementInFluid (Lnet/minecraft/unmapped/C_ednuhnnn;D)Z
 		ARG 1 key
 		ARG 2 velocity
-	METHOD m_paxmjcli movementInputToVelocity (Lnet/minecraft/unmapped/C_vgpupfxx;FF)Lnet/minecraft/unmapped/C_vgpupfxx;
+	METHOD m_paxmjcli movementInputToAcceleration (Lnet/minecraft/unmapped/C_vgpupfxx;FF)Lnet/minecraft/unmapped/C_vgpupfxx;
 		ARG 0 movementInput
-		ARG 1 speed
+		ARG 1 accelerationFactor
 		ARG 2 yaw
 	METHOD m_pcyynmjj isSilent ()Z
 	METHOD m_pdtybxtp getRemovalReason ()Lnet/minecraft/unmapped/C_astfners$C_emmohndu;

diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -68,7 +68,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	FIELD f_oyncoeen MIN_MOVEMENT_DISTANCE D
 	FIELD f_phnacmet prevBodyYaw F
 	FIELD f_pjcisjtc stepBobbingAmount F
-	FIELD f_pldzhgrb movementSpeed F
+	FIELD f_pldzhgrb baseAccelerationFactor F
 	FIELD f_prubtnbt activeStatusEffects Ljava/util/Map;
 	FIELD f_pxramaew forwardSpeed F
 	FIELD f_qalszaps dead Z
@@ -119,7 +119,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_armeddpk getDamageTracker ()Lnet/minecraft/unmapped/C_xkhemiqp;
 	METHOD m_astmyzdc getHand (Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_yuycoehb;
 		ARG 0 hand
-	METHOD m_awmtskvv getMovementSpeed (F)F
+	METHOD m_awmtskvv getAccelerationFactor (F)F
 		ARG 1 slipperiness
 	METHOD m_axkhmdzu getDeathSound ()Lnet/minecraft/unmapped/C_avavozay;
 	METHOD m_ayeajhdm setCurrentHand (Lnet/minecraft/unmapped/C_laxmzoqs;)V
@@ -248,7 +248,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_fyloosbv updateGlowing ()V
 	METHOD m_gbfixjfm updateAttribute (Lnet/minecraft/unmapped/C_cjzoxshv;)V
 		ARG 1 attribute
-	METHOD m_gdlvulbl getAirSpeed ()F
+	METHOD m_gdlvulbl getAirAccelerationFactor ()F
 	METHOD m_gfhvqjeo getFallingInFluidAdjustedMovement (DZLnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx;
 		ARG 1 descentSpeed
 		ARG 3 descending
@@ -279,9 +279,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 		ARG 1 air
 	METHOD m_gvdtmqle swapHandStacks ()V
 	METHOD m_gvffcdjw updateAttributes ()V
-	METHOD m_gvmhasrb getMovementSpeed ()F
-	METHOD m_gwksxurc setMovementSpeed (F)V
-		ARG 1 movementSpeed
+	METHOD m_gvmhasrb getBaseAccelerationFactor ()F
+	METHOD m_gwksxurc setBaseAccelerationFactor (F)V
+		ARG 1 factor
 	METHOD m_gxsldibl getLootTableSeed ()J
 	METHOD m_gxxlbgpz getMainHandStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
 	METHOD m_hbdaqklu canBreatheInWater ()Z
@@ -302,7 +302,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 		ARG 1 item
 		ARG 2 count
 	METHOD m_hobjxuks getBrain ()Lnet/minecraft/unmapped/C_rjqjaxef;
-	METHOD m_huhprabe getBaseMovementSpeedMultiplier ()F
+	METHOD m_huhprabe getBaseWaterAccelerationFactor ()F
 	METHOD m_hxaqkpon handleFrictionAndCalculateMovement (Lnet/minecraft/unmapped/C_vgpupfxx;F)Lnet/minecraft/unmapped/C_vgpupfxx;
 		ARG 1 movementInput
 		ARG 2 slipperiness
@@ -618,7 +618,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_whvujbsh dropInventory (Lnet/minecraft/unmapped/C_bdwnwhiu;)V
 	METHOD m_widuipxk getAttributes ()Lnet/minecraft/unmapped/C_cohbwqne;
 	METHOD m_wjvypezh getRoll ()I
-	METHOD m_wkgrdcha travelGliding ()V
+	METHOD m_wkgrdcha fallFlyTravel ()V
 	METHOD m_wmvelibz isHoldingOntoLadder ()Z
 		COMMENT @return {@code true} if this entity should not lose height while in a climbing state
 		COMMENT @see net.minecraft.entity.LivingEntity

diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
@@ -275,6 +275,9 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 	METHOD m_umudukuf onCraft (Lnet/minecraft/unmapped/C_cdctfzbn;)V
 	METHOD m_utrmkjnp setCooldown (I)V
 		ARG 1 cooldown
+	METHOD m_uzwjgkgy minimizeCount (I)V
+		COMMENT If the count of items in this item stack is greater than the passed {@code count},
+		COMMENT sets it to the passed {@code count}.
 	METHOD m_vchnqfkp applyComponents (Lnet/minecraft/unmapped/C_kouhnfig;)V
 	METHOD m_vncsdaoo hasGlint ()Z
 	METHOD m_vprylruv isEmpty ()Z

diff --git a/mappings/net/minecraft/loot/ContainerComponentModifier.mapping b/mappings/net/minecraft/loot/ContainerComponentModifier.mapping
@@ -0,0 +1,13 @@
+CLASS net/minecraft/unmapped/C_vgxbedbz net/minecraft/loot/ContainerComponentModifier
+	METHOD m_iecwewrz modifyContents (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/UnaryOperator;)V
+		ARG 2 stackModifier
+	METHOD m_iqcayxuo getDefault ()Ljava/lang/Object;
+	METHOD m_mybsxhne modify (Ljava/lang/Object;Ljava/util/stream/Stream;)Ljava/lang/Object;
+		ARG 1 component
+		ARG 2 stacks
+	METHOD m_rewgrlov getType ()Lnet/minecraft/unmapped/C_pscqxfcs;
+	METHOD m_tpdkdrct modifyWithDefault (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/stream/Stream;)V
+	METHOD m_wdlgbvpc streamStacks (Ljava/lang/Object;)Ljava/util/stream/Stream;
+		ARG 1 component
+	METHOD m_zleqyxzp modify (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/lang/Object;Ljava/util/stream/Stream;)V
+		ARG 2 value
diff --git a/mappings/net/minecraft/loot/ContainerComponentModifiers.mapping b/mappings/net/minecraft/loot/ContainerComponentModifiers.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/unmapped/C_ngersqqy net/minecraft/loot/ContainerComponentModifiers
+	FIELD f_csinryxp CONTAINER Lnet/minecraft/unmapped/C_vgxbedbz;
+	FIELD f_idsovweb CHARGED_PROJECTILES Lnet/minecraft/unmapped/C_vgxbedbz;
+	FIELD f_lgdevqfy BY_TYPE Ljava/util/Map;
+	FIELD f_pslfltxk BUNDLE_CONTENTS Lnet/minecraft/unmapped/C_vgxbedbz;
+	METHOD m_dzwmzxia (Lnet/minecraft/unmapped/C_pscqxfcs;)Lcom/mojang/serialization/DataResult;
+		ARG 0 type
+	METHOD m_sguyqmwp (Lnet/minecraft/unmapped/C_vgxbedbz;)Lnet/minecraft/unmapped/C_vgxbedbz;
+		ARG 0 modifier
diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping
@@ -2,11 +2,14 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable
 	FIELD f_dyzbynxg type Lnet/minecraft/unmapped/C_ykthnceq;
 	FIELD f_euzdblpq combinedFunction Ljava/util/function/BiFunction;
 	FIELD f_fuzuxxka functions Ljava/util/List;
+	FIELD f_kozlclng DEFAULT_SEED J
 	FIELD f_laaskmuo randomSequenceId Ljava/util/Optional;
 	FIELD f_nawobxkn pools Ljava/util/List;
 	FIELD f_ookilagu GENERIC Lnet/minecraft/unmapped/C_ykthnceq;
 	FIELD f_rgkwwxmf LOGGER Lorg/slf4j/Logger;
+	FIELD f_rmuzkcnb HOLDER_CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_sartmpeq EMPTY Lnet/minecraft/unmapped/C_inwsuliy;
+	FIELD f_wvxzdplc CODEC Lcom/mojang/serialization/Codec;
 	METHOD m_azuvczrx generateRawLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;JLjava/util/function/Consumer;)V
 		ARG 1 parameterSet
 		ARG 2 seed
@@ -26,11 +29,15 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable
 	METHOD m_henqulth generateLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;Ljava/util/function/Consumer;)V
 		ARG 1 parameterSet
 		ARG 2 lootConsumer
+	METHOD m_hkmfceqo (Lnet/minecraft/unmapped/C_inwsuliy;)Ljava/util/List;
+		ARG 0 table
 	METHOD m_kdnetbvp generateLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 		ARG 1 parameterSet
 	METHOD m_ksxvxexm generateRawLoot (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V
 		ARG 1 context
 		ARG 2 lootConsumer
+	METHOD m_lzrqgafz (Lnet/minecraft/unmapped/C_inwsuliy;)Ljava/util/Optional;
+		ARG 0 table
 	METHOD m_nsgsgvtn generateLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;J)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 		ARG 1 parameterSet
 		ARG 2 seed
@@ -43,10 +50,15 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable
 		ARG 2 lootConsumer
 	METHOD m_punwgoad generateLoot (Lnet/minecraft/unmapped/C_iakykpgh;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 		ARG 1 context
+	METHOD m_qwijqopm generateLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;Lnet/minecraft/unmapped/C_rlomrsco;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	METHOD m_shguvbkl (Lnet/minecraft/unmapped/C_inwsuliy;)Ljava/util/List;
+		ARG 0 table
 	METHOD m_smqsokwf getType ()Lnet/minecraft/unmapped/C_ykthnceq;
 	METHOD m_tmeopeok builder ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;
 	METHOD m_xfbhesuf processStacks (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
 		ARG 1 lootConsumer
+	METHOD m_ymonjzfv (Lnet/minecraft/unmapped/C_inwsuliy;)Lnet/minecraft/unmapped/C_ykthnceq;
+		ARG 0 table
 	CLASS C_daaljsfu Builder
 		FIELD f_azlxvnwl type Lnet/minecraft/unmapped/C_ykthnceq;
 		FIELD f_dnxcxqti pools Lcom/google/common/collect/ImmutableList$Builder;
@@ -58,3 +70,4 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable
 		METHOD m_ggtisasp randomSequence (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;
 			ARG 1 id
 		METHOD m_jpkpymka type (Lnet/minecraft/unmapped/C_ykthnceq;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;
+			ARG 1 type
diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping
@@ -1,15 +1,24 @@
 CLASS net/minecraft/unmapped/C_eumtgsbp net/minecraft/loot/LootTableReporter
+	FIELD f_jvnjgkvv type Lnet/minecraft/unmapped/C_ykthnceq;
 	FIELD f_ovshwzxs errorReporter Lnet/minecraft/unmapped/C_jtpvewkp;
 	FIELD f_psnzcplo visitedElements Ljava/util/Set;
 	FIELD f_spdbzdri dataLookup Ljava/util/Optional;
+	METHOD <init> (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_ykthnceq;)V
+		ARG 2 type
+	METHOD <init> (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_ykthnceq;Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;)V
+		ARG 2 type
 	METHOD m_cftbvarw getErrorReporter ()Lnet/minecraft/unmapped/C_jtpvewkp;
 	METHOD m_glhnmzie makeChild (Ljava/lang/String;)Lnet/minecraft/unmapped/C_eumtgsbp;
 		ARG 1 name
 	METHOD m_jwjmhnkf makeChild (Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_eumtgsbp;
 		ARG 1 name
+	METHOD m_ncvkgbcl validate (Lnet/minecraft/unmapped/C_dogcxkxz;)V
+		ARG 1 context
 	METHOD m_qfxfbvfj hasVisited (Lnet/minecraft/unmapped/C_xhhleach;)Z
 		ARG 1 element
 	METHOD m_rxfxlyoi getDataLookup ()Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;
 	METHOD m_tbxtkgvh report (Ljava/lang/String;)V
 		ARG 1 message
 	METHOD m_tsoypkps hasDataLookup ()Z
+	METHOD m_zscrhcin withType (Lnet/minecraft/unmapped/C_ykthnceq;)Lnet/minecraft/unmapped/C_eumtgsbp;
+		ARG 1 type
diff --git a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping
@@ -1,9 +1,13 @@
 CLASS net/minecraft/unmapped/C_kwfsxfym net/minecraft/loot/condition/BlockStatePropertyLootCondition
 	FIELD f_aurmymjq properties Ljava/util/Optional;
 	FIELD f_mektqjvw block Lnet/minecraft/unmapped/C_cjzoxshv;
+	METHOD m_cvsqtdji (Lnet/minecraft/unmapped/C_kwfsxfym;Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 1 missing
 	METHOD m_qlrdhwtv builder (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_kwfsxfym$C_endolkru;
 		ARG 0 block
-	METHOD m_vrognxqo (Lnet/minecraft/unmapped/C_kwfsxfym;)Lcom/mojang/serialization/DataResult;
+	METHOD m_ukrlueii (Lnet/minecraft/unmapped/C_kwfsxfym;Lnet/minecraft/unmapped/C_fsjpkzrx;)Ljava/util/Optional;
+		ARG 1 predicate
+	METHOD m_vrognxqo validate (Lnet/minecraft/unmapped/C_kwfsxfym;)Lcom/mojang/serialization/DataResult;
 		ARG 0 lootConditions
 	METHOD test (Ljava/lang/Object;)Z
 		ARG 1 context

diff --git a/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping b/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping
@@ -1,6 +1,14 @@
 CLASS net/minecraft/unmapped/C_ctyjhvds net/minecraft/loot/condition/CompoundLootCondition
 	FIELD f_hhdzxlyp predicate Ljava/util/function/Predicate;
 	FIELD f_vsuaiinl conditions Ljava/util/List;
+	METHOD m_ehyomcff createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 factory
+	METHOD m_ldqybufu (Lnet/minecraft/unmapped/C_ctyjhvds;)Ljava/util/List;
+		ARG 0 condition
+	METHOD m_pepuczup createInlineCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
+		ARG 0 factory
+	METHOD m_wcmbpgeo (Lnet/minecraft/unmapped/C_ctyjhvds;)Ljava/util/List;
+		ARG 0 condition
 	METHOD test (Ljava/lang/Object;)Z
 		ARG 1 context
 	CLASS C_oldlxhyu Builder

diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_lqmakrms net/minecraft/loot/condition/LocationCheckLootCondition
 	FIELD f_bfijysui offset Lnet/minecraft/unmapped/C_hynzadkk;
+	FIELD f_bxrjjfnl OFFSET_CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_eqnfjjsw predicate Ljava/util/Optional;
 	FIELD f_nkffmwkk CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD m_epauhchv builder (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;

diff --git a/mappings/net/minecraft/loot/condition/LootCondition.mapping b/mappings/net/minecraft/loot/condition/LootCondition.mapping
@@ -1,4 +1,7 @@
 CLASS net/minecraft/unmapped/C_vqkczpuv net/minecraft/loot/condition/LootCondition
+	FIELD f_cqpcavqz HOLDER_CODEC Lcom/mojang/serialization/Codec;
+	FIELD f_ctdemqea CODEC Lcom/mojang/serialization/Codec;
+	FIELD f_tuxonfwi BASE_CODEC Lcom/mojang/serialization/Codec;
 	METHOD m_pfwldqai getType ()Lnet/minecraft/unmapped/C_debunopu;
 	CLASS C_cjvmpogn Builder
 		METHOD and (Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_ramegrrx$C_tbmltwqb;

diff --git a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping
@@ -1,3 +1,7 @@
 CLASS net/minecraft/unmapped/C_vvwlqdtn net/minecraft/loot/condition/RandomChanceLootCondition
+	METHOD m_dbenidbq conditionBuilder (F)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
+		ARG 0 chance
+	METHOD m_hkryzkkk conditionBuilder (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
+		ARG 0 chance
 	METHOD test (Ljava/lang/Object;)Z
 		ARG 1 context
diff --git a/mappings/net/minecraft/loot/condition/RandomChanceWithEnchantedBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithEnchantedBonusLootCondition.mapping
@@ -1 +1,7 @@
 CLASS net/minecraft/unmapped/C_cbexmsqd net/minecraft/loot/condition/RandomChanceWithEnchantedBonusLootCondition
+	METHOD m_qpnviojd conditionBuilder (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;FF)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
+		ARG 0 enchantment
+		ARG 1 unenchantedChance
+		ARG 2 additionalChancePerLevel
+	METHOD test (Ljava/lang/Object;)Z
+		ARG 1 context
diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping
@@ -1,5 +1,8 @@
 CLASS net/minecraft/unmapped/C_nttdmald net/minecraft/loot/condition/TableBonusLootCondition
 	FIELD f_axmfycpo enchantment Lnet/minecraft/unmapped/C_cjzoxshv;
 	FIELD f_hnquhvdw chances Ljava/util/List;
+	METHOD m_tmbdegkn conditionBuilder (Lnet/minecraft/unmapped/C_cjzoxshv;[F)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
+		ARG 0 enchantment
+		ARG 1 chances
 	METHOD test (Ljava/lang/Object;)Z
 		ARG 1 context
diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping
@@ -8,6 +8,8 @@ CLASS net/minecraft/unmapped/C_iakykpgh net/minecraft/loot/context/LootContext
 	METHOD m_bmdlitpa getDataLookup ()Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;
 	METHOD m_boycmais createEntry (Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_iakykpgh$C_kslhzure;
 		ARG 0 function
+	METHOD m_cgaxgrxg get (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object;
+		ARG 1 parameter
 	METHOD m_htdhqpov addVisitedElement (Lnet/minecraft/unmapped/C_iakykpgh$C_kslhzure;)Z
 		ARG 1 entry
 	METHOD m_idypeamr createEntry (Lnet/minecraft/unmapped/C_inwsuliy;)Lnet/minecraft/unmapped/C_iakykpgh$C_kslhzure;
@@ -18,13 +20,18 @@ CLASS net/minecraft/unmapped/C_iakykpgh net/minecraft/loot/context/LootContext
 	METHOD m_tjqtsntr drop (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/function/Consumer;)V
 		ARG 1 id
 		ARG 2 lootConsumer
+	METHOD m_vnevydll getOrThrow (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object;
+		ARG 1 parameter
 	METHOD m_wajkhgmd getRandom ()Lnet/minecraft/unmapped/C_rlomrsco;
 	METHOD m_whhxcymq getLuck ()F
 	METHOD m_xojwzglq hasVisitedElement (Lnet/minecraft/unmapped/C_iakykpgh$C_kslhzure;)Z
 		ARG 1 entry
+	METHOD m_ylvpnrzu contains (Lnet/minecraft/unmapped/C_fwhrecir;)Z
+		ARG 1 parameter
 	CLASS C_kslhzure Entry
 	CLASS C_qtufoufh EntityTarget
 		FIELD f_mvjjhvcy parameter Lnet/minecraft/unmapped/C_fwhrecir;
+		FIELD f_qzgthnlo CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc;
 		FIELD f_uyijmmap type Ljava/lang/String;
 		METHOD m_lzewnxma getParameter ()Lnet/minecraft/unmapped/C_fwhrecir;
 		METHOD m_quasqlsc fromString (Ljava/lang/String;)Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;
@@ -34,7 +41,9 @@ CLASS net/minecraft/unmapped/C_iakykpgh net/minecraft/loot/context/LootContext
 		FIELD f_cphcdszg random Lnet/minecraft/unmapped/C_rlomrsco;
 		METHOD <init> (Lnet/minecraft/unmapped/C_nzsnkdtl;)V
 			ARG 1 parameters
+		METHOD m_dyvbihcy random (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_iakykpgh$C_xdyltqvb;
 		METHOD m_hoabyrky build (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_iakykpgh;
+			ARG 1 randomSequenceId
 		METHOD m_jiwxjvnm getWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu;
 		METHOD m_lmjmflya withRandomSeed (J)Lnet/minecraft/unmapped/C_iakykpgh$C_xdyltqvb;
 			ARG 1 seed