Skip to content

Commit

Permalink
improve movement terminology (#654)
Browse files Browse the repository at this point in the history 
rename "movement speed" things -> "acceleration factor"

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@supersaiyansubtlety @github-actions
supersaiyansubtlety and github-actions[bot] authored Nov 4, 2024
1 parent 0af52e5 commit 06e6440
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
6 changes: 3 additions & 3 deletions mappings/net/minecraft/entity/Entity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,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
Expand Down Expand Up @@ -610,9 +610,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;
Expand Down
19 changes: 12 additions & 7 deletions mappings/net/minecraft/entity/LivingEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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
Expand Down Expand Up @@ -117,7 +117,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
Expand Down Expand Up @@ -175,6 +175,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_eajivoso isUndead ()Z
METHOD m_eclhumtu getStackInHandSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 slot
METHOD m_eehgexpm travelDefault (Lnet/minecraft/unmapped/C_vgpupfxx;)V
ARG 1 movementInput
METHOD m_eerxjifd removePowderSnowSlow ()V
METHOD m_ejiuyguk isFallFlying ()Z
METHOD m_eljjwntg setStatusEffect (Lnet/minecraft/unmapped/C_wpfizwve;Lnet/minecraft/unmapped/C_astfners;)V
Expand Down Expand Up @@ -215,7 +217,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
Expand All @@ -242,9 +244,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
Expand All @@ -265,7 +267,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
Expand Down Expand Up @@ -527,6 +529,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_vckvknnt getStackReference (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_xkkpnyvk;
ARG 0 entity
ARG 1 slot
METHOD m_viviwntz travelInFluid (Lnet/minecraft/unmapped/C_vgpupfxx;)V
ARG 1 movementInput
METHOD m_vixrfdxj hasEquipmentChanged (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
COMMENT Returns whether the equipment has changed based on the previous and new values.
COMMENT
Expand Down Expand Up @@ -554,6 +558,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 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
Expand Down

3 comments on commit 06e6440

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 06e6440, 216 file(s) were updated with 1959 line(s) added and 1758 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2024-11-04 23:31:19.573090606 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-11-04 23:30:05.809574945 +0000
@@ -18,7 +18,7 @@
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -98,9 +98,9 @@
    private static Text createText(AdvancementDisplay display) {
       Text lv = display.getTitle();
       Formatting lv2 = display.getType().getFormatting();
-      Text lv3 = Texts.setStyleIfAbsent(lv.copy(), Style.EMPTY.withColor(lv2)).append("\n").append(display.getDescription());
+      Text lv3 = TextUtil.setStyleIfAbsent(lv.copy(), Style.EMPTY.withColor(lv2)).append("\n").append(display.getDescription());
       Text lv4 = lv.copy().styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lv3)));
-      return Texts.bracketed(lv4).formatted(lv2);
+      return TextUtil.bracketed(lv4).formatted(lv2);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-11-04 23:31:19.721089625 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-11-04 23:30:05.993573764 +0000
@@ -52,8 +52,8 @@
    public void apply(ServerPlayerEntity player) {
       player.addExperience(this.experience);
       LootContextParameterSet lv = new LootContextParameterSet.Builder(player.getServerWorld())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_mvxqkdcc, player.getPos())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.ORIGIN, player.getPos())
          .build(LootContextTypes.ADVANCEMENT_REWARD);
       boolean bl = false;
 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java	2024-11-04 23:31:19.549090766 +0000
+++ namedSrc/net/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger.java	2024-11-04 23:30:05.781575126 +0000
@@ -36,10 +36,10 @@
       ServerWorld lv = player.getServerWorld();
       BlockState lv2 = lv.getBlockState(pos);
       LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
-         .add(LootContextParameters.f_mvxqkdcc, pos.ofCenter())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_avxjsfab, lv2)
-         .add(LootContextParameters.f_nxapolcz, stack)
+         .add(LootContextParameters.ORIGIN, pos.ofCenter())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.BLOCK_STATE, lv2)
+         .add(LootContextParameters.TOOL, stack)
          .build(LootContextTypes.ADVANCEMENT_LOCATION);
       LootContext lv4 = new LootContext.Builder(lv3).build(Optional.empty());
       this.trigger(player, arg2 -> arg2.test(lv4));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CriterionValidator.java namedSrc/net/minecraft/advancement/criterion/CriterionValidator.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CriterionValidator.java	2024-11-04 23:31:19.713089678 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionValidator.java	2024-11-04 23:30:05.981573841 +0000
@@ -62,8 +62,8 @@
     * @mapping {@literal hashed m_aeyodzvy Lnet/minecraft/unmapped/C_zybjffid;m_aeyodzvy(Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ykthnceq;Ljava/lang/String;)V}
     * @mapping {@literal named m_aeyodzvy Lnet/minecraft/advancement/criterion/CriterionValidator;m_aeyodzvy(Lnet/minecraft/predicate/ContextAwarePredicate;Lnet/minecraft/util/context/ContextKeySet;Ljava/lang/String;)V}
     */
-   public void m_aeyodzvy(ContextAwarePredicate arg, ContextKeySet arg2, String name) {
-      arg.validateConditions(new LootTableReporter(this.errorReporter.forChild(name), arg2, this.dataLookup));
+   public void m_aeyodzvy(ContextAwarePredicate arg, ContextKeySet type, String name) {
+      arg.validateConditions(new LootTableReporter(this.errorReporter.forChild(name), type, this.dataLookup));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java	2024-11-04 23:31:19.609090367 +0000
+++ namedSrc/net/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger.java	2024-11-04 23:30:05.853574663 +0000
@@ -35,9 +35,9 @@
       ServerWorld lv = player.getServerWorld();
       BlockState lv2 = lv.getBlockState(pos);
       LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
-         .add(LootContextParameters.f_mvxqkdcc, pos.ofCenter())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_avxjsfab, lv2)
+         .add(LootContextParameters.ORIGIN, pos.ofCenter())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.BLOCK_STATE, lv2)
          .build(LootContextTypes.BLOCK_USE);
       LootContext lv4 = new LootContext.Builder(lv3).build(Optional.empty());
       this.trigger(player, arg2 -> arg2.test(lv4));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2024-11-04 23:31:19.621090288 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2024-11-04 23:30:05.869574560 +0000
@@ -63,7 +63,7 @@
          return (DataResult<EnterBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
                arg2 -> conditions.state
-                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.getValue()).getStateManager()))
+                     .flatMap(arg2x -> arg2x.reportFirstMissing(((Block)arg2.getValue()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
             .orElseGet(() -> DataResult.success(conditions));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2024-11-04 23:31:19.793089148 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2024-11-04 23:30:06.081573198 +0000
@@ -84,7 +84,7 @@
          } else {
             if (this.caughtItem.isPresent()) {
                boolean bl = false;
-               Entity lv = hookedEntityContext.m_cgaxgrxg(LootContextParameters.f_rcnckitm);
+               Entity lv = hookedEntityContext.get(LootContextParameters.THIS_ENTITY);
                if (lv instanceof ItemEntity lv2 && ((ItemPredicate)this.caughtItem.get()).test(lv2.getStack())) {
                   bl = true;
                }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2024-11-04 23:31:19.573090606 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2024-11-04 23:30:05.809574945 +0000
@@ -45,10 +45,10 @@
       ServerWorld lv = player.getServerWorld();
       BlockState lv2 = lv.getBlockState(pos);
       LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
-         .add(LootContextParameters.f_mvxqkdcc, pos.ofCenter())
-         .add(LootContextParameters.f_rcnckitm, player)
-         .add(LootContextParameters.f_avxjsfab, lv2)
-         .add(LootContextParameters.f_nxapolcz, stack)
+         .add(LootContextParameters.ORIGIN, pos.ofCenter())
+         .add(LootContextParameters.THIS_ENTITY, player)
+         .add(LootContextParameters.BLOCK_STATE, lv2)
+         .add(LootContextParameters.TOOL, stack)
          .build(LootContextTypes.ADVANCEMENT_LOCATION);
       LootContext lv4 = new LootContext.Builder(lv3).build(Optional.empty());
       this.trigger(player, conditions -> conditions.matches(lv4));
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2024-11-04 23:31:19.749089440 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2024-11-04 23:30:06.029573532 +0000
@@ -63,7 +63,7 @@
          return (DataResult<SlideDownBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
                arg2 -> conditions.state
-                     .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.getValue()).getStateManager()))
+                     .flatMap(arg2x -> arg2x.reportFirstMissing(((Block)arg2.getValue()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
             .orElseGet(() -> DataResult.success(conditions));
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-11-04 23:31:19.525090924 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-11-04 23:30:05.749575331 +0000
@@ -297,12 +297,12 @@
          if (lv.shouldDropItemsOnExplosion(explosion)) {
             BlockEntity lv2 = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
             LootContextParameterSet.Builder lv3 = new LootContextParameterSet.Builder(world)
-               .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
-               .add(LootContextParameters.f_nxapolcz, ItemStack.EMPTY)
-               .addOptional(LootContextParameters.f_wwaxuttk, lv2)
-               .addOptional(LootContextParameters.f_rcnckitm, explosion.getEntity());
+               .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
+               .add(LootContextParameters.TOOL, ItemStack.EMPTY)
+               .addOptional(LootContextParameters.BLOCK_ENTITY, lv2)
+               .addOptional(LootContextParameters.THIS_ENTITY, explosion.getEntity());
             if (explosion.getDestructionType() == Explosion.DestructionType.DESTROY_WITH_DECAY) {
-               lv3.add(LootContextParameters.f_pvhqgmwf, explosion.getPower());
+               lv3.add(LootContextParameters.EXPLOSION_RADIUS, explosion.getPower());
             }
 
             state.onStacksDropped(world, pos, ItemStack.EMPTY, bl);
@@ -448,7 +448,7 @@
       if (this.lootTableId.isEmpty()) {
          return Collections.emptyList();
       } else {
-         LootContextParameterSet lv = lootParameterBuilder.add(LootContextParameters.f_avxjsfab, state).build(LootContextTypes.BLOCK);
+         LootContextParameterSet lv = lootParameterBuilder.add(LootContextParameters.BLOCK_STATE, state).build(LootContextTypes.BLOCK);
          ServerWorld lv2 = lv.getWorld();
          LootTable lv3 = lv2.getServer().getReloadableRegistries().getLootTable((RegistryKey<LootTable>)this.lootTableId.get());
          return lv3.generateLoot(lv);
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-11-04 23:31:19.681089890 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-11-04 23:30:05.941574098 +0000
@@ -399,13 +399,13 @@
     */
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
-      Entity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_rcnckitm);
+      Entity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.THIS_ENTITY);
       if (lv instanceof TntEntity
          || lv instanceof CreeperEntity
          || lv instanceof WitherSkullEntity
          || lv instanceof WitherEntity
          || lv instanceof TntMinecartEntity) {
-         BlockEntity lv2 = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_wwaxuttk);
+         BlockEntity lv2 = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
          if (lv2 instanceof BeehiveBlockEntity lv3) {
             lv3.angerBees(null, state, BeehiveBlockEntity.BeeState.EMERGENCY);
          }
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-11-04 23:31:19.801089095 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-11-04 23:30:06.089573147 +0000
@@ -500,9 +500,9 @@
     */
    public static List<ItemStack> getDroppedStacks(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity) {
       LootContextParameterSet.Builder lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
-         .add(LootContextParameters.f_nxapolcz, ItemStack.EMPTY)
-         .addOptional(LootContextParameters.f_wwaxuttk, blockEntity);
+         .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
+         .add(LootContextParameters.TOOL, ItemStack.EMPTY)
+         .addOptional(LootContextParameters.BLOCK_ENTITY, blockEntity);
       return state.getDroppedStacks(lv);
    }
 
@@ -514,10 +514,10 @@
       BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack stack
    ) {
       LootContextParameterSet.Builder lv = new LootContextParameterSet.Builder(world)
-         .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
-         .add(LootContextParameters.f_nxapolcz, stack)
-         .addOptional(LootContextParameters.f_rcnckitm, entity)
-         .addOptional(LootContextParameters.f_wwaxuttk, blockEntity);
+         .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
+         .add(LootContextParameters.TOOL, stack)
+         .addOptional(LootContextParameters.THIS_ENTITY, entity)
+         .addOptional(LootContextParameters.BLOCK_ENTITY, blockEntity);
       return state.getDroppedStacks(lv);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-11-04 23:31:19.509091031 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-11-04 23:30:05.733575434 +0000
@@ -247,7 +247,7 @@
     */
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
-      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_wwaxuttk);
+      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof DecoratedPotBlockEntity lv2) {
          lootParameterBuilder.withDynamicDrop(SHERDS, consumer -> {
             for (Item lvx : lv2.getSherds().ordered()) {
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-11-04 23:31:19.545090791 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-11-04 23:30:05.777575151 +0000
@@ -468,7 +468,7 @@
       ItemStack lv = this.inventory.get(slot);
       boolean bl = !stack.isEmpty() && ItemStack.itemsAndComponentsMatch(lv, stack);
       this.inventory.set(slot, stack);
-      stack.m_uzwjgkgy(this.getMaxCount(stack));
+      stack.minimizeCount(this.getMaxCount(stack));
       if (slot == 0 && !bl && this.world instanceof ServerWorld lv2) {
          this.cookTimeTotal = getCookTime(lv2, this);
          this.cookTime = 0;
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-11-04 23:31:19.689089837 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-11-04 23:30:05.953574020 +0000
@@ -169,10 +169,10 @@
          }
 
          LootContextParameterSet lv3 = new LootContextParameterSet.Builder(world)
-            .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(this.pos))
+            .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(this.pos))
             .withLuck(player.getLuck())
-            .add(LootContextParameters.f_rcnckitm, player)
-            .add(LootContextParameters.f_nxapolcz, stack)
+            .add(LootContextParameters.THIS_ENTITY, player)
+            .add(LootContextParameters.TOOL, stack)
             .build(LootContextTypes.ARCHAEOLOGY);
          ObjectArrayList<ItemStack> objectArrayList = lv.generateLoot(lv3, this.lootTableSeed);
 
diff -bur namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java namedSrc/net/minecraft/block/entity/HopperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-11-04 23:31:19.509091031 +0000
+++ namedSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-11-04 23:30:05.733575434 +0000
@@ -129,7 +129,7 @@
    public void setStack(int slot, ItemStack stack) {
       this.setupLoot(null);
       this.getInventory().set(slot, stack);
-      stack.m_uzwjgkgy(this.getMaxCount(stack));
+      stack.minimizeCount(this.getMaxCount(stack));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-11-04 23:31:19.693089811 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-11-04 23:30:05.957573995 +0000
@@ -186,7 +186,7 @@
    @Override
    public void setStack(int slot, ItemStack stack) {
       this.getInventory().set(slot, stack);
-      stack.m_uzwjgkgy(this.getMaxCount(stack));
+      stack.minimizeCount(this.getMaxCount(stack));
       this.markDirty();
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-11-04 23:31:19.785089201 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-11-04 23:30:06.069573276 +0000
@@ -24,7 +24,7 @@
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
@@ -207,7 +207,7 @@
    private Text parseLine(Text text) {
       if (this.world instanceof ServerWorld lv) {
          try {
-            return Texts.parse(createCommandSource(null, lv, this.pos), text, null, 0);
+            return TextUtil.parse(createCommandSource(null, lv, this.pos), text, null, 0);
          } catch (CommandSyntaxException var4) {
          }
       }
diff -bur namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-11-04 23:31:19.621090288 +0000
+++ namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-11-04 23:30:05.873574535 +0000
@@ -471,9 +471,9 @@
       private static ItemStack getRandomDisplayItem(ServerWorld world, BlockPos pos, RegistryKey<LootTable> key) {
          LootTable lv = world.getServer().getReloadableRegistries().getLootTable(key);
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
-            .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
+            .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .build(LootContextTypes.VAULT);
-         List<ItemStack> list = lv.m_qwijqopm(lv2, world.getRandom());
+         List<ItemStack> list = lv.generateLoot(lv2, world.getRandom());
          return list.isEmpty() ? ItemStack.EMPTY : Util.getRandom(list, world.getRandom());
       }
 
@@ -497,10 +497,10 @@
       private static List<ItemStack> m_rlrwoomb(ServerWorld world, VaultConfig arg2, BlockPos pos, PlayerEntity player, ItemStack stack) {
          LootTable lv = world.getServer().getReloadableRegistries().getLootTable(arg2.lootTable());
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
-            .add(LootContextParameters.f_mvxqkdcc, Vec3d.ofCenter(pos))
+            .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .withLuck(player.getLuck())
-            .add(LootContextParameters.f_rcnckitm, player)
-            .add(LootContextParameters.f_nxapolcz, stack)
+            .add(LootContextParameters.THIS_ENTITY, player)
+            .add(LootContextParameters.TOOL, stack)
             .build(LootContextTypes.VAULT);
          return lv.generateLoot(lv2);
       }
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonExtensionBlock.java namedSrc/net/minecraft/block/piston/PistonExtensionBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonExtensionBlock.java	2024-11-04 23:31:19.713089678 +0000
+++ namedSrc/net/minecraft/block/piston/PistonExtensionBlock.java	2024-11-04 23:30:05.981573841 +0000
@@ -142,7 +142,7 @@
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
       PistonBlockEntity lv = this.getPistonBlockEntity(
-         lootParameterBuilder.getWorld(), BlockPos.fromPosition(lootParameterBuilder.getParameter(LootContextParameters.f_mvxqkdcc))
+         lootParameterBuilder.getWorld(), BlockPos.fromPosition(lootParameterBuilder.getParameter(LootContextParameters.ORIGIN))
       );
       return lv == null ? Collections.emptyList() : lv.getMovedBlockState().getDroppedStacks(lootParameterBuilder);
    }
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-11-04 23:31:19.661090023 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-11-04 23:30:05.917574252 +0000
@@ -240,7 +240,7 @@
     */
    @Override
    protected List<ItemStack> getDroppedStacks(BlockState state, LootContextParameterSet.Builder lootParameterBuilder) {
-      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.f_wwaxuttk);
+      BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof ShulkerBoxBlockEntity lv2) {
          lootParameterBuilder = lootParameterBuilder.withDynamicDrop(CONTENTS_DYNAMIC_DROP_ID, consumer -> {
             for (int i = 0; i < lv2.size(); i++) {
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2024-11-04 23:31:19.473091269 +0000
+++ namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2024-11-04 23:30:05.689575717 +0000
@@ -31,7 +31,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Nullables;
@@ -209,7 +209,7 @@
          this.healthStates.clear();
          this.visible = visible;
          if (visible) {
-            Text lv = Texts.join(this.getVisibleEntries(), Text.literal(", "), this::getPlayerName);
+            Text lv = TextUtil.join(this.getVisibleEntries(), Text.literal(", "), this::getPlayerName);
             this.client.getChatNarratorManager().narrate(Text.translatable("multiplayer.player.list.narration", lv));
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2024-11-04 23:31:19.477091243 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2024-11-04 23:30:05.693575690 +0000
@@ -15,7 +15,7 @@
 import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Language;
 import net.minecraft.util.math.MathHelper;
@@ -175,7 +175,7 @@
       int i = this.computeProgressWidth();
       int j = 29 + client.textRenderer.getWidth(this.title) + i;
       this.description = Language.getInstance()
-         .reorder(this.wrapDescription(Texts.setStyleIfAbsent(display.getDescription().copy(), Style.EMPTY.withColor(display.getType().getFormatting())), j));
+         .reorder(this.wrapDescription(TextUtil.setStyleIfAbsent(display.getDescription().copy(), Style.EMPTY.withColor(display.getType().getFormatting())), j));
 
       for (OrderedText lv : this.description) {
          j = Math.max(j, client.textRenderer.getWidth(lv));
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/BanScreenFactories.java namedSrc/net/minecraft/client/gui/screen/BanScreenFactories.java
--- namedTargetSrc/net/minecraft/client/gui/screen/BanScreenFactories.java	2024-11-04 23:31:19.605090394 +0000
+++ namedSrc/net/minecraft/client/gui/screen/BanScreenFactories.java	2024-11-04 23:30:05.849574689 +0000
@@ -11,7 +11,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.UrlConstants;
 import net.minecraft.util.Util;
@@ -124,7 +124,7 @@
          AbuseReportReason lv = AbuseReportReason.get(i);
          Text lv2;
          if (lv != null) {
-            lv2 = Texts.setStyleIfAbsent(lv.getId().copy(), Style.EMPTY.withBold(true));
+            lv2 = TextUtil.setStyleIfAbsent(lv.getId().copy(), Style.EMPTY.withBold(true));
          } else if (string2 != null) {
             lv2 = Text.translatable("gui.banned.description.reason_id_message", i, string2).formatted(Formatting.BOLD);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CommandSuggestor.java namedSrc/net/minecraft/client/gui/screen/CommandSuggestor.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CommandSuggestor.java	2024-11-04 23:31:19.501091083 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CommandSuggestor.java	2024-11-04 23:30:05.725575485 +0000
@@ -38,7 +38,7 @@
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec2f;
@@ -399,7 +399,7 @@
     * @mapping {@literal named formatException Lnet/minecraft/client/gui/screen/CommandSuggestor;formatException(Lcom/mojang/brigadier/exceptions/CommandSyntaxException;)Lnet/minecraft/text/OrderedText;}
     */
    private static OrderedText formatException(CommandSyntaxException exception) {
-      Text lv = Texts.toText(exception.getRawMessage());
+      Text lv = TextUtil.toText(exception.getRawMessage());
       String string = exception.getContext();
       return string == null ? lv.asOrderedText() : Text.translatable("command.context.parse_error", lv, exception.getCursor(), string).asOrderedText();
    }
@@ -727,7 +727,7 @@
          if (bl5) {
             Message message = ((Suggestion)this.suggestions.get(this.selection)).getTooltip();
             if (message != null) {
-               graphics.drawTooltip(CommandSuggestor.this.textRenderer, Texts.toText(message), mouseX, mouseY);
+               graphics.drawTooltip(CommandSuggestor.this.textRenderer, TextUtil.toText(message), mouseX, mouseY);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java	2024-11-04 23:31:19.609090367 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsBrokenWorldScreen.java	2024-11-04 23:30:05.857574637 +0000
@@ -24,7 +24,7 @@
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -120,7 +120,7 @@
     */
    @Override
    public Text getNarratedTitle() {
-      return Texts.join(
+      return TextUtil.join(
          (Collection<? extends Text>)Stream.concat(Stream.of(this.title), Stream.of(this.message)).collect(Collectors.toList()), CommonTexts.SPACE
       );
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java namedSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java	2024-11-04 23:31:19.641090156 +0000
+++ namedSrc/net/minecraft/client/gui/screen/UnsupportedGraphicsScreen.java	2024-11-04 23:30:05.893574406 +0000
@@ -9,7 +9,7 @@
 import net.minecraft.client.gui.widget.button.ButtonWidget;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ouqxetay}
@@ -70,7 +70,7 @@
    protected UnsupportedGraphicsScreen(Text title, List<Text> message, ImmutableList<UnsupportedGraphicsScreen.WidgetData> widgets) {
       super(title);
       this.message = message;
-      this.narrationMessage = CommonTexts.joinSentences(title, Texts.join(message, CommonTexts.EMPTY));
+      this.narrationMessage = CommonTexts.joinSentences(title, TextUtil.join(message, CommonTexts.EMPTY));
       this.widgets = widgets;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java namedSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java	2024-11-04 23:31:19.753089413 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/ExperimentalFeaturesWarningScreen.java	2024-11-04 23:30:06.037573481 +0000
@@ -22,7 +22,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -263,7 +263,7 @@
             for (PackProfile lv : enabledFeatures) {
                String string = FeatureFlags.showMissing(FeatureFlags.DEFAULT_SET, lv.getRequestedFeatures());
                if (!string.isEmpty()) {
-                  Text lv2 = Texts.setStyleIfAbsent(lv.getDisplayName().copy(), Style.EMPTY.withBold(true));
+                  Text lv2 = TextUtil.setStyleIfAbsent(lv.getDisplayName().copy(), Style.EMPTY.withBold(true));
                   Text lv3 = Text.translatable("selectWorld.experimental.details.entry", string);
                   this.addEntry(
                      DetailsScreen.this.new RequirementEntry(lv2, lv3, MultilineText.create(DetailsScreen.this.textRenderer, lv3, this.getRowWidth()))
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java	2024-11-04 23:31:19.609090367 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/PlainTextButtonWidget.java	2024-11-04 23:30:05.853574663 +0000
@@ -6,7 +6,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -39,7 +39,7 @@
       super(x, y, width, height, content, empty, DEFAULT_NARRATION);
       this.font = font;
       this.content = content;
-      this.underlinedContent = Texts.setStyleIfAbsent(content.copy(), Style.EMPTY.withUnderline(true));
+      this.underlinedContent = TextUtil.setStyleIfAbsent(content.copy(), Style.EMPTY.withUnderline(true));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java	2024-11-04 23:31:19.637090182 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/multiplayer/ServerEntryListWidget.java	2024-11-04 23:30:05.889574432 +0000
@@ -27,7 +27,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -861,7 +861,7 @@
                   lv.append(CommonTexts.SENTENCE_SEPARATOR);
                   lv.append(Text.translatable("multiplayer.status.player_count.narration", this.server.players.online(), this.server.players.max()));
                   lv.append(CommonTexts.SENTENCE_SEPARATOR);
-                  lv.append(Texts.join(this.server.playerListSummary, Text.literal(", ")));
+                  lv.append(TextUtil.join(this.server.playerListSummary, Text.literal(", ")));
                }
          }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-11-04 23:31:19.661090023 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-11-04 23:30:05.917574252 +0000
@@ -1340,7 +1340,7 @@
          Vec3d lv = this.getPos();
          Vec3d lv2 = lv.add((double)dx, 0.0, (double)dz);
          Vec3d lv3 = new Vec3d((double)dx, 0.0, (double)dz);
-         float h = this.getMovementSpeed();
+         float h = this.getBaseAccelerationFactor();
          float i = (float)lv3.lengthSquared();
          if (i <= 0.001F) {
             Vec2f lv4 = this.input.m_jpymendx();
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java namedSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java
--- namedTargetSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java	2024-11-04 23:31:19.625090262 +0000
+++ namedSrc/net/minecraft/client/render/model/json/AndMultipartModelSelector.java	2024-11-04 23:30:05.877574509 +0000
@@ -40,6 +40,6 @@
     */
    @Override
    public Predicate<BlockState> getPredicate(StateManager<Block, BlockState> arg) {
-      return Util.m_sebyursz(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
+      return Util.allOf(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java namedSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java
--- namedTargetSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java	2024-11-04 23:31:19.497091110 +0000
+++ namedSrc/net/minecraft/client/render/model/json/OrMultipartModelSelector.java	2024-11-04 23:30:05.717575536 +0000
@@ -40,6 +40,6 @@
     */
    @Override
    public Predicate<BlockState> getPredicate(StateManager<Block, BlockState> arg) {
-      return Util.m_vbthhkfm(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
+      return Util.anyOf(Streams.stream(this.selectors).map(selector -> selector.getPredicate(arg)).toList());
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java namedSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java
--- namedTargetSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java	2024-11-04 23:31:19.465091322 +0000
+++ namedSrc/net/minecraft/client/render/model/json/SimpleMultipartModelSelector.java	2024-11-04 23:30:05.669575845 +0000
@@ -69,7 +69,7 @@
             if (list.size() == 1) {
                predicate = this.createPredicate(arg, lv, string);
             } else {
-               predicate = Util.m_vbthhkfm(list.stream().map(stringx -> this.createPredicate(arg, lv, stringx)).toList());
+               predicate = Util.anyOf(list.stream().map(stringx -> this.createPredicate(arg, lv, stringx)).toList());
             }
 
             return bl ? predicate.negate() : predicate;
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundManager.java namedSrc/net/minecraft/client/sound/SoundManager.java
--- namedTargetSrc/net/minecraft/client/sound/SoundManager.java	2024-11-04 23:31:19.501091083 +0000
+++ namedSrc/net/minecraft/client/sound/SoundManager.java	2024-11-04 23:30:05.725575485 +0000
@@ -25,7 +25,7 @@
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.unmapped.C_faujnouj;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
@@ -185,7 +185,7 @@
       if (SharedConstants.isDevelopment) {
          for (Identifier lv : this.sounds.keySet()) {
             WeightedSoundSet lv2 = (WeightedSoundSet)this.sounds.get(lv);
-            if (!Texts.canResolve(lv2.getSubtitle()) && Registries.SOUND_EVENT.containsId(lv)) {
+            if (!TextUtil.canResolve(lv2.getSubtitle()) && Registries.SOUND_EVENT.containsId(lv)) {
                LOGGER.error("Missing subtitle {} for sound event: {}", lv2.getSubtitle(), lv);
             }
          }
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-11-04 23:31:19.489091163 +0000
+++ namedSrc/net/minecraft/command/argument/ItemPredicateArgumentType.java	2024-11-04 23:30:05.709575588 +0000
@@ -141,7 +141,7 @@
     * @mapping {@literal named parse Lnet/minecraft/command/argument/ItemPredicateArgumentType;parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/command/argument/ItemPredicateArgumentType$ItemPredicateArgument;}
     */
    public ItemPredicateArgumentType.ItemPredicateArgument parse(StringReader reader) throws CommandSyntaxException {
-      return Util.m_sebyursz(this.f_gticmpkj.m_onlfahvw(reader))::test;
+      return Util.allOf(this.f_gticmpkj.m_onlfahvw(reader))::test;
    }
 
    /**
@@ -356,7 +356,7 @@
        * @mapping {@literal named m_uqiyvusz Lnet/minecraft/command/argument/ItemPredicateArgumentType$C_wadhfwgl;m_uqiyvusz(Ljava/util/List;)Ljava/util/function/Predicate;}
        */
       public Predicate<ItemStack> m_uqiyvusz(List<Predicate<ItemStack>> list) {
-         return Util.m_vbthhkfm(list);
+         return Util.anyOf(list);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelector.java namedSrc/net/minecraft/command/EntitySelector.java
--- namedTargetSrc/net/minecraft/command/EntitySelector.java	2024-11-04 23:31:19.773089281 +0000
+++ namedSrc/net/minecraft/command/EntitySelector.java	2024-11-04 23:30:06.057573353 +0000
@@ -16,7 +16,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.Box;
@@ -395,7 +395,7 @@
          list = list2;
       }
 
-      return Util.m_sebyursz(list);
+      return Util.allOf(list);
    }
 
    /**
@@ -415,6 +415,6 @@
     * @mapping {@literal named getNames Lnet/minecraft/command/EntitySelector;getNames(Ljava/util/List;)Lnet/minecraft/text/Text;}
     */
    public static Text getNames(List<? extends Entity> entities) {
-      return Texts.join(entities, Entity::getDisplayName);
+      return TextUtil.join(entities, Entity::getDisplayName);
    }
 }
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java namedSrc/net/minecraft/command/EntitySelectorOptions.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java	2024-11-04 23:31:19.757089387 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-11-04 23:30:06.037573481 +0000
@@ -516,8 +516,8 @@
                            return false;
                         } else {
                            LootContextParameterSet lv2 = new LootContextParameterSet.Builder(lvx)
-                              .add(LootContextParameters.f_rcnckitm, entity)
-                              .add(LootContextParameters.f_mvxqkdcc, entity.getPos())
+                              .add(LootContextParameters.THIS_ENTITY, entity)
+                              .add(LootContextParameters.ORIGIN, entity.getPos())
                               .build(LootContextTypes.SELECTOR);
                            LootContext lv3 = new LootContext.Builder(lv2).build(Optional.empty());
                            lv3.addVisitedElement(LootContext.createEntry((LootCondition)optional.get()));
diff -bur namedTargetSrc/net/minecraft/component/type/JukeboxPlayableComponent.java namedSrc/net/minecraft/component/type/JukeboxPlayableComponent.java
--- namedTargetSrc/net/minecraft/component/type/JukeboxPlayableComponent.java	2024-11-04 23:31:19.565090659 +0000
+++ namedSrc/net/minecraft/component/type/JukeboxPlayableComponent.java	2024-11-04 23:30:05.797575023 +0000
@@ -23,7 +23,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.unmapped.C_cemdjcik;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
@@ -68,7 +68,7 @@
       if (this.showInTooltip && lv != null) {
          this.song.m_bomacrpw(lv).ifPresent(arg -> {
             MutableText lvx = ((JukeboxSong)arg.getValue()).description().copy();
-            Texts.setStyleIfAbsent(lvx, Style.EMPTY.withColor(Formatting.GRAY));
+            TextUtil.setStyleIfAbsent(lvx, Style.EMPTY.withColor(Formatting.GRAY));
             tooltipConsumer.accept(lvx);
          });
       }
diff -bur namedTargetSrc/net/minecraft/component/type/LoreComponent.java namedSrc/net/minecraft/component/type/LoreComponent.java
--- namedTargetSrc/net/minecraft/component/type/LoreComponent.java	2024-11-04 23:31:19.653090076 +0000
+++ namedSrc/net/minecraft/component/type/LoreComponent.java	2024-11-04 23:30:05.909574304 +0000
@@ -13,7 +13,7 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
 
@@ -55,7 +55,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/component/type/LoreComponent;<init>(Ljava/util/List;)V}
     */
    public LoreComponent(List<Text> lines) {
-      this(lines, Lists.transform(lines, line -> Texts.setStyleIfAbsent(line.copy(), STYLE)));
+      this(lines, Lists.transform(lines, line -> TextUtil.setStyleIfAbsent(line.copy(), STYLE)));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/component/type/UnbreakableComponent.java namedSrc/net/minecraft/component/type/UnbreakableComponent.java
--- namedTargetSrc/net/minecraft/component/type/UnbreakableComponent.java	2024-11-04 23:31:19.605090394 +0000
+++ namedSrc/net/minecraft/component/type/UnbreakableComponent.java	2024-11-04 23:30:05.849574689 +0000
@@ -49,9 +49,9 @@
 
    /**
     * @mapping {@literal hashed m_nrzkdjww Lnet/minecraft/unmapped/C_drqhpkfg;m_nrzkdjww(Z)Lnet/minecraft/unmapped/C_drqhpkfg;}
-    * @mapping {@literal named create Lnet/minecraft/component/type/UnbreakableComponent;create(Z)Lnet/minecraft/component/type/UnbreakableComponent;}
+    * @mapping {@literal named withShownInTooltip Lnet/minecraft/component/type/UnbreakableComponent;withShownInTooltip(Z)Lnet/minecraft/component/type/UnbreakableComponent;}
     */
-   public UnbreakableComponent create(boolean shownInTooltip) {
+   public UnbreakableComponent withShownInTooltip(boolean shownInTooltip) {
       return new UnbreakableComponent(shownInTooltip);
    }
 }
diff -bur namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java
--- namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-11-04 23:31:19.497091110 +0000
+++ namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-11-04 23:30:05.721575511 +0000
@@ -16,7 +16,7 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
-import net.minecraft.text.Texts;
+import net.minecraft.text.TextUtil;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
 
@@ -178,7 +178,7 @@
    private static Optional<Filterable<Text>> resolvePage(ServerCommandSource source, @Nullable PlayerEntity player, Filterable<Text> page) {
       return page.resolve(filtered -> {
          try {
-            Text lv = Texts.parse(source, filtered, player, 0);
+            Text lv = TextUtil.parse(source, filtered, player, 0);
             return isPageTooLarge(lv, source.getRegistryManager()) ? Optional.empty() : Optional.of(lv);
          } catch (Exception var4) {
             return Optional.of(filtered);
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java	2024-11-04 23:31:19.537090845 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/ArchaeologyLootTableGenerator.java	2024-11-04 23:30:05.769575202 +0000
@@ -39,12 +39,12 @@
                      ItemEntry.builder(Items.SUSPICIOUS_STEW)
                         .apply(
                            SetStewEffectLootFunction.builder()
-                              .withEffect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
-                              .withEffect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
-                              .withEffect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
-                              .withEffect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
-                              .withEffect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
-                              .withEffect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
+                              .effect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
+                              .effect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
+                              .effect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
                         )
                   )
             )
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java	2024-11-04 23:31:19.609090367 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BarteringLootTableGenerator.java	2024-11-04 23:30:05.857574637 +0000
@@ -39,12 +39,12 @@
                   .with(
                      ItemEntry.builder(Items.BOOK)
                         .weight(5)
-                        .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                        .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_BOOTS)
                         .weight(8)
-                        .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                        .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                   )
                   .with(ItemEntry.builder(Items.POTION).weight(8).apply(SetPotionFunction.builder(Potions.FIRE_RESISTANCE)))
                   .with(ItemEntry.builder(Items.SPLASH_POTION).weight(8).apply(SetPotionFunction.builder(Potions.FIRE_RESISTANCE)))
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-11-04 23:31:19.473091269 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-11-04 23:30:05.689575717 +0000
@@ -345,9 +345,7 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(
                      ItemEntry.builder(drop)
-                        .apply(
-                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_gbinruor(DataComponentTypes.CUSTOM_NAME)
-                        )
+                        .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.CUSTOM_NAME))
                   )
             )
          );
@@ -367,11 +365,11 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                              .m_gbinruor(DataComponentTypes.CUSTOM_NAME)
-                              .m_gbinruor(DataComponentTypes.CONTAINER)
-                              .m_gbinruor(DataComponentTypes.LOCK)
-                              .m_gbinruor(DataComponentTypes.CONTAINER_LOOT)
+                           CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                              .include(DataComponentTypes.CUSTOM_NAME)
+                              .include(DataComponentTypes.CONTAINER)
+                              .include(DataComponentTypes.LOCK)
+                              .include(DataComponentTypes.CONTAINER_LOOT)
                         )
                   )
             )
@@ -390,7 +388,7 @@
             drop,
             ItemEntry.builder(Items.RAW_COPPER)
                .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 5.0F)))
-               .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+               .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -407,7 +405,7 @@
             drop,
             ItemEntry.builder(Items.LAPIS_LAZULI)
                .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 9.0F)))
-               .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+               .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -424,7 +422,7 @@
             drop,
             ItemEntry.builder(Items.REDSTONE)
                .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 5.0F)))
-               .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+               .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -443,12 +441,12 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                              .m_gbinruor(DataComponentTypes.CUSTOM_NAME)
-                              .m_gbinruor(DataComponentTypes.ITEM_NAME)
-                              .m_gbinruor(DataComponentTypes.HIDE_ADDITIONAL_TOOLTIP)
-                              .m_gbinruor(DataComponentTypes.BANNER_PATTERNS)
-                              .m_gbinruor(DataComponentTypes.RARITY)
+                           CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                              .include(DataComponentTypes.CUSTOM_NAME)
+                              .include(DataComponentTypes.ITEM_NAME)
+                              .include(DataComponentTypes.HIDE_ADDITIONAL_TOOLTIP)
+                              .include(DataComponentTypes.BANNER_PATTERNS)
+                              .include(DataComponentTypes.RARITY)
                         )
                   )
             )
@@ -467,7 +465,7 @@
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(
                   ItemEntry.builder(block)
-                     .apply(CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_gbinruor(DataComponentTypes.BEES))
+                     .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(block).addProperty(BeehiveBlock.HONEY_LEVEL))
                )
          );
@@ -485,7 +483,7 @@
                .with(
                   ItemEntry.builder(block)
                      .conditionally(this.m_pjptakrh())
-                     .apply(CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_gbinruor(DataComponentTypes.BEES))
+                     .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(block).addProperty(BeehiveBlock.HONEY_LEVEL))
                      .alternatively(ItemEntry.builder(block))
                )
@@ -514,7 +512,7 @@
       return this.dropsWithSilkTouch(
          dropWithSilkTouch,
          (LootPoolEntry.Builder<?>)this.applyExplosionDecay(
-            dropWithSilkTouch, ItemEntry.builder(drop).apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+            dropWithSilkTouch, ItemEntry.builder(drop).apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
          )
       );
    }
@@ -546,8 +544,8 @@
          (LootPoolEntry.Builder<?>)this.applyExplosionDecay(
             dropWithShears,
             ItemEntry.builder(Items.WHEAT_SEEDS)
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.125F))
-               .apply(ApplyBonusLootFunction.m_gomajsny(lv.getHolderOrThrow(Enchantments.FORTUNE), 2))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.125F))
+               .apply(ApplyBonusLootFunction.uniformFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 2))
          )
       );
    }
@@ -667,7 +665,7 @@
       return this.dropsWithShearsOrSilkTouch(
             leaves,
             ((LeafEntry.Builder)this.applySurvivesExplosionCondition(leaves, ItemEntry.builder(drop)))
-               .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), chance))
+               .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), chance))
          )
          .pool(
             LootPool.builder()
@@ -677,7 +675,7 @@
                   ((LeafEntry.Builder)this.applyExplosionDecay(
                         leaves, ItemEntry.builder(Items.STICK).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
                      ))
-                     .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
+                     .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
                )
          );
    }
@@ -696,7 +694,9 @@
                .with(
                   ((LeafEntry.Builder)this.applySurvivesExplosionCondition(leaves, ItemEntry.builder(Items.APPLE)))
                      .conditionally(
-                        TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.005F, 0.0055555557F, 0.00625F, 0.008333334F, 0.025F)
+                        TableBonusLootCondition.conditionBuilder(
+                           lv.getHolderOrThrow(Enchantments.FORTUNE), 0.005F, 0.0055555557F, 0.00625F, 0.008333334F, 0.025F
+                        )
                      )
                )
          );
@@ -713,7 +713,7 @@
          ((LeafEntry.Builder)this.applyExplosionDecay(
                Blocks.MANGROVE_LEAVES, ItemEntry.builder(Items.STICK).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
             ))
-            .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
+            .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), LEAVES_STICK_DROP_CHANCES))
       );
    }
 
@@ -730,7 +730,9 @@
             .pool(
                LootPool.builder()
                   .conditionally(condition)
-                  .with(ItemEntry.builder(seeds).apply(ApplyBonusLootFunction.m_ziaghyfl(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)))
+                  .with(
+                     ItemEntry.builder(seeds).apply(ApplyBonusLootFunction.binomialFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))
+                  )
             )
       );
    }
@@ -759,7 +761,7 @@
          .conditionally(this.m_fdmlfnlz())
          .alternatively(
             ((LeafEntry.Builder)this.applySurvivesExplosionCondition(tallGrass, ItemEntry.builder(Items.WHEAT_SEEDS)))
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.125F))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.125F))
          );
       return LootTable.builder()
          .pool(
@@ -918,7 +920,7 @@
       HolderLookup.RegistryLookup<Enchantment> lv = this.f_phocahpv.getLookupOrThrow(RegistryKeys.ENCHANTMENT);
       LootTable.Builder lv2 = this.dropsWithShearsOrSilkTouch(
          vines,
-         ItemEntry.builder(vines).conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.33F, 0.55F, 0.77F, 1.0F))
+         ItemEntry.builder(vines).conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.33F, 0.55F, 0.77F, 1.0F))
       );
       this.add(vines, lv2);
       this.add(plant, lv2);

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java	2024-11-04 23:31:19.757089387 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/ChestLootTableGenerator.java	2024-11-04 23:30:06.037573481 +0000
@@ -57,7 +57,7 @@
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                   .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE))
                   .with(ItemEntry.builder(Items.NAME_TAG).weight(30))
-                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(ItemEntry.builder(Items.IRON_PICKAXE).weight(5))
                   .with(EmptyEntry.builder().weight(5))
             )
@@ -141,8 +141,8 @@
                         .weight(1)
                         .apply(
                            SetStewEffectLootFunction.builder()
-                              .withEffect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
-                              .withEffect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
+                              .effect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                              .effect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
                         )
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 6.0F)))
                   )
@@ -201,7 +201,7 @@
                   .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR).weight(10))
                   .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR).weight(15))
                   .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(5))
-                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
             )
             .pool(
                LootPool.builder()
@@ -277,7 +277,8 @@
                   .with(ItemEntry.builder(Items.APPLE).weight(15).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                   .with(ItemEntry.builder(Items.IRON_PICKAXE))
                   .with(
-                     ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                     ItemEntry.builder(Items.BOOK)
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
             )
       );
@@ -297,21 +298,21 @@
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE))
-                  .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE))
                   .with(ItemEntry.builder(Items.GOLDEN_HELMET))
-                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(
                      ItemEntry.builder(Items.MAP)
                         .weight(10)
                         .apply(
                            ExplorationMapLootFunction.create()
-                              .withDestination(StructureTags.ON_TREASURE_MAPS)
-                              .withDecoration(MapDecorationTypes.RED_X)
-                              .withZoom((byte)1)
-                              .withSkipExistingChunks(false)
+                              .destination(StructureTags.ON_TREASURE_MAPS)
+                              .decoration(MapDecorationTypes.RED_X)
+                              .zoom((byte)1)
+                              .skipExistingChunks(false)
                         )
-                        .apply(SetNameLootFunction.m_qjkvclgt(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.C_pyscauma.ITEM_NAME))
+                        .apply(SetNameLootFunction.builder(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.Target.ITEM_NAME))
                   )
             )
       );
@@ -332,18 +333,18 @@
                   .rolls(ConstantLootNumberProvider.create(1.0F))
                   .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE))
                   .with(ItemEntry.builder(Items.GOLDEN_HELMET))
-                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.FISHING_ROD).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(
                      ItemEntry.builder(Items.MAP)
                         .weight(5)
                         .apply(
                            ExplorationMapLootFunction.create()
-                              .withDestination(StructureTags.ON_TREASURE_MAPS)
-                              .withDecoration(MapDecorationTypes.RED_X)
-                              .withZoom((byte)1)
-                              .withSkipExistingChunks(false)
+                              .destination(StructureTags.ON_TREASURE_MAPS)
+                              .decoration(MapDecorationTypes.RED_X)
+                              .zoom((byte)1)
+                              .skipExistingChunks(false)
                         )
-                        .apply(SetNameLootFunction.m_qjkvclgt(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.C_pyscauma.ITEM_NAME))
+                        .apply(SetNameLootFunction.builder(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.Target.ITEM_NAME))
                   )
             )
       );
@@ -622,15 +623,15 @@
                   .with(ItemEntry.builder(Items.FIRE_CHARGE).weight(40))
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(15))
                   .with(ItemEntry.builder(Items.GOLD_NUGGET).weight(15).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 24.0F))))
-                  .with(ItemEntry.builder(Items.GOLDEN_SWORD).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_AXE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_HOE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_SHOVEL).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_PICKAXE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_BOOTS).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_CHESTPLATE).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_HELMET).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-                  .with(ItemEntry.builder(Items.GOLDEN_LEGGINGS).weight(15).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_SWORD).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_AXE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_HOE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_SHOVEL).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_PICKAXE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_BOOTS).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_CHESTPLATE).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_HELMET).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+                  .with(ItemEntry.builder(Items.GOLDEN_LEGGINGS).weight(15).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(
                      ItemEntry.builder(Items.GLISTERING_MELON_SLICE)
                         .weight(5)
@@ -829,7 +830,7 @@
                      ItemEntry.builder(Items.DIAMOND_AXE)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.4F, 0.9F)))
-                        .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                        .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                         .weight(1)
                   )
                   .with(
@@ -872,7 +873,7 @@
                      ItemEntry.builder(Items.IRON_AXE)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.4F, 0.9F)))
-                        .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                        .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                         .weight(1)
                   )
                   .with(ItemEntry.builder(Items.HONEYCOMB).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 8.0F))).weight(1))
@@ -909,22 +910,22 @@
                   .with(
                      ItemEntry.builder(Items.BOW)
                         .weight(3)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.CROSSBOW)
                         .weight(2)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_AXE)
                         .weight(2)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_CHESTPLATE)
                         .weight(2)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(0.0F, 10.0F)))
                   )
                   .with(ItemEntry.builder(Items.GOLDEN_CARROT).weight(2).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F))))
                   .with(
@@ -932,7 +933,7 @@
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(
+                              .options(
                                  HolderSet.createDirect(
                                     lv.getHolderOrThrow(Enchantments.SHARPNESS),
                                     lv.getHolderOrThrow(Enchantments.BANE_OF_ARTHROPODS),
@@ -949,7 +950,7 @@
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(
+                              .options(
                                  HolderSet.createDirect(
                                     lv.getHolderOrThrow(Enchantments.RIPTIDE),
                                     lv.getHolderOrThrow(Enchantments.LOYALTY),
@@ -963,12 +964,12 @@
                   .with(
                      ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                         .weight(1)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.DIAMOND_AXE)
                         .weight(1)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 15.0F)))
                   )
             )
       );
@@ -993,7 +994,7 @@
                      ItemEntry.builder(Items.OMINOUS_BOTTLE)
                         .weight(2)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                        .apply(SetOminousBottleLootFunction.m_brubuqjn(UniformLootNumberProvider.create(0.0F, 1.0F)))
+                        .apply(SetOminousBottleLootFunction.builder(UniformLootNumberProvider.create(0.0F, 1.0F)))
                   )
                   .with(ItemEntry.builder(Items.WIND_CHARGE).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 12.0F))))
                   .with(ItemEntry.builder(Items.DIAMOND).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F))))
@@ -1029,7 +1030,7 @@
             .pool(
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
-                  .conditionally(RandomChanceLootCondition.m_dbenidbq(0.25F))
+                  .conditionally(RandomChanceLootCondition.conditionBuilder(0.25F))
                   .with(LootTableEntry.builder(LootTables.TRIAL_CHAMBERS_REWARD_UNIQUE_CHEST))
             )
       );
@@ -1044,25 +1045,25 @@
                   .with(
                      ItemEntry.builder(Items.CROSSBOW)
                         .weight(4)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(5.0F, 20.0F)))
                   )
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(3))
                   .with(
                      ItemEntry.builder(Items.DIAMOND_AXE)
                         .weight(3)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                         .weight(3)
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(10.0F, 20.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.BOOK)
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(
+                              .options(
                                  HolderSet.createDirect(
                                     lv.getHolderOrThrow(Enchantments.KNOCKBACK),
                                     lv.getHolderOrThrow(Enchantments.PUNCH),
@@ -1078,7 +1079,7 @@
                         .weight(2)
                         .apply(
                            new EnchantRandomlyLootFunction.Builder()
-                              .m_kshsocad(HolderSet.createDirect(lv.getHolderOrThrow(Enchantments.BREACH), lv.getHolderOrThrow(Enchantments.DENSITY)))
+                              .options(HolderSet.createDirect(lv.getHolderOrThrow(Enchantments.BREACH), lv.getHolderOrThrow(Enchantments.DENSITY)))
                         )
                   )
                   .with(
@@ -1086,7 +1087,7 @@
                         .weight(2)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv.getHolderOrThrow(Enchantments.WIND_BURST), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv.getHolderOrThrow(Enchantments.WIND_BURST), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(ItemEntry.builder(Items.DIAMOND_BLOCK).weight(1))
@@ -1111,7 +1112,7 @@
                      ItemEntry.builder(Items.OMINOUS_BOTTLE)
                         .weight(1)
                         .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                        .apply(SetOminousBottleLootFunction.m_brubuqjn(UniformLootNumberProvider.create(2.0F, 4.0F)))
+                        .apply(SetOminousBottleLootFunction.builder(UniformLootNumberProvider.create(2.0F, 4.0F)))
                   )
             )
       );
@@ -1145,7 +1146,7 @@
             .pool(
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
-                  .conditionally(RandomChanceLootCondition.m_dbenidbq(0.75F))
+                  .conditionally(RandomChanceLootCondition.conditionBuilder(0.75F))
                   .with(LootTableEntry.builder(LootTables.TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE_CHEST))
             )
       );
@@ -1290,12 +1291,12 @@
                      .weight(10)
                      .apply(
                         SetStewEffectLootFunction.builder()
-                           .withEffect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
-                           .withEffect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
-                           .withEffect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
-                           .withEffect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
-                           .withEffect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
-                           .withEffect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                           .effect(StatusEffects.NIGHT_VISION, UniformLootNumberProvider.create(7.0F, 10.0F))
+                           .effect(StatusEffects.JUMP_BOOST, UniformLootNumberProvider.create(7.0F, 10.0F))
+                           .effect(StatusEffects.WEAKNESS, UniformLootNumberProvider.create(6.0F, 8.0F))
+                           .effect(StatusEffects.BLINDNESS, UniformLootNumberProvider.create(5.0F, 7.0F))
+                           .effect(StatusEffects.POISON, UniformLootNumberProvider.create(10.0F, 20.0F))
+                           .effect(StatusEffects.SATURATION, UniformLootNumberProvider.create(7.0F, 10.0F))
                      )
                )
                .with(ItemEntry.builder(Items.COAL).weight(6).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 8.0F))))
@@ -1304,10 +1305,10 @@
                .with(ItemEntry.builder(Blocks.BAMBOO).weight(2).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.GUNPOWDER).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 5.0F))))
                .with(ItemEntry.builder(Blocks.TNT).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F))))
-               .with(ItemEntry.builder(Items.LEATHER_HELMET).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-               .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-               .with(ItemEntry.builder(Items.LEATHER_LEGGINGS).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
-               .with(ItemEntry.builder(Items.LEATHER_BOOTS).weight(3).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_HELMET).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_CHESTPLATE).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_LEGGINGS).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
+               .with(ItemEntry.builder(Items.LEATHER_BOOTS).weight(3).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -1334,12 +1335,12 @@
                   ItemEntry.builder(Items.MAP)
                      .apply(
                         ExplorationMapLootFunction.create()
-                           .withDestination(StructureTags.ON_TREASURE_MAPS)
-                           .withDecoration(MapDecorationTypes.RED_X)
-                           .withZoom((byte)1)
-                           .withSkipExistingChunks(false)
+                           .destination(StructureTags.ON_TREASURE_MAPS)
+                           .decoration(MapDecorationTypes.RED_X)
+                           .zoom((byte)1)
+                           .skipExistingChunks(false)
                      )
-                     .apply(SetNameLootFunction.m_qjkvclgt(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.C_pyscauma.ITEM_NAME))
+                     .apply(SetNameLootFunction.builder(Text.translatable("filled_map.buried_treasure"), SetNameLootFunction.Target.ITEM_NAME))
                )
          )
          .pool(
@@ -1377,14 +1378,14 @@
                   ItemEntry.builder(Items.DIAMOND_SHOVEL)
                      .weight(15)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.15F, 0.8F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_PICKAXE)
                      .weight(12)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.15F, 0.95F)))
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.NETHERITE_SCRAP).weight(8).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.ANCIENT_DEBRIS).weight(12).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1400,7 +1401,7 @@
                .with(
                   ItemEntry.builder(Items.GOLDEN_AXE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Blocks.CRYING_OBSIDIAN).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 5.0F))))
                .with(ItemEntry.builder(Blocks.GLOWSTONE).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 6.0F))))
@@ -1447,7 +1448,7 @@
                .with(
                   ItemEntry.builder(Items.CROSSBOW)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.1F, 0.5F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.SPECTRAL_ARROW).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(10.0F, 28.0F))))
                .with(ItemEntry.builder(Blocks.GILDED_BLACKSTONE).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(8.0F, 12.0F))))
@@ -1459,27 +1460,27 @@
                .with(
                   ItemEntry.builder(Items.GOLDEN_CHESTPLATE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_HELMET)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_LEGGINGS)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_BOOTS)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_AXE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
          )
          .pool(
@@ -1526,72 +1527,72 @@
                .with(
                   ItemEntry.builder(Items.DIAMOND_SWORD)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_BOOTS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_HELMET)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_PICKAXE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_SHOVEL)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_SWORD)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_BOOTS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_CHESTPLATE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_HELMET)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_PICKAXE)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(
                   ItemEntry.builder(Items.IRON_SHOVEL)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
          )
          .pool(
@@ -1649,31 +1650,31 @@
                   ItemEntry.builder(Items.DIAMOND_SWORD)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_CHESTPLATE)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_HELMET)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(
                   ItemEntry.builder(Items.DIAMOND_BOOTS)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.DIAMOND_SWORD).weight(6))
                .with(ItemEntry.builder(Items.DIAMOND_CHESTPLATE).weight(5))
@@ -1719,14 +1720,14 @@
                   ItemEntry.builder(Items.DIAMOND_PICKAXE)
                      .weight(6)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.DIAMOND_SHOVEL).weight(6).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(
                   ItemEntry.builder(Items.CROSSBOW)
                      .weight(6)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.1F, 0.9F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Items.ANCIENT_DEBRIS).weight(12).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.NETHERITE_SCRAP).weight(4).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1738,7 +1739,7 @@
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(10)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                )
          )
          .pool(
@@ -1749,18 +1750,18 @@
                      .weight(2)
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.1F, 0.9F)))
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Blocks.IRON_BLOCK).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(
                   ItemEntry.builder(Items.GOLDEN_BOOTS)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SOUL_SPEED)))
                )
                .with(
                   ItemEntry.builder(Items.GOLDEN_AXE)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
-                     .apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries))
+                     .apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries))
                )
                .with(ItemEntry.builder(Blocks.GOLD_BLOCK).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.CROSSBOW).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1819,7 +1820,7 @@
                .with(ItemEntry.builder(Items.CHAINMAIL_CHESTPLATE).weight(10))
                .with(ItemEntry.builder(Items.DIAMOND_HOE).weight(15))
                .with(ItemEntry.builder(Items.DIAMOND_CHESTPLATE).weight(5))
-               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -1867,7 +1868,7 @@
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(10)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                )
          )
          .pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).with(ItemEntry.builder(Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE).weight(1)));
@@ -1901,7 +1902,10 @@
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.MUSIC_DISC_OTHERSIDE))
-               .with(ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F))))
+               .with(
+                  ItemEntry.builder(Items.BOOK)
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
+               )
          )
          .pool(
             LootPool.builder()
@@ -1933,7 +1937,7 @@
                      .weight(2)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(ItemEntry.builder(Items.LEAD).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -1943,12 +1947,12 @@
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(2)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(3)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
                )
                .with(ItemEntry.builder(Items.SCULK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 10.0F))))
                .with(ItemEntry.builder(Items.SCULK_SENSOR).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -1959,7 +1963,7 @@
                .with(
                   ItemEntry.builder(Items.IRON_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(ItemEntry.builder(Items.ECHO_SHARD).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.DISC_FRAGMENT_5).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -1969,7 +1973,7 @@
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                      .apply(SetPotionFunction.builder(Potions.STRONG_REGENERATION))
                )
-               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.BOOK).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 10.0F))))
                .with(ItemEntry.builder(Items.BONE).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
                .with(ItemEntry.builder(Items.SOUL_TORCH).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
@@ -2004,7 +2008,10 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR))
-               .with(ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F))))
+               .with(
+                  ItemEntry.builder(Items.BOOK)
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
+               )
          )
          .pool(
             LootPool.builder()
@@ -2079,7 +2086,7 @@
                .with(ItemEntry.builder(Items.ARROW).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 7.0F))))
                .with(ItemEntry.builder(Items.TRIPWIRE_HOOK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.IRON_INGOT).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
-               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -2119,7 +2126,7 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR).weight(15))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR).weight(10))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(5))
-               .with(ItemEntry.builder(Items.BOOK).weight(20).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(20).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE).weight(2))
                .with(EmptyEntry.builder().weight(15))
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-11-04 23:31:19.689089837 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-11-04 23:30:05.953574020 +0000
@@ -49,9 +49,10 @@
  */
 public abstract class EntityLootTableGenerator implements LootTableGenerator {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qjcpnzik Lnet/minecraft/unmapped/C_egeqzyvk;f_qjcpnzik:Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;}
+    * @mapping {@literal named registries Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;registries:Lnet/minecraft/registry/HolderLookup$Provider;}
     */
-   protected final HolderLookup.Provider f_qjcpnzik;
+   protected final HolderLookup.Provider registries;
    /**
     * @mapping {@literal hashed f_pordewqu Lnet/minecraft/unmapped/C_egeqzyvk;f_pordewqu:Lnet/minecraft/unmapped/C_czxxrbcp;}
     * @mapping {@literal named allowedFeatures Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;allowedFeatures:Lnet/minecraft/feature_flags/FeatureFlagBitSet;}
@@ -72,7 +73,7 @@
     * Mapping not found
     */
    protected final AnyOfLootCondition.Builder m_xqssttdx() {
-      HolderLookup.RegistryLookup<Enchantment> lv = this.f_qjcpnzik.getLookupOrThrow(RegistryKeys.ENCHANTMENT);
+      HolderLookup.RegistryLookup<Enchantment> lv = this.registries.getLookupOrThrow(RegistryKeys.ENCHANTMENT);
       return AnyOfLootCondition.create(
          EntityPropertiesLootCondition.builder(
             LootContext.EntityTarget.THIS, EntityPredicate.Builder.create().flags(EntityFlagsPredicate.Builder.create().onFire(true))
@@ -98,18 +99,18 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_egeqzyvk;<init>(Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named <init> Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;<init>(Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   protected EntityLootTableGenerator(FeatureFlagBitSet arg, HolderLookup.Provider arg2) {
-      this(arg, arg, arg2);
+   protected EntityLootTableGenerator(FeatureFlagBitSet requiredFeatures, HolderLookup.Provider registries) {
+      this(requiredFeatures, requiredFeatures, registries);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_egeqzyvk;<init>(Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named <init> Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;<init>(Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/feature_flags/FeatureFlagBitSet;Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   protected EntityLootTableGenerator(FeatureFlagBitSet allowedFeatures, FeatureFlagBitSet requiredFeatures, HolderLookup.Provider arg3) {
+   protected EntityLootTableGenerator(FeatureFlagBitSet allowedFeatures, FeatureFlagBitSet requiredFeatures, HolderLookup.Provider registries) {
       this.allowedFeatures = allowedFeatures;
       this.requiredFeatures = requiredFeatures;
-      this.f_qjcpnzik = arg3;
+      this.registries = registries;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java	2024-11-04 23:31:19.769089308 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EquipmentLootTableGenerator.java	2024-11-04 23:30:06.053573378 +0000
@@ -63,14 +63,14 @@
                      ItemEntry.builder(Items.IRON_SWORD)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.SHARPNESS), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.SHARPNESS), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(
                      ItemEntry.builder(Items.IRON_SWORD)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.KNOCKBACK), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.KNOCKBACK), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(ItemEntry.builder(Items.DIAMOND_SWORD))
@@ -88,14 +88,14 @@
                      ItemEntry.builder(Items.BOW)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.POWER), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.POWER), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
                   .with(
                      ItemEntry.builder(Items.BOW)
                         .apply(
                            new SetEnchantmentsLootFunction.Builder()
-                              .m_emjssomh(lv3.getHolderOrThrow(Enchantments.PUNCH), ConstantLootNumberProvider.create(1.0F))
+                              .enchantment(lv3.getHolderOrThrow(Enchantments.PUNCH), ConstantLootNumberProvider.create(1.0F))
                         )
                   )
             )
@@ -103,37 +103,38 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fdxfyfno Lnet/minecraft/unmapped/C_noaidmgc;m_fdxfyfno(Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vglbnrob;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;}
+    * @mapping {@literal named m_fdxfyfno Lnet/minecraft/data/server/loot_table/EquipmentLootTableGenerator;m_fdxfyfno(Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/item/trim/ArmorTrimPermutation;Lnet/minecraft/registry/HolderLookup$RegistryLookup;)Lnet/minecraft/loot/LootTable$Builder;}
     */
-   public static LootTable.Builder m_fdxfyfno(Item arg, Item arg2, ArmorTrimPermutation arg3, HolderLookup.RegistryLookup<Enchantment> arg4) {
+   public static LootTable.Builder m_fdxfyfno(Item arg, Item arg2, ArmorTrimPermutation value, HolderLookup.RegistryLookup<Enchantment> arg4) {
       return LootTable.builder()
          .pool(
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.5F))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.5F))
                .with(
                   ItemEntry.builder(arg)
-                     .apply(SetComponentsLootFunction.m_ehhrxiiv(DataComponentTypes.TRIM, arg3))
+                     .apply(SetComponentsLootFunction.builder(DataComponentTypes.TRIM, value))
                      .apply(
                         new SetEnchantmentsLootFunction.Builder()
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
                      )
                )
          )
          .pool(
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
-               .conditionally(RandomChanceLootCondition.m_dbenidbq(0.5F))
+               .conditionally(RandomChanceLootCondition.conditionBuilder(0.5F))
                .with(
                   ItemEntry.builder(arg2)
-                     .apply(SetComponentsLootFunction.m_ehhrxiiv(DataComponentTypes.TRIM, arg3))
+                     .apply(SetComponentsLootFunction.builder(DataComponentTypes.TRIM, value))
                      .apply(
                         new SetEnchantmentsLootFunction.Builder()
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
-                           .m_emjssomh(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.PROJECTILE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
+                           .enchantment(arg4.getHolderOrThrow(Enchantments.FIRE_PROTECTION), ConstantLootNumberProvider.create(4.0F))
                      )
                )
          );
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java	2024-11-04 23:31:19.473091269 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java	2024-11-04 23:30:05.689575717 +0000
@@ -104,15 +104,16 @@
                   .with(
                      ItemEntry.builder(Items.BOW)
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.0F, 0.25F)))
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
                   .with(
                      ItemEntry.builder(Items.FISHING_ROD)
                         .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.0F, 0.25F)))
-                        .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
                   .with(
-                     ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F)))
+                     ItemEntry.builder(Items.BOOK)
+                        .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
                   )
                   .with(ItemEntry.builder(Items.NAUTILUS_SHELL))
             )

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java	2024-11-04 23:31:19.685089864 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.java	2024-11-04 23:30:05.949574046 +0000
@@ -46,7 +46,7 @@
                   .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                   .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE))
                   .with(ItemEntry.builder(Items.NAME_TAG).weight(30))
-                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+                  .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                   .with(ItemEntry.builder(Items.IRON_PICKAXE).weight(5))
                   .with(EmptyEntry.builder().weight(5))
             )
@@ -81,7 +81,7 @@
                   .with(
                      ItemEntry.builder(Items.BOOK)
                         .weight(1)
-                        .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.EFFICIENCY)))
+                        .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.EFFICIENCY)))
                   )
             )
       );
@@ -119,7 +119,7 @@
                .with(ItemEntry.builder(Items.ARROW).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 7.0F))))
                .with(ItemEntry.builder(Items.TRIPWIRE_HOOK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.IRON_INGOT).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
-               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(1).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
          )
          .pool(
             LootPool.builder()
@@ -144,7 +144,7 @@
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(2)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.QUICK_CHARGE)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.QUICK_CHARGE)))
                )
          );
    }
@@ -170,7 +170,7 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR).weight(15))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR).weight(10))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(5))
-               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(10).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.GOLDEN_APPLE).weight(20))
                .with(ItemEntry.builder(Items.ENCHANTED_GOLDEN_APPLE).weight(2))
                .with(EmptyEntry.builder().weight(15))
@@ -194,9 +194,7 @@
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(2.0F)))
                )
                .with(
-                  ItemEntry.builder(Items.BOOK)
-                     .weight(2)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.UNBREAKING)))
+                  ItemEntry.builder(Items.BOOK).weight(2).apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.UNBREAKING)))
                )
          );
    }
@@ -223,7 +221,7 @@
                      .weight(2)
                      .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F)))
                      .apply(SetDamageLootFunction.builder(UniformLootNumberProvider.create(0.8F, 1.0F)))
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(ItemEntry.builder(Items.LEAD).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR).weight(2).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(1.0F))))
@@ -233,12 +231,12 @@
                .with(
                   ItemEntry.builder(Items.DIAMOND_LEGGINGS)
                      .weight(2)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(30.0F, 50.0F)))
                )
                .with(
                   ItemEntry.builder(Items.BOOK)
                      .weight(3)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
+                     .apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.SWIFT_SNEAK)))
                )
                .with(ItemEntry.builder(Items.SCULK).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(4.0F, 10.0F))))
                .with(ItemEntry.builder(Items.SCULK_SENSOR).weight(3).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -249,7 +247,7 @@
                .with(
                   ItemEntry.builder(Items.IRON_LEGGINGS)
                      .weight(3)
-                     .apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, UniformLootNumberProvider.create(20.0F, 39.0F)))
                )
                .with(ItemEntry.builder(Items.ECHO_SHARD).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
                .with(ItemEntry.builder(Items.DISC_FRAGMENT_5).weight(4).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F))))
@@ -259,7 +257,7 @@
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 3.0F)))
                      .apply(SetPotionFunction.builder(Potions.STRONG_REGENERATION))
                )
-               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.m_hgxjeanh(this.registries)))
+               .with(ItemEntry.builder(Items.BOOK).weight(5).apply(EnchantRandomlyLootFunction.randomLootBuilder(this.registries)))
                .with(ItemEntry.builder(Items.BOOK).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 10.0F))))
                .with(ItemEntry.builder(Items.BONE).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
                .with(ItemEntry.builder(Items.SOUL_TORCH).weight(5).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 15.0F))))
@@ -269,11 +267,7 @@
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(EmptyEntry.builder().weight(71))
-               .with(
-                  ItemEntry.builder(Items.BOOK)
-                     .weight(4)
-                     .apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.MENDING)))
-               )
+               .with(ItemEntry.builder(Items.BOOK).weight(4).apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.MENDING))))
                .with(ItemEntry.builder(Items.WARD_ARMOR_TRIM_SMITHING_TEMPLATE).weight(4))
                .with(ItemEntry.builder(Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE).weight(1))
          );
@@ -300,7 +294,10 @@
                .with(ItemEntry.builder(Items.IRON_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.GOLDEN_HORSE_ARMOR))
                .with(ItemEntry.builder(Items.DIAMOND_HORSE_ARMOR))
-               .with(ItemEntry.builder(Items.BOOK).apply(EnchantWithLevelsLootFunction.m_baumhjth(this.registries, ConstantLootNumberProvider.create(30.0F))))
+               .with(
+                  ItemEntry.builder(Items.BOOK)
+                     .apply(EnchantWithLevelsLootFunction.randomLootBuilder(this.registries, ConstantLootNumberProvider.create(30.0F)))
+               )
          )
          .pool(
             LootPool.builder()
@@ -316,7 +313,7 @@
             LootPool.builder()
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(EmptyEntry.builder().weight(1))
-               .with(ItemEntry.builder(Items.BOOK).apply(new EnchantRandomlyLootFunction.Builder().m_blmnznah(lv.getHolderOrThrow(Enchantments.UNBREAKING))))
+               .with(ItemEntry.builder(Items.BOOK).apply(new EnchantRandomlyLootFunction.Builder().option(lv.getHolderOrThrow(Enchantments.UNBREAKING))))
          );
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-11-04 23:31:19.645090129 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-11-04 23:30:05.897574380 +0000
@@ -1027,10 +1027,10 @@
                         .with(
                            ItemEntry.builder(block)
                               .apply(
-                                 CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                                    .m_gbinruor(DataComponentTypes.PROFILE)
-                                    .m_gbinruor(DataComponentTypes.NOTE_BLOCK_SOUND)
-                                    .m_gbinruor(DataComponentTypes.CUSTOM_NAME)
+                                 CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY)
+                                    .include(DataComponentTypes.PROFILE)
+                                    .include(DataComponentTypes.NOTE_BLOCK_SOUND)
+                                    .include(DataComponentTypes.CUSTOM_NAME)
                               )
                         )
                   )
@@ -1097,7 +1097,10 @@
                .pool(
                   LootPool.builder()
                      .conditionally(lv5)
-                     .with(ItemEntry.builder(Items.CARROT).apply(ApplyBonusLootFunction.m_ziaghyfl(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)))
+                     .with(
+                        ItemEntry.builder(Items.CARROT)
+                           .apply(ApplyBonusLootFunction.binomialFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))
+                     )
                )
          )
       );
@@ -1112,12 +1115,15 @@
                .pool(
                   LootPool.builder()
                      .conditionally(lv7)
-                     .with(ItemEntry.builder(Items.POTATO).apply(ApplyBonusLootFunction.m_ziaghyfl(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)))
+                     .with(
+                        ItemEntry.builder(Items.POTATO)
+                           .apply(ApplyBonusLootFunction.binomialFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))
+                     )
                )
                .pool(
                   LootPool.builder()
                      .conditionally(lv7)
-                     .with(ItemEntry.builder(Items.POISONOUS_POTATO).conditionally(RandomChanceLootCondition.m_dbenidbq(0.02F)))
+                     .with(ItemEntry.builder(Items.POISONOUS_POTATO).conditionally(RandomChanceLootCondition.conditionBuilder(0.02F)))
                )
          )
       );
@@ -1134,7 +1140,7 @@
                         )
                         .with(ItemEntry.builder(Items.SWEET_BERRIES))
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 3.0F)))
-                        .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                        .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                   )
                   .pool(
                      LootPool.builder()
@@ -1144,7 +1150,7 @@
                         )
                         .with(ItemEntry.builder(Items.SWEET_BERRIES))
                         .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0F, 2.0F)))
-                        .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                        .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                   )
             )
       );
@@ -1171,7 +1177,7 @@
                   block,
                   ItemEntry.builder(Items.GOLD_NUGGET)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 6.0F)))
-                     .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                )
             )
       );
@@ -1226,7 +1232,7 @@
                   block,
                   ItemEntry.builder(Items.GLOWSTONE_DUST)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 4.0F)))
-                     .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                      .apply(LimitCountLootFunction.builder(BoundedIntUnaryOperator.create(1, 4)))
                )
             )
@@ -1239,7 +1245,7 @@
                   block,
                   ItemEntry.builder(Items.MELON_SLICE)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(3.0F, 7.0F)))
-                     .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                      .apply(LimitCountLootFunction.builder(BoundedIntUnaryOperator.createMax(9)))
                )
             )
@@ -1254,7 +1260,7 @@
                   block,
                   ItemEntry.builder(Items.PRISMARINE_CRYSTALS)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 3.0F)))
-                     .apply(ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                     .apply(ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                      .apply(LimitCountLootFunction.builder(BoundedIntUnaryOperator.create(1, 5)))
                )
             )
@@ -1277,7 +1283,7 @@
                                     )
                               )
                               .apply(
-                                 ApplyBonusLootFunction.m_xucqilfu(lv.getHolderOrThrow(Enchantments.FORTUNE))
+                                 ApplyBonusLootFunction.baseFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE))
                                     .conditionally(
                                        BlockStatePropertyLootCondition.builder(block)
                                           .properties(StatePredicate.Builder.create().exactMatch(NetherWartBlock.AGE, 3))
@@ -1327,7 +1333,7 @@
                this.applySurvivesExplosionCondition(
                   block,
                   ItemEntry.builder(Items.FLINT)
-                     .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
+                     .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
                      .alternatively(ItemEntry.builder(block))
                )
             )
@@ -1349,7 +1355,7 @@
                   block,
                   ItemEntry.builder(Items.GOLD_NUGGET)
                      .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0F, 5.0F)))
-                     .conditionally(TableBonusLootCondition.m_tmbdegkn(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
+                     .conditionally(TableBonusLootCondition.conditionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE), 0.1F, 0.14285715F, 0.25F, 1.0F))
                      .alternatively(ItemEntry.builder(block))
                )
             )
@@ -1369,7 +1375,7 @@
                block,
                ItemEntry.builder(Items.AMETHYST_SHARD)
                   .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(4.0F)))
-                  .apply(ApplyBonusLootFunction.m_lngedsfm(lv.getHolderOrThrow(Enchantments.FORTUNE)))
+                  .apply(ApplyBonusLootFunction.oreDropsFunctionBuilder(lv.getHolderOrThrow(Enchantments.FORTUNE)))
                   .conditionally(MatchToolLootCondition.builder(ItemPredicate.Builder.create().m_lubfxdrb(lv2, ItemTags.CLUSTER_MAX_HARVESTABLES)))
                   .alternatively(
                      (LootPoolEntry.Builder<?>)this.applyExplosionDecay(
@@ -1500,8 +1506,7 @@
                      .alternatively(
                         ItemEntry.builder(pot)
                            .apply(
-                              CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
-                                 .m_gbinruor(DataComponentTypes.POT_DECORATIONS)
+                              CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.POT_DECORATIONS)
                            )
                      )
                )


The remaining diff is too long!

Please sign in to comment.