100% entity · ix0rai/quilt-mappings@233438b

github-actions · 2024-07-09T01:41:45Z

With commit 233438b, 327 file(s) were updated with 3318 line(s) added and 2998 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-07-09 01:41:43.160045801 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-07-09 01:40:34.735039986 +0000
@@ -68,7 +68,7 @@
                      SoundEvents.ENTITY_ITEM_PICKUP,
                      SoundCategory.PLAYERS,
                      0.2F,
-                     ((player.m_dlwxaobh().nextFloat() - player.m_dlwxaobh().nextFloat()) * 0.7F + 1.0F) * 2.0F
+                     ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F
                   );
                bl = true;
             } else {
diff -bur namedTargetSrc/net/minecraft/block/AbstractFireBlock.java namedSrc/net/minecraft/block/AbstractFireBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractFireBlock.java	2024-07-09 01:41:43.008043521 +0000
+++ namedSrc/net/minecraft/block/AbstractFireBlock.java	2024-07-09 01:40:34.475037984 +0000
@@ -173,7 +173,7 @@
       if (!entity.isFireImmune()) {
          entity.setFireTicks(entity.getFireTicks() + 1);
          if (entity.getFireTicks() == 0) {
-            entity.m_xbkkrydd(8.0F);
+            entity.setOnFireForSeconds(8.0F);
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/block/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-07-09 01:41:43.132045381 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-07-09 01:40:34.683039585 +0000
@@ -126,7 +126,7 @@
    public void afterBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack) {
       super.afterBreak(world, player, pos, state, blockEntity, stack);
       if (!world.isClient && blockEntity instanceof BeehiveBlockEntity lv) {
-         if (!EnchantmentHelper.m_ruiicrds(stack, EnchantmentTags.PREVENTS_BEE_SPAWNS_WHEN_MINING)) {
+         if (!EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_BEE_SPAWNS_WHEN_MINING)) {
             lv.angerBees(player, state, BeehiveBlockEntity.BeeState.EMERGENCY);
             world.updateComparators(pos, this);
             this.angerNearbyBees(world, pos);
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-07-09 01:41:43.216046641 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-07-09 01:40:34.827040694 +0000
@@ -902,7 +902,7 @@
     * @mapping {@literal named dropConditionalExperience Lnet/minecraft/block/Block;dropConditionalExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/int_provider/IntProvider;)V}
     */
    protected void dropConditionalExperience(ServerWorld world, BlockPos pos, ItemStack stack, IntProvider experienceProvider) {
-      int i = EnchantmentHelper.m_mcehpxsn(world, stack, experienceProvider.get(world.getRandom()));
+      int i = EnchantmentHelper.getBlockExperience(world, stack, experienceProvider.get(world.getRandom()));
       if (i > 0) {
          this.dropExperience(world, pos, i);
       }
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-07-09 01:41:43.144045561 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-07-09 01:40:34.703039739 +0000
@@ -167,7 +167,7 @@
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
       if ((Boolean)state.get(LIT) && entity instanceof LivingEntity) {
-         entity.damage(world.getDamageSources().m_lxrwzlzj(), (float)this.fireDamage);
+         entity.damage(world.getDamageSources().campfire(), (float)this.fireDamage);
       }
 
       super.onEntityCollision(state, world, pos, entity);
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-07-09 01:41:43.012043581 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-07-09 01:40:34.479038015 +0000
@@ -261,7 +261,7 @@
    public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
       ItemStack lv = player.getMainHandStack();
       BlockState lv2 = state;
-      if (lv.isIn(ItemTags.BREAKS_DECORATED_POTS) && !EnchantmentHelper.m_ruiicrds(lv, EnchantmentTags.PREVENTS_DECORATED_POT_SHATTERING)) {
+      if (lv.isIn(ItemTags.BREAKS_DECORATED_POTS) && !EnchantmentHelper.hasTag(lv, EnchantmentTags.PREVENTS_DECORATED_POT_SHATTERING)) {
          lv2 = state.with(CRACKED, Boolean.valueOf(true));
          world.setBlockState(pos, lv2, Block.NO_REDRAW);
       }
diff -bur namedTargetSrc/net/minecraft/block/EndGatewayBlock.java namedSrc/net/minecraft/block/EndGatewayBlock.java
--- namedTargetSrc/net/minecraft/block/EndGatewayBlock.java	2024-07-09 01:41:42.988043221 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-07-09 01:40:34.435037677 +0000
@@ -11,11 +11,10 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 import org.jetbrains.annotations.Nullable;
@@ -24,7 +23,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_pwjzqojt}
  * @mapping {@literal named net/minecraft/block/EndGatewayBlock}
  */
-public class EndGatewayBlock extends BlockWithEntity implements C_teerivzm {
+public class EndGatewayBlock extends BlockWithEntity implements Portal {
    /**
     * @mapping {@literal hashed f_lllipcqu Lnet/minecraft/unmapped/C_pwjzqojt;f_lllipcqu:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/EndGatewayBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
@@ -115,25 +114,26 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (entity.m_acybdbgv(false)
+      if (entity.canUsePortals(false)
          && !world.isClient
          && world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2
          && !lv2.needsCooldownBeforeTeleporting()) {
-         entity.m_bikcqssn(this, pos);
+         entity.setInsidePortal(this, pos);
          EndGatewayBlockEntity.startTeleportCooldown(world, pos, state, lv2);
       }
    }
 
    /**
-    * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_pwjzqojt;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndGatewayBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * Mapping not found
     */
    @Nullable
    @Override
-   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
+   public DimensionTransition createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2) {
          Vec3d lv4 = lv2.m_shfarbmg(world, pos);
-         return lv4 != null ? new C_zbvyjshu(world, lv4, m_jeehjmdl(arg2), arg2.getYaw(), arg2.getPitch(), C_zbvyjshu.f_fbtpbgjw) : null;
+         return lv4 != null
+            ? new DimensionTransition(world, lv4, m_jeehjmdl(entity), entity.getYaw(), entity.getPitch(), DimensionTransition.PLACE_PORTAL_CHUNK_TICKET)
+            : null;
       } else {
          return null;
       }
diff -bur namedTargetSrc/net/minecraft/block/EndPortalBlock.java namedSrc/net/minecraft/block/EndPortalBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalBlock.java	2024-07-09 01:41:43.112045081 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-07-09 01:40:34.651039339 +0000
@@ -11,8 +11,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.unmapped.C_idrtmfxf;
-import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -21,6 +19,7 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
@@ -28,7 +27,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_iqbzlnao}
  * @mapping {@literal named net/minecraft/block/EndPortalBlock}
  */
-public class EndPortalBlock extends BlockWithEntity implements C_teerivzm {
+public class EndPortalBlock extends BlockWithEntity implements Portal {
    /**
     * @mapping {@literal hashed f_woptqwkp Lnet/minecraft/unmapped/C_iqbzlnao;f_woptqwkp:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/EndPortalBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
@@ -77,7 +76,7 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (entity.m_acybdbgv(false)
+      if (entity.canUsePortals(false)
          && VoxelShapes.matchesAnywhere(
             VoxelShapes.cuboid(entity.getBounds().offset((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ()))),
             state.getOutlineShape(world, pos),
@@ -88,16 +87,15 @@
             return;
          }
 
-         entity.m_bikcqssn(this, pos);
+         entity.setInsidePortal(this, pos);
       }
    }
 
    /**
-    * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_iqbzlnao;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/EndPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * Mapping not found
     */
    @Override
-   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
+   public DimensionTransition createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -106,22 +104,24 @@
          boolean bl = lv == World.END;
          BlockPos lv3 = bl ? ServerWorld.END_SPAWN_POS : lv2.getSpawnPos();
          Vec3d lv4 = lv3.m_rtputfdg();
-         float f = arg2.getYaw();
+         float f = entity.getYaw();
          if (bl) {
             C_idrtmfxf.m_narefewt(lv2, BlockPos.fromPosition(lv4).down(), true);
             f = Direction.WEST.asRotation();
-            if (arg2 instanceof ServerPlayerEntity) {
+            if (entity instanceof ServerPlayerEntity) {
                lv4 = lv4.subtract(0.0, 1.0, 0.0);
             }
          } else {
-            if (arg2 instanceof ServerPlayerEntity lv5) {
-               return lv5.m_jpjsvuqt(false, C_zbvyjshu.f_jgwyllbi);
+            if (entity instanceof ServerPlayerEntity lv5) {
+               return lv5.m_jpjsvuqt(false, DimensionTransition.NO_OP);
             }
 
-            lv4 = arg2.m_vfbpgxfo(lv2, lv3).m_rtputfdg();
+            lv4 = entity.getAdjustedSpawnLocation(lv2, lv3).m_rtputfdg();
          }
 
-         return new C_zbvyjshu(lv2, lv4, arg2.getVelocity(), f, arg2.getPitch(), C_zbvyjshu.f_kidpbkzf.then(C_zbvyjshu.f_fbtpbgjw));
+         return new DimensionTransition(
+            lv2, lv4, entity.getVelocity(), f, entity.getPitch(), DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_CHUNK_TICKET)
+         );
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/IceBlock.java namedSrc/net/minecraft/block/IceBlock.java
--- namedTargetSrc/net/minecraft/block/IceBlock.java	2024-07-09 01:41:43.220046701 +0000
+++ namedSrc/net/minecraft/block/IceBlock.java	2024-07-09 01:40:34.831040724 +0000
@@ -54,7 +54,7 @@
    @Override
    public void afterBreak(World world, PlayerEntity player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack) {
       super.afterBreak(world, player, pos, state, blockEntity, stack);
-      if (!EnchantmentHelper.m_ruiicrds(stack, EnchantmentTags.PREVENTS_ICE_MELTING)) {
+      if (!EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_ICE_MELTING)) {
          if (world.getDimension().ultraWarm()) {
             world.removeBlock(pos, false);
             return;
diff -bur namedTargetSrc/net/minecraft/block/InfestedBlock.java namedSrc/net/minecraft/block/InfestedBlock.java
--- namedTargetSrc/net/minecraft/block/InfestedBlock.java	2024-07-09 01:41:43.044044061 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-07-09 01:40:34.531038415 +0000
@@ -108,7 +108,7 @@
    @Override
    protected void onStacksDropped(BlockState state, ServerWorld world, BlockPos pos, ItemStack stack, boolean dropExperience) {
       super.onStacksDropped(state, world, pos, stack, dropExperience);
-      if (world.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS) && !EnchantmentHelper.m_ruiicrds(stack, EnchantmentTags.PREVENTS_INFESTED_SPAWNS)) {
+      if (world.getGameRules().getBooleanValue(GameRules.DO_TILE_DROPS) && !EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_INFESTED_SPAWNS)) {
          this.spawnSilverfish(world, pos);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/NetherPortalBlock.java namedSrc/net/minecraft/block/NetherPortalBlock.java
--- namedTargetSrc/net/minecraft/block/NetherPortalBlock.java	2024-07-09 01:41:43.156045741 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-07-09 01:40:34.731039955 +0000
@@ -17,8 +17,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_teerivzm;
-import net.minecraft.unmapped.C_zbvyjshu;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -27,6 +25,7 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockLocating;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.DimensionTransition;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
@@ -41,7 +40,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_zpsdinym}
  * @mapping {@literal named net/minecraft/block/NetherPortalBlock}
  */
-public class NetherPortalBlock extends Block implements C_teerivzm {
+public class NetherPortalBlock extends Block implements Portal {
    /**
     * @mapping {@literal hashed f_murlvzvr Lnet/minecraft/unmapped/C_zpsdinym;f_murlvzvr:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/NetherPortalBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
@@ -145,18 +144,17 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (entity.m_acybdbgv(false)) {
-         entity.m_bikcqssn(this, pos);
+      if (entity.canUsePortals(false)) {
+         entity.setInsidePortal(this, pos);
       }
    }
 
    /**
-    * @mapping {@literal hashed m_ynslrhia Lnet/minecraft/unmapped/C_zpsdinym;m_ynslrhia(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)I}
-    * @mapping {@literal named m_ynslrhia Lnet/minecraft/block/NetherPortalBlock;m_ynslrhia(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;)I}
+    * Mapping not found
     */
    @Override
-   public int m_ynslrhia(ServerWorld world, Entity arg2) {
-      return arg2 instanceof PlayerEntity lv
+   public int getTransitionTime(ServerWorld world, Entity entity) {
+      return entity instanceof PlayerEntity lv
          ? Math.max(
             1,
             world.getGameRules()
@@ -166,12 +164,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_zpsdinym;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_ssylpsbj Lnet/minecraft/block/NetherPortalBlock;m_ssylpsbj(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * Mapping not found
     */
    @Nullable
    @Override
-   public C_zbvyjshu m_ssylpsbj(ServerWorld world, Entity arg2, BlockPos pos) {
+   public DimensionTransition createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.NETHER ? World.OVERWORLD : World.NETHER;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -180,25 +177,25 @@
          boolean bl = lv2.getRegistryKey() == World.NETHER;
          WorldBorder lv3 = lv2.getWorldBorder();
          double d = DimensionType.getCoordinateScaleFactor(world.getDimension(), lv2.getDimension());
-         BlockPos lv4 = lv3.m_vnkyxdhv(arg2.getX() * d, arg2.getY(), arg2.getZ() * d);
-         return this.m_cuetenod(lv2, arg2, pos, lv4, bl, lv3);
+         BlockPos lv4 = lv3.m_vnkyxdhv(entity.getX() * d, entity.getY(), entity.getZ() * d);
+         return this.m_cuetenod(lv2, entity, pos, lv4, bl, lv3);
       }
    }
 
    /**
     * @mapping {@literal hashed m_cuetenod Lnet/minecraft/unmapped/C_zpsdinym;m_cuetenod(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;ZLnet/minecraft/unmapped/C_pneibfez;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_cuetenod Lnet/minecraft/block/NetherPortalBlock;m_cuetenod(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_cuetenod Lnet/minecraft/block/NetherPortalBlock;m_cuetenod(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/world/DimensionTransition;}
     */
    @Nullable
-   private C_zbvyjshu m_cuetenod(ServerWorld world, Entity arg2, BlockPos arg3, BlockPos arg4, boolean bl, WorldBorder arg5) {
+   private DimensionTransition m_cuetenod(ServerWorld world, Entity arg2, BlockPos arg3, BlockPos arg4, boolean bl, WorldBorder arg5) {
       Optional<BlockPos> optional = world.getPortalForcer().m_mpevuvcu(arg4, bl, arg5);
       BlockLocating.Rectangle lv3;
-      C_zbvyjshu.C_pytyshdn lv4;
+      DimensionTransition.PostDimensionTransition lv4;
       if (optional.isPresent()) {
          BlockPos lv = (BlockPos)optional.get();
          BlockState lv2 = world.getBlockState(lv);
          lv3 = BlockLocating.getLargestRectangle(lv, lv2.get(Properties.HORIZONTAL_AXIS), 21, Direction.Axis.Y, 21, pos -> world.getBlockState(pos) == lv2);
-         lv4 = C_zbvyjshu.f_kidpbkzf.then(arg2x -> arg2x.m_gykcjypz(lv));
+         lv4 = DimensionTransition.PLAY_PORTAL_SOUND.then(arg2x -> arg2x.addPortalTicket(lv));
       } else {
          Direction.Axis lv5 = (Direction.Axis)arg2.getWorld().getBlockState(arg3).getOrEmpty(AXIS).orElse(Direction.Axis.X);
          Optional<BlockLocating.Rectangle> optional2 = world.getPortalForcer().createPortal(arg4, lv5);
@@ -208,7 +205,7 @@
          }
 
          lv3 = (BlockLocating.Rectangle)optional2.get();
-         lv4 = C_zbvyjshu.f_kidpbkzf.then(C_zbvyjshu.f_fbtpbgjw);
+         lv4 = DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_CHUNK_TICKET);
       }
 
       return m_kvaymgqu(arg2, arg3, lv3, world, lv4);
@@ -216,9 +213,11 @@
 
    /**
     * @mapping {@literal hashed m_kvaymgqu Lnet/minecraft/unmapped/C_zpsdinym;m_kvaymgqu(Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_kvaymgqu Lnet/minecraft/block/NetherPortalBlock;m_kvaymgqu(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_kvaymgqu Lnet/minecraft/block/NetherPortalBlock;m_kvaymgqu(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/DimensionTransition;}
     */
-   private static C_zbvyjshu m_kvaymgqu(Entity arg, BlockPos pos, BlockLocating.Rectangle arg3, ServerWorld world, C_zbvyjshu.C_pytyshdn arg5) {
+   private static DimensionTransition m_kvaymgqu(
+      Entity arg, BlockPos pos, BlockLocating.Rectangle arg3, ServerWorld world, DimensionTransition.PostDimensionTransition arg5
+   ) {
       BlockState lv = arg.getWorld().getBlockState(pos);
       Direction.Axis lv2;
       Vec3d lv4;
@@ -236,10 +235,18 @@
 
    /**
     * @mapping {@literal hashed m_fzuhemna Lnet/minecraft/unmapped/C_zpsdinym;m_fzuhemna(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
-    * @mapping {@literal named m_fzuhemna Lnet/minecraft/block/NetherPortalBlock;m_fzuhemna(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;}
+    * @mapping {@literal named m_fzuhemna Lnet/minecraft/block/NetherPortalBlock;m_fzuhemna(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;FFLnet/minecraft/world/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/DimensionTransition;}
     */
-   private static C_zbvyjshu m_fzuhemna(
-      ServerWorld world, BlockLocating.Rectangle arg2, Direction.Axis arg3, Vec3d arg4, Entity arg5, Vec3d arg6, float f, float g, C_zbvyjshu.C_pytyshdn arg7
+   private static DimensionTransition m_fzuhemna(
+      ServerWorld world,
+      BlockLocating.Rectangle arg2,
+      Direction.Axis arg3,
+      Vec3d arg4,
+      Entity arg5,
+      Vec3d arg6,
+      float f,
+      float g,
+      DimensionTransition.PostDimensionTransition arg7
    ) {
       BlockPos lv = arg2.lowerLeft;
       BlockState lv2 = world.getBlockState(lv);
@@ -255,15 +262,15 @@
       boolean bl = lv3 == Direction.Axis.X;
       Vec3d lv6 = new Vec3d((double)lv.getX() + (bl ? h : k), (double)lv.getY() + j, (double)lv.getZ() + (bl ? k : h));
       Vec3d lv7 = AreaHelper.findOpenPosition(lv6, world, arg5, lv4);
-      return new C_zbvyjshu(world, lv7, lv5, f + (float)i, g, arg7);
+      return new DimensionTransition(world, lv7, lv5, f + (float)i, g, arg7);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public C_teerivzm.C_budwrmur m_kzlfoqae() {
-      return C_teerivzm.C_budwrmur.CONFUSION;
+   public Portal.Effect getEffect() {
+      return Portal.Effect.CONFUSION;
    }
 
    /**
Only in namedSrc/net/minecraft/block: Portal.java
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-07-09 01:41:43.140045501 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-07-09 01:40:34.695039677 +0000
@@ -305,7 +305,7 @@
          if (arg2 != null) {
             world.syncWorldEvent(WorldEvents.TRIAL_SPAWNER_SPAWNS_MOB_AT_POS, arg2.getBlockPos(), TrialSpawnerLogic.C_vhsnwpwm.NORMAL.m_cyctivcj());
             if (arg2 instanceof MobEntity lv) {
-               lv.m_cyqouyby();
+               lv.dropAllEquipment();
             }
 
             arg2.remove(Entity.RemovalReason.DISCARDED);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2024-07-09 01:41:43.180046101 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2024-07-09 01:40:34.763040201 +0000
@@ -23,7 +23,7 @@
 import net.minecraft.network.CookieStorage;
 import net.minecraft.network.NetworkSide;
 import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
-import net.minecraft.network.phase.LoginPhaseProtocols;
+import net.minecraft.network.phase.LoginPhases;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_wbxficvd;
@@ -198,7 +198,7 @@
                ConnectScreen.this.future.syncUninterruptibly();
                synchronized (ConnectScreen.this) {
                   if (ConnectScreen.this.connectingCancelled) {
-                     lv.disconnect(ConnectScreen.CONNECTION_ABORTED);
+                     lv.m_kykiqlcb(ConnectScreen.CONNECTION_ABORTED);
                      return;
                   }
 
@@ -210,8 +210,8 @@
                   .connect(
                      inetSocketAddress.getHostName(),
                      inetSocketAddress.getPort(),
-                     LoginPhaseProtocols.C2S,
-                     LoginPhaseProtocols.S2C,
+                     LoginPhases.C2S,
+                     LoginPhases.S2C,
                      new ClientLoginNetworkHandler(
                         ConnectScreen.this.connection, client, serverInfo, ConnectScreen.this.parent, false, null, ConnectScreen.this::setStatus, cookies
                      ),
@@ -306,7 +306,7 @@
             }
 
             if (this.connection != null) {
-               this.connection.disconnect(CONNECTION_ABORTED);
+               this.connection.m_kykiqlcb(CONNECTION_ABORTED);
             }
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java namedSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java	2024-07-09 01:41:43.036043941 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java	2024-07-09 01:40:34.519038323 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.client.gui.widget.layout.LinearLayoutWidget;
 import net.minecraft.client.gui.widget.text.MultilineTextWidget;
 import net.minecraft.client.gui.widget.text.TextWidget;
-import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.Util;
 
 /**
@@ -44,7 +44,7 @@
    /**
     * Mapping not found
     */
-   private final DisconnectionDetails f_kinjqdqw;
+   private final C_igbzvhln f_kinjqdqw;
    /**
     * @mapping {@literal hashed f_rlcssznk Lnet/minecraft/unmapped/C_mluajnfe;f_rlcssznk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named returnText Lnet/minecraft/client/gui/screen/DisconnectedScreen;returnText:Lnet/minecraft/text/Text;}
@@ -61,7 +61,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;)V}
     */
    public DisconnectedScreen(Screen parent, Text title, Text reason) {
-      this(parent, title, new DisconnectionDetails(reason));
+      this(parent, title, new C_igbzvhln(reason));
    }
 
    /**
@@ -69,22 +69,22 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;)V}
     */
    public DisconnectedScreen(Screen parent, Text title, Text reason, Text returnText) {
-      this(parent, title, new DisconnectionDetails(reason), returnText);
+      this(parent, title, new C_igbzvhln(reason), returnText);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mluajnfe;<init>(Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_igbzvhln;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/network/DisconnectionDetails;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/unmapped/C_igbzvhln;)V}
     */
-   public DisconnectedScreen(Screen parent, Text title, DisconnectionDetails arg3) {
+   public DisconnectedScreen(Screen parent, Text title, C_igbzvhln arg3) {
       this(parent, title, arg3, TO_MENU);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mluajnfe;<init>(Lnet/minecraft/unmapped/C_wrmtlwqx;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_igbzvhln;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/network/DisconnectionDetails;Lnet/minecraft/text/Text;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/unmapped/C_igbzvhln;Lnet/minecraft/text/Text;)V}
     */
-   public DisconnectedScreen(Screen parent, Text title, DisconnectionDetails arg3, Text returnText) {
+   public DisconnectedScreen(Screen parent, Text title, C_igbzvhln arg3, Text returnText) {
       super(title);
       this.parent = parent;
       this.f_kinjqdqw = arg3;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-07-09 01:41:43.048044121 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-07-09 01:40:34.539038477 +0000
@@ -277,7 +277,9 @@
             int o = l + 1;
             if (this.isPointWithinBounds(60, 14 + 19 * l, 108, 17, (double)mouseX, (double)mouseY) && m > 0 && n >= 0 && optional != null) {
                List<Text> list = Lists.<Text>newArrayList();
-               list.add(Text.translatable("container.enchant.clue", Enchantment.m_zfqdifee((Holder<Enchantment>)optional.get(), n)).formatted(Formatting.WHITE));
+               list.add(
+                  Text.translatable("container.enchant.clue", Enchantment.getFullName((Holder<Enchantment>)optional.get(), n)).formatted(Formatting.WHITE)
+               );
                if (!bl) {
                   list.add(CommonTexts.EMPTY);
                   if (this.client.player.experienceLevel < m) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ReconfiguringDisconnectScreen.java namedSrc/net/minecraft/client/gui/screen/ReconfiguringDisconnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ReconfiguringDisconnectScreen.java	2024-07-09 01:41:43.020043701 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ReconfiguringDisconnectScreen.java	2024-07-09 01:40:34.491038107 +0000
@@ -68,7 +68,7 @@
       this.columns.getDefaultSettings().alignHorizontallyCenter().setPadding(10);
       this.columns.add(new TextWidget(this.title, this.textRenderer));
       this.disconnectButton = this.columns
-         .add(ButtonWidget.builder(CommonTexts.DISCONNECT, button -> this.clientConnection.disconnect(ConnectScreen.CONNECTION_ABORTED)).build());
+         .add(ButtonWidget.builder(CommonTexts.DISCONNECT, button -> this.clientConnection.m_kykiqlcb(ConnectScreen.CONNECTION_ABORTED)).build());
       this.disconnectButton.active = false;
       this.columns.arrangeElements();
       this.columns.visitWidgets(widget -> {
diff -bur namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-09 01:41:43.108045021 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientNetworkHandler.java	2024-07-09 01:40:34.643039277 +0000
@@ -32,7 +32,6 @@
 import net.minecraft.client.util.telemetry.WorldTelemetryManager;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.CookieStorage;
-import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.NetworkThreadUtils;
 import net.minecraft.network.listener.ClientCommonPacketListener;
 import net.minecraft.network.listener.ServerPacketListener;
@@ -45,12 +44,10 @@
 import net.minecraft.network.packet.payload.DiscardedCustomPayload;
 import net.minecraft.network.packet.s2c.common.AddResourcePackS2CPacket;
 import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
-import net.minecraft.network.packet.s2c.common.CustomReportDetailsS2CPacket;
 import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.common.KeepConnectionAliveS2CPacket;
 import net.minecraft.network.packet.s2c.common.PingS2CPacket;
 import net.minecraft.network.packet.s2c.common.RemoveResourcePackS2CPacket;
-import net.minecraft.network.packet.s2c.common.ServerLinksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.CookieRequestS2CPacket;
 import net.minecraft.network.packet.s2c.payload.BrandPayload;
 import net.minecraft.network.packet.s2c.query.StoreCookieS2CPacket;
@@ -58,7 +55,10 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_ccpekhhb;
+import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_ouodvkzu;
+import net.minecraft.unmapped.C_qoushzky;
+import net.minecraft.unmapped.C_zaxzpkwd;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -122,13 +122,12 @@
     */
    protected boolean f_zzouahkl;
    /**
-    * @mapping {@literal hashed f_ifbkjylc Lnet/minecraft/unmapped/C_xcfjcqcn;f_ifbkjylc:Z}
-    * @mapping {@literal named strictErrorHandling Lnet/minecraft/client/network/AbstractClientNetworkHandler;strictErrorHandling:Z}
+    * Mapping not found
     */
    @Deprecated(
       forRemoval = true
    )
-   protected final boolean strictErrorHandling;
+   protected final boolean f_ifbkjylc;
    /**
     * @mapping {@literal hashed f_kjyjkrbj Lnet/minecraft/unmapped/C_xcfjcqcn;f_kjyjkrbj:Ljava/util/List;}
     * @mapping {@literal named deferredPackets Lnet/minecraft/client/network/AbstractClientNetworkHandler;deferredPackets:Ljava/util/List;}
@@ -140,15 +139,13 @@
     */
    protected final Map<Identifier, byte[]> serverCookies;
    /**
-    * @mapping {@literal hashed f_vvtetqza Lnet/minecraft/unmapped/C_xcfjcqcn;f_vvtetqza:Ljava/util/Map;}
-    * @mapping {@literal named customReportDetails Lnet/minecraft/client/network/AbstractClientNetworkHandler;customReportDetails:Ljava/util/Map;}
+    * Mapping not found
     */
-   protected Map<String, String> customReportDetails;
+   protected Map<String, String> f_vvtetqza;
    /**
-    * @mapping {@literal hashed f_wjciyfll Lnet/minecraft/unmapped/C_xcfjcqcn;f_wjciyfll:Lnet/minecraft/unmapped/C_ouodvkzu;}
-    * @mapping {@literal named serverLinks Lnet/minecraft/client/network/AbstractClientNetworkHandler;serverLinks:Lnet/minecraft/unmapped/C_ouodvkzu;}
+    * Mapping not found
     */
-   protected C_ouodvkzu serverLinks;
+   protected C_ouodvkzu f_wjciyfll;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xcfjcqcn;<init>(Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_oasmcckk;Lnet/minecraft/unmapped/C_qqflkeyp;)V}
@@ -162,21 +159,21 @@
       this.telemetryManager = connectionState.telemetryManager();
       this.postDisconnectScreen = connectionState.postDisconnectScreen();
       this.serverCookies = connectionState.serverCookies();
-      this.strictErrorHandling = connectionState.strictErrorHandling();
-      this.customReportDetails = connectionState.customReportDetails();
-      this.serverLinks = connectionState.serverLinks();
+      this.f_ifbkjylc = connectionState.strictErrorHandling();
+      this.f_vvtetqza = connectionState.customReportDetails();
+      this.f_wjciyfll = connectionState.serverLinks();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPacketException(Packet packet, Exception cause) {
-      LOGGER.error("Failed to handle packet {}", packet, cause);
-      Optional<Path> optional = this.m_yuakheuk(packet, cause);
-      Optional<URI> optional2 = this.serverLinks.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT).map(C_ouodvkzu.C_moygobps::link);
-      if (this.strictErrorHandling) {
-         this.connection.disconnect(new DisconnectionDetails(Text.translatable("disconnect.packetError"), optional, optional2));
+   public void m_jelicxwl(Packet arg, Exception exception) {
+      LOGGER.error("Failed to handle packet {}", arg, exception);
+      Optional<Path> optional = this.m_yuakheuk(arg, exception);
+      Optional<URI> optional2 = this.f_wjciyfll.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT).map(C_ouodvkzu.C_moygobps::link);
+      if (this.f_ifbkjylc) {
+         this.connection.m_dzmcexuz(new C_igbzvhln(Text.translatable("disconnect.packetError"), optional, optional2));
       }
    }
 
@@ -184,23 +181,23 @@
     * Mapping not found
     */
    @Override
-   public DisconnectionDetails createDisconnectionDetails(Text reason, Throwable cause) {
-      Optional<Path> optional = this.m_yuakheuk(null, cause);
-      Optional<URI> optional2 = this.serverLinks.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT).map(C_ouodvkzu.C_moygobps::link);
-      return new DisconnectionDetails(reason, optional, optional2);
+   public C_igbzvhln m_dfsclzjh(Text arg, Throwable throwable) {
+      Optional<Path> optional = this.m_yuakheuk(null, throwable);
+      Optional<URI> optional2 = this.f_wjciyfll.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT).map(C_ouodvkzu.C_moygobps::link);
+      return new C_igbzvhln(arg, optional, optional2);
    }
 
    /**
     * @mapping {@literal hashed m_yuakheuk Lnet/minecraft/unmapped/C_xcfjcqcn;m_yuakheuk(Lnet/minecraft/unmapped/C_zyjtrjrl;Ljava/lang/Throwable;)Ljava/util/Optional;}
     * @mapping {@literal named m_yuakheuk Lnet/minecraft/client/network/AbstractClientNetworkHandler;m_yuakheuk(Lnet/minecraft/network/packet/Packet;Ljava/lang/Throwable;)Ljava/util/Optional;}
     */
-   private Optional<Path> m_yuakheuk(@Nullable Packet packet, Throwable cause) {
+   private Optional<Path> m_yuakheuk(@Nullable Packet arg, Throwable cause) {
       CrashReport lv = CrashReport.create(cause, "Packet handling error");
-      NetworkThreadUtils.fillCrashReport(lv, this, packet);
+      NetworkThreadUtils.m_yybqntwy(lv, this, arg);
       Path path = this.client.runDirectory.toPath().resolve("debug");
       Path path2 = path.resolve("disconnect-" + Util.getFileNameFormattedDateTime() + "-client.txt");
-      Optional<C_ouodvkzu.C_moygobps> optional = this.serverLinks.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT);
-      List<String> list = (List<String>)optional.map(arg -> List.of("Server bug reporting link: " + arg.link())).orElse(List.of());
+      Optional<C_ouodvkzu.C_moygobps> optional = this.f_wjciyfll.m_gdegqnaz(C_ouodvkzu.C_ekdhaajb.BUG_REPORT);
+      List<String> list = (List<String>)optional.map(argx -> List.of("Server bug reporting link: " + argx.link())).orElse(List.of());
       return lv.m_jipyzcdw(path2, C_ccpekhhb.MINECRAFT_NETWORK_PROTOCOL_ERROR_REPORT, list) ? Optional.of(path2) : Optional.empty();
    }
 
@@ -331,16 +328,16 @@
     * Mapping not found
     */
    @Override
-   public void m_ifiopbgv(CustomReportDetailsS2CPacket arg) {
+   public void m_ifiopbgv(C_zaxzpkwd arg) {
       NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.customReportDetails = arg.details();
+      this.f_vvtetqza = arg.details();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_ikewnwne(ServerLinksS2CPacket arg) {
+   public void m_ikewnwne(C_qoushzky arg) {
       NetworkThreadUtils.forceMainThread(arg, this, this.client);
       List<C_ouodvkzu.C_tkgsynzm> list = arg.links();
       Builder<C_ouodvkzu.C_moygobps> builder = ImmutableList.builderWithExpectedSize(list.size());
@@ -354,7 +351,7 @@
          }
       }
 
-      this.serverLinks = new C_ouodvkzu(builder.build());
+      this.f_wjciyfll = new C_ouodvkzu(builder.build());
    }
 
    /**
@@ -367,7 +364,7 @@
       if (this.serverInfo == null) {
          throw new IllegalStateException("Cannot transfer to server from singleplayer");
       } else {
-         this.connection.disconnect(Text.translatable("disconnect.transfer"));
+         this.connection.m_kykiqlcb(Text.translatable("disconnect.transfer"));
          this.connection.disableAutoRead();
          this.connection.handleDisconnection();
          ServerAddress lv = new ServerAddress(packet.host(), packet.port());
@@ -387,7 +384,7 @@
     */
    @Override
    public void onDisconnect(DisconnectS2CPacket packet) {
-      this.connection.disconnect(packet.reason());
+      this.connection.m_kykiqlcb(packet.reason());
    }
 
    /**
@@ -420,30 +417,30 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(DisconnectionDetails details) {
+   public void onDisconnected(C_igbzvhln arg) {
       this.telemetryManager.onDisconnect();
-      this.client.m_ogfkcsgc(this.createDisconnectScreen(details), this.f_zzouahkl);
-      LOGGER.warn("Client disconnected with reason: {}", details.reason().getString());
+      this.client.m_ogfkcsgc(this.createDisconnectScreen(arg), this.f_zzouahkl);
+      LOGGER.warn("Client disconnected with reason: {}", arg.reason().getString());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void addCrashReportInfo(CrashReport report, CrashReportSection section) {
+   public void addCrashReportInfo(CrashReport arg, CrashReportSection section) {
       section.add("Server type", (CrashCallable<String>)(() -> this.serverInfo != null ? this.serverInfo.getServerType().toString() : "<none>"));
       section.add("Server brand", (CrashCallable<String>)(() -> this.serverBrand));
-      if (!this.customReportDetails.isEmpty()) {
-         CrashReportSection lv = report.addElement("Custom Server Details");
-         this.customReportDetails.forEach(lv::add);
+      if (!this.f_vvtetqza.isEmpty()) {
+         CrashReportSection lv = arg.addElement("Custom Server Details");
+         this.f_vvtetqza.forEach(lv::add);
       }
    }
 
    /**
     * @mapping {@literal hashed m_zwgetqya Lnet/minecraft/unmapped/C_xcfjcqcn;m_zwgetqya(Lnet/minecraft/unmapped/C_igbzvhln;)Lnet/minecraft/unmapped/C_wrmtlwqx;}
-    * @mapping {@literal named createDisconnectScreen Lnet/minecraft/client/network/AbstractClientNetworkHandler;createDisconnectScreen(Lnet/minecraft/network/DisconnectionDetails;)Lnet/minecraft/client/gui/screen/Screen;}
+    * @mapping {@literal named createDisconnectScreen Lnet/minecraft/client/network/AbstractClientNetworkHandler;createDisconnectScreen(Lnet/minecraft/unmapped/C_igbzvhln;)Lnet/minecraft/client/gui/screen/Screen;}
     */
-   protected Screen createDisconnectScreen(DisconnectionDetails arg) {
+   protected Screen createDisconnectScreen(C_igbzvhln arg) {
       Screen lv = (Screen)Objects.requireNonNullElseGet(this.postDisconnectScreen, () -> new SelectServerScreen(new TitleScreen()));
       return (Screen)(this.serverInfo != null && this.serverInfo.isRealm()
          ? new DisconnectedRealmsScreen(lv, CONNECTION_LOST, arg.reason())
@@ -526,7 +523,7 @@
                } else {
                   lv.m_whrfzbbp();
                   if (bl) {
-                     AbstractClientNetworkHandler.this.connection.disconnect(Text.translatable("multiplayer.requiredTexturePrompt.disconnect"));
+                     AbstractClientNetworkHandler.this.connection.m_kykiqlcb(Text.translatable("multiplayer.requiredTexturePrompt.disconnect"));
                   } else if (AbstractClientNetworkHandler.this.serverInfo != null) {
                      AbstractClientNetworkHandler.this.serverInfo.setResourcePackPolicy(ServerInfo.ResourcePackPolicy.DISABLED);
                   }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-07-09 01:41:43.008043521 +0000
+++ namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-07-09 01:40:34.475037984 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.network.ClientConnection;
-import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.NetworkThreadUtils;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.listener.ClientConfigurationPacketListener;
@@ -25,11 +24,12 @@
 import net.minecraft.network.packet.s2c.configuration.ResetChatS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SelectKnownPacksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SynchronizeEnabledFeatureFlagsS2CPacket;
-import net.minecraft.network.phase.PlayPhaseProtocols;
+import net.minecraft.network.phase.PlayPhases;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.resource.AutoCloseableResourceManager;
 import net.minecraft.resource.ResourceFactory;
 import net.minecraft.resource.pack.KnownPack;
+import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_jcuvnmyx;
 import net.minecraft.unmapped.C_wvzzfswm;
 import org.jetbrains.annotations.Nullable;
@@ -184,8 +184,8 @@
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       DynamicRegistryManager.Frozen lv = this.m_pglrvykp(arg -> this.f_elfoiiwu.m_mwczbzrr(arg, this.receivedRegistries, this.connection.isLocal()));
       this.connection
-         .setupInboundProtocol(
-            PlayPhaseProtocols.S2C_TEMPLATE.bind(RegistryByteBuf.makeFactory(lv)),
+         .m_qjeqlspr(
+            PlayPhases.f_akkpjpwv.m_ycknaccl(RegistryByteBuf.makeFactory(lv)),
             new ClientPlayNetworkHandler(
                this.client,
                this.connection,
@@ -199,14 +199,14 @@
                   this.postDisconnectScreen,
                   this.serverCookies,
                   this.f_npbcqpux,
-                  this.strictErrorHandling,
-                  this.customReportDetails,
-                  this.serverLinks
+                  this.f_ifbkjylc,
+                  this.f_vvtetqza,
+                  this.f_wjciyfll
                )
             )
          );
       this.connection.send(FinishConfigurationC2SPacket.INSTANCE);
-      this.connection.setupOutboundProtocol(PlayPhaseProtocols.C2S_TEMPLATE.bind(RegistryByteBuf.makeFactory(lv)));
+      this.connection.m_tckzsnsu(PlayPhases.f_qbbqatif.m_ycknaccl(RegistryByteBuf.makeFactory(lv)));
    }
 
    /**
@@ -221,8 +221,8 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(DisconnectionDetails details) {
-      super.onDisconnected(details);
+   public void onDisconnected(C_igbzvhln arg) {
+      super.onDisconnected(arg);
       this.client.m_jfglektg();
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-07-09 01:41:42.988043221 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2024-07-09 01:40:34.439037707 +0000
@@ -30,7 +30,6 @@
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.CookieStorage;
-import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.encryption.NetworkEncryptionUtils;
 import net.minecraft.network.listener.ClientLoginPacketListener;
@@ -47,9 +46,10 @@
 import net.minecraft.network.packet.s2c.login.LoginQueryRequestS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
 import net.minecraft.network.packet.s2c.payload.BrandPayload;
-import net.minecraft.network.phase.ConfigurationPhaseProtocols;
+import net.minecraft.network.phase.ConfigurationPhases;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.unmapped.C_ouodvkzu;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -199,7 +199,7 @@
             Text lvx = this.joinServerSession(string);
             if (lvx != null) {
                if (this.info == null || !this.info.isLocal()) {
-                  this.connection.disconnect(lvx);
+                  this.connection.m_kykiqlcb(lvx);
                   return;
                }
 
@@ -260,8 +260,8 @@
       this.setStatus(ClientLoginNetworkHandler.ClientLoginStatus.JOINING);
       GameProfile gameProfile = packet.gameProfile();
       this.connection
-         .setupInboundProtocol(
-            ConfigurationPhaseProtocols.S2C,
+         .m_qjeqlspr(
+            ConfigurationPhases.S2C,
             new ClientConfigurationNetworkHandler(
                this.client,
                this.connection,
@@ -282,7 +282,7 @@
             )
          );
       this.connection.send(LoginAcknowledgementC2SPacket.INSTANCE);
-      this.connection.setupOutboundProtocol(ConfigurationPhaseProtocols.C2S);
+      this.connection.m_tckzsnsu(ConfigurationPhases.C2S);
       this.connection.send(new CustomPayloadC2SPacket(new BrandPayload(ClientBrandRetriever.getClientModName())));
       this.connection.send(new ClientSettingsUpdateC2SPacket(this.client.options.getClientOptions()));
    }
@@ -291,12 +291,12 @@
     * Mapping not found
     */
    @Override
-   public void onDisconnected(DisconnectionDetails details) {
+   public void onDisconnected(C_igbzvhln arg) {
       Text lv = this.f_bpdsyxzv ? CommonTexts.FAILED_TRANSFER : CommonTexts.CONNECT_FAILED;
       if (this.info != null && this.info.isRealm()) {
-         this.client.setScreen(new DisconnectedRealmsScreen(this.parentScreen, lv, details.reason()));
+         this.client.setScreen(new DisconnectedRealmsScreen(this.parentScreen, lv, arg.reason()));
       } else {
-         this.client.setScreen(new DisconnectedScreen(this.parentScreen, lv, details));
+         this.client.setScreen(new DisconnectedScreen(this.parentScreen, lv, arg));
       }
    }
 
@@ -313,7 +313,7 @@
     */
    @Override
    public void onDisconnect(LoginDisconnectS2CPacket packet) {
-      this.connection.disconnect(packet.getReason());
+      this.connection.m_kykiqlcb(packet.getReason());
    }
 
    /**
@@ -355,7 +355,7 @@
     * Mapping not found
     */
    @Override
-   public void addCrashReportInfo(CrashReport report, CrashReportSection section) {
+   public void addCrashReportInfo(CrashReport arg, CrashReportSection section) {
       section.add("Server type", (CrashCallable<String>)(() -> this.info != null ? this.info.getServerType().toString() : "<unknown>"));
       section.add("Login phase", (CrashCallable<String>)(() -> ((ClientLoginNetworkHandler.ClientLoginStatus)this.connectionStatus.get()).toString()));
    }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-07-09 01:41:43.120045201 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-07-09 01:40:34.659039400 +0000
@@ -9,6 +9,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Portal;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.block.entity.CommandBlockBlockEntity;
 import net.minecraft.block.entity.HangingSignBlockEntity;
@@ -76,7 +77,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_teerivzm;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ClickType;
 import net.minecraft.util.Hand;
@@ -1057,7 +1057,7 @@
       }
 
       if (!(this.client.currentScreen instanceof DownloadingTerrainScreen)) {
-         this.m_wcafttvs(this.m_wavkxtkh() == C_teerivzm.C_budwrmur.CONFUSION);
+         this.m_wcafttvs(this.m_wavkxtkh() == Portal.Effect.CONFUSION);
          this.tickNetherPortalCooldown();
       }
 
@@ -1221,8 +1221,8 @@
    /**
     * Mapping not found
     */
-   public C_teerivzm.C_budwrmur m_wavkxtkh() {
-      return this.f_xunwzhqo == null ? C_teerivzm.C_budwrmur.NONE : this.f_xunwzhqo.m_fgkknvcv();
+   public Portal.Effect m_wavkxtkh() {
+      return this.portalProcessor == null ? Portal.Effect.NONE : this.portalProcessor.getEffect();
    }
 
    /**
@@ -1242,7 +1242,7 @@
    private void m_wcafttvs(boolean bl) {
       this.lastScreenSwirlIntensity = this.screenSwirlIntensity;
       float f = 0.0F;
-      if (bl && this.f_xunwzhqo != null && this.f_xunwzhqo.m_ylhauphj()) {
+      if (bl && this.portalProcessor != null && this.portalProcessor.isInPortal()) {
          if (this.client.currentScreen != null
             && !this.client.currentScreen.isPauseScreen()
             && !(this.client.currentScreen instanceof DeathScreen)
@@ -1259,7 +1259,7 @@
          }
 
          f = 0.0125F;
-         this.f_xunwzhqo.m_rvthihju(false);
+         this.portalProcessor.setInPortal(false);
       } else if (this.hasStatusEffect(StatusEffects.NAUSEA) && !this.getStatusEffect(StatusEffects.NAUSEA).endsWithin(60)) {
          f = 0.006666667F;
       } else if (this.screenSwirlIntensity > 0.0F) {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-07-09 01:41:43.196046341 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-07-09 01:40:34.795040448 +0000
@@ -70,6 +70,7 @@
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.ExperienceOrbEntity;
 import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.Leashable;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.MovementFlag;
 import net.minecraft.entity.PacketPositionCodec;
@@ -257,7 +258,7 @@
 import net.minecraft.network.packet.s2c.play.data.ChunkData;
 import net.minecraft.network.packet.s2c.play.data.LightData;
 import net.minecraft.network.packet.s2c.query.QueryPongS2CPacket;
-import net.minecraft.network.phase.ConfigurationPhaseProtocols;
+import net.minecraft.network.phase.ConfigurationPhases;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.recipe.BrewingRecipeRegistry;
 import net.minecraft.recipe.RecipeManager;
@@ -281,7 +282,6 @@
 import net.minecraft.stat.Stat;
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gbavazgo;
 import net.minecraft.unmapped.C_hgofpcxx;
 import net.minecraft.unmapped.C_jhbjvrtr;
 import net.minecraft.unmapped.C_jvzsxkum;
@@ -1035,8 +1035,8 @@
       ChatHud.C_frlehikz lv = this.client.inGameHud.getChatHud().m_iudfmgeq();
       this.client.m_uottczas(new ReconfiguringDisconnectScreen(RECONFIGURING_DISCONNECT, this.connection));
       this.connection
-         .setupInboundProtocol(
-            ConfigurationPhaseProtocols.S2C,
+         .m_qjeqlspr(
+            ConfigurationPhases.S2C,
             new ClientConfigurationNetworkHandler(
                this.client,
                this.connection,
@@ -1050,14 +1050,14 @@
                   this.postDisconnectScreen,
                   this.serverCookies,
                   lv,
-                  this.strictErrorHandling,
-                  this.customReportDetails,
-                  this.serverLinks
+                  this.f_ifbkjylc,
+                  this.f_vvtetqza,
+                  this.f_wjciyfll
                )
             )
          );
       this.send(ReconfigurationAcknowledgementC2SPacket.INSTANCE);
-      this.connection.setupOutboundProtocol(ConfigurationPhaseProtocols.C2S);
+      this.connection.m_tckzsnsu(ConfigurationPhases.C2S);
    }
 
    /**
@@ -1134,7 +1134,7 @@
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       Optional<MessageBody> optional = packet.body().createBody(this.messageSignatureStorage);
       if (optional.isEmpty()) {
-         this.connection.disconnect(INVALID_PACKET_DISCONNECT);
+         this.connection.m_kykiqlcb(INVALID_PACKET_DISCONNECT);
       } else {
          this.messageSignatureStorage.sign((MessageBody)optional.get(), packet.signature());
          UUID uUID = packet.sender();
@@ -1179,7 +1179,7 @@
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       Optional<MessageSignature> optional = packet.signature().get(this.messageSignatureStorage);
       if (optional.isEmpty()) {
-         this.connection.disconnect(INVALID_PACKET_DISCONNECT);
+         this.connection.m_kykiqlcb(INVALID_PACKET_DISCONNECT);
       } else {
          this.lastSeenMessageTracker.removePending((MessageSignature)optional.get());
          if (!this.client.getChatListener().removeDelayedMessage((MessageSignature)optional.get())) {
@@ -1284,8 +1284,8 @@
    @Override
    public void onEntityAttachment(EntityAttachmentS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      if (this.world.getEntityById(packet.getAttachedEntityId()) instanceof C_gbavazgo lv2) {
-         lv2.m_jywtllgu(packet.getHoldingEntityId());
+      if (this.world.getEntityById(packet.getAttachedEntityId()) instanceof Leashable lv2) {
+         lv2.setDelayedLeashHolderId(packet.getHoldingEntityId());
       }
    }
 
@@ -1419,9 +1419,9 @@
       }
 
       if (packet.hasKeptDataFlag((byte)1)) {
-         lv8.getAttributes().m_qzikslsi(lv4.getAttributes());
+         lv8.getAttributes().setValuesFrom(lv4.getAttributes());
       } else {
-         lv8.getAttributes().m_iaixpnqz(lv4.getAttributes());
+         lv8.getAttributes().setBaseValuesFrom(lv4.getAttributes());
       }
 
       lv8.init();
@@ -1494,7 +1494,7 @@
       if (this.world.getEntityById(packet.getHorseId()) instanceof AbstractHorseEntity lv2) {
          ClientPlayerEntity lv3 = this.client.player;
          int i = packet.m_fdbmmudq();
-         SimpleInventory lv4 = new SimpleInventory(AbstractHorseEntity.m_litexlgd(i));
+         SimpleInventory lv4 = new SimpleInventory(AbstractHorseEntity.getInventorySize(i));
          HorseScreenHandler lv5 = new HorseScreenHandler(packet.getSyncId(), lv3.getInventory(), lv4, lv2, i);
          lv3.currentScreenHandler = lv5;
          this.client.setScreen(new HorseScreen(lv5, lv3.getInventory(), lv2, i));
@@ -2729,7 +2729,7 @@
    public void m_nirbbegl(C_jhbjvrtr arg) {
       NetworkThreadUtils.forceMainThread(arg, this, this.client);
       if (this.world.getEntityById(arg.m_mxxebkeh()) instanceof ExplosiveProjectileEntity lv2) {
-         lv2.f_omngpikt = arg.m_hxnpbaoh();
+         lv2.accelerationPower = arg.m_hxnpbaoh();
       }
    }
 
@@ -3081,6 +3081,6 @@
     * Mapping not found
     */
    public C_ouodvkzu m_ndihoime() {
-      return this.serverLinks;
+      return this.f_wjciyfll;
    }
 }

github-actions · 2024-07-09T01:41:45Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java
--- namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2024-07-09 01:41:43.044044061 +0000
+++ namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2024-07-09 01:40:34.531038415 +0000
@@ -22,7 +22,6 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.ConnectScreen;
 import net.minecraft.network.ClientConnection;
-import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.listener.ClientQueryPacketListener;
 import net.minecraft.network.packet.c2s.query.MetadataQueryC2SPacket;
 import net.minecraft.network.packet.c2s.query.QueryPingC2SPacket;
@@ -32,6 +31,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_fjukoybs;
+import net.minecraft.unmapped.C_igbzvhln;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
 import org.slf4j.Logger;
@@ -96,7 +96,7 @@
             @Override
             public void onServerMetadata(ServerMetadataS2CPacket packet) {
                if (this.received) {
-                  lv2.disconnect(Text.translatable("multiplayer.status.unrequested"));
+                  lv2.m_kykiqlcb(Text.translatable("multiplayer.status.unrequested"));
                } else {
                   this.received = true;
                   ServerMetadata lv = packet.status();
@@ -147,7 +147,7 @@
                long l = this.startTime;
                long m = Util.getMeasuringTimeMs();
                entry.ping = m - l;
-               lv2.disconnect(Text.translatable("multiplayer.status.finished"));
+               lv2.m_kykiqlcb(Text.translatable("multiplayer.status.finished"));
                runnable2.run();
             }
 
@@ -155,9 +155,9 @@
              * Mapping not found
              */
             @Override
-            public void onDisconnected(DisconnectionDetails details) {
+            public void onDisconnected(C_igbzvhln arg) {
                if (!this.sentQuery) {
-                  MultiplayerServerListPinger.this.showError(details.reason(), entry);
+                  MultiplayerServerListPinger.this.showError(arg.reason(), entry);
                   MultiplayerServerListPinger.this.ping(inetSocketAddress, lv, entry);
                }
             }
@@ -260,7 +260,7 @@
             ClientConnection lv = (ClientConnection)iterator.next();
             if (lv.isOpen()) {
                iterator.remove();
-               lv.disconnect(Text.translatable("multiplayer.status.cancelled"));
+               lv.m_kykiqlcb(Text.translatable("multiplayer.status.cancelled"));
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-07-09 01:41:43.212046581 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-07-09 01:40:34.819040632 +0000
@@ -85,7 +85,7 @@
       }
 
       if (this.velocityLerpDivisor > 0) {
-         this.addVelocity(
+         this.addVelocityInternal(
             new Vec3d(
                (this.lastVelocity.x - this.getVelocity().x) / (double)this.velocityLerpDivisor,
                (this.lastVelocity.y - this.getVelocity().y) / (double)this.velocityLerpDivisor,
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java namedSrc/net/minecraft/client/realms/RealmsConnection.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java	2024-07-09 01:41:43.192046281 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsConnection.java	2024-07-09 01:40:34.791040417 +0000
@@ -138,7 +138,7 @@
    public void abort() {
       this.aborted = true;
       if (this.connection != null && this.connection.isOpen()) {
-         this.connection.disconnect(Text.translatable("disconnect.genericReason"));
+         this.connection.m_kykiqlcb(Text.translatable("disconnect.genericReason"));
          this.connection.handleDisconnection();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java namedSrc/net/minecraft/client/render/entity/EntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-07-09 01:41:43.088044721 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-07-09 01:40:34.615039062 +0000
@@ -12,8 +12,8 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAttachmentType;
+import net.minecraft.entity.Leashable;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gbavazgo;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
@@ -110,8 +110,8 @@
          if (frustum.isVisible(lv)) {
             return true;
          } else {
-            if (entity instanceof C_gbavazgo lv2) {
-               Entity lv3 = lv2.m_xkmzlwed();
+            if (entity instanceof Leashable lv2) {
+               Entity lv3 = lv2.getLeashHolder();
                if (lv3 != null) {
                   return frustum.isVisible(lv3.getVisibilityBoundingBox());
                }
@@ -135,8 +135,8 @@
     * @mapping {@literal named render Lnet/minecraft/client/render/entity/EntityRenderer;render(Lnet/minecraft/entity/Entity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
     */
    public void render(T entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) {
-      if (entity instanceof C_gbavazgo lv) {
-         Entity lv2 = lv.m_xkmzlwed();
+      if (entity instanceof Leashable lv) {
+         Entity lv2 = lv.getLeashHolder();
          if (lv2 != null) {
             this.m_kgwqpdyp(entity, tickDelta, matrices, vertexConsumers, lv2);
          }
@@ -154,7 +154,7 @@
    private <E extends Entity> void m_kgwqpdyp(T arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, E entity) {
       matrices.push();
       Vec3d lv = entity.getLeashHoldPosition(f);
-      double d = (double)(arg.m_yjtjhqxv(f) * (float) (Math.PI / 180.0)) + (Math.PI / 2);
+      double d = (double)(arg.lerpYaw(f) * (float) (Math.PI / 180.0)) + (Math.PI / 2);
       Vec3d lv2 = arg.getLeashOffset(f);
       double e = Math.cos(d) * lv2.z + Math.sin(d) * lv2.x;
       double g = Math.sin(d) * lv2.z - Math.cos(d) * lv2.x;
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.java	2024-07-09 01:41:43.208046521 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.java	2024-07-09 01:40:34.811040571 +0000
@@ -70,11 +70,11 @@
                int p = n % o;
                int q = (n + 1) % o;
                float r = ((float)(arg3.age % 25) + h) / 25.0F;
-               int s = SheepEntity.m_pegrkopl(DyeColor.byId(p));
-               int t = SheepEntity.m_pegrkopl(DyeColor.byId(q));
+               int s = SheepEntity.getColor(DyeColor.byId(p));
+               int t = SheepEntity.getColor(DyeColor.byId(q));
                u = ColorUtil.Argb32.lerp(r, s, t);
             } else {
-               u = SheepEntity.m_pegrkopl(arg3.m_zzglaoyq());
+               u = SheepEntity.getColor(arg3.getDyeColor());
             }
 
             render(this.getContextModel(), this.model, SKIN, matrices, vertexConsumers, i, arg3, f, g, j, k, l, h, u);
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-07-09 01:41:43.144045561 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-07-09 01:40:34.703039739 +0000
@@ -541,7 +541,7 @@
     */
    @Override
    public void disconnect() {
-      this.netHandler.getConnection().disconnect(Text.translatable("multiplayer.status.quitting"));
+      this.netHandler.getConnection().m_kykiqlcb(Text.translatable("multiplayer.status.quitting"));
    }
 
    /**
Only in namedSrc/net/minecraft/component: EnchantmentEffectComponentTypes.java
diff -bur namedTargetSrc/net/minecraft/component/type/AttributeModifiersComponent.java namedSrc/net/minecraft/component/type/AttributeModifiersComponent.java
--- namedTargetSrc/net/minecraft/component/type/AttributeModifiersComponent.java	2024-07-09 01:41:43.056044241 +0000
+++ namedSrc/net/minecraft/component/type/AttributeModifiersComponent.java	2024-07-09 01:40:34.551038569 +0000
@@ -210,10 +210,11 @@
       );
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jwwovmpm Lnet/minecraft/unmapped/C_azfkqhlm$C_blxybhdo;m_jwwovmpm(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)Z}
+       * @mapping {@literal named m_jwwovmpm Lnet/minecraft/component/type/AttributeModifiersComponent$Entry;m_jwwovmpm(Lnet/minecraft/registry/Holder;Lnet/minecraft/util/Identifier;)Z}
        */
-      public boolean m_jwwovmpm(Holder<EntityAttribute> arg, Identifier arg2) {
-         return arg.equals(this.attribute) && this.modifier.m_uwuvpbaf(arg2);
+      public boolean m_jwwovmpm(Holder<EntityAttribute> arg, Identifier id) {
+         return arg.equals(this.attribute) && this.modifier.matches(id);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java
--- namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-09 01:41:43.136045441 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-09 01:40:34.691039647 +0000
@@ -47,7 +47,7 @@
     * @mapping {@literal hashed f_weawpons Lnet/minecraft/unmapped/C_qlclfxvn;f_weawpons:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named LEVELS_CODEC Lnet/minecraft/component/type/ItemEnchantmentsComponent;LEVELS_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<Object2IntOpenHashMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap(Enchantment.f_cvunyugc, LEVEL_CODEC)
+   private static final Codec<Object2IntOpenHashMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap(Enchantment.ENTRY_CODEC, LEVEL_CODEC)
       .xmap(Object2IntOpenHashMap::new, Function.identity());
    /**
     * @mapping {@literal hashed f_nekwvric Lnet/minecraft/unmapped/C_qlclfxvn;f_nekwvric:Lcom/mojang/serialization/Codec;}
@@ -72,7 +72,7 @@
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/component/type/ItemEnchantmentsComponent;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, ItemEnchantmentsComponent> PACKET_CODEC = PacketCodec.tuple(
-      PacketCodecs.map(Object2IntOpenHashMap::new, Enchantment.PACKET_CODEC, PacketCodecs.VAR_INT),
+      PacketCodecs.map(Object2IntOpenHashMap::new, Enchantment.ENTRY_PACKET_CODEC, PacketCodecs.VAR_INT),
       component -> component.levels,
       PacketCodecs.BOOL,
       component -> component.shownInTooltip,
@@ -106,10 +106,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ugcgsgdf Lnet/minecraft/unmapped/C_qlclfxvn;m_ugcgsgdf(Lnet/minecraft/unmapped/C_cjzoxshv;)I}
+    * @mapping {@literal named getLevel Lnet/minecraft/component/type/ItemEnchantmentsComponent;getLevel(Lnet/minecraft/registry/Holder;)I}
     */
-   public int m_ugcgsgdf(Holder<Enchantment> arg) {
-      return this.levels.getInt(arg);
+   public int getLevel(Holder<Enchantment> enchantment) {
+      return this.levels.getInt(enchantment);
    }
 
    /**
@@ -124,14 +125,14 @@
          for (Holder<Enchantment> lv3 : lv2) {
             int i = this.levels.getInt(lv3);
             if (i > 0) {
-               tooltipConsumer.accept(Enchantment.m_zfqdifee(lv3, i));
+               tooltipConsumer.accept(Enchantment.getFullName(lv3, i));
             }
          }
 
          for (Entry<Holder<Enchantment>> entry : this.levels.object2IntEntrySet()) {
             Holder<Enchantment> lv4 = (Holder<Enchantment>)entry.getKey();
             if (!lv2.contains(lv4)) {
-               tooltipConsumer.accept(Enchantment.m_zfqdifee((Holder<Enchantment>)entry.getKey(), entry.getIntValue()));
+               tooltipConsumer.accept(Enchantment.getFullName((Holder<Enchantment>)entry.getKey(), entry.getIntValue()));
             }
          }
       }
@@ -248,23 +249,23 @@
 
       /**
        * @mapping {@literal hashed m_gpwlqqlc Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;m_gpwlqqlc(Lnet/minecraft/unmapped/C_cjzoxshv;I)V}
-       * @mapping {@literal named m_gpwlqqlc Lnet/minecraft/component/type/ItemEnchantmentsComponent$Builder;m_gpwlqqlc(Lnet/minecraft/registry/Holder;I)V}
+       * @mapping {@literal named set Lnet/minecraft/component/type/ItemEnchantmentsComponent$Builder;set(Lnet/minecraft/registry/Holder;I)V}
        */
-      public void m_gpwlqqlc(Holder<Enchantment> arg, int a) {
-         if (a <= 0) {
-            this.enchantments.removeInt(arg);
+      public void set(Holder<Enchantment> enchantment, int level) {
+         if (level <= 0) {
+            this.enchantments.removeInt(enchantment);
          } else {
-            this.enchantments.put(arg, Math.min(a, 255));
+            this.enchantments.put(enchantment, Math.min(level, 255));
          }
       }
 
       /**
        * @mapping {@literal hashed m_emkouuul Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;m_emkouuul(Lnet/minecraft/unmapped/C_cjzoxshv;I)V}
-       * @mapping {@literal named m_emkouuul Lnet/minecraft/component/type/ItemEnchantmentsComponent$Builder;m_emkouuul(Lnet/minecraft/registry/Holder;I)V}
+       * @mapping {@literal named upgrade Lnet/minecraft/component/type/ItemEnchantmentsComponent$Builder;upgrade(Lnet/minecraft/registry/Holder;I)V}
        */
-      public void m_emkouuul(Holder<Enchantment> arg, int a) {
-         if (a > 0) {
-            this.enchantments.merge(arg, Math.min(a, 255), Integer::max);
+      public void upgrade(Holder<Enchantment> enchantment, int level) {
+         if (level > 0) {
+            this.enchantments.merge(enchantment, Math.min(level, 255), Integer::max);
          }
       }
 
@@ -277,10 +278,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_wsnzisby Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;m_wsnzisby(Lnet/minecraft/unmapped/C_cjzoxshv;)I}
+       * @mapping {@literal named getLevel Lnet/minecraft/component/type/ItemEnchantmentsComponent$Builder;getLevel(Lnet/minecraft/registry/Holder;)I}
        */
-      public int m_wsnzisby(Holder<Enchantment> arg) {
-         return this.enchantments.getOrDefault(arg, 0);
+      public int getLevel(Holder<Enchantment> enchantment) {
+         return this.enchantments.getOrDefault(enchantment, 0);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/data/Main.java namedSrc/net/minecraft/data/Main.java
--- namedTargetSrc/net/minecraft/data/Main.java	2024-07-09 01:41:43.096044841 +0000
+++ namedSrc/net/minecraft/data/Main.java	2024-07-09 01:40:34.623039124 +0000
@@ -20,7 +20,6 @@
 import net.minecraft.data.report.BlockListProvider;
 import net.minecraft.data.report.CommandSyntaxProvider;
 import net.minecraft.data.report.ItemListProvider;
-import net.minecraft.data.report.PacketReportProvider;
 import net.minecraft.data.report.RegistriesDataPackProvider;
 import net.minecraft.data.report.RegistryDumpProvider;
 import net.minecraft.data.server.VanillaAdvancementsProvider;
@@ -55,6 +54,7 @@
 import net.minecraft.registry.VanillaDynamicRegistries;
 import net.minecraft.registry.tag.StructureTagsProvider;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_apbctukq;
 import net.minecraft.unmapped.C_vkynrwhu;
 import net.minecraft.unmapped.C_ythfdxbi;
 import net.minecraft.util.Util;
@@ -171,7 +171,7 @@
       lv4.addProvider(createFactory(BlockListProvider::new, completableFuture));
       lv4.addProvider(createFactory(CommandSyntaxProvider::new, completableFuture));
       lv4.addProvider(RegistryDumpProvider::new);
-      lv4.addProvider(PacketReportProvider::new);
+      lv4.addProvider(C_apbctukq::new);
       lv4 = lv.createDataPack(includeServer, "bundle");
       lv4.addProvider(createFactory(BundleRecipesProvider::new, completableFuture));
       lv4.addProvider(
Only in namedTargetSrc/net/minecraft/data/report: PacketReportProvider.java
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-07-09 01:41:43.176046041 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-07-09 01:40:34.759040170 +0000
@@ -994,7 +994,7 @@
                LootCondition.Builder lv3 = LocationCheckLootCondition.builder(
                   LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().blocks(block)), new BlockPos(direction.getVector())
                );
-               return AllOfLootCondition.m_sibyssbo(lv2, lv3);
+               return AllOfLootCondition.builder(lv2, lv3);
             }
          )
          .toArray(LootCondition.Builder[]::new);
diff -bur namedTargetSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java namedSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java
--- namedTargetSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java	2024-07-09 01:41:43.000043401 +0000
+++ namedSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java	2024-07-09 01:40:34.459037861 +0000
@@ -58,7 +58,7 @@
       this.getOrCreateTagBuilder(DamageTypeTags.IS_FIRE)
          .add(
             DamageTypes.IN_FIRE,
-            DamageTypes.f_aebymdih,
+            DamageTypes.CAMPFIRE,
             DamageTypes.ON_FIRE,
             DamageTypes.LAVA,
             DamageTypes.HOT_FLOOR,
@@ -88,7 +88,7 @@
       this.getOrCreateTagBuilder(DamageTypeTags.NO_IMPACT).add(DamageTypes.DROWN);
       this.getOrCreateTagBuilder(DamageTypeTags.ALWAYS_MOST_SIGNIFICANT_FALL).add(DamageTypes.OUT_OF_WORLD);
       this.getOrCreateTagBuilder(DamageTypeTags.WITHER_IMMUNE_TO).add(DamageTypes.DROWN);
-      this.getOrCreateTagBuilder(DamageTypeTags.IGNITES_ARMOR_STANDS).add(DamageTypes.IN_FIRE, DamageTypes.f_aebymdih);
+      this.getOrCreateTagBuilder(DamageTypeTags.IGNITES_ARMOR_STANDS).add(DamageTypes.IN_FIRE, DamageTypes.CAMPFIRE);
       this.getOrCreateTagBuilder(DamageTypeTags.BURNS_ARMOR_STANDS).add(DamageTypes.ON_FIRE);
       this.getOrCreateTagBuilder(DamageTypeTags.AVOIDS_GUARDIAN_THORNS).add(DamageTypes.MAGIC, DamageTypes.THORNS).addTag(DamageTypeTags.IS_EXPLOSION);
       this.getOrCreateTagBuilder(DamageTypeTags.ALWAYS_TRIGGERS_SILVERFISH).add(DamageTypes.MAGIC);
@@ -121,7 +121,7 @@
             DamageTypes.STALAGMITE,
             DamageTypes.OUTSIDE_BORDER,
             DamageTypes.GENERIC_KILL,
-            DamageTypes.f_aebymdih
+            DamageTypes.CAMPFIRE
          );
       this.getOrCreateTagBuilder(DamageTypeTags.ALWAYS_KILLS_ARMOR_STANDS)
          .add(DamageTypes.ARROW, DamageTypes.TRIDENT, DamageTypes.FIREBALL, DamageTypes.WITHER_SKULL, DamageTypes.WIND_CHARGE);
@@ -142,7 +142,7 @@
             DamageTypes.WITHER
          );
       this.getOrCreateTagBuilder(DamageTypeTags.IS_PLAYER_ATTACK).add(DamageTypes.PLAYER_ATTACK);
-      this.getOrCreateTagBuilder(DamageTypeTags.BURN_FROM_STEPPING).add(DamageTypes.f_aebymdih, DamageTypes.HOT_FLOOR);
+      this.getOrCreateTagBuilder(DamageTypeTags.BURN_FROM_STEPPING).add(DamageTypes.CAMPFIRE, DamageTypes.HOT_FLOOR);
       this.getOrCreateTagBuilder(DamageTypeTags.PANIC_ENVIRONMENTAL_CAUSES)
          .add(
             DamageTypes.CACTUS,
Only in namedSrc/net/minecraft/enchantment: effect
Only in namedSrc/net/minecraft/enchantment: EnchantmentEffectContext.java

github-actions · 2024-07-09T01:41:45Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-09 01:41:43.112045081 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-09 01:40:34.647039308 +0000
@@ -13,7 +13,11 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.component.DataComponentType;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.EnchantmentEffectComponentTypes;
 import net.minecraft.component.type.ItemEnchantmentsComponent;
+import net.minecraft.enchantment.effect.EnchantmentEffectTarget;
+import net.minecraft.enchantment.effect.EnchantmentValueEffect;
+import net.minecraft.enchantment.provider.EnchantmentProvider;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.EquipmentSlotGroup;
@@ -33,11 +37,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_nzjqewao;
-import net.minecraft.unmapped.C_pjrjvgrp;
-import net.minecraft.unmapped.C_qraehchg;
-import net.minecraft.unmapped.C_rkxlblfn;
-import net.minecraft.unmapped.C_zjvjrddv;
 import net.minecraft.util.Util;
 import net.minecraft.util.collection.Weighting;
 import net.minecraft.util.math.MathHelper;
@@ -56,25 +55,25 @@
 public class EnchantmentHelper {
    /**
     * @mapping {@literal hashed m_byjosehc Lnet/minecraft/unmapped/C_jakrppis;m_byjosehc(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_sddaxwyk;)I}
-    * @mapping {@literal named m_byjosehc Lnet/minecraft/enchantment/EnchantmentHelper;m_byjosehc(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/ItemStack;)I}
+    * @mapping {@literal named getLevel Lnet/minecraft/enchantment/EnchantmentHelper;getLevel(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/ItemStack;)I}
     */
-   public static int m_byjosehc(Holder<Enchantment> arg, ItemStack stack) {
+   public static int getLevel(Holder<Enchantment> enchantment, ItemStack stack) {
       ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
-      return lv.m_ugcgsgdf(arg);
+      return lv.getLevel(enchantment);
    }
 
    /**
     * @mapping {@literal hashed m_iefpfmdo Lnet/minecraft/unmapped/C_jakrppis;m_iefpfmdo(Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_qlclfxvn;}
-    * @mapping {@literal named m_iefpfmdo Lnet/minecraft/enchantment/EnchantmentHelper;m_iefpfmdo(Lnet/minecraft/item/ItemStack;Ljava/util/function/Consumer;)Lnet/minecraft/component/type/ItemEnchantmentsComponent;}
+    * @mapping {@literal named applyEnchantments Lnet/minecraft/enchantment/EnchantmentHelper;applyEnchantments(Lnet/minecraft/item/ItemStack;Ljava/util/function/Consumer;)Lnet/minecraft/component/type/ItemEnchantmentsComponent;}
     */
-   public static ItemEnchantmentsComponent m_iefpfmdo(ItemStack stack, java.util.function.Consumer<ItemEnchantmentsComponent.Builder> consumer) {
-      DataComponentType<ItemEnchantmentsComponent> lv = m_fbcdwuju(stack);
+   public static ItemEnchantmentsComponent applyEnchantments(ItemStack stack, java.util.function.Consumer<ItemEnchantmentsComponent.Builder> applier) {
+      DataComponentType<ItemEnchantmentsComponent> lv = getComponentType(stack);
       ItemEnchantmentsComponent lv2 = stack.get(lv);
       if (lv2 == null) {
          return ItemEnchantmentsComponent.DEFAULT;
       } else {
          ItemEnchantmentsComponent.Builder lv3 = new ItemEnchantmentsComponent.Builder(lv2);
-         consumer.accept(lv3);
+         applier.accept(lv3);
          ItemEnchantmentsComponent lv4 = lv3.build();
          stack.set(lv, lv4);
          return lv4;
@@ -83,10 +82,10 @@
 
    /**
     * @mapping {@literal hashed m_mimuzvcl Lnet/minecraft/unmapped/C_jakrppis;m_mimuzvcl(Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
-    * @mapping {@literal named m_mimuzvcl Lnet/minecraft/enchantment/EnchantmentHelper;m_mimuzvcl(Lnet/minecraft/item/ItemStack;)Z}
+    * @mapping {@literal named supportsEnchantments Lnet/minecraft/enchantment/EnchantmentHelper;supportsEnchantments(Lnet/minecraft/item/ItemStack;)Z}
     */
-   public static boolean m_mimuzvcl(ItemStack stack) {
-      return stack.contains(m_fbcdwuju(stack));
+   public static boolean supportsEnchantments(ItemStack stack) {
+      return stack.contains(getComponentType(stack));
    }
 
    /**
@@ -99,104 +98,104 @@
     * @mapping {@literal named set Lnet/minecraft/enchantment/EnchantmentHelper;set(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/type/ItemEnchantmentsComponent;)V}
     */
    public static void set(ItemStack stack, ItemEnchantmentsComponent value) {
-      stack.set(m_fbcdwuju(stack), value);
+      stack.set(getComponentType(stack), value);
    }
 
    /**
     * @mapping {@literal hashed m_uyoiclvv Lnet/minecraft/unmapped/C_jakrppis;m_uyoiclvv(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_qlclfxvn;}
-    * @mapping {@literal named m_uyoiclvv Lnet/minecraft/enchantment/EnchantmentHelper;m_uyoiclvv(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/component/type/ItemEnchantmentsComponent;}
+    * @mapping {@literal named getEnchantments Lnet/minecraft/enchantment/EnchantmentHelper;getEnchantments(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/component/type/ItemEnchantmentsComponent;}
     */
-   public static ItemEnchantmentsComponent m_uyoiclvv(ItemStack stack) {
-      return stack.getOrDefault(m_fbcdwuju(stack), ItemEnchantmentsComponent.DEFAULT);
+   public static ItemEnchantmentsComponent getEnchantments(ItemStack stack) {
+      return stack.getOrDefault(getComponentType(stack), ItemEnchantmentsComponent.DEFAULT);
    }
 
    /**
     * @mapping {@literal hashed m_fbcdwuju Lnet/minecraft/unmapped/C_jakrppis;m_fbcdwuju(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_pscqxfcs;}
-    * @mapping {@literal named m_fbcdwuju Lnet/minecraft/enchantment/EnchantmentHelper;m_fbcdwuju(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/component/DataComponentType;}
+    * @mapping {@literal named getComponentType Lnet/minecraft/enchantment/EnchantmentHelper;getComponentType(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/component/DataComponentType;}
     */
-   private static DataComponentType<ItemEnchantmentsComponent> m_fbcdwuju(ItemStack stack) {
+   private static DataComponentType<ItemEnchantmentsComponent> getComponentType(ItemStack stack) {
       return stack.isOf(Items.ENCHANTED_BOOK) ? DataComponentTypes.STORED_ENCHANTMENTS : DataComponentTypes.ENCHANTMENTS;
    }
 
    /**
     * @mapping {@literal hashed m_koeurtnx Lnet/minecraft/unmapped/C_jakrppis;m_koeurtnx(Lnet/minecraft/unmapped/C_sddaxwyk;)Z}
-    * @mapping {@literal named m_koeurtnx Lnet/minecraft/enchantment/EnchantmentHelper;m_koeurtnx(Lnet/minecraft/item/ItemStack;)Z}
+    * @mapping {@literal named hasEnchantments Lnet/minecraft/enchantment/EnchantmentHelper;hasEnchantments(Lnet/minecraft/item/ItemStack;)Z}
     */
-   public static boolean m_koeurtnx(ItemStack stack) {
+   public static boolean hasEnchantments(ItemStack stack) {
       return !stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty()
          || !stack.getOrDefault(DataComponentTypes.STORED_ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty();
    }
 
    /**
     * @mapping {@literal hashed m_chdruiod Lnet/minecraft/unmapped/C_jakrppis;m_chdruiod(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;I)I}
-    * @mapping {@literal named m_chdruiod Lnet/minecraft/enchantment/EnchantmentHelper;m_chdruiod(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I}
+    * @mapping {@literal named getDurabilityChange Lnet/minecraft/enchantment/EnchantmentHelper;getDurabilityChange(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I}
     */
-   public static int m_chdruiod(ServerWorld world, ItemStack stack, int i) {
-      MutableFloat mutableFloat = new MutableFloat((float)i);
-      m_akhrohzh(stack, (arg3, ix) -> arg3.value().m_smjuddye(world, ix, stack, mutableFloat));
+   public static int getDurabilityChange(ServerWorld world, ItemStack stack, int baseDamage) {
+      MutableFloat mutableFloat = new MutableFloat((float)baseDamage);
+      forEachEnchantment(stack, (arg3, i) -> arg3.value().modifyDurabilityChange(world, i, stack, mutableFloat));
       return mutableFloat.intValue();
    }
 
    /**
     * @mapping {@literal hashed m_pvuxrowe Lnet/minecraft/unmapped/C_jakrppis;m_pvuxrowe(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;I)I}
-    * @mapping {@literal named m_pvuxrowe Lnet/minecraft/enchantment/EnchantmentHelper;m_pvuxrowe(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;I)I}
+    * @mapping {@literal named getAmmoUse Lnet/minecraft/enchantment/EnchantmentHelper;getAmmoUse(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;I)I}
     */
-   public static int m_pvuxrowe(ServerWorld world, ItemStack arg2, ItemStack arg3, int i) {
-      MutableFloat mutableFloat = new MutableFloat((float)i);
-      m_akhrohzh(arg2, (arg3x, ix) -> ((Enchantment)arg3x.value()).m_xkuqfipi(world, ix, arg3, mutableFloat));
+   public static int getAmmoUse(ServerWorld world, ItemStack weapon, ItemStack projectile, int baseAmmoUse) {
+      MutableFloat mutableFloat = new MutableFloat((float)baseAmmoUse);
+      forEachEnchantment(weapon, (arg3, i) -> arg3.value().modifyAmmoChange(world, i, projectile, mutableFloat));
       return mutableFloat.intValue();
    }
 
    /**
     * @mapping {@literal hashed m_mcehpxsn Lnet/minecraft/unmapped/C_jakrppis;m_mcehpxsn(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;I)I}
-    * @mapping {@literal named m_mcehpxsn Lnet/minecraft/enchantment/EnchantmentHelper;m_mcehpxsn(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I}
+    * @mapping {@literal named getBlockExperience Lnet/minecraft/enchantment/EnchantmentHelper;getBlockExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I}
     */
-   public static int m_mcehpxsn(ServerWorld world, ItemStack stack, int i) {
-      MutableFloat mutableFloat = new MutableFloat((float)i);
-      m_akhrohzh(stack, (arg3, ix) -> arg3.value().m_tfnzpqjx(world, ix, stack, mutableFloat));
+   public static int getBlockExperience(ServerWorld world, ItemStack stack, int baseBlockExperience) {
+      MutableFloat mutableFloat = new MutableFloat((float)baseBlockExperience);
+      forEachEnchantment(stack, (arg3, i) -> arg3.value().modifyBlockExperience(world, i, stack, mutableFloat));
       return mutableFloat.intValue();
    }
 
    /**
     * @mapping {@literal hashed m_uxlmovdv Lnet/minecraft/unmapped/C_jakrppis;m_uxlmovdv(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;I)I}
-    * @mapping {@literal named m_uxlmovdv Lnet/minecraft/enchantment/EnchantmentHelper;m_uxlmovdv(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/Entity;I)I}
+    * @mapping {@literal named getMobExperience Lnet/minecraft/enchantment/EnchantmentHelper;getMobExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/Entity;I)I}
     */
-   public static int m_uxlmovdv(ServerWorld world, @Nullable Entity arg2, Entity arg3, int i) {
-      if (arg2 instanceof LivingEntity lv) {
-         MutableFloat mutableFloat = new MutableFloat((float)i);
-         m_kvkboaps(lv, (arg3x, ix, arg4) -> ((Enchantment)arg3x.value()).m_dktlsnak(world, ix, arg4.itemStack(), arg3, mutableFloat));
+   public static int getMobExperience(ServerWorld world, @Nullable Entity attacker, Entity mob, int baseExperience) {
+      if (attacker instanceof LivingEntity lv) {
+         MutableFloat mutableFloat = new MutableFloat((float)baseExperience);
+         forEachEquippedEnchantment(lv, (arg3, i, arg4) -> arg3.value().modifyMobExperience(world, i, arg4.itemStack(), mob, mutableFloat));
          return mutableFloat.intValue();
       } else {
-         return i;
+         return baseExperience;
       }
    }
 
    /**
     * @mapping {@literal hashed m_akhrohzh Lnet/minecraft/unmapped/C_jakrppis;m_akhrohzh(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jakrppis$C_jdhxivxn;)V}
-    * @mapping {@literal named m_akhrohzh Lnet/minecraft/enchantment/EnchantmentHelper;m_akhrohzh(Lnet/minecraft/item/ItemStack;Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;)V}
+    * @mapping {@literal named forEachEnchantment Lnet/minecraft/enchantment/EnchantmentHelper;forEachEnchantment(Lnet/minecraft/item/ItemStack;Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;)V}
     */
-   private static void m_akhrohzh(ItemStack stack, EnchantmentHelper.Consumer arg2) {
+   private static void forEachEnchantment(ItemStack stack, EnchantmentHelper.Consumer enchantmentConsumer) {
       ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
 
       for (Entry<Holder<Enchantment>> entry : lv.getEnchantmentEntries()) {
-         arg2.accept((Holder<Enchantment>)entry.getKey(), entry.getIntValue());
+         enchantmentConsumer.accept((Holder<Enchantment>)entry.getKey(), entry.getIntValue());
       }
    }
 
    /**
     * @mapping {@literal hashed m_xdjgfpqn Lnet/minecraft/unmapped/C_jakrppis;m_xdjgfpqn(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_jakrppis$C_wtxpyhvg;)V}
-    * @mapping {@literal named m_xdjgfpqn Lnet/minecraft/enchantment/EnchantmentHelper;m_xdjgfpqn(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/enchantment/EnchantmentHelper$C_wtxpyhvg;)V}
+    * @mapping {@literal named forEachEnchantment Lnet/minecraft/enchantment/EnchantmentHelper;forEachEnchantment(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/enchantment/EnchantmentHelper$ContextAwareConsumer;)V}
     */
-   private static void m_xdjgfpqn(ItemStack stack, EquipmentSlot inSlot, LivingEntity owner, EnchantmentHelper.C_wtxpyhvg arg4) {
+   private static void forEachEnchantment(ItemStack stack, EquipmentSlot inSlot, LivingEntity owner, EnchantmentHelper.ContextAwareConsumer enchantmentConsumer) {
       if (!stack.isEmpty()) {
          ItemEnchantmentsComponent lv = stack.get(DataComponentTypes.ENCHANTMENTS);
          if (lv != null && !lv.isEmpty()) {
-            C_pjrjvgrp lv2 = new C_pjrjvgrp(stack, inSlot, owner);
+            EnchantmentEffectContext lv2 = new EnchantmentEffectContext(stack, inSlot, owner);
 
             for (Entry<Holder<Enchantment>> entry : lv.getEnchantmentEntries()) {
                Holder<Enchantment> lv3 = (Holder<Enchantment>)entry.getKey();
-               if (lv3.value().m_jhglsmkm(inSlot)) {
-                  arg4.accept(lv3, entry.getIntValue(), lv2);
+               if (lv3.value().matchesSlot(inSlot)) {
+                  enchantmentConsumer.accept(lv3, entry.getIntValue(), lv2);
                }
             }
          }
@@ -204,149 +203,155 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kvkboaps Lnet/minecraft/unmapped/C_jakrppis;m_kvkboaps(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_jakrppis$C_wtxpyhvg;)V}
+    * @mapping {@literal named forEachEquippedEnchantment Lnet/minecraft/enchantment/EnchantmentHelper;forEachEquippedEnchantment(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/enchantment/EnchantmentHelper$ContextAwareConsumer;)V}
     */
-   private static void m_kvkboaps(LivingEntity arg, EnchantmentHelper.C_wtxpyhvg arg2) {
+   private static void forEachEquippedEnchantment(LivingEntity entity, EnchantmentHelper.ContextAwareConsumer enchantmentConsumer) {
       for (EquipmentSlot lv : EquipmentSlot.values()) {
-         m_xdjgfpqn(arg.getEquippedStack(lv), lv, arg, arg2);
+         forEachEnchantment(entity.getEquippedStack(lv), lv, entity, enchantmentConsumer);
       }
    }
 
    /**
     * @mapping {@literal hashed m_gqfvpbsm Lnet/minecraft/unmapped/C_jakrppis;m_gqfvpbsm(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z}
-    * @mapping {@literal named m_gqfvpbsm Lnet/minecraft/enchantment/EnchantmentHelper;m_gqfvpbsm(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;)Z}
+    * @mapping {@literal named getImmuneToDamageFrom Lnet/minecraft/enchantment/EnchantmentHelper;getImmuneToDamageFrom(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;)Z}
     */
-   public static boolean m_gqfvpbsm(ServerWorld world, LivingEntity arg2, DamageSource arg3) {
+   public static boolean getImmuneToDamageFrom(ServerWorld world, LivingEntity entity, DamageSource source) {
       MutableBoolean mutableBoolean = new MutableBoolean();
-      m_kvkboaps(arg2, (arg4, i, arg5) -> mutableBoolean.setValue(mutableBoolean.isTrue() || arg4.value().m_ujjglmjb(world, i, arg2, arg3)));
+      forEachEquippedEnchantment(
+         entity, (arg4, i, arg5) -> mutableBoolean.setValue(mutableBoolean.isTrue() || arg4.value().isImmuneToDamageFrom(world, i, entity, source))
+      );
       return mutableBoolean.isTrue();
    }
 
    /**
     * @mapping {@literal hashed m_jfbiswcz Lnet/minecraft/unmapped/C_jakrppis;m_jfbiswcz(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sbxfkpyv;)F}
-    * @mapping {@literal named m_jfbiswcz Lnet/minecraft/enchantment/EnchantmentHelper;m_jfbiswcz(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;)F}
+    * @mapping {@literal named getDamageProtection Lnet/minecraft/enchantment/EnchantmentHelper;getDamageProtection(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;)F}
     */
-   public static float m_jfbiswcz(ServerWorld world, LivingEntity arg2, DamageSource arg3) {
+   public static float getDamageProtection(ServerWorld world, LivingEntity entity, DamageSource source) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      m_kvkboaps(arg2, (arg4, i, arg5) -> arg4.value().m_ysnvykwd(world, i, arg5.itemStack(), arg2, arg3, mutableFloat));
+      forEachEquippedEnchantment(entity, (arg4, i, arg5) -> arg4.value().modifyDamageProtection(world, i, arg5.itemStack(), entity, source, mutableFloat));
       return mutableFloat.floatValue();
    }
 
    /**
     * @mapping {@literal hashed m_xevkkzlv Lnet/minecraft/unmapped/C_jakrppis;m_xevkkzlv(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;F)F}
-    * @mapping {@literal named m_xevkkzlv Lnet/minecraft/enchantment/EnchantmentHelper;m_xevkkzlv(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
+    * @mapping {@literal named getDamage Lnet/minecraft/enchantment/EnchantmentHelper;getDamage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
     */
-   public static float m_xevkkzlv(ServerWorld world, ItemStack stack, Entity arg3, DamageSource arg4, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg5, i) -> arg5.value().m_hhzjktgj(world, i, stack, arg3, arg4, mutableFloat));
+   public static float getDamage(ServerWorld world, ItemStack stack, Entity entity, DamageSource source, float baseDamage) {
+      MutableFloat mutableFloat = new MutableFloat(baseDamage);
+      forEachEnchantment(stack, (arg5, i) -> arg5.value().modifyDamage(world, i, stack, entity, source, mutableFloat));
       return mutableFloat.floatValue();
    }
 
    /**
     * @mapping {@literal hashed m_gihyytey Lnet/minecraft/unmapped/C_jakrppis;m_gihyytey(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;F)F}
-    * @mapping {@literal named m_gihyytey Lnet/minecraft/enchantment/EnchantmentHelper;m_gihyytey(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
+    * @mapping {@literal named getFallBasedDamage Lnet/minecraft/enchantment/EnchantmentHelper;getFallBasedDamage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
     */
-   public static float m_gihyytey(ServerWorld world, ItemStack stack, Entity arg3, DamageSource arg4, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg5, i) -> arg5.value().m_bycsoyig(world, i, stack, arg3, arg4, mutableFloat));
+   public static float getFallBasedDamage(ServerWorld world, ItemStack stack, Entity entity, DamageSource source, float baseDamage) {
+      MutableFloat mutableFloat = new MutableFloat(baseDamage);
+      forEachEnchantment(stack, (arg5, i) -> arg5.value().modifyFallBasedDamage(world, i, stack, entity, source, mutableFloat));
       return mutableFloat.floatValue();
    }
 
    /**
     * @mapping {@literal hashed m_rrxecqvc Lnet/minecraft/unmapped/C_jakrppis;m_rrxecqvc(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;F)F}
-    * @mapping {@literal named m_rrxecqvc Lnet/minecraft/enchantment/EnchantmentHelper;m_rrxecqvc(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
+    * @mapping {@literal named getArmorEffectiveness Lnet/minecraft/enchantment/EnchantmentHelper;getArmorEffectiveness(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
     */
-   public static float m_rrxecqvc(ServerWorld world, ItemStack stack, Entity arg3, DamageSource arg4, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg5, i) -> arg5.value().m_jaecftnx(world, i, stack, arg3, arg4, mutableFloat));
+   public static float getArmorEffectiveness(ServerWorld world, ItemStack stack, Entity entity, DamageSource source, float baseEffectiveness) {
+      MutableFloat mutableFloat = new MutableFloat(baseEffectiveness);
+      forEachEnchantment(stack, (arg5, i) -> arg5.value().modifyArmorEffectiveness(world, i, stack, entity, source, mutableFloat));
       return mutableFloat.floatValue();
    }
 
    /**
     * @mapping {@literal hashed m_imfnnaau Lnet/minecraft/unmapped/C_jakrppis;m_imfnnaau(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;F)F}
-    * @mapping {@literal named m_imfnnaau Lnet/minecraft/enchantment/EnchantmentHelper;m_imfnnaau(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
+    * @mapping {@literal named getKnockback Lnet/minecraft/enchantment/EnchantmentHelper;getKnockback(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;F)F}
     */
-   public static float m_imfnnaau(ServerWorld world, ItemStack stack, Entity arg3, DamageSource arg4, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg5, i) -> arg5.value().m_tehyavah(world, i, stack, arg3, arg4, mutableFloat));
+   public static float getKnockback(ServerWorld world, ItemStack stack, Entity entity, DamageSource source, float baseKnockback) {
+      MutableFloat mutableFloat = new MutableFloat(baseKnockback);
+      forEachEnchantment(stack, (arg5, i) -> arg5.value().modifyKnockback(world, i, stack, entity, source, mutableFloat));
       return mutableFloat.floatValue();
    }
 
    /**
     * @mapping {@literal hashed m_rixuxzms Lnet/minecraft/unmapped/C_jakrppis;m_rixuxzms(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V}
-    * @mapping {@literal named m_rixuxzms Lnet/minecraft/enchantment/EnchantmentHelper;m_rixuxzms(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;)V}
+    * @mapping {@literal named onEntityDamaged Lnet/minecraft/enchantment/EnchantmentHelper;onEntityDamaged(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;)V}
     */
-   public static void m_rixuxzms(ServerWorld world, Entity arg2, DamageSource arg3) {
-      if (arg3.getAttacker() instanceof LivingEntity lv) {
-         m_swhrpoib(world, arg2, arg3, lv.m_ywnmbdjz());
+   public static void onEntityDamaged(ServerWorld world, Entity entity, DamageSource source) {
+      if (source.getAttacker() instanceof LivingEntity lv) {
+         onEntityHitWithItem(world, entity, source, lv.getWeaponStack());
       } else {
-         m_swhrpoib(world, arg2, arg3, null);
+         onEntityHitWithItem(world, entity, source, null);
       }
    }
 
    /**
     * @mapping {@literal hashed m_swhrpoib Lnet/minecraft/unmapped/C_jakrppis;m_swhrpoib(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named m_swhrpoib Lnet/minecraft/enchantment/EnchantmentHelper;m_swhrpoib(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lnet/minecraft/item/ItemStack;)V}
+    * @mapping {@literal named onEntityHitWithItem Lnet/minecraft/enchantment/EnchantmentHelper;onEntityHitWithItem(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/damage/DamageSource;Lnet/minecraft/item/ItemStack;)V}
     */
-   public static void m_swhrpoib(ServerWorld world, Entity arg2, DamageSource arg3, @Nullable ItemStack stack) {
-      if (arg2 instanceof LivingEntity lv) {
-         m_kvkboaps(lv, (arg4, i, arg5) -> arg4.value().m_umpbrnfg(world, i, arg5, C_zjvjrddv.VICTIM, arg2, arg3));
+   public static void onEntityHitWithItem(ServerWorld world, Entity entity, DamageSource source, @Nullable ItemStack stack) {
+      if (entity instanceof LivingEntity lv) {
+         forEachEquippedEnchantment(lv, (arg4, i, arg5) -> arg4.value().onTargetHit(world, i, arg5, EnchantmentEffectTarget.VICTIM, entity, source));
       }
 
-      if (stack != null && arg3.getAttacker() instanceof LivingEntity lv2) {
-         m_xdjgfpqn(stack, EquipmentSlot.MAINHAND, lv2, (arg4, i, arg5) -> arg4.value().m_umpbrnfg(world, i, arg5, C_zjvjrddv.ATTACKER, arg2, arg3));
+      if (stack != null && source.getAttacker() instanceof LivingEntity lv2) {
+         forEachEnchantment(
+            stack, EquipmentSlot.MAINHAND, lv2, (arg4, i, arg5) -> arg4.value().onTargetHit(world, i, arg5, EnchantmentEffectTarget.ATTACKER, entity, source)
+         );
       }
    }
 
    /**
     * @mapping {@literal hashed m_unfnerqk Lnet/minecraft/unmapped/C_jakrppis;m_unfnerqk(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)V}
-    * @mapping {@literal named m_unfnerqk Lnet/minecraft/enchantment/EnchantmentHelper;m_unfnerqk(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)V}
+    * @mapping {@literal named applyLocationBasedEffects Lnet/minecraft/enchantment/EnchantmentHelper;applyLocationBasedEffects(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)V}
     */
-   public static void m_unfnerqk(ServerWorld world, LivingEntity arg2) {
-      m_kvkboaps(arg2, (arg3, i, arg4) -> arg3.value().m_mfxiclqq(world, i, arg4, arg2));
+   public static void applyLocationBasedEffects(ServerWorld world, LivingEntity entity) {
+      forEachEquippedEnchantment(entity, (arg3, i, arg4) -> arg3.value().applyLocationBasedEffects(world, i, arg4, entity));
    }
 
    /**
     * @mapping {@literal hashed m_aqtkrfxn Lnet/minecraft/unmapped/C_jakrppis;m_aqtkrfxn(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)V}
-    * @mapping {@literal named m_aqtkrfxn Lnet/minecraft/enchantment/EnchantmentHelper;m_aqtkrfxn(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;)V}
+    * @mapping {@literal named applyLocationBasedEffects Lnet/minecraft/enchantment/EnchantmentHelper;applyLocationBasedEffects(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
-   public static void m_aqtkrfxn(ServerWorld world, ItemStack stack, LivingEntity owner, EquipmentSlot inSlot) {
-      m_xdjgfpqn(stack, inSlot, owner, (arg3, i, arg4) -> arg3.value().m_mfxiclqq(world, i, arg4, owner));
+   public static void applyLocationBasedEffects(ServerWorld world, ItemStack stack, LivingEntity owner, EquipmentSlot inSlot) {
+      forEachEnchantment(stack, inSlot, owner, (arg3, i, arg4) -> arg3.value().applyLocationBasedEffects(world, i, arg4, owner));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rgjmrwbl Lnet/minecraft/unmapped/C_jakrppis;m_rgjmrwbl(Lnet/minecraft/unmapped/C_usxaxydn;)V}
+    * @mapping {@literal named removeLocationBasedEffects Lnet/minecraft/enchantment/EnchantmentHelper;removeLocationBasedEffects(Lnet/minecraft/entity/LivingEntity;)V}
     */
-   public static void m_rgjmrwbl(LivingEntity arg) {
-      m_kvkboaps(arg, (arg2, i, arg3) -> arg2.value().m_auqlyhrd(i, arg3, arg));
+   public static void removeLocationBasedEffects(LivingEntity entity) {
+      forEachEquippedEnchantment(entity, (arg2, i, arg3) -> arg2.value().removeLocationBasedEffects(i, arg3, entity));
    }
 
    /**
     * @mapping {@literal hashed m_rpbekwgr Lnet/minecraft/unmapped/C_jakrppis;m_rpbekwgr(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_yuycoehb;)V}
-    * @mapping {@literal named m_rpbekwgr Lnet/minecraft/enchantment/EnchantmentHelper;m_rpbekwgr(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;)V}
+    * @mapping {@literal named removeLocationBasedEffects Lnet/minecraft/enchantment/EnchantmentHelper;removeLocationBasedEffects(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
-   public static void m_rpbekwgr(ItemStack stack, LivingEntity owner, EquipmentSlot inSlot) {
-      m_xdjgfpqn(stack, inSlot, owner, (arg2, i, arg3) -> arg2.value().m_auqlyhrd(i, arg3, owner));
+   public static void removeLocationBasedEffects(ItemStack stack, LivingEntity owner, EquipmentSlot inSlot) {
+      forEachEnchantment(stack, inSlot, owner, (arg2, i, arg3) -> arg2.value().removeLocationBasedEffects(i, arg3, owner));
    }
 
    /**
     * @mapping {@literal hashed m_anckqezf Lnet/minecraft/unmapped/C_jakrppis;m_anckqezf(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)V}
-    * @mapping {@literal named m_anckqezf Lnet/minecraft/enchantment/EnchantmentHelper;m_anckqezf(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)V}
+    * @mapping {@literal named tick Lnet/minecraft/enchantment/EnchantmentHelper;tick(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)V}
     */
-   public static void m_anckqezf(ServerWorld world, LivingEntity arg2) {
-      m_kvkboaps(arg2, (arg3, i, arg4) -> arg3.value().m_laluoqcj(world, i, arg4, arg2));
+   public static void tick(ServerWorld world, LivingEntity entity) {
+      forEachEquippedEnchantment(entity, (arg3, i, arg4) -> arg3.value().tick(world, i, arg4, entity));
    }
 
    /**
     * @mapping {@literal hashed m_wfidublc Lnet/minecraft/unmapped/C_jakrppis;m_wfidublc(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_usxaxydn;)I}
-    * @mapping {@literal named m_wfidublc Lnet/minecraft/enchantment/EnchantmentHelper;m_wfidublc(Lnet/minecraft/registry/Holder;Lnet/minecraft/entity/LivingEntity;)I}
+    * @mapping {@literal named getHighestEquippedLevel Lnet/minecraft/enchantment/EnchantmentHelper;getHighestEquippedLevel(Lnet/minecraft/registry/Holder;Lnet/minecraft/entity/LivingEntity;)I}
     */
-   public static int m_wfidublc(Holder<Enchantment> arg, LivingEntity entity) {
-      Iterable<ItemStack> iterable = arg.value().getEquipment(entity).values();
+   public static int getHighestEquippedLevel(Holder<Enchantment> enchantment, LivingEntity entity) {
+      Iterable<ItemStack> iterable = enchantment.value().getEquipment(entity).values();
       int i = 0;
 
       for (ItemStack lv : iterable) {
-         int j = m_byjosehc(arg, lv);
+         int j = getLevel(enchantment, lv);
          if (j > i) {
             i = j;
          }
@@ -357,93 +362,93 @@
 
    /**
     * @mapping {@literal hashed m_hsagtbhc Lnet/minecraft/unmapped/C_jakrppis;m_hsagtbhc(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;I)I}
-    * @mapping {@literal named m_hsagtbhc Lnet/minecraft/enchantment/EnchantmentHelper;m_hsagtbhc(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;I)I}
+    * @mapping {@literal named getProjectileCount Lnet/minecraft/enchantment/EnchantmentHelper;getProjectileCount(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;I)I}
     */
-   public static int m_hsagtbhc(ServerWorld world, ItemStack stack, Entity arg3, int i) {
-      MutableFloat mutableFloat = new MutableFloat((float)i);
-      m_akhrohzh(stack, (arg4, ix) -> arg4.value().m_kevrabge(world, ix, stack, arg3, mutableFloat));
+   public static int getProjectileCount(ServerWorld world, ItemStack stack, Entity entity, int baseCount) {
+      MutableFloat mutableFloat = new MutableFloat((float)baseCount);
+      forEachEnchantment(stack, (arg4, i) -> arg4.value().modifyProjectileCount(world, i, stack, entity, mutableFloat));
       return Math.max(0, mutableFloat.intValue());
    }
 
    /**
     * @mapping {@literal hashed m_lkbuzftr Lnet/minecraft/unmapped/C_jakrppis;m_lkbuzftr(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;F)F}
-    * @mapping {@literal named m_lkbuzftr Lnet/minecraft/enchantment/EnchantmentHelper;m_lkbuzftr(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;F)F}
+    * @mapping {@literal named getProjectileSpeed Lnet/minecraft/enchantment/EnchantmentHelper;getProjectileSpeed(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;F)F}
     */
-   public static float m_lkbuzftr(ServerWorld world, ItemStack stack, Entity arg3, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_zlpziyyk(world, i, stack, arg3, mutableFloat));
+   public static float getProjectileSpeed(ServerWorld world, ItemStack stack, Entity entity, float baseSpeed) {
+      MutableFloat mutableFloat = new MutableFloat(baseSpeed);
+      forEachEnchantment(stack, (arg4, i) -> arg4.value().modifyProjectileSpread(world, i, stack, entity, mutableFloat));
       return Math.max(0.0F, mutableFloat.floatValue());
    }
 
    /**
     * @mapping {@literal hashed m_hilwldki Lnet/minecraft/unmapped/C_jakrppis;m_hilwldki(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)I}
-    * @mapping {@literal named m_hilwldki Lnet/minecraft/enchantment/EnchantmentHelper;m_hilwldki(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)I}
+    * @mapping {@literal named getProjectilePiercing Lnet/minecraft/enchantment/EnchantmentHelper;getProjectilePiercing(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)I}
     */
-   public static int m_hilwldki(ServerWorld world, ItemStack arg2, ItemStack arg3) {
+   public static int getProjectilePiercing(ServerWorld world, ItemStack weapon, ItemStack projectile) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      m_akhrohzh(arg2, (arg3x, i) -> ((Enchantment)arg3x.value()).m_iehcgemg(world, i, arg3, mutableFloat));
+      forEachEnchantment(weapon, (arg3, i) -> arg3.value().modifyProjectilePiercing(world, i, projectile, mutableFloat));
       return Math.max(0, mutableFloat.intValue());
    }
 
    /**
     * @mapping {@literal hashed m_yolmdyfp Lnet/minecraft/unmapped/C_jakrppis;m_yolmdyfp(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_gstiksvs;Ljava/util/function/Consumer;)V}
-    * @mapping {@literal named m_yolmdyfp Lnet/minecraft/enchantment/EnchantmentHelper;m_yolmdyfp(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/projectile/PersistentProjectileEntity;Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named onProjectileSpawned Lnet/minecraft/enchantment/EnchantmentHelper;onProjectileSpawned(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/projectile/PersistentProjectileEntity;Ljava/util/function/Consumer;)V}
     */
-   public static void m_yolmdyfp(ServerWorld world, ItemStack stack, PersistentProjectileEntity arg3, java.util.function.Consumer<Item> consumer) {
-      LivingEntity lv2 = arg3.getOwner() instanceof LivingEntity lv ? lv : null;
-      C_pjrjvgrp lv3 = new C_pjrjvgrp(stack, null, lv2, consumer);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_dgttciah(world, i, lv3, arg3));
+   public static void onProjectileSpawned(ServerWorld world, ItemStack stack, PersistentProjectileEntity projectile, java.util.function.Consumer<Item> onBreak) {
+      LivingEntity lv2 = projectile.getOwner() instanceof LivingEntity lv ? lv : null;
+      EnchantmentEffectContext lv3 = new EnchantmentEffectContext(stack, null, lv2, onBreak);
+      forEachEnchantment(stack, (arg4, i) -> arg4.value().onProjectileSpawned(world, i, lv3, projectile));
    }
 
    /**
     * @mapping {@literal hashed m_etohkgai Lnet/minecraft/unmapped/C_jakrppis;m_etohkgai(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_txtbiemp;Ljava/util/function/Consumer;)V}
-    * @mapping {@literal named m_etohkgai Lnet/minecraft/enchantment/EnchantmentHelper;m_etohkgai(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/block/BlockState;Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named onHitBlock Lnet/minecraft/enchantment/EnchantmentHelper;onHitBlock(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/block/BlockState;Ljava/util/function/Consumer;)V}
     */
-   public static void m_etohkgai(
+   public static void onHitBlock(
       ServerWorld world,
       ItemStack stack,
       @Nullable LivingEntity owner,
-      Entity arg4,
+      Entity entity,
       @Nullable EquipmentSlot inSlot,
-      Vec3d arg6,
+      Vec3d pos,
       BlockState state,
       java.util.function.Consumer<Item> onBreak
    ) {
-      C_pjrjvgrp lv = new C_pjrjvgrp(stack, inSlot, owner, onBreak);
-      m_akhrohzh(stack, (arg6x, i) -> ((Enchantment)arg6x.value()).m_ovgqiywz(world, i, lv, arg4, arg6, state));
+      EnchantmentEffectContext lv = new EnchantmentEffectContext(stack, inSlot, owner, onBreak);
+      forEachEnchantment(stack, (arg6, i) -> arg6.value().onHitBlock(world, i, lv, entity, pos, state));
    }
 
    /**
     * @mapping {@literal hashed m_efgilggg Lnet/minecraft/unmapped/C_jakrppis;m_efgilggg(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;I)I}
-    * @mapping {@literal named m_efgilggg Lnet/minecraft/enchantment/EnchantmentHelper;m_efgilggg(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I}
+    * @mapping {@literal named getRepairFromXp Lnet/minecraft/enchantment/EnchantmentHelper;getRepairFromXp(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I}
     */
-   public static int m_efgilggg(ServerWorld world, ItemStack stack, int i) {
-      MutableFloat mutableFloat = new MutableFloat((float)i);
-      m_akhrohzh(stack, (arg3, ix) -> arg3.value().m_zzkivipg(world, ix, stack, mutableFloat));
+   public static int getRepairFromXp(ServerWorld world, ItemStack stack, int baseRepair) {
+      MutableFloat mutableFloat = new MutableFloat((float)baseRepair);
+      forEachEnchantment(stack, (arg3, i) -> arg3.value().modifyRepairFromXp(world, i, stack, mutableFloat));
       return Math.max(0, mutableFloat.intValue());
    }
 
    /**
     * @mapping {@literal hashed m_wbtbmiwo Lnet/minecraft/unmapped/C_jakrppis;m_wbtbmiwo(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sbxfkpyv;F)F}
-    * @mapping {@literal named m_wbtbmiwo Lnet/minecraft/enchantment/EnchantmentHelper;m_wbtbmiwo(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;F)F}
+    * @mapping {@literal named getEquipmentDropChance Lnet/minecraft/enchantment/EnchantmentHelper;getEquipmentDropChance(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;F)F}
     */
-   public static float m_wbtbmiwo(ServerWorld world, LivingEntity arg2, DamageSource arg3, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      RandomGenerator lv = arg2.m_dlwxaobh();
-      m_kvkboaps(arg2, (arg5, i, arg6) -> {
-         LootContext lvx = Enchantment.m_yyvgkyyg(world, i, arg2, arg3);
-         arg5.value().m_tujulygf(C_rkxlblfn.EQUIPMENT_DROPS).forEach(arg3xx -> {
-            if (arg3xx.enchanted() == C_zjvjrddv.VICTIM && arg3xx.affected() == C_zjvjrddv.VICTIM && arg3xx.m_sbmzbkam(lvx)) {
-               mutableFloat.setValue(((C_nzjqewao)arg3xx.effect()).m_usnsfqay(i, lv, mutableFloat.floatValue()));
+   public static float getEquipmentDropChance(ServerWorld world, LivingEntity attacker, DamageSource source, float baseDropChance) {
+      MutableFloat mutableFloat = new MutableFloat(baseDropChance);
+      RandomGenerator lv = attacker.getRandom();
+      forEachEquippedEnchantment(attacker, (arg5, i, arg6) -> {
+         LootContext lvx = Enchantment.createDamageContext(world, i, attacker, source);
+         arg5.value().getEffect(EnchantmentEffectComponentTypes.EQUIPMENT_DROPS).forEach(arg3x -> {
+            if (arg3x.enchanted() == EnchantmentEffectTarget.VICTIM && arg3x.affected() == EnchantmentEffectTarget.VICTIM && arg3x.matches(lvx)) {
+               mutableFloat.setValue(((EnchantmentValueEffect)arg3x.effect()).apply(i, lv, mutableFloat.floatValue()));
             }
          });
       });
-      if (arg3.getAttacker() instanceof LivingEntity lv3) {
-         m_kvkboaps(lv3, (arg5, i, arg6) -> {
-            LootContext lvx = Enchantment.m_yyvgkyyg(world, i, arg2, arg3);
-            arg5.value().m_tujulygf(C_rkxlblfn.EQUIPMENT_DROPS).forEach(arg3xx -> {
-               if (arg3xx.enchanted() == C_zjvjrddv.ATTACKER && arg3xx.affected() == C_zjvjrddv.VICTIM && arg3xx.m_sbmzbkam(lvx)) {
-                  mutableFloat.setValue(((C_nzjqewao)arg3xx.effect()).m_usnsfqay(i, lv, mutableFloat.floatValue()));
+      if (source.getAttacker() instanceof LivingEntity lv3) {
+         forEachEquippedEnchantment(lv3, (arg5, i, arg6) -> {
+            LootContext lvx = Enchantment.createDamageContext(world, i, attacker, source);
+            arg5.value().getEffect(EnchantmentEffectComponentTypes.EQUIPMENT_DROPS).forEach(arg3x -> {
+               if (arg3x.enchanted() == EnchantmentEffectTarget.ATTACKER && arg3x.affected() == EnchantmentEffectTarget.VICTIM && arg3x.matches(lvx)) {
+                  mutableFloat.setValue(((EnchantmentValueEffect)arg3x.effect()).apply(i, lv, mutableFloat.floatValue()));
                }
             });
          });
@@ -454,88 +459,90 @@
 
    /**
     * @mapping {@literal hashed m_cjzxcjvw Lnet/minecraft/unmapped/C_jakrppis;m_cjzxcjvw(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_qfoqahef;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_cjzxcjvw Lnet/minecraft/enchantment/EnchantmentHelper;m_cjzxcjvw(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlotGroup;Ljava/util/function/BiConsumer;)V}
+    * @mapping {@literal named applyAttributeModifiers Lnet/minecraft/enchantment/EnchantmentHelper;applyAttributeModifiers(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlotGroup;Ljava/util/function/BiConsumer;)V}
     */
-   public static void m_cjzxcjvw(ItemStack stack, EquipmentSlotGroup arg2, BiConsumer<Holder<EntityAttribute>, EntityAttributeModifier> biConsumer) {
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_tujulygf(C_rkxlblfn.ATTRIBUTES).forEach(arg3 -> {
-            if (((Enchantment)arg2x.value()).definition().slots().contains(arg2)) {
-               biConsumer.accept(arg3.attribute(), arg3.m_sepzipgo(i, arg2));
+   public static void applyAttributeModifiers(
+      ItemStack stack, EquipmentSlotGroup group, BiConsumer<Holder<EntityAttribute>, EntityAttributeModifier> applicator
+   ) {
+      forEachEnchantment(stack, (arg2, i) -> arg2.value().getEffect(EnchantmentEffectComponentTypes.ATTRIBUTES).forEach(arg3 -> {
+            if (((Enchantment)arg2.value()).definition().slots().contains(group)) {
+               applicator.accept(arg3.attribute(), arg3.createModifier(i, group));
             }
          }));
    }
 
    /**
     * @mapping {@literal hashed m_zkmvjzhi Lnet/minecraft/unmapped/C_jakrppis;m_zkmvjzhi(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;Ljava/util/function/BiConsumer;)V}
-    * @mapping {@literal named m_zkmvjzhi Lnet/minecraft/enchantment/EnchantmentHelper;m_zkmvjzhi(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;Ljava/util/function/BiConsumer;)V}
+    * @mapping {@literal named applyAttributeModifiers Lnet/minecraft/enchantment/EnchantmentHelper;applyAttributeModifiers(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;Ljava/util/function/BiConsumer;)V}
     */
-   public static void m_zkmvjzhi(ItemStack stack, EquipmentSlot arg2, BiConsumer<Holder<EntityAttribute>, EntityAttributeModifier> biConsumer) {
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_tujulygf(C_rkxlblfn.ATTRIBUTES).forEach(arg3 -> {
-            if (((Enchantment)arg2x.value()).m_jhglsmkm(arg2)) {
-               biConsumer.accept(arg3.attribute(), arg3.m_sepzipgo(i, arg2));
+   public static void applyAttributeModifiers(ItemStack stack, EquipmentSlot slot, BiConsumer<Holder<EntityAttribute>, EntityAttributeModifier> applicator) {
+      forEachEnchantment(stack, (arg2, i) -> arg2.value().getEffect(EnchantmentEffectComponentTypes.ATTRIBUTES).forEach(arg3 -> {
+            if (((Enchantment)arg2.value()).matchesSlot(slot)) {
+               applicator.accept(arg3.attribute(), arg3.createModifier(i, slot));
             }
          }));
    }
 
    /**
     * @mapping {@literal hashed m_qhyhygvf Lnet/minecraft/unmapped/C_jakrppis;m_qhyhygvf(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;)I}
-    * @mapping {@literal named m_qhyhygvf Lnet/minecraft/enchantment/EnchantmentHelper;m_qhyhygvf(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;)I}
+    * @mapping {@literal named getFishingLuckBonus Lnet/minecraft/enchantment/EnchantmentHelper;getFishingLuckBonus(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;)I}
     */
-   public static int m_qhyhygvf(ServerWorld world, ItemStack stack, Entity arg3) {
+   public static int getFishingLuckBonus(ServerWorld world, ItemStack stack, Entity entity) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_kpljywnw(world, i, stack, arg3, mutableFloat));
+      forEachEnchantment(stack, (arg4, i) -> arg4.value().modifyFishingLuckBonus(world, i, stack, entity, mutableFloat));
       return Math.max(0, mutableFloat.intValue());
    }
 
    /**
     * @mapping {@literal hashed m_eordtwww Lnet/minecraft/unmapped/C_jakrppis;m_eordtwww(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;)F}
-    * @mapping {@literal named m_eordtwww Lnet/minecraft/enchantment/EnchantmentHelper;m_eordtwww(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;)F}
+    * @mapping {@literal named getFishingTimeReduction Lnet/minecraft/enchantment/EnchantmentHelper;getFishingTimeReduction(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;)F}
     */
-   public static float m_eordtwww(ServerWorld world, ItemStack stack, Entity arg3) {
+   public static float getFishingTimeReduction(ServerWorld world, ItemStack stack, Entity entity) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_sswkpgks(world, i, stack, arg3, mutableFloat));
+      forEachEnchantment(stack, (arg4, i) -> arg4.value().modifyFishingTimeReduction(world, i, stack, entity, mutableFloat));
       return Math.max(0.0F, mutableFloat.floatValue());
    }
 
    /**
     * @mapping {@literal hashed m_zrsoxtbx Lnet/minecraft/unmapped/C_jakrppis;m_zrsoxtbx(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;)I}
-    * @mapping {@literal named m_zrsoxtbx Lnet/minecraft/enchantment/EnchantmentHelper;m_zrsoxtbx(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;)I}
+    * @mapping {@literal named getTridentReturnAcceleration Lnet/minecraft/enchantment/EnchantmentHelper;getTridentReturnAcceleration(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/Entity;)I}
     */
-   public static int m_zrsoxtbx(ServerWorld world, ItemStack stack, Entity arg3) {
+   public static int getTridentReturnAcceleration(ServerWorld world, ItemStack stack, Entity entity) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_tdrqsuwy(world, i, stack, arg3, mutableFloat));
+      forEachEnchantment(stack, (arg4, i) -> arg4.value().modifyTridentReturnAcceleration(world, i, stack, entity, mutableFloat));
       return Math.max(0, mutableFloat.intValue());
    }
 
    /**
     * @mapping {@literal hashed m_kcdilbhw Lnet/minecraft/unmapped/C_jakrppis;m_kcdilbhw(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;F)F}
-    * @mapping {@literal named m_kcdilbhw Lnet/minecraft/enchantment/EnchantmentHelper;m_kcdilbhw(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;F)F}
+    * @mapping {@literal named getCrossbowChargeTime Lnet/minecraft/enchantment/EnchantmentHelper;getCrossbowChargeTime(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;F)F}
     */
-   public static float m_kcdilbhw(ItemStack stack, LivingEntity arg2, float f) {
-      MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_bhhtcbyx(arg2.m_dlwxaobh(), i, mutableFloat));
+   public static float getCrossbowChargeTime(ItemStack stack, LivingEntity entity, float baseChargeTime) {
+      MutableFloat mutableFloat = new MutableFloat(baseChargeTime);
+      forEachEnchantment(stack, (arg2, i) -> arg2.value().modifyCrossbowChargeTime(entity.getRandom(), i, mutableFloat));
       return Math.max(0.0F, mutableFloat.floatValue());
    }
 
    /**
     * @mapping {@literal hashed m_urcuarne Lnet/minecraft/unmapped/C_jakrppis;m_urcuarne(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)F}
-    * @mapping {@literal named m_urcuarne Lnet/minecraft/enchantment/EnchantmentHelper;m_urcuarne(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;)F}
+    * @mapping {@literal named getTridentSpinAttackStrength Lnet/minecraft/enchantment/EnchantmentHelper;getTridentSpinAttackStrength(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;)F}
     */
-   public static float m_urcuarne(ItemStack stack, LivingEntity arg2) {
+   public static float getTridentSpinAttackStrength(ItemStack stack, LivingEntity entity) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_stvdursa(arg2.m_dlwxaobh(), i, mutableFloat));
+      forEachEnchantment(stack, (arg2, i) -> arg2.value().modifyTridentSpinAttackStrength(entity.getRandom(), i, mutableFloat));
       return mutableFloat.floatValue();
    }
 
    /**
     * @mapping {@literal hashed m_ruiicrds Lnet/minecraft/unmapped/C_jakrppis;m_ruiicrds(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ednuhnnn;)Z}
-    * @mapping {@literal named m_ruiicrds Lnet/minecraft/enchantment/EnchantmentHelper;m_ruiicrds(Lnet/minecraft/item/ItemStack;Lnet/minecraft/registry/tag/TagKey;)Z}
+    * @mapping {@literal named hasTag Lnet/minecraft/enchantment/EnchantmentHelper;hasTag(Lnet/minecraft/item/ItemStack;Lnet/minecraft/registry/tag/TagKey;)Z}
     */
-   public static boolean m_ruiicrds(ItemStack stack, TagKey<Enchantment> arg2) {
+   public static boolean hasTag(ItemStack stack, TagKey<Enchantment> enchantment) {
       ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
 
       for (Entry<Holder<Enchantment>> entry : lv.getEnchantmentEntries()) {
          Holder<Enchantment> lv2 = (Holder<Enchantment>)entry.getKey();
-         if (lv2.isIn(arg2)) {
+         if (lv2.isIn(enchantment)) {
             return true;
          }
       }
@@ -545,12 +552,12 @@
 
    /**
     * @mapping {@literal hashed m_plpqcodb Lnet/minecraft/unmapped/C_jakrppis;m_plpqcodb(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_pscqxfcs;)Z}
-    * @mapping {@literal named m_plpqcodb Lnet/minecraft/enchantment/EnchantmentHelper;m_plpqcodb(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/DataComponentType;)Z}
+    * @mapping {@literal named has Lnet/minecraft/enchantment/EnchantmentHelper;has(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/DataComponentType;)Z}
     */
-   public static boolean m_plpqcodb(ItemStack stack, DataComponentType<?> arg2) {
+   public static boolean has(ItemStack stack, DataComponentType<?> componentType) {
       MutableBoolean mutableBoolean = new MutableBoolean(false);
-      m_akhrohzh(stack, (arg2x, i) -> {
-         if (((Enchantment)arg2x.value()).effects().contains(arg2)) {
+      forEachEnchantment(stack, (arg2, i) -> {
+         if (arg2.value().effects().contains(componentType)) {
             mutableBoolean.setTrue();
          }
       });
@@ -559,10 +566,10 @@
 
    /**
     * @mapping {@literal hashed m_pbsmenak Lnet/minecraft/unmapped/C_jakrppis;m_pbsmenak(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/Optional;}
-    * @mapping {@literal named m_pbsmenak Lnet/minecraft/enchantment/EnchantmentHelper;m_pbsmenak(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/DataComponentType;)Ljava/util/Optional;}
+    * @mapping {@literal named pickHighestLevel Lnet/minecraft/enchantment/EnchantmentHelper;pickHighestLevel(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/DataComponentType;)Ljava/util/Optional;}
     */
-   public static <T> Optional<T> m_pbsmenak(ItemStack stack, DataComponentType<List<T>> arg2) {
-      Pair<List<T>, Integer> pair = m_hkpckyyg(stack, arg2);
+   public static <T> Optional<T> pickHighestLevel(ItemStack stack, DataComponentType<List<T>> componentType) {
+      Pair<List<T>, Integer> pair = getHighestLevel(stack, componentType);
       if (pair != null) {
          List<T> list = pair.getFirst();
          int i = pair.getSecond();
@@ -574,14 +581,14 @@
 
    /**
     * @mapping {@literal hashed m_hkpckyyg Lnet/minecraft/unmapped/C_jakrppis;m_hkpckyyg(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_pscqxfcs;)Lcom/mojang/datafixers/util/Pair;}
-    * @mapping {@literal named m_hkpckyyg Lnet/minecraft/enchantment/EnchantmentHelper;m_hkpckyyg(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/DataComponentType;)Lcom/mojang/datafixers/util/Pair;}
+    * @mapping {@literal named getHighestLevel Lnet/minecraft/enchantment/EnchantmentHelper;getHighestLevel(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/DataComponentType;)Lcom/mojang/datafixers/util/Pair;}
     */
    @Nullable
-   public static <T> Pair<T, Integer> m_hkpckyyg(ItemStack stack, DataComponentType<T> arg2) {
+   public static <T> Pair<T, Integer> getHighestLevel(ItemStack stack, DataComponentType<T> componentType) {
       MutableObject<Pair<T, Integer>> mutableObject = new MutableObject<>();
-      m_akhrohzh(stack, (arg2x, i) -> {
+      forEachEnchantment(stack, (arg2, i) -> {
          if (mutableObject.getValue() == null || mutableObject.getValue().getSecond() < i) {
-            T object = ((Enchantment)arg2x.value()).effects().get(arg2);
+            T object = arg2.value().effects().get(componentType);
             if (object != null) {
                mutableObject.setValue(Pair.of(object, i));
             }
@@ -591,26 +598,29 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_obijpcqw Lnet/minecraft/unmapped/C_jakrppis;m_obijpcqw(Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_usxaxydn;Ljava/util/function/Predicate;)Ljava/util/Optional;}
+    * @mapping {@literal named getContextForRandomEquipmentWith Lnet/minecraft/enchantment/EnchantmentHelper;getContextForRandomEquipmentWith(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/entity/LivingEntity;Ljava/util/function/Predicate;)Ljava/util/Optional;}
     */
-   public static Optional<C_pjrjvgrp> m_obijpcqw(DataComponentType<?> arg, LivingEntity arg2, Predicate<ItemStack> predicate) {
-      List<C_pjrjvgrp> list = new ArrayList();
+   public static Optional<EnchantmentEffectContext> getContextForRandomEquipmentWith(
+      DataComponentType<?> componentType, LivingEntity entity, Predicate<ItemStack> stackPredicate
+   ) {
+      List<EnchantmentEffectContext> list = new ArrayList();
 
       for (EquipmentSlot lv : EquipmentSlot.values()) {
-         ItemStack lv2 = arg2.getEquippedStack(lv);
-         if (predicate.test(lv2)) {
+         ItemStack lv2 = entity.getEquippedStack(lv);
+         if (stackPredicate.test(lv2)) {
             ItemEnchantmentsComponent lv3 = lv2.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
 
             for (Entry<Holder<Enchantment>> entry : lv3.getEnchantmentEntries()) {
                Holder<Enchantment> lv4 = (Holder<Enchantment>)entry.getKey();
-               if (lv4.value().effects().contains(arg) && lv4.value().m_jhglsmkm(lv)) {
-                  list.add(new C_pjrjvgrp(lv2, lv, arg2));
+               if (lv4.value().effects().contains(componentType) && lv4.value().matchesSlot(lv)) {
+                  list.add(new EnchantmentEffectContext(lv2, lv, entity));
                }
             }
          }
       }
 
-      return Util.getRandomOrEmpty(list, arg2.m_dlwxaobh());
+      return Util.getRandomOrEmpty(list, entity.getRandom());
    }
 
    /**
@@ -645,31 +655,32 @@
 
    /**
     * @mapping {@literal hashed m_zzbecydw Lnet/minecraft/unmapped/C_jakrppis;m_zzbecydw(Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named m_zzbecydw Lnet/minecraft/enchantment/EnchantmentHelper;m_zzbecydw(Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/item/ItemStack;ILnet/minecraft/registry/DynamicRegistryManager;Ljava/util/Optional;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named enchant Lnet/minecraft/enchantment/EnchantmentHelper;enchant(Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/item/ItemStack;ILnet/minecraft/registry/DynamicRegistryManager;Ljava/util/Optional;)Lnet/minecraft/item/ItemStack;}
     */
-   public static ItemStack m_zzbecydw(
-      RandomGenerator random, ItemStack stack, int i, DynamicRegistryManager registryManager, Optional<? extends HolderSet<Enchantment>> optional
+   public static ItemStack enchant(
+      RandomGenerator random, ItemStack stack, int level, DynamicRegistryManager registryManager, Optional<? extends HolderSet<Enchantment>> enchantments
    ) {
-      return m_xnhbdqna(
+      return enchant(
          random,
          stack,
-         i,
-         (Stream<Holder<Enchantment>>)optional.map(HolderSet::stream).orElseGet(() -> registryManager.get(RegistryKeys.ENCHANTMENT).holders().map(arg -> arg))
+         level,
+         (Stream<Holder<Enchantment>>)enchantments.map(HolderSet::stream)
+            .orElseGet(() -> registryManager.get(RegistryKeys.ENCHANTMENT).holders().map(arg -> arg))
       );
    }
 
    /**
     * @mapping {@literal hashed m_xnhbdqna Lnet/minecraft/unmapped/C_jakrppis;m_xnhbdqna(Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;ILjava/util/stream/Stream;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named m_xnhbdqna Lnet/minecraft/enchantment/EnchantmentHelper;m_xnhbdqna(Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/item/ItemStack;ILjava/util/stream/Stream;)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named enchant Lnet/minecraft/enchantment/EnchantmentHelper;enchant(Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/item/ItemStack;ILjava/util/stream/Stream;)Lnet/minecraft/item/ItemStack;}
     */
-   public static ItemStack m_xnhbdqna(RandomGenerator random, ItemStack stack, int i, Stream<Holder<Enchantment>> stream) {
-      List<EnchantmentLevelEntry> list = m_udfcqeza(random, stack, i, stream);
+   public static ItemStack enchant(RandomGenerator random, ItemStack stack, int level, Stream<Holder<Enchantment>> possibleEnchantments) {
+      List<EnchantmentLevelEntry> list = generateEnchantments(random, stack, level, possibleEnchantments);
       if (stack.isOf(Items.BOOK)) {
          stack = new ItemStack(Items.ENCHANTED_BOOK);
       }
 

The diff for this file is not complete!

The remaining diff is too long!

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_htakvyyx FUSE Lnet/minecraft/unmapped/C_rinmcaxy;
     	FIELD f_kbwbaeda causingEntity Lnet/minecraft/unmapped/C_usxaxydn;
     	FIELD f_nglvtdks BLOCK_STATE_KEY Ljava/lang/String;
+    	FIELD f_ryozcxns usedPortal Z
     	FIELD f_tifoqahe FUSE_KEY Ljava/lang/String;
     	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;DDDLnet/minecraft/unmapped/C_usxaxydn;)V
     		ARG 1 world
@@ Expand All @@
     		ARG 6 z
     		ARG 8 igniter
     	METHOD m_eexfdliv getFuse ()I
+    	METHOD m_mzqvctrw setUsedPortal (Z)V
+    		ARG 1 usedPortal
     	METHOD m_quxfdrbw explode ()V
     	METHOD m_tiajjtwm setFuse (I)V
     		ARG 1 fuse
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_epnzhhem EXPLOSION_BEHAVIOR Lnet/minecraft/unmapped/C_dmexlawk;
     	FIELD f_phhjsqan deflectCooldown I
     	FIELD f_ptkglokr EXPLOSION_POWER F
+    	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;DDDLnet/minecraft/unmapped/C_vgpupfxx;)V
+    		ARG 2 x
+    		ARG 4 y
+    		ARG 6 z
+    		ARG 8 velocity

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_bkeyoylk speed F
     	FIELD f_fqkxixwg HORIZONTAL_RANGE I
     	FIELD f_iynajoye MAX_RUN_TIME I
+    	FIELD f_rcpxgapc damageTypeGetter Ljava/util/function/Function;
     	FIELD f_trxuqcna VERTICAL_RANGE I
     	FIELD f_wcvudbwu MIN_RUN_TIME I
     	METHOD <init> (F)V
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_gotokljs active Z
     	FIELD f_gvozgbas targetX D
     	FIELD f_hpmxvyiq targetZ D
+    	FIELD f_lqzvnbrm damageTypeGetter Ljava/util/function/Function;
     	FIELD f_najlgwjk targetY D
     	FIELD f_svbrvkbw speed D
     	FIELD f_ypymgqlx WATER_CHECK_DISTANCE_VERTICAL I
     	METHOD <init> (Lnet/minecraft/unmapped/C_hqdayibh;D)V
     		ARG 1 mob
     		ARG 2 speed
+    	METHOD <init> (Lnet/minecraft/unmapped/C_hqdayibh;DLnet/minecraft/unmapped/C_ednuhnnn;)V
+    		ARG 4 damageType
     	METHOD m_bdaffrkt locateClosestWater (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;I)Lnet/minecraft/unmapped/C_hynzadkk;
     		ARG 1 blockView
     		ARG 2 entity
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_fpousrxy skeletonHorse Lnet/minecraft/unmapped/C_nghhbunv;
     	METHOD <init> (Lnet/minecraft/unmapped/C_nghhbunv;)V
     		ARG 1 skeletonHorse
+    	METHOD m_mpjqignn equipSpawnEquipment (Lnet/minecraft/unmapped/C_fihnfnjv;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_jiailwzt;)V
+    		ARG 1 skeleton
+    		ARG 2 slot
     	METHOD m_obntfjzt getHorse (Lnet/minecraft/unmapped/C_jiailwzt;)Lnet/minecraft/unmapped/C_ktznyhaj;
     		ARG 1 localDifficulty
     	METHOD m_ylaiemqt getSkeleton (Lnet/minecraft/unmapped/C_jiailwzt;Lnet/minecraft/unmapped/C_ktznyhaj;)Lnet/minecraft/unmapped/C_fihnfnjv;
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `233438b`

github-actions bot commented on `233438b` Jul 9, 2024

github-actions bot commented on `233438b` Jul 9, 2024

github-actions bot commented on `233438b` Jul 9, 2024

-Original file line number
+Diff line change
@@ -1,26 +1,40 @@
     CLASS net/minecraft/unmapped/C_cohbwqne net/minecraft/entity/attribute/AttributeContainer
+    	FIELD f_fxhnugqm pendingSync Ljava/util/Set;
     	FIELD f_ktubclms fallback Lnet/minecraft/unmapped/C_sdjuuzrz;
     	FIELD f_samklskl custom Ljava/util/Map;
     	FIELD f_ulfeetgn LOGGER Lorg/slf4j/Logger;
+    	FIELD f_xwjysvew pendingUpdate Ljava/util/Set;
     	METHOD <init> (Lnet/minecraft/unmapped/C_sdjuuzrz;)V
     		ARG 1 defaultAttributes
     	METHOD m_bfjyjwud toNbt ()Lnet/minecraft/unmapped/C_hqhtfwlr;
+    	METHOD m_fkydwjmo addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V
+    		ARG 1 modifiers
     	METHOD m_furmwbsi getModifierValue (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)D
     		ARG 1 attribute
+    		ARG 2 id
     	METHOD m_gsorkasz getModifier (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)Z
     		ARG 1 attribute
+    		ARG 2 id
     	METHOD m_gygnrjuj (Lnet/minecraft/unmapped/C_lzukavpx;)Z
     		ARG 0 attribute
+    	METHOD m_iaixpnqz setBaseValuesFrom (Lnet/minecraft/unmapped/C_cohbwqne;)V
+    		ARG 1 container
     	METHOD m_ifykwsrr getInstance (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_lzukavpx;
     		ARG 1 attribute
+    	METHOD m_jhklrcmp getAttributesToUpdate ()Ljava/util/Set;
+    	METHOD m_kzjivbbd getAttributesToSync ()Ljava/util/Set;
     	METHOD m_miiadyyh getAttributesToSend ()Ljava/util/Collection;
     	METHOD m_pzbjebfw getValue (Lnet/minecraft/unmapped/C_cjzoxshv;)D
     		ARG 1 attribute
     	METHOD m_qtoghhlr getBaseValue (Lnet/minecraft/unmapped/C_cjzoxshv;)D
     		ARG 1 attribute
+    	METHOD m_qzikslsi setValuesFrom (Lnet/minecraft/unmapped/C_cohbwqne;)V
+    		ARG 1 container
     	METHOD m_sxuxykrh readNbt (Lnet/minecraft/unmapped/C_hqhtfwlr;)V
     		ARG 1 nbt
     	METHOD m_txvwadfp hasAttribute (Lnet/minecraft/unmapped/C_cjzoxshv;)Z
     		ARG 1 attribute
+    	METHOD m_yortiwsq removeModifiers (Lcom/google/common/collect/Multimap;)V
+    		ARG 1 modifiers
     	METHOD m_zswycxao updateTrackedStatus (Lnet/minecraft/unmapped/C_lzukavpx;)V
     		ARG 1 instance

-Original file line number
+Diff line change
@@ Expand Up @@
     	COMMENT <p>An attribute is a tracked double value stored on an entity.
     	COMMENT An attribute has a default value on which attribute modifiers operate.
     	FIELD f_auwguvrl translationKey Ljava/lang/String;
+    	FIELD f_ffykkeba category Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;
     	FIELD f_tvtujviz tracked Z
     	FIELD f_umxvzebo fallback D
     	METHOD <init> (Ljava/lang/String;D)V
     		ARG 1 translationKey
     		ARG 2 fallback
+    	METHOD m_bpecfdak getFormatting (Z)Lnet/minecraft/unmapped/C_tnezalvh;
+    	METHOD m_ieprxwbk setCategory (Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;)Lnet/minecraft/unmapped/C_ppzfbbsy;
+    		ARG 1 category
     	METHOD m_iewqlpym getTranslationKey ()Ljava/lang/String;
     	METHOD m_oflenfkp getDefaultValue ()D
     	METHOD m_pdnjpmsx isTracked ()Z
@@ Expand All @@
     		ARG 1 tracked
     	METHOD m_wvpsxepv clamp (D)D
     		ARG 1 value
+    	CLASS C_hgeqpcpn Category
+    		METHOD m_dplecdbe getFormatting (Z)Lnet/minecraft/unmapped/C_tnezalvh;
+    			ARG 1 addition

-Original file line number
+Diff line change
@@ Expand Up @@
     	COMMENT A double-valued attribute.
     	FIELD f_aekcslxq baseValue D
     	FIELD f_axpfwlpj idToModifiers Ljava/util/Map;
+    	FIELD f_bkqrbgay ID_NBT_KEY Ljava/lang/String;
     	FIELD f_hbhcmses value D
+    	FIELD f_hxrayccb MODIFIERS_NBT_KEY Ljava/lang/String;
+    	FIELD f_jihvavrd BASE_NBT_KEY Ljava/lang/String;
     	FIELD f_kbiwugqb persistentModifiers Ljava/util/Map;
     	FIELD f_liwslfna dirty Z
     	FIELD f_mlqjboam type Lnet/minecraft/unmapped/C_cjzoxshv;
     	FIELD f_obppmvpj updateCallback Ljava/util/function/Consumer;
     	FIELD f_ybqmfnir operationToModifiers Ljava/util/Map;
     	METHOD m_ardmyaxt toNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
+    	METHOD m_basvthgj removeModifier (Lnet/minecraft/unmapped/C_ncpywfca;)Z
+    		ARG 1 id
     	METHOD m_bsifaddn (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;Ljava/util/Map;)V
     		ARG 1 operation
+    	METHOD m_fcqlvfzc replacePersistentModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)V
+    		ARG 1 modifier
     	METHOD m_gbtcpwti hasModifier (Lnet/minecraft/unmapped/C_ncpywfca;)Z
+    		ARG 1 id
     	METHOD m_gktfmzhg addIfAbsent (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/util/Map;
     	METHOD m_gtfjwrju readNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)V
     		ARG 1 nbt
@@ Expand Down Expand Up @@
     		COMMENT <p>Temporary modifiers are copied when using the operation.
     		ARG 1 other
     	METHOD m_rtwvskho getModifier (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_hdbqsqsm;
+    		ARG 1 id
     	METHOD m_tunrypxo addModifier (Lnet/minecraft/unmapped/C_hdbqsqsm;)V
     		ARG 1 modifier
     	METHOD m_xdafakih (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/util/Map;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     CLASS net/minecraft/unmapped/C_hdbqsqsm net/minecraft/entity/attribute/EntityAttributeModifier
     	FIELD f_bfacrmpa MAP_CODEC Lcom/mojang/serialization/MapCodec;
-    	FIELD f_hdbjrwxm uuid Lnet/minecraft/unmapped/C_ncpywfca;
+    	FIELD f_hdbjrwxm id Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_owzzukjv LOGGER Lorg/slf4j/Logger;
     	FIELD f_qcjtagbu CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_wcmcuppa operation Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;
@@ Expand All @@
     		ARG 1 o
     	METHOD m_fqbtxzed fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hdbqsqsm;
     		ARG 0 nbt
+    	METHOD m_loqpavmv (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+    		ARG 0 instance
     	METHOD m_svfezfmf toNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
+    	METHOD m_uwuvpbaf matches (Lnet/minecraft/unmapped/C_ncpywfca;)Z
+    		ARG 1 id
     	CLASS C_pljpmmzs Operation
     		COMMENT Represents an operation which can be applied to an attribute modifier.
     		FIELD f_dqfeqgfg id I
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_tjtkpeoz facing Lnet/minecraft/unmapped/C_xpuuihxf;
     	METHOD m_jpaijrhc (Lnet/minecraft/unmapped/C_astfners;)Z
     		ARG 0 entity
+    	METHOD m_lbdhqjli calculateBoundingBox (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_hbcjzgoe;
     	METHOD m_pjpwgxem setFacing (Lnet/minecraft/unmapped/C_xpuuihxf;)V
     		ARG 1 facing
+    	METHOD m_rhbnmmyq calculateSupportBox ()Lnet/minecraft/unmapped/C_hbcjzgoe;
     	METHOD m_tmiedenc onPlace ()V

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_ccszafxh ITEM_STACK Lnet/minecraft/unmapped/C_rinmcaxy;
     	FIELD f_dnmfuadb itemDropChance F
     	FIELD f_hkngbiyl ROTATION Lnet/minecraft/unmapped/C_rinmcaxy;
+    	FIELD f_mitznpai HEIGHT F
+    	FIELD f_nallonhx DEPTH F
     	FIELD f_rdvivgoi ROTATIONS_COUNT I
+    	FIELD f_xrplubwv WIDTH F
     	FIELD f_zsyuumcg fixed Z
     	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)V
     		ARG 1 world
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
     		ARG 1 world
     		ARG 2 pos
+    	METHOD m_fxwzcdqc playSound ()V
     	METHOD m_tpzxhpzc getOrCreate (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_nqadrnms;
     		ARG 0 world
     		ARG 1 pos

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     CLASS net/minecraft/unmapped/C_xypmuulf net/minecraft/entity/decoration/painting/PaintingEntity
     	FIELD f_hgphohxe MAP_CODEC Lcom/mojang/serialization/MapCodec;
+    	FIELD f_hkxbjxlp DEPTH F
     	FIELD f_jaaowbsw CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_yakljvtn VARIANT Lnet/minecraft/unmapped/C_rinmcaxy;
     	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
@@ Expand All @@
     		ARG 0 world
     		ARG 1 pos
     		ARG 2 direction
+    	METHOD m_zksfobqk getOffset (I)D
+    		ARG 1 width

-Original file line number
+Diff line change
@@ -1,3 +1,10 @@
     CLASS net/minecraft/unmapped/C_gbaxbrwg net/minecraft/entity/decoration/painting/PaintingVariant
+    	FIELD f_azsnvele DIRECT_CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_bqduxiyq height I
+    	FIELD f_dfoybqqo CODEC Lcom/mojang/serialization/Codec;
+    	FIELD f_dkvvcxps PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
+    	FIELD f_dtfxxovq DIRECT_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
     	FIELD f_snhuitee width I
+    	METHOD m_chqqbhoj (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+    		ARG 0 instance
+    	METHOD m_ghrmnkpe getArea ()I

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
     CLASS net/minecraft/unmapped/C_xzjscbit net/minecraft/entity/decoration/painting/PaintingVariants
     	METHOD m_avgpdivu getKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;
     		ARG 0 name
+    	METHOD m_vyjmbxzu register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;II)V
+    	METHOD m_wmijsric bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 6 z
     	METHOD m_veysajwx getSpawnedSlimeCount (ILnet/minecraft/unmapped/C_koniavnx$C_ehxlmbuh;I)I
     		ARG 0 maxEntityCramming
+    		ARG 1 counter
     		ARG 2 nearbySlimeCount
+    	CLASS C_ehxlmbuh SlimeCounter
+    		METHOD count count (I)I
+    			ARG 1 limit
+    		METHOD m_ttqtxznn collectNearby (Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_koniavnx$C_ehxlmbuh;
+    			ARG 0 entity

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_dlnculql bowAttackGoal Lnet/minecraft/unmapped/C_hgsilaic;
     	FIELD f_npspjwxb HARD_ATTACK_INTERVAL I
     	FIELD f_vcnullwp meleeAttackGoal Lnet/minecraft/unmapped/C_iaznzguw;
+    	METHOD m_cezloghr createArrowProjectile (Lnet/minecraft/unmapped/C_sddaxwyk;FLnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_gstiksvs;
     	METHOD m_dwhijquw getHardAttackInterval ()I
     	METHOD m_dwuesuhg isShaking ()Z
     	METHOD m_lxumqeoa getStepSound ()Lnet/minecraft/unmapped/C_avavozay;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_ygzaeast JUMP_CIRCLE_MIDDLE_RADIUS F
     	METHOD m_inljbpxh addIdleTasks (Lnet/minecraft/unmapped/C_rjqjaxef;)V
     	METHOD m_iwbteida addFightTasks (Lnet/minecraft/unmapped/C_nqresjkz;Lnet/minecraft/unmapped/C_rjqjaxef;)V
+    		ARG 0 breeze
     	METHOD m_srjsqfdn updateActivities (Lnet/minecraft/unmapped/C_nqresjkz;)V
     		ARG 0 breeze
     	METHOD m_tbkrmicx create (Lnet/minecraft/unmapped/C_nqresjkz;Lnet/minecraft/unmapped/C_rjqjaxef;)Lnet/minecraft/unmapped/C_rjqjaxef;
+    		ARG 0 breeze
     	METHOD m_xtdyigmi addCoreTasks (Lnet/minecraft/unmapped/C_rjqjaxef;)V
     	CLASS C_zxrtsqua BreezeWanderTask

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_ctosbzlf CREEPY_STARE_SOUND_DELAY I
     	FIELD f_cwdbwanb ageWhenTargetSet I
     	FIELD f_hgsgxhbj targetUuid Ljava/util/UUID;
-    	FIELD f_ichtmwpb ATTACKING_SPEED_BOOST Lnet/minecraft/unmapped/C_hdbqsqsm;
+    	FIELD f_hrckybei ATTACKING_SPEED_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
+    	FIELD f_ichtmwpb ATTACKING_SPEED_MODIFIER Lnet/minecraft/unmapped/C_hdbqsqsm;
     	FIELD f_oaptzzqr ANGER_TIME_RANGE Lnet/minecraft/unmapped/C_hvilmtvi;
     	FIELD f_pysgdony PROVOKED Lnet/minecraft/unmapped/C_rinmcaxy;
     	FIELD f_ueojapuk MIN_ANGER_LOSS_TIME I
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_tcesvuol lookControl Lnet/minecraft/unmapped/C_lgufpcrf;
     	FIELD f_uushnomk targetSelector Lnet/minecraft/unmapped/C_qospjrjn;
     	FIELD f_vuffzgdh lootTable Lnet/minecraft/unmapped/C_xhhleach;
+    	FIELD f_wfwaeazd leashData Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu;
     	FIELD f_wkutgcpe DEFAULT_ATTACK_RANGE D
     	FIELD f_xdwjzxrd handDropChances [F
+    	FIELD f_yqqanohh RANDOM_SPAWN_BONUS_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_ziddtuje GOAL_SELECTOR_UPDATE_INTERVAL I
+    	FIELD f_zmktcisp PRESERVE_ITEM_DROP_CHANCE_THRESHOLD F
     	FIELD f_zqtbccqn armorDropChances [F
     	FIELD f_zwyrnqpo MAX_WEAR_ARMOR_PROBABILITY F
     	METHOD m_ahhtjfdq getItemPickupReach ()Lnet/minecraft/unmapped/C_ceivtqhh;
@@ Expand All @@
     	METHOD m_cauyzlww getNavigation ()Lnet/minecraft/unmapped/C_atbvfjwi;
     	METHOD m_ckimhneu getPositionTarget ()Lnet/minecraft/unmapped/C_hynzadkk;
     	METHOD m_cpqekrmu clearPositionTarget ()V
+    	METHOD m_cyqouyby dropAllEquipment ()V
     	METHOD m_dciqpbdm canImmediatelyDespawn (D)Z
     		ARG 1 distanceSquared
     	METHOD m_dijkljpy clearGoalsAndTasks ()V
     	METHOD m_dsykcsrd setAiDisabled (Z)V
     		ARG 1 aiDisabled
+    	METHOD m_dwkutgwm playAttackSound ()V
     	METHOD m_eeaedybm createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
     	METHOD m_enspzmcx isInWalkTargetRange (Lnet/minecraft/unmapped/C_hynzadkk;)Z
     		ARG 1 pos
@@ Expand Down Expand Up @@
     		ARG 1 sidewaysMovement
     	METHOD m_jdpupgbu getLootTableId ()Lnet/minecraft/unmapped/C_xhhleach;
     	METHOD m_jjefzxbm getAmbientSound ()Lnet/minecraft/unmapped/C_avavozay;
+    	METHOD m_jlsekxwk enchantEquipment (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_rlomrsco;FLnet/minecraft/unmapped/C_jiailwzt;)V
+    		ARG 1 world
+    		ARG 2 slot
+    		ARG 4 chance
     	METHOD m_jrjjwiqr onStartPathfinding ()V
     	METHOD m_jrvaluhu updateDropChances (Lnet/minecraft/unmapped/C_yuycoehb;)V
     		ARG 1 slot
@@ Expand All @@
     	METHOD m_lqlfsnxj getBodyYawSpeed ()I
     	METHOD m_lxcdvhkn enchantEquipment (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_jiailwzt;)V
     		ARG 3 slot
+    	METHOD m_mapkswnb dropEquipment (Ljava/util/function/Predicate;)Ljava/util/Set;
+    		ARG 1 shouldDrop
     	METHOD m_mbyporyt createBodyControl ()Lnet/minecraft/unmapped/C_vofymfgv;
     	METHOD m_mowaxfbl isLeftHanded ()Z
     	METHOD m_mrbrckqf isDisallowedInPeaceful ()Z
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     CLASS net/minecraft/unmapped/C_lkhqndnb net/minecraft/entity/mob/PiglinEntity
     	FIELD f_anmnqnjv BABY_SPAWN_PROBABILITY F
+    	FIELD f_bmortxcl BABY_SPEED_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_dicqsfvy DANCING Lnet/minecraft/unmapped/C_rinmcaxy;
     	FIELD f_dvmxvvkj HOGLIN_MAX_PASSENGERS I
     	FIELD f_grlrcjra cannotHunt Z
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_mcgjemru MAX_SCALE F
     	FIELD f_nhqhcoaz NEARBY_SHULKER_SCAN_RADIUS I
     	FIELD f_odaehnvp prevAttachedBlock Lnet/minecraft/unmapped/C_hynzadkk;
+    	FIELD f_ouwpbtua COVERED_ARMOR_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_qyhdlubn PEEK_AMOUNT Lnet/minecraft/unmapped/C_rinmcaxy;
     	FIELD f_rhlsurhw FORWARD Lorg/joml/Vector3f;
     	FIELD f_sxhxgvpw DEFAULT_COLOR B
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_aqmtulcv DRINKING_SPEED_PENALTY_MODIFIER Lnet/minecraft/unmapped/C_hdbqsqsm;
     	FIELD f_gdmxxabw raidGoal Lnet/minecraft/unmapped/C_eqvbqsuw;
     	FIELD f_jqqwyqmf DRINKING Lnet/minecraft/unmapped/C_rinmcaxy;
+    	FIELD f_rygeaoac DRINKING_SPEED_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_wquvddre drinkTimeLeft I
     	METHOD m_csagunow isDrinking ()Z
     	METHOD m_ejgoqdkc setDrinking (Z)V
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,10 +1,14 @@
     CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity
     	FIELD f_aqispqmf inWaterTime I
     	FIELD f_bkkffcav CAN_BREAK_DOORS_PROBABILITY F
+    	FIELD f_cbavnqhn LEADER_ZOMBIE_BONUS_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_cgelqhxp ZOMBIE_LEADER_CHANCE F
     	FIELD f_dugfemzi BABY Lnet/minecraft/unmapped/C_rinmcaxy;
     	FIELD f_ednvlrgk canBreakDoors Z
+    	FIELD f_ffsrjhzo REINFORCEMENT_CALLER_CHARGE_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
+    	FIELD f_ftlgfqrm BABY_SPEED_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	FIELD f_htmnnmvg REINFORCEMENT_MAX_RANGE I
+    	FIELD f_kplgseir REINFORCEMENT_CALLEE_CHARGE_MODIFIER Lnet/minecraft/unmapped/C_hdbqsqsm;
     	FIELD f_luzrnhym REINFORCEMENT_MIN_RANGE I
     	FIELD f_oxqoblan BABY_DIMENSIONS Lnet/minecraft/unmapped/C_sszpscpo;
     	FIELD f_pwwkwurn ZOMBIE_TYPE Lnet/minecraft/unmapped/C_rinmcaxy;
@@ Expand All @@
     	FIELD f_ubjsjkvp DOOR_BREAK_DIFFICULTY_CHECKER Ljava/util/function/Predicate;
     	FIELD f_upyoimqe ticksUntilWaterConversion I
     	FIELD f_xkowrfdx BABY_SPEED_BONUS Lnet/minecraft/unmapped/C_hdbqsqsm;
+    	FIELD f_yvivhgvq ZOMBIE_RANDOM_SPAWN_BONUS_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
     	METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;)V
     		ARG 1 world
     	METHOD m_byfmkeyh shouldBeBaby (Lnet/minecraft/unmapped/C_rlomrsco;)Z
@@ Expand Down @@

Commit

There are no files selected for viewing

3 comments on commit 233438b

github-actions bot commented on 233438b Jul 9, 2024

Choose a reason for hiding this comment

github-actions bot commented on 233438b Jul 9, 2024

Choose a reason for hiding this comment

github-actions bot commented on 233438b Jul 9, 2024

Choose a reason for hiding this comment

3 comments on commit `233438b`

github-actions bot commented on `233438b` Jul 9, 2024

github-actions bot commented on `233438b` Jul 9, 2024

github-actions bot commented on `233438b` Jul 9, 2024