Skip to content

Commit

Permalink
add 'callee'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Jul 9, 2024
1 parent cfe154b commit 64a641a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ xmap
leetcode
entrypoint
deque
callee
charset
classpath
clazz
Expand Down

3 comments on commit 64a641a

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit 64a641a, 249 file(s) were updated with 1711 line(s) added and 1497 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:56:10.996980583 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-07-09 01:54:56.504857688 +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:56:10.776980232 +0000
+++ namedSrc/net/minecraft/block/AbstractFireBlock.java	2024-07-09 01:54:56.224857204 +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/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-07-09 01:56:10.968980538 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-07-09 01:54:56.476857640 +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/EndGatewayBlock.java namedSrc/net/minecraft/block/EndGatewayBlock.java
--- namedTargetSrc/net/minecraft/block/EndGatewayBlock.java	2024-07-09 01:56:10.748980188 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-07-09 01:54:56.148857073 +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:56:10.924980468 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-07-09 01:54:56.424857550 +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/NetherPortalBlock.java namedSrc/net/minecraft/block/NetherPortalBlock.java
--- namedTargetSrc/net/minecraft/block/NetherPortalBlock.java	2024-07-09 01:56:10.988980570 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-07-09 01:54:56.500857681 +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:56:10.960980526 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-07-09 01:54:56.468857626 +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/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-07-09 01:56:10.932980481 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-07-09 01:54:56.432857564 +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:56:11.048980666 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-07-09 01:54:56.568857799 +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;
@@ -282,7 +283,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_jvzsxkum;
 import net.minecraft.unmapped.C_ouodvkzu;
@@ -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 onProjectilePower(ProjectilePowerS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.world.getEntityById(packet.getEntityId()) instanceof ExplosiveProjectileEntity lv2) {
-         lv2.f_omngpikt = packet.m_hxnpbaoh();
+         lv2.accelerationPower = packet.m_hxnpbaoh();
       }
    }
 
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:56:11.064980691 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-07-09 01:54:56.592857841 +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/render/entity/EntityRenderer.java namedSrc/net/minecraft/client/render/entity/EntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-07-09 01:56:10.888980411 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-07-09 01:54:56.380857474 +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:56:11.060980685 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.java	2024-07-09 01:54:56.584857827 +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/component/type/AttributeModifiersComponent.java namedSrc/net/minecraft/component/type/AttributeModifiersComponent.java
--- namedTargetSrc/net/minecraft/component/type/AttributeModifiersComponent.java	2024-07-09 01:56:10.840980335 +0000
+++ namedSrc/net/minecraft/component/type/AttributeModifiersComponent.java	2024-07-09 01:54:56.316857363 +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:56:10.956980520 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-09 01:54:56.460857612 +0000
@@ -107,10 +107,10 @@
 
    /**
     * @mapping {@literal hashed m_ugcgsgdf Lnet/minecraft/unmapped/C_qlclfxvn;m_ugcgsgdf(Lnet/minecraft/unmapped/C_cjzoxshv;)I}
-    * @mapping {@literal named m_ugcgsgdf Lnet/minecraft/component/type/ItemEnchantmentsComponent;m_ugcgsgdf(Lnet/minecraft/registry/Holder;)I}
+    * @mapping {@literal named getLevel Lnet/minecraft/component/type/ItemEnchantmentsComponent;getLevel(Lnet/minecraft/registry/Holder;)I}
     */
-   public int m_ugcgsgdf(Holder<Enchantment> enchantmentHolder) {
-      return this.levels.getInt(enchantmentHolder);
+   public int getLevel(Holder<Enchantment> enchantment) {
+      return this.levels.getInt(enchantment);
    }
 
    /**
@@ -249,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);
          }
       }
 
@@ -278,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/server/tag/DamageTypeTagsProvider.java namedSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java
--- namedTargetSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java	2024-07-09 01:56:10.764980213 +0000
+++ namedSrc/net/minecraft/data/server/tag/DamageTypeTagsProvider.java	2024-07-09 01:54:56.208857177 +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,
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/ApplyMobEffect.java namedSrc/net/minecraft/enchantment/effect/ApplyMobEffect.java
--- namedTargetSrc/net/minecraft/enchantment/effect/ApplyMobEffect.java	2024-07-09 01:56:11.004980596 +0000
+++ namedSrc/net/minecraft/enchantment/effect/ApplyMobEffect.java	2024-07-09 01:54:56.516857709 +0000
@@ -46,7 +46,7 @@
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
       if (user instanceof LivingEntity lv) {
-         RandomGenerator lv2 = lv.m_dlwxaobh();
+         RandomGenerator lv2 = lv.getRandom();
          Optional<Holder<StatusEffect>> optional = this.toApply.getRandomElement(lv2);
          if (optional.isPresent()) {
             int j = Math.round(MathHelper.nextBetween(lv2, this.minDuration.getValue(level), this.maxDuration.getValue(level)) * 20.0F);
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/DamageEntity.java namedSrc/net/minecraft/enchantment/effect/DamageEntity.java
--- namedTargetSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-07-09 01:56:10.856980360 +0000
+++ namedSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-07-09 01:54:56.336857398 +0000
@@ -35,7 +35,7 @@
     */
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
-      float f = MathHelper.nextBetween(user.m_dlwxaobh(), this.minDamage.getValue(level), this.maxDamage.getValue(level));
+      float f = MathHelper.nextBetween(user.getRandom(), this.minDamage.getValue(level), this.maxDamage.getValue(level));
       user.damage(new DamageSource(this.damageType, context.owner()), f);
    }
 
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/EnchantmentAttribute.java namedSrc/net/minecraft/enchantment/effect/EnchantmentAttribute.java
--- namedTargetSrc/net/minecraft/enchantment/effect/EnchantmentAttribute.java	2024-07-09 01:56:10.880980398 +0000
+++ namedSrc/net/minecraft/enchantment/effect/EnchantmentAttribute.java	2024-07-09 01:54:56.368857453 +0000
@@ -58,7 +58,7 @@
    @Override
    public void onChangedBlock(ServerWorld world, int level, EnchantmentEffectContext context, Entity entity, Vec3d pos, boolean newlyApplied) {
       if (newlyApplied && entity instanceof LivingEntity lv) {
-         lv.getAttributes().m_fkydwjmo(this.createAttributeMap(level, context.inSlot()));
+         lv.getAttributes().addTemporaryModifiers(this.createAttributeMap(level, context.inSlot()));
       }
    }
 
@@ -68,7 +68,7 @@
    @Override
    public void onDeactivated(EnchantmentEffectContext context, Entity entity, Vec3d pos, int level) {
       if (entity instanceof LivingEntity lv) {
-         lv.getAttributes().m_yortiwsq(this.createAttributeMap(level, context.inSlot()));
+         lv.getAttributes().removeModifiers(this.createAttributeMap(level, context.inSlot()));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/Ignite.java namedSrc/net/minecraft/enchantment/effect/Ignite.java
--- namedTargetSrc/net/minecraft/enchantment/effect/Ignite.java	2024-07-09 01:56:10.784980245 +0000
+++ namedSrc/net/minecraft/enchantment/effect/Ignite.java	2024-07-09 01:54:56.236857225 +0000
@@ -26,7 +26,7 @@
     */
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
-      user.m_xbkkrydd(this.duration.getValue(level));
+      user.setOnFireForSeconds(this.duration.getValue(level));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/PlaySound.java namedSrc/net/minecraft/enchantment/effect/PlaySound.java
--- namedTargetSrc/net/minecraft/enchantment/effect/PlaySound.java	2024-07-09 01:56:11.052980672 +0000
+++ namedSrc/net/minecraft/enchantment/effect/PlaySound.java	2024-07-09 01:54:56.576857813 +0000
@@ -34,7 +34,7 @@
     */
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
-      RandomGenerator lv = user.m_dlwxaobh();
+      RandomGenerator lv = user.getRandom();
       if (!user.isSilent()) {
          world.m_kbzhgjwh(null, pos.getX(), pos.getY(), pos.getZ(), this.soundEvent, user.getSoundCategory(), this.volume.get(lv), this.pitch.get(lv));
       }
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/ReplaceBlock.java namedSrc/net/minecraft/enchantment/effect/ReplaceBlock.java
--- namedTargetSrc/net/minecraft/enchantment/effect/ReplaceBlock.java	2024-07-09 01:56:11.024980628 +0000
+++ namedSrc/net/minecraft/enchantment/effect/ReplaceBlock.java	2024-07-09 01:54:56.540857750 +0000
@@ -41,7 +41,7 @@
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
       BlockPos lv = BlockPos.fromPosition(pos).add(this.offset);
       if ((Boolean)this.predicate.map(arg3 -> arg3.test(world, lv)).orElse(true)
-         && world.setBlockState(lv, this.blockState.getBlockState(user.m_dlwxaobh(), lv))) {
+         && world.setBlockState(lv, this.blockState.getBlockState(user.getRandom(), lv))) {
          this.triggerGameEvent.ifPresent(arg4 -> world.emitGameEvent(user, arg4, lv));
       }
    }
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/ReplaceDisk.java namedSrc/net/minecraft/enchantment/effect/ReplaceDisk.java
--- namedTargetSrc/net/minecraft/enchantment/effect/ReplaceDisk.java	2024-07-09 01:56:10.948980506 +0000
+++ namedSrc/net/minecraft/enchantment/effect/ReplaceDisk.java	2024-07-09 01:54:56.452857598 +0000
@@ -51,7 +51,7 @@
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
       BlockPos lv = BlockPos.fromPosition(pos).add(this.offset);
-      RandomGenerator lv2 = user.m_dlwxaobh();
+      RandomGenerator lv2 = user.getRandom();
       int j = (int)this.radius.getValue(level);
       int k = (int)this.height.getValue(level);
 
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/SpawnParticles.java namedSrc/net/minecraft/enchantment/effect/SpawnParticles.java
--- namedTargetSrc/net/minecraft/enchantment/effect/SpawnParticles.java	2024-07-09 01:56:11.036980647 +0000
+++ namedSrc/net/minecraft/enchantment/effect/SpawnParticles.java	2024-07-09 01:54:56.556857778 +0000
@@ -81,8 +81,8 @@
     */
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity user, Vec3d pos) {
-      RandomGenerator lv = user.m_dlwxaobh();
-      Vec3d lv2 = user.m_roxbbrfe();
+      RandomGenerator lv = user.getRandom();
+      Vec3d lv2 = user.getMovement();
       float f = user.getWidth();
       float g = user.getHeight();
       world.spawnParticles(
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-09 01:56:10.916980456 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-09 01:54:56.416857536 +0000
@@ -59,7 +59,7 @@
     */
    public static int getLevel(Holder<Enchantment> enchantment, ItemStack stack) {
       ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
-      return lv.m_ugcgsgdf(enchantment);
+      return lv.getLevel(enchantment);
    }
 
    /**
@@ -280,7 +280,7 @@
     */
    public static void onEntityDamaged(ServerWorld world, Entity entity, DamageSource source) {
       if (source.getAttacker() instanceof LivingEntity lv) {
-         onEntityHitWithItem(world, entity, source, lv.m_ywnmbdjz());
+         onEntityHitWithItem(world, entity, source, lv.getWeaponStack());
       } else {
          onEntityHitWithItem(world, entity, source, null);
       }
@@ -434,7 +434,7 @@
     */
    public static float getEquipmentDropChance(ServerWorld world, LivingEntity attacker, DamageSource source, float baseDropChance) {
       MutableFloat mutableFloat = new MutableFloat(baseDropChance);
-      RandomGenerator lv = attacker.m_dlwxaobh();
+      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 -> {
@@ -519,7 +519,7 @@
     */
    public static float getCrossbowChargeTime(ItemStack stack, LivingEntity entity, float baseChargeTime) {
       MutableFloat mutableFloat = new MutableFloat(baseChargeTime);
-      forEachEnchantment(stack, (arg2, i) -> arg2.value().modifyCrossbowChargeTime(entity.m_dlwxaobh(), i, mutableFloat));
+      forEachEnchantment(stack, (arg2, i) -> arg2.value().modifyCrossbowChargeTime(entity.getRandom(), i, mutableFloat));
       return Math.max(0.0F, mutableFloat.floatValue());
    }
 
@@ -529,7 +529,7 @@
     */
    public static float getTridentSpinAttackStrength(ItemStack stack, LivingEntity entity) {
       MutableFloat mutableFloat = new MutableFloat(0.0F);
-      forEachEnchantment(stack, (arg2, i) -> arg2.value().modifyTridentSpinAttackStrength(entity.m_dlwxaobh(), i, mutableFloat));
+      forEachEnchantment(stack, (arg2, i) -> arg2.value().modifyTridentSpinAttackStrength(entity.getRandom(), i, mutableFloat));
       return mutableFloat.floatValue();
    }
 
@@ -620,7 +620,7 @@
          }
       }
 
-      return Util.getRandomOrEmpty(list, entity.m_dlwxaobh());
+      return Util.getRandomOrEmpty(list, entity.getRandom());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/enchantment/Enchantment.java namedSrc/net/minecraft/enchantment/Enchantment.java
--- namedTargetSrc/net/minecraft/enchantment/Enchantment.java	2024-07-09 01:56:10.860980366 +0000
+++ namedSrc/net/minecraft/enchantment/Enchantment.java	2024-07-09 01:54:56.340857405 +0000
@@ -334,7 +334,7 @@
 
       for (ConditionalEnchantmentEffect<EnchantmentValueEffect> lv2 : this.getEffect(EnchantmentEffectComponentTypes.DAMAGE_PROTECTION)) {
          if (lv2.test(lv)) {
-            value.setValue(lv2.effect().apply(i, entity.m_dlwxaobh(), value.floatValue()));
+            value.setValue(lv2.effect().apply(i, entity.getRandom(), value.floatValue()));
          }
       }
    }
@@ -583,7 +583,7 @@
       applyEffects(
          this.getEffect(type),
          createEntityContext(world, level, entity, entity.getPos()),
-         arg2 -> value.setValue(arg2.apply(level, entity.m_dlwxaobh(), value.floatValue()))
+         arg2 -> value.setValue(arg2.apply(level, entity.getRandom(), value.floatValue()))
       );
    }
 
@@ -603,7 +603,7 @@
       applyEffects(
          this.getEffect(type),
          createDamageContext(world, level, entity, source),
-         arg2 -> value.setValue(arg2.apply(level, entity.m_dlwxaobh(), value.floatValue()))
+         arg2 -> value.setValue(arg2.apply(level, entity.getRandom(), value.floatValue()))
       );
    }
 
@@ -694,12 +694,12 @@
     */
    public void applyLocationBasedEffects(ServerWorld world, int level, EnchantmentEffectContext context, LivingEntity entity) {
       if (context.inSlot() != null && !this.matchesSlot(context.inSlot())) {
-         Set<EnchantmentLocationBasedEffect> set = (Set<EnchantmentLocationBasedEffect>)entity.m_lbpuzdpj().remove(this);
+         Set<EnchantmentLocationBasedEffect> set = (Set<EnchantmentLocationBasedEffect>)entity.getLocationBasedEnchantmentEffects().remove(this);
          if (set != null) {
             set.forEach(arg3 -> arg3.onDeactivated(context, entity, entity.getPos(), level));
          }
       } else {
-         Set<EnchantmentLocationBasedEffect> set2 = (Set<EnchantmentLocationBasedEffect>)entity.m_lbpuzdpj().get(this);
+         Set<EnchantmentLocationBasedEffect> set2 = (Set<EnchantmentLocationBasedEffect>)entity.getLocationBasedEnchantmentEffects().get(this);
 
          for (ConditionalEnchantmentEffect<EnchantmentLocationBasedEffect> lv : this.getEffect(EnchantmentEffectComponentTypes.LOCATION_CHANGED)) {
             EnchantmentLocationBasedEffect lv2 = lv.effect();
@@ -708,7 +708,7 @@
                if (!bl) {
                   if (set2 == null) {
                      set2 = new ObjectArraySet<>();
-                     entity.m_lbpuzdpj().put(this, set2);
+                     entity.getLocationBasedEnchantmentEffects().put(this, set2);
                   }
 
                   set2.add(lv2);
@@ -721,7 +721,7 @@
          }
 
          if (set2 != null && set2.isEmpty()) {
-            entity.m_lbpuzdpj().remove(this);
+            entity.getLocationBasedEnchantmentEffects().remove(this);
          }
       }
    }
@@ -731,7 +731,7 @@
     * @mapping {@literal named removeLocationBasedEffects Lnet/minecraft/enchantment/Enchantment;removeLocationBasedEffects(ILnet/minecraft/enchantment/EnchantmentEffectContext;Lnet/minecraft/entity/LivingEntity;)V}
     */
    public void removeLocationBasedEffects(int level, EnchantmentEffectContext context, LivingEntity user) {
-      Set<EnchantmentLocationBasedEffect> set = (Set<EnchantmentLocationBasedEffect>)user.m_lbpuzdpj().remove(this);
+      Set<EnchantmentLocationBasedEffect> set = (Set<EnchantmentLocationBasedEffect>)user.getLocationBasedEnchantmentEffects().remove(this);
       if (set != null) {
          for (EnchantmentLocationBasedEffect lv : set) {
             lv.onDeactivated(context, user, user.getPos(), level);
Only in namedSrc/net/minecraft/enchantment/provider: ByCostEnchantmentProvider.java
Only in namedSrc/net/minecraft/enchantment/provider: ByCostWithDifficultyEnchantmentProvider.java
Only in namedSrc/net/minecraft/enchantment/provider: EnchantmentProviders.java
Only in namedSrc/net/minecraft/enchantment/provider: SingleEnchantmentProvider.java
Only in namedSrc/net/minecraft/enchantment/provider: TradeRebalanceEnchantmentProviders.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/AboveGroundTargeting.java namedSrc/net/minecraft/entity/ai/AboveGroundTargeting.java
--- namedTargetSrc/net/minecraft/entity/ai/AboveGroundTargeting.java	2024-07-09 01:56:10.888980411 +0000
+++ namedSrc/net/minecraft/entity/ai/AboveGroundTargeting.java	2024-07-09 01:54:56.380857474 +0000
@@ -25,7 +25,7 @@
       return FuzzyPositions.guessBestPathTarget(
          entity,
          () -> {
-            BlockPos lv = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange, 0, x, z, (double)angle);
+            BlockPos lv = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange, 0, x, z, (double)angle);
             if (lv == null) {
                return null;
             } else {
@@ -35,7 +35,7 @@
                } else {
                   lv2 = FuzzyPositions.upWhile(
                      lv2,
-                     entity.m_dlwxaobh().nextInt(maxAboveSolid - minAboveSolid + 1) + minAboveSolid,
+                     entity.getRandom().nextInt(maxAboveSolid - minAboveSolid + 1) + minAboveSolid,
                      entity.getWorld().getTopY(),
                      pos -> NavigationConditions.isSolidAt(entity, pos)
                   );
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BreedTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreedTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreedTask.java	2024-07-09 01:56:10.976980551 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreedTask.java	2024-07-09 01:54:56.484857653 +0000
@@ -107,7 +107,7 @@
       arg2.getBrain().remember(MemoryModuleType.BREED_TARGET, lv);
       lv.getBrain().remember(MemoryModuleType.BREED_TARGET, arg2);
       LookTargetUtil.lookAtAndWalkTowardsEachOther(arg2, lv, this.speed, this.completionRange);
-      int i = 60 + arg2.m_dlwxaobh().nextInt(50);
+      int i = 60 + arg2.getRandom().nextInt(50);
       this.breedTime = l + (long)i;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java	2024-07-09 01:56:10.880980398 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java	2024-07-09 01:54:56.368857453 +0000
@@ -112,7 +112,7 @@
          } else if (!canJumpFromPos(world, breeze)) {
             return false;
          } else {
-            BlockPos lv2 = getJumpTargetPos(breeze, C_cspceykn.m_jpogoaaz(lv, breeze.m_dlwxaobh()));
+            BlockPos lv2 = getJumpTargetPos(breeze, C_cspceykn.m_jpogoaaz(lv, breeze.getRandom()));
             if (lv2 == null) {
                return false;
             } else {
@@ -175,7 +175,7 @@
       if (isFinishedInhaling(arg2)) {
          Vec3d lv = (Vec3d)arg2.getBrain()
             .getOptionalMemory(MemoryModuleType.BREEZE_JUMP_TARGET)
-            .flatMap(pos -> getJumpVector(arg2, arg2.m_dlwxaobh(), Vec3d.ofBottomCenter(pos)))
+            .flatMap(pos -> getJumpVector(arg2, arg2.getRandom(), Vec3d.ofBottomCenter(pos)))
             .orElse(null);
          if (lv == null) {
             arg2.setPose(EntityPose.STANDING);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-07-09 01:56:10.992980576 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-07-09 01:54:56.504857688 +0000
@@ -62,7 +62,7 @@
          }
 
          if (lv2 == null) {
-            lv2 = arg2.m_dlwxaobh().nextBoolean() ? C_cspceykn.m_jpogoaaz(lv, arg2.m_dlwxaobh()) : getRandomPointInMediumRange(arg2, lv);
+            lv2 = arg2.getRandom().nextBoolean() ? C_cspceykn.m_jpogoaaz(lv, arg2.getRandom()) : getRandomPointInMediumRange(arg2, lv);
          }
 
          arg2.getBrain().remember(MemoryModuleType.WALK_TARGET, new WalkTarget(BlockPos.fromPosition(lv2), 0.6F, 1));
@@ -75,7 +75,7 @@
     */
    private static Vec3d getRandomPointInMediumRange(BreezeEntity breeze, LivingEntity target) {
       Vec3d lv = target.getPos().subtract(breeze.getPos());
-      double d = lv.length() - MathHelper.lerp(breeze.m_dlwxaobh().nextDouble(), 8.0, 4.0);
+      double d = lv.length() - MathHelper.lerp(breeze.getRandom().nextDouble(), 8.0, 4.0);
       Vec3d lv2 = lv.normalize().multiply(d, d, d);
       return breeze.getPos().add(lv2);
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java namedSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java	2024-07-09 01:56:10.780980239 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java	2024-07-09 01:54:56.236857225 +0000
@@ -70,7 +70,7 @@
     * @mapping {@literal named keepRunning Lnet/minecraft/entity/ai/brain/task/CelebrateRaidWinTask;keepRunning(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/VillagerEntity;J)V}
     */
    protected void keepRunning(ServerWorld world, VillagerEntity arg2, long l) {
-      RandomGenerator lv = arg2.m_dlwxaobh();
+      RandomGenerator lv = arg2.getRandom();
       if (lv.nextInt(100) == 0) {
          arg2.playCelebrateSound();
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java	2024-07-09 01:56:10.860980366 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java	2024-07-09 01:54:56.336857398 +0000
@@ -104,7 +104,7 @@
          if (i >= CrossbowItem.m_jwwdtsib(lv, entity)) {
             entity.stopUsingItem();
             this.state = CrossbowAttackTask.CrossbowState.CHARGED;
-            this.chargingCooldown = 20 + entity.m_dlwxaobh().nextInt(20);
+            this.chargingCooldown = 20 + entity.getRandom().nextInt(20);
             entity.setCharging(false);
          }
       } else if (this.state == CrossbowAttackTask.CrossbowState.CHARGED) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java namedSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java	2024-07-09 01:56:11.048980666 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HideInHomeTask.java	2024-07-09 01:54:56.568857799 +0000
@@ -48,7 +48,7 @@
                                        PointOfInterestStorage.OccupationStatus.ANY,
                                        arg10.getBlockPos(),
                                        maxDistance,
-                                       arg10.m_dlwxaobh()
+                                       arg10.getRandom()
                                     )
                            )
                            .or(() -> arg.getValueOptional(arg3).map(GlobalPos::getPos))
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java namedSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java	2024-07-09 01:56:10.872980385 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpToPreferredBlockTask.java	2024-07-09 01:54:56.360857439 +0000
@@ -67,7 +67,7 @@
    protected void run(ServerWorld world, E arg2, long l) {
       super.run(world, arg2, l);
       this.jumpTargets.clear();
-      this.shouldJump = arg2.m_dlwxaobh().nextFloat() < this.jumpChance;
+      this.shouldJump = arg2.getRandom().nextFloat() < this.jumpChance;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-07-09 01:56:10.944980500 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-07-09 01:54:56.444857584 +0000
@@ -58,7 +58,7 @@
     * @mapping {@literal named run Lnet/minecraft/entity/ai/brain/task/RandomLookAroundTask;run(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/mob/MobEntity;J)V}
     */
    protected void run(ServerWorld world, MobEntity arg2, long l) {
-      RandomGenerator lv = arg2.m_dlwxaobh();
+      RandomGenerator lv = arg2.getRandom();
       float f = MathHelper.clamp(lv.nextFloat() * this.pitchRange + this.minPitch, -90.0F, 90.0F);
       float g = MathHelper.wrapDegrees(arg2.getYaw() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
       Vec3d lv2 = Vec3d.fromPolar(f, g);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java namedSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java	2024-07-09 01:56:11.052980672 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SeekSkyTask.java	2024-07-09 01:54:56.572857806 +0000
@@ -39,7 +39,7 @@
     */
    @Nullable
    private static Vec3d findNearbySky(ServerWorld world, LivingEntity entity) {
-      RandomGenerator lv = entity.m_dlwxaobh();
+      RandomGenerator lv = entity.getRandom();
       BlockPos lv2 = entity.getBlockPos();
 
       for (int i = 0; i < 10; i++) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.java namedSrc/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.java	2024-07-09 01:56:10.856980360 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.java	2024-07-09 01:54:56.336857398 +0000
@@ -54,7 +54,7 @@
     * @mapping {@literal named keepRunning Lnet/minecraft/entity/ai/brain/task/StayAboveWaterTask;keepRunning(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/mob/MobEntity;J)V}
     */
    protected void keepRunning(ServerWorld world, MobEntity arg2, long l) {
-      if (arg2.m_dlwxaobh().nextFloat() < this.chance) {
+      if (arg2.getRandom().nextFloat() < this.chance) {
          arg2.getJumpControl().setActive();
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/VillagerBreedTask.java namedSrc/net/minecraft/entity/ai/brain/task/VillagerBreedTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/VillagerBreedTask.java	2024-07-09 01:56:10.768980220 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/VillagerBreedTask.java	2024-07-09 01:54:56.212857184 +0000
@@ -65,7 +65,7 @@
       LookTargetUtil.lookAtAndWalkTowardsEachOther(arg2, lv, 0.5F, 2);
       world.sendEntityStatus(lv, EntityStatuses.ADD_BREEDING_PARTICLES);
       world.sendEntityStatus(arg2, EntityStatuses.ADD_BREEDING_PARTICLES);
-      int i = 275 + arg2.m_dlwxaobh().nextInt(50);
+      int i = 275 + arg2.getRandom().nextInt(50);
       this.breedEndTime = l + (long)i;
    }
 
@@ -81,7 +81,7 @@
             arg2.eatForBreeding();
             lv.eatForBreeding();
             this.goHome(world, arg2, lv);
-         } else if (arg2.m_dlwxaobh().nextInt(35) == 0) {
+         } else if (arg2.getRandom().nextInt(35) == 0) {
             world.sendEntityStatus(lv, EntityStatuses.ADD_VILLAGER_HEART_PARTICLES);
             world.sendEntityStatus(arg2, EntityStatuses.ADD_VILLAGER_HEART_PARTICLES);
          }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkTask.java	2024-07-09 01:56:10.924980468 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkTask.java	2024-07-09 01:54:56.424857550 +0000
@@ -53,9 +53,10 @@
     */
    private final float speed;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rcpxgapc Lnet/minecraft/unmapped/C_uuyjertq;f_rcpxgapc:Ljava/util/function/Function;}
+    * @mapping {@literal named damageTypeGetter Lnet/minecraft/entity/ai/brain/task/WalkTask;damageTypeGetter:Ljava/util/function/Function;}
     */
-   private final Function<PathAwareEntity, TagKey<DamageType>> f_rcpxgapc;
+   private final Function<PathAwareEntity, TagKey<DamageType>> damageTypeGetter;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_uuyjertq;<init>(F)V}
@@ -69,10 +70,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_uuyjertq;<init>(FLjava/util/function/Function;)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/ai/brain/task/WalkTask;<init>(FLjava/util/function/Function;)V}
     */
-   public WalkTask(float speed, Function<PathAwareEntity, TagKey<DamageType>> function) {
+   public WalkTask(float speed, Function<PathAwareEntity, TagKey<DamageType>> damageTypeGetter) {
       super(Map.of(MemoryModuleType.IS_PANICKING, MemoryModuleState.REGISTERED, MemoryModuleType.HURT_BY, MemoryModuleState.REGISTERED), 100, 120);
       this.speed = speed;
-      this.f_rcpxgapc = function;
+      this.damageTypeGetter = damageTypeGetter;
    }
 
    /**
@@ -82,7 +83,7 @@
    protected boolean shouldRun(ServerWorld world, E arg2) {
       return (Boolean)arg2.getBrain()
             .getOptionalMemory(MemoryModuleType.HURT_BY)
-            .map(arg2x -> arg2x.isTypeIn((TagKey<DamageType>)this.f_rcpxgapc.apply(arg2)))
+            .map(arg2x -> arg2x.isTypeIn((TagKey<DamageType>)this.damageTypeGetter.apply(arg2)))
             .orElse(false)
          || arg2.getBrain().hasMemoryModule(MemoryModuleType.IS_PANICKING);
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/FuzzyTargeting.java namedSrc/net/minecraft/entity/ai/FuzzyTargeting.java
--- namedTargetSrc/net/minecraft/entity/ai/FuzzyTargeting.java	2024-07-09 01:56:10.836980328 +0000
+++ namedSrc/net/minecraft/entity/ai/FuzzyTargeting.java	2024-07-09 01:54:56.308857350 +0000
@@ -31,7 +31,7 @@
    public static Vec3d find(PathAwareEntity entity, int horizontalRange, int verticalRange, ToDoubleFunction<BlockPos> scorer) {
       boolean bl = NavigationConditions.isPositionTargetInRange(entity, horizontalRange);
       return FuzzyPositions.guessBest(() -> {
-         BlockPos lv = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange);
+         BlockPos lv = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange);
          BlockPos lv2 = tryMake(entity, horizontalRange, bl, lv);
          return lv2 == null ? null : validate(entity, lv2);
       }, scorer);
@@ -66,7 +66,7 @@
    @Nullable
    private static Vec3d findValid(PathAwareEntity entity, int horizontalRange, int verticalRange, Vec3d direction, boolean posTargetInRange) {
       return FuzzyPositions.guessBestPathTarget(entity, () -> {
-         BlockPos lv = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange, 0, direction.x, direction.z, (float) (Math.PI / 2));
+         BlockPos lv = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange, 0, direction.x, direction.z, (float) (Math.PI / 2));
          if (lv == null) {
             return null;
          } else {
@@ -92,7 +92,7 @@
     */
    @Nullable
    public static BlockPos tryMake(PathAwareEntity entity, int horizontalRange, boolean posTargetInRange, BlockPos relativeInRangePos) {
-      BlockPos lv = FuzzyPositions.towardTarget(entity, horizontalRange, entity.m_dlwxaobh(), relativeInRangePos);
+      BlockPos lv = FuzzyPositions.towardTarget(entity, horizontalRange, entity.getRandom(), relativeInRangePos);
       return !NavigationConditions.isHeightInvalid(lv, entity)
             && !NavigationConditions.isPositionTargetOutOfWalkRange(posTargetInRange, entity, lv)
             && !NavigationConditions.isInvalidPosition(entity.getNavigation(), lv)
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/BowAttackGoal.java namedSrc/net/minecraft/entity/ai/goal/BowAttackGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/BowAttackGoal.java	2024-07-09 01:56:10.760980207 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/BowAttackGoal.java	2024-07-09 01:54:56.204857169 +0000
@@ -162,11 +162,11 @@
          }
 
          if (this.combatTicks >= 20) {
-            if ((double)this.actor.m_dlwxaobh().nextFloat() < 0.3) {
+            if ((double)this.actor.getRandom().nextFloat() < 0.3) {
                this.movingToLeft = !this.movingToLeft;
             }
 
-            if ((double)this.actor.m_dlwxaobh().nextFloat() < 0.3) {
+            if ((double)this.actor.getRandom().nextFloat() < 0.3) {
                this.backward = !this.backward;
             }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java namedSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java	2024-07-09 01:56:11.040980653 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java	2024-07-09 01:54:56.560857785 +0000
@@ -113,7 +113,7 @@
    @Override
    public void tick() {
       super.tick();
-      if (this.mob.m_dlwxaobh().nextInt(20) == 0) {
+      if (this.mob.getRandom().nextInt(20) == 0) {
          this.mob.getWorld().syncWorldEvent(WorldEvents.ZOMBIE_ATTACKS_WOODEN_DOOR, this.doorPos, 0);
          if (!this.mob.handSwinging) {
             this.mob.swingHand(this.mob.getActiveHand());
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java namedSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java	2024-07-09 01:56:10.860980366 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java	2024-07-09 01:54:56.340857405 +0000
@@ -152,7 +152,7 @@
             this.cooldown--;
             if (this.cooldown <= 0) {
                this.actor.getNavigation().startMovingTo(lv, this.isUncharged() ? this.speed : this.speed * 0.5);
-               this.cooldown = COOLDOWN_RANGE.get(this.actor.m_dlwxaobh());
+               this.cooldown = COOLDOWN_RANGE.get(this.actor.getRandom());
             }
          } else {
             this.cooldown = 0;
@@ -176,7 +176,7 @@
             if (i >= CrossbowItem.m_jwwdtsib(lv2, this.actor)) {
                this.actor.stopUsingItem();
                this.stage = CrossbowAttackGoal.Stage.CHARGED;
-               this.chargedTicksLeft = 20 + this.actor.m_dlwxaobh().nextInt(20);
+               this.chargedTicksLeft = 20 + this.actor.getRandom().nextInt(20);
                this.actor.setCharging(false);
             }
          } else if (this.stage == CrossbowAttackGoal.Stage.CHARGED) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-07-09 01:56:10.932980481 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-07-09 01:54:56.432857564 +0000
@@ -49,7 +49,7 @@
     */
    @Override
    public boolean canStart() {
-      if (this.dolphin.m_dlwxaobh().nextInt(this.chance) != 0) {
+      if (this.dolphin.getRandom().nextInt(this.chance) != 0) {
          return false;
       } else {
          Direction lv = this.dolphin.getMovementDirection();
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java namedSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java	2024-07-09 01:56:10.960980526 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java	2024-07-09 01:54:56.464857619 +0000
@@ -59,7 +59,7 @@
     */
    @Override
    public boolean canStart() {
-      if (this.mob.m_dlwxaobh().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) {
+      if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) {
          return false;
       } else {
          BlockPos lv = this.mob.getBlockPos();
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/EscapeDangerGoal.java namedSrc/net/minecraft/entity/ai/goal/EscapeDangerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/EscapeDangerGoal.java	2024-07-09 01:56:10.828980315 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/EscapeDangerGoal.java	2024-07-09 01:54:56.300857335 +0000
@@ -55,9 +55,10 @@
     */
    protected boolean active;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lqzvnbrm Lnet/minecraft/unmapped/C_gilizaew;f_lqzvnbrm:Ljava/util/function/Function;}
+    * @mapping {@literal named damageTypeGetter Lnet/minecraft/entity/ai/goal/EscapeDangerGoal;damageTypeGetter:Ljava/util/function/Function;}
     */
-   private final Function<PathAwareEntity, TagKey<DamageType>> f_lqzvnbrm;
+   private final Function<PathAwareEntity, TagKey<DamageType>> damageTypeGetter;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gilizaew;<init>(Lnet/minecraft/unmapped/C_hqdayibh;D)V}
@@ -71,18 +72,18 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gilizaew;<init>(Lnet/minecraft/unmapped/C_hqdayibh;DLnet/minecraft/unmapped/C_ednuhnnn;)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/EscapeDangerGoal;<init>(Lnet/minecraft/entity/mob/PathAwareEntity;DLnet/minecraft/registry/tag/TagKey;)V}
     */
-   public EscapeDangerGoal(PathAwareEntity mob, double speed, TagKey<DamageType> arg2) {
-      this(mob, speed, arg2x -> arg2);
+   public EscapeDangerGoal(PathAwareEntity mob, double speed, TagKey<DamageType> damageType) {
+      this(mob, speed, arg2 -> damageType);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gilizaew;<init>(Lnet/minecraft/unmapped/C_hqdayibh;DLjava/util/function/Function;)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/EscapeDangerGoal;<init>(Lnet/minecraft/entity/mob/PathAwareEntity;DLjava/util/function/Function;)V}
     */
-   public EscapeDangerGoal(PathAwareEntity mob, double speed, Function<PathAwareEntity, TagKey<DamageType>> function) {
+   public EscapeDangerGoal(PathAwareEntity mob, double speed, Function<PathAwareEntity, TagKey<DamageType>> damageTypeGetter) {
       this.mob = mob;
       this.speed = speed;
-      this.f_lqzvnbrm = function;
+      this.damageTypeGetter = damageTypeGetter;
       this.setControls(EnumSet.of(Goal.Control.MOVE));
    }
 
@@ -113,7 +114,7 @@
     * @mapping {@literal named shouldEscape Lnet/minecraft/entity/ai/goal/EscapeDangerGoal;shouldEscape()Z}
     */
    protected boolean shouldEscape() {
-      return this.mob.getRecentDamageSource() != null && this.mob.getRecentDamageSource().isTypeIn((TagKey<DamageType>)this.f_lqzvnbrm.apply(this.mob));
+      return this.mob.getRecentDamageSource() != null && this.mob.getRecentDamageSource().isTypeIn((TagKey<DamageType>)this.damageTypeGetter.apply(this.mob));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java namedSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java	2024-07-09 01:56:10.808980283 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java	2024-07-09 01:54:56.276857294 +0000
@@ -112,7 +112,7 @@
     */
    @Nullable
    protected Vec3d locateShadedPos() {
-      RandomGenerator lv = this.mob.m_dlwxaobh();
+      RandomGenerator lv = this.mob.getRandom();
       BlockPos lv2 = this.mob.getBlockPos();
 
       for (int i = 0; i < 10; i++) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.java namedSrc/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.java	2024-07-09 01:56:10.744980181 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.java	2024-07-09 01:54:56.144857066 +0000
@@ -45,7 +45,7 @@
     * @mapping {@literal named getSurroundingSearchDelay Lnet/minecraft/entity/ai/goal/FollowGroupLeaderGoal;getSurroundingSearchDelay(Lnet/minecraft/entity/passive/SchoolingFishEntity;)I}
     */
    protected int getSurroundingSearchDelay(SchoolingFishEntity fish) {
-      return toGoalTicks(200 + fish.m_dlwxaobh().nextInt(200) % 20);
+      return toGoalTicks(200 + fish.getRandom().nextInt(200) % 20);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FollowMobGoal.java namedSrc/net/minecraft/entity/ai/goal/FollowMobGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FollowMobGoal.java	2024-07-09 01:56:10.944980500 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowMobGoal.java	2024-07-09 01:54:56.444857584 +0000
@@ -133,7 +133,7 @@
     */
    @Override
    public void tick() {
-      if (this.target != null && !this.mob.m_egrefywv()) {
+      if (this.target != null && !this.mob.isLeashed()) {
          this.mob.getLookControl().lookAt(this.target, 10.0F, (float)this.mob.getLookPitchSpeed());
          if (--this.updateCountdownTicks <= 0) {
             this.updateCountdownTicks = this.getTickCount(10);
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-07-09 01:56:10.852980353 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-07-09 01:54:56.328857384 +0000
@@ -80,7 +80,7 @@
       LivingEntity lv = this.tameable.getOwner();
       if (lv == null) {
          return false;
-      } else if (this.tameable.m_qlmizzto()) {
+      } else if (this.tameable.cannotFollowOwner()) {
          return false;
       } else if (this.tameable.squaredDistanceTo(lv) < (double)(this.minDistance * this.minDistance)) {
          return false;
@@ -98,7 +98,7 @@
       if (this.navigation.isIdle()) {
          return false;
       } else {
-         return this.tameable.m_qlmizzto() ? false : !(this.tameable.squaredDistanceTo(this.owner) <= (double)(this.maxDistance * this.maxDistance));
+         return this.tameable.cannotFollowOwner() ? false : !(this.tameable.squaredDistanceTo(this.owner) <= (double)(this.maxDistance * this.maxDistance));
       }
    }
 
@@ -127,7 +127,7 @@
     */
    @Override
    public void tick() {
-      boolean bl = this.tameable.m_wzurfvbh();
+      boolean bl = this.tameable.shouldTryTeleportToOwner();
       if (!bl) {
          this.tameable.getLookControl().lookAt(this.owner, 10.0F, (float)this.tameable.getLookPitchSpeed());
       }
@@ -135,7 +135,7 @@
       if (--this.updateCountdownTicks <= 0) {
          this.updateCountdownTicks = this.getTickCount(10);
          if (bl) {
-            this.tameable.m_zutxpjge();
+            this.tameable.tryTeleportToOwner();
          } else {
             this.navigation.startMovingTo(this.owner, this.speed);
          }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FormCaravanGoal.java namedSrc/net/minecraft/entity/ai/goal/FormCaravanGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FormCaravanGoal.java	2024-07-09 01:56:10.852980353 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FormCaravanGoal.java	2024-07-09 01:54:56.328857384 +0000
@@ -49,7 +49,7 @@
     */
    @Override
    public boolean canStart() {
-      if (!this.llama.m_egrefywv() && !this.llama.isFollowing()) {
+      if (!this.llama.isLeashed() && !this.llama.isFollowing()) {
          List<Entity> list = this.llama.getWorld().getOtherEntities(this.llama, this.llama.getBounds().expand(9.0, 4.0, 9.0), entity -> {
             EntityType<?> lvx = entity.getType();
             return lvx == EntityType.LLAMA || lvx == EntityType.TRADER_LLAMA;
@@ -71,7 +71,7 @@
          if (lv == null) {
             for (Entity lv4 : list) {
                LlamaEntity lv5 = (LlamaEntity)lv4;
-               if (lv5.m_egrefywv() && !lv5.hasFollower()) {
+               if (lv5.isLeashed() && !lv5.hasFollower()) {
                   double f = this.llama.squaredDistanceTo(lv5);
                   if (!(f > d)) {
                      d = f;
@@ -85,7 +85,7 @@
             return false;
          } else if (d < 4.0) {
             return false;
-         } else if (!lv.m_egrefywv() && !this.canFollow(lv, 1)) {
+         } else if (!lv.isLeashed() && !this.canFollow(lv, 1)) {
             return false;
          } else {
             this.llama.follow(lv);
@@ -140,7 +140,7 @@
    @Override
    public void tick() {
       if (this.llama.isFollowing()) {
-         if (!(this.llama.m_xkmzlwed() instanceof LeashKnotEntity)) {
+         if (!(this.llama.getLeashHolder() instanceof LeashKnotEntity)) {
             LlamaEntity lv = this.llama.getFollowing();
             double d = (double)this.llama.distanceTo(lv);
             float f = 2.0F;
@@ -160,7 +160,7 @@
       if (length > 8) {
          return false;
       } else if (llama.isFollowing()) {
-         return llama.getFollowing().m_egrefywv() ? true : this.canFollow(llama.getFollowing(), ++length);
+         return llama.getFollowing().isLeashed() ? true : this.canFollow(llama.getFollowing(), ++length);
       } else {
          return false;
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/GoToVillageGoal.java namedSrc/net/minecraft/entity/ai/goal/GoToVillageGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/GoToVillageGoal.java	2024-07-09 01:56:11.024980628 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/GoToVillageGoal.java	2024-07-09 01:54:56.540857750 +0000
@@ -58,7 +58,7 @@
          return false;
       } else if (this.mob.getWorld().isDay()) {
          return false;
-      } else if (this.mob.m_dlwxaobh().nextInt(this.searchRange) != 0) {
+      } else if (this.mob.getRandom().nextInt(this.searchRange) != 0) {
          return false;
       } else {
          ServerWorld lv = (ServerWorld)this.mob.getWorld();
@@ -108,7 +108,7 @@
     * @mapping {@literal named findOtherWaypoint Lnet/minecraft/entity/ai/goal/GoToVillageGoal;findOtherWaypoint()V}
     */
    private void findOtherWaypoint() {
-      RandomGenerator lv = this.mob.m_dlwxaobh();
+      RandomGenerator lv = this.mob.getRandom();
       BlockPos lv2 = this.mob
          .getWorld()
          .getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, this.mob.getBlockPos().add(-8 + lv.nextInt(16), 0, -8 + lv.nextInt(16)));
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java namedSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java	2024-07-09 01:56:10.980980558 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java	2024-07-09 01:54:56.488857660 +0000
@@ -78,7 +78,7 @@
    public void stop() {
       this.actor.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
       if (this.sound != null) {
-         this.actor.playSound(this.sound, 1.0F, this.actor.m_dlwxaobh().nextFloat() * 0.2F + 0.9F);
+         this.actor.playSound(this.sound, 1.0F, this.actor.getRandom().nextFloat() * 0.2F + 0.9F);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java namedSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java	2024-07-09 01:56:10.944980500 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java	2024-07-09 01:54:56.448857591 +0000
@@ -90,7 +90,7 @@
     */
    @Override
    public void tick() {
-      if (!this.horse.isTame() && this.horse.m_dlwxaobh().nextInt(this.getTickCount(50)) == 0) {
+      if (!this.horse.isTame() && this.horse.getRandom().nextInt(this.getTickCount(50)) == 0) {
          Entity lv = this.horse.getFirstPassenger();
          if (lv == null) {
             return;
@@ -99,7 +99,7 @@
          if (lv instanceof PlayerEntity lv2) {
             int i = this.horse.getTemper();
             int j = this.horse.getMaxTemper();
-            if (j > 0 && this.horse.m_dlwxaobh().nextInt(j) < i) {
+            if (j > 0 && this.horse.getRandom().nextInt(j) < i) {
                this.horse.bondWithPlayer(lv2);
                return;
             }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java namedSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java	2024-07-09 01:56:11.016980615 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java	2024-07-09 01:54:56.532857737 +0000
@@ -52,7 +52,7 @@
    public boolean canStart() {
       if (!this.golem.getWorld().isDay()) {
          return false;
-      } else if (this.golem.m_dlwxaobh().nextInt(8000) != 0) {
+      } else if (this.golem.getRandom().nextInt(8000) != 0) {
          return false;
       } else {
          this.targetVillager = this.golem
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/LookAroundGoal.java namedSrc/net/minecraft/entity/ai/goal/LookAroundGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/LookAroundGoal.java	2024-07-09 01:56:10.912980449 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/LookAroundGoal.java	2024-07-09 01:54:56.408857522 +0000
@@ -43,7 +43,7 @@
     */
    @Override
    public boolean canStart() {
-      return this.mob.m_dlwxaobh().nextFloat() < 0.02F;
+      return this.mob.getRandom().nextFloat() < 0.02F;
    }
 
    /**
@@ -59,10 +59,10 @@
     */
    @Override
    public void start() {
-      double d = (Math.PI * 2) * this.mob.m_dlwxaobh().nextDouble();
+      double d = (Math.PI * 2) * this.mob.getRandom().nextDouble();
       this.deltaX = Math.cos(d);
       this.deltaZ = Math.sin(d);
-      this.lookTime = 20 + this.mob.m_dlwxaobh().nextInt(20);
+      this.lookTime = 20 + this.mob.getRandom().nextInt(20);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java namedSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java	2024-07-09 01:56:10.988980570 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java	2024-07-09 01:54:56.496857675 +0000
@@ -102,7 +102,7 @@
     */
    @Override
    public boolean canStart() {
-      if (this.mob.m_dlwxaobh().nextFloat() >= this.chance) {
+      if (this.mob.getRandom().nextFloat() >= this.chance) {
          return false;
       } else {
          if (this.mob.getTarget() != null) {
@@ -147,7 +147,7 @@
     */
    @Override
    public void start() {
-      this.lookTime = this.getTickCount(40 + this.mob.m_dlwxaobh().nextInt(40));
+      this.lookTime = this.getTickCount(40 + this.mob.getRandom().nextInt(40));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java namedSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java	2024-07-09 01:56:10.964980532 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java	2024-07-09 01:54:56.472857633 +0000
@@ -173,12 +173,12 @@
             && (
                this.targetX == 0.0 && this.targetY == 0.0 && this.targetZ == 0.0
                   || lv.squaredDistanceTo(this.targetX, this.targetY, this.targetZ) >= 1.0
-                  || this.mob.m_dlwxaobh().nextFloat() < 0.05F
+                  || this.mob.getRandom().nextFloat() < 0.05F
             )) {
             this.targetX = lv.getX();
             this.targetY = lv.getY();
             this.targetZ = lv.getZ();
-            this.updateCountdownTicks = 4 + this.mob.m_dlwxaobh().nextInt(7);
+            this.updateCountdownTicks = 4 + this.mob.getRandom().nextInt(7);
             double d = this.mob.squaredDistanceTo(lv);
             if (d > 1024.0) {
                this.updateCountdownTicks += 10;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.java namedSrc/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.java	2024-07-09 01:56:10.972980545 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.java	2024-07-09 01:54:56.480857647 +0000
@@ -116,7 +116,7 @@
     * @mapping {@literal named getInterval Lnet/minecraft/entity/ai/goal/MoveToTargetPosGoal;getInterval(Lnet/minecraft/entity/mob/PathAwareEntity;)I}
     */
    protected int getInterval(PathAwareEntity mob) {
-      return toGoalTicks(200 + mob.m_dlwxaobh().nextInt(200));
+      return toGoalTicks(200 + mob.getRandom().nextInt(200));
    }
 
    /**
@@ -134,7 +134,7 @@
    public void start() {
       this.startMovingToTarget();
       this.tryingTime = 0;
-      this.safeWaitingTime = this.mob.m_dlwxaobh().nextInt(this.mob.m_dlwxaobh().nextInt(1200) + 1200) + 1200;
+      this.safeWaitingTime = this.mob.getRandom().nextInt(this.mob.getRandom().nextInt(1200) + 1200) + 1200;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/PounceAtTargetGoal.java namedSrc/net/minecraft/entity/ai/goal/PounceAtTargetGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/PounceAtTargetGoal.java	2024-07-09 01:56:10.876980391 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/PounceAtTargetGoal.java	2024-07-09 01:54:56.364857446 +0000
@@ -52,7 +52,7 @@
             if (d < 4.0 || d > 16.0) {
                return false;
             } else {
-               return !this.mob.isOnGround() ? false : this.mob.m_dlwxaobh().nextInt(toGoalTicks(5)) == 0;
+               return !this.mob.isOnGround() ? false : this.mob.getRandom().nextInt(toGoalTicks(5)) == 0;
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/RaidGoal.java namedSrc/net/minecraft/entity/ai/goal/RaidGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/RaidGoal.java	2024-07-09 01:56:11.052980672 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/RaidGoal.java	2024-07-09 01:54:56.576857813 +0000
@@ -50,7 +50,7 @@
     */
    @Override
    public boolean canStart() {
-      if (this.cooldown > 0 || !this.mob.m_dlwxaobh().nextBoolean()) {
+      if (this.cooldown > 0 || !this.mob.getRandom().nextBoolean()) {
          return false;
       } else if (!((RaiderEntity)this.mob).hasActiveRaid()) {
          return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/RearGoal.java namedSrc/net/minecraft/entity/ai/goal/RearGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/RearGoal.java	2024-07-09 01:56:10.948980506 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/RearGoal.java	2024-07-09 01:54:56.452857598 +0000
@@ -62,9 +62,9 @@
    @Override
    public boolean canStart() {
       this.timer++;
-      if (this.timer > 0 && this.horse.m_dlwxaobh().nextInt(1000) < this.timer) {
+      if (this.timer > 0 && this.horse.getRandom().nextInt(1000) < this.timer) {
          this.resetTimer(this.horse);
-         return !this.horse.isImmobile() && this.horse.m_dlwxaobh().nextInt(10) == 0;
+         return !this.horse.isImmobile() && this.horse.getRandom().nextInt(10) == 0;
       } else {
          return false;
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.java namedSrc/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.java	2024-07-09 01:56:11.000980590 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.java	2024-07-09 01:54:56.516857709 +0000
@@ -64,7 +64,7 @@
     */
    @Override
    public void tick() {
-      if (!this.mounted && !this.tameable.isInSittingPose() && !this.tameable.m_egrefywv()) {
+      if (!this.mounted && !this.tameable.isInSittingPose() && !this.tameable.isLeashed()) {
          if (this.tameable.getBounds().intersects(this.owner.getBounds())) {
             this.mounted = this.tameable.mountOnto(this.owner);
          }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-07-09 01:56:11.032980640 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-07-09 01:54:56.548857764 +0000
@@ -3,6 +3,7 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.ItemEnchantmentsComponent;
 import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.provider.EnchantmentProviders;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LightningEntity;
@@ -13,7 +14,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_hzfgfhbe;
 import net.minecraft.world.LocalDifficulty;
 import org.jetbrains.annotations.Nullable;
 
@@ -71,7 +71,7 @@
                   if (lv6 != null) {
                      lv6.startRiding(lv5);
                      lv5.addVelocity(
-                        this.skeletonHorse.m_dlwxaobh().nextTriangular(0.0, 1.1485), 0.0, this.skeletonHorse.m_dlwxaobh().nextTriangular(0.0, 1.1485)
+                        this.skeletonHorse.getRandom().nextTriangular(0.0, 1.1485), 0.0, this.skeletonHorse.getRandom().nextTriangular(0.0, 1.1485)
                      );
                      lv.spawnEntityAndPassengers(lv5);
                   }
@@ -116,8 +116,8 @@
             lv.equipStack(EquipmentSlot.HEAD, new ItemStack(Items.IRON_HELMET));
          }
 
-         this.m_mpjqignn(lv, EquipmentSlot.MAINHAND, localDifficulty);
-         this.m_mpjqignn(lv, EquipmentSlot.HEAD, localDifficulty);
+         this.equipSpawnEquipment(lv, EquipmentSlot.MAINHAND, localDifficulty);
+         this.equipSpawnEquipment(lv, EquipmentSlot.HEAD, localDifficulty);
       }
 
       return lv;
@@ -125,12 +125,14 @@
 
    /**
     * @mapping {@literal hashed m_mpjqignn Lnet/minecraft/unmapped/C_aeyqpoyu;m_mpjqignn(Lnet/minecraft/unmapped/C_fihnfnjv;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_jiailwzt;)V}
-    * @mapping {@literal named m_mpjqignn Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;m_mpjqignn(Lnet/minecraft/entity/mob/SkeletonEntity;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/world/LocalDifficulty;)V}
+    * @mapping {@literal named equipSpawnEquipment Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;equipSpawnEquipment(Lnet/minecraft/entity/mob/SkeletonEntity;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/world/LocalDifficulty;)V}
     */
-   private void m_mpjqignn(SkeletonEntity arg, EquipmentSlot arg2, LocalDifficulty difficulty) {
-      ItemStack lv = arg.getEquippedStack(arg2);
+   private void equipSpawnEquipment(SkeletonEntity skeleton, EquipmentSlot slot, LocalDifficulty difficulty) {
+      ItemStack lv = skeleton.getEquippedStack(slot);
       lv.set(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
-      EnchantmentHelper.enchantFromProvider(lv, arg.getWorld().getRegistryManager(), C_hzfgfhbe.MOB_SPAWN_EQUIPMENT, difficulty, arg.m_dlwxaobh());
-      arg.equipStack(arg2, lv);
+      EnchantmentHelper.enchantFromProvider(
+         lv, skeleton.getWorld().getRegistryManager(), EnchantmentProviders.MOB_SPAWN_EQUIPMENT, difficulty, skeleton.getRandom()
+      );
+      skeleton.equipStack(slot, lv);
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java namedSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java	2024-07-09 01:56:10.864980373 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java	2024-07-09 01:54:56.344857412 +0000
@@ -117,7 +117,7 @@
       World lv = this.stepAndDestroyMob.getWorld();
       BlockPos lv2 = this.stepAndDestroyMob.getBlockPos();
       BlockPos lv3 = this.tweakToProperPos(lv2, lv);
-      RandomGenerator lv4 = this.stepAndDestroyMob.m_dlwxaobh();
+      RandomGenerator lv4 = this.stepAndDestroyMob.getRandom();
       if (this.hasReached() && lv3 != null) {
          if (this.counter > 0) {
             Vec3d lv5 = this.stepAndDestroyMob.getVelocity();
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/SwimGoal.java namedSrc/net/minecraft/entity/ai/goal/SwimGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/SwimGoal.java	2024-07-09 01:56:10.844980341 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SwimGoal.java	2024-07-09 01:54:56.316857363 +0000
@@ -46,7 +46,7 @@
     */
    @Override
    public void tick() {
-      if (this.mob.m_dlwxaobh().nextFloat() < 0.8F) {
+      if (this.mob.getRandom().nextFloat() < 0.8F) {
          this.mob.getJumpControl().setActive();
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/TargetGoal.java namedSrc/net/minecraft/entity/ai/goal/TargetGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TargetGoal.java	2024-07-09 01:56:11.020980621 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TargetGoal.java	2024-07-09 01:54:56.536857744 +0000
@@ -90,7 +90,7 @@
     */
    @Override
    public boolean canStart() {
-      if (this.reciprocalChance > 0 && this.mob.m_dlwxaobh().nextInt(this.reciprocalChance) != 0) {
+      if (this.reciprocalChance > 0 && this.mob.getRandom().nextInt(this.reciprocalChance) != 0) {
          return false;
       } else {
          this.findClosestTarget();
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java namedSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java	2024-07-09 01:56:10.956980520 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java	2024-07-09 01:54:56.464857619 +0000
@@ -190,7 +190,7 @@
     * @mapping {@literal named canNavigateToEntity Lnet/minecraft/entity/ai/goal/TrackTargetGoal;canNavigateToEntity(Lnet/minecraft/entity/LivingEntity;)Z}
     */
    private boolean canNavigateToEntity(LivingEntity entity) {
-      this.checkCanNavigateCooldown = toGoalTicks(10 + this.mob.m_dlwxaobh().nextInt(5));
+      this.checkCanNavigateCooldown = toGoalTicks(10 + this.mob.getRandom().nextInt(5));
       Path lv = this.mob.getNavigation().findPathTo(entity, 0);
       if (lv == null) {
          return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/WanderAroundFarGoal.java namedSrc/net/minecraft/entity/ai/goal/WanderAroundFarGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/WanderAroundFarGoal.java	2024-07-09 01:56:11.052980672 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/WanderAroundFarGoal.java	2024-07-09 01:54:56.576857813 +0000
@@ -47,7 +47,7 @@
          Vec3d lv = FuzzyTargeting.find(this.mob, 15, 7);
          return lv == null ? super.getWanderTarget() : lv;
       } else {
-         return this.mob.m_dlwxaobh().nextFloat() >= this.probability ? FuzzyTargeting.find(this.mob, 10, 7) : super.getWanderTarget();
+         return this.mob.getRandom().nextFloat() >= this.probability ? FuzzyTargeting.find(this.mob, 10, 7) : super.getWanderTarget();
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/WanderAroundGoal.java namedSrc/net/minecraft/entity/ai/goal/WanderAroundGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/WanderAroundGoal.java	2024-07-09 01:56:11.012980608 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/WanderAroundGoal.java	2024-07-09 01:54:56.528857730 +0000
@@ -98,7 +98,7 @@
                return false;
             }
 
-            if (this.mob.m_dlwxaobh().nextInt(toGoalTicks(this.chance)) != 0) {
+            if (this.mob.getRandom().nextInt(toGoalTicks(this.chance)) != 0) {
                return false;
             }
          }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/WolfBegGoal.java namedSrc/net/minecraft/entity/ai/goal/WolfBegGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/WolfBegGoal.java	2024-07-09 01:56:10.936980488 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/WolfBegGoal.java	2024-07-09 01:54:56.440857578 +0000
@@ -88,7 +88,7 @@
    @Override
    public void start() {
       this.wolf.setBegging(true);
-      this.timer = this.getTickCount(40 + this.wolf.m_dlwxaobh().nextInt(40));
+      this.timer = this.getTickCount(40 + this.wolf.getRandom().nextInt(40));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/NoPenaltySolidTargeting.java namedSrc/net/minecraft/entity/ai/NoPenaltySolidTargeting.java
--- namedTargetSrc/net/minecraft/entity/ai/NoPenaltySolidTargeting.java	2024-07-09 01:56:10.884980405 +0000
+++ namedSrc/net/minecraft/entity/ai/NoPenaltySolidTargeting.java	2024-07-09 01:54:56.372857460 +0000
@@ -42,11 +42,11 @@
       double rangeAngle,
       boolean posTargetInRange
    ) {
-      BlockPos lv = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange, startHeight, directionX, directionZ, rangeAngle);
+      BlockPos lv = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange, startHeight, directionX, directionZ, rangeAngle);
       if (lv == null) {
          return null;
       } else {
-         BlockPos lv2 = FuzzyPositions.towardTarget(entity, horizontalRange, entity.m_dlwxaobh(), lv);
+         BlockPos lv2 = FuzzyPositions.towardTarget(entity, horizontalRange, entity.getRandom(), lv);
          if (!NavigationConditions.isHeightInvalid(lv2, entity) && !NavigationConditions.isPositionTargetOutOfWalkRange(posTargetInRange, entity, lv2)) {
             lv2 = FuzzyPositions.upWhile(lv2, entity.getWorld().getTopY(), pos -> NavigationConditions.isSolidAt(entity, pos));
             return NavigationConditions.hasPathfindingPenalty(entity, lv2) ? null : lv2;
diff -bur namedTargetSrc/net/minecraft/entity/ai/NoPenaltyTargeting.java namedSrc/net/minecraft/entity/ai/NoPenaltyTargeting.java
--- namedTargetSrc/net/minecraft/entity/ai/NoPenaltyTargeting.java	2024-07-09 01:56:10.808980283 +0000
+++ namedSrc/net/minecraft/entity/ai/NoPenaltyTargeting.java	2024-07-09 01:54:56.272857287 +0000
@@ -21,7 +21,7 @@
    public static Vec3d find(PathAwareEntity entity, int horizontalRange, int verticalRange) {
       boolean bl = NavigationConditions.isPositionTargetInRange(entity, horizontalRange);
       return FuzzyPositions.guessBestPathTarget(entity, () -> {
-         BlockPos lv = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange);
+         BlockPos lv = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange);
          return tryMake(entity, horizontalRange, bl, lv);
       });
    }
@@ -35,7 +35,7 @@
       Vec3d lv = end.subtract(entity.getX(), entity.getY(), entity.getZ());
       boolean bl = NavigationConditions.isPositionTargetInRange(entity, horizontalRange);
       return FuzzyPositions.guessBestPathTarget(entity, () -> {
-         BlockPos lvx = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange, 0, lv.x, lv.z, angleRange);
+         BlockPos lvx = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange, 0, lv.x, lv.z, angleRange);
          return lvx == null ? null : tryMake(entity, horizontalRange, bl, lvx);
       });
    }
@@ -49,7 +49,7 @@
       Vec3d lv = entity.getPos().subtract(direction);
       boolean bl = NavigationConditions.isPositionTargetInRange(entity, horizontalRange);
       return FuzzyPositions.guessBestPathTarget(entity, () -> {
-         BlockPos lvx = FuzzyPositions.localFuzz(entity.m_dlwxaobh(), horizontalRange, verticalRange, 0, lv.x, lv.z, (float) (Math.PI / 2));
+         BlockPos lvx = FuzzyPositions.localFuzz(entity.getRandom(), horizontalRange, verticalRange, 0, lv.x, lv.z, (float) (Math.PI / 2));
          return lvx == null ? null : tryMake(entity, horizontalRange, bl, lvx);
       });
    }
@@ -60,7 +60,7 @@
     */
    @Nullable
    private static BlockPos tryMake(PathAwareEntity entity, int horizontalRange, boolean posTargetInRange, BlockPos fuzz) {
-      BlockPos lv = FuzzyPositions.towardTarget(entity, horizontalRange, entity.m_dlwxaobh(), fuzz);
+      BlockPos lv = FuzzyPositions.towardTarget(entity, horizontalRange, entity.getRandom(), fuzz);
       return !NavigationConditions.isHeightInvalid(lv, entity)
             && !NavigationConditions.isPositionTargetOutOfWalkRange(posTargetInRange, entity, lv)
             && !NavigationConditions.isInvalidPosition(entity.getNavigation(), lv)
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java	2024-07-09 01:56:10.736980168 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java	2024-07-09 01:54:56.120857024 +0000
@@ -389,7 +389,7 @@
          double f = Math.max(0.0, 1.1F - lv.getYLength());
          Box lv2 = lv.expand(e, f, d);
          return BlockPos.iterateRandomly(
-            entity.m_dlwxaobh(),
+            entity.getRandom(),
             10,
             MathHelper.floor(lv2.minX),
             MathHelper.floor(lv2.minY),
diff -bur namedTargetSrc/net/minecraft/entity/attribute/AttributeContainer.java namedSrc/net/minecraft/entity/attribute/AttributeContainer.java
--- namedTargetSrc/net/minecraft/entity/attribute/AttributeContainer.java	2024-07-09 01:56:10.980980558 +0000
+++ namedSrc/net/minecraft/entity/attribute/AttributeContainer.java	2024-07-09 01:54:56.492857668 +0000
@@ -33,13 +33,15 @@
     */
    private final Map<Holder<EntityAttribute>, EntityAttributeInstance> custom = new Object2ObjectOpenHashMap<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fxhnugqm Lnet/minecraft/unmapped/C_cohbwqne;f_fxhnugqm:Ljava/util/Set;}
+    * @mapping {@literal named pendingSync Lnet/minecraft/entity/attribute/AttributeContainer;pendingSync:Ljava/util/Set;}
     */
-   private final Set<EntityAttributeInstance> f_fxhnugqm = new ObjectOpenHashSet<>();
+   private final Set<EntityAttributeInstance> pendingSync = new ObjectOpenHashSet<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xwjysvew Lnet/minecraft/unmapped/C_cohbwqne;f_xwjysvew:Ljava/util/Set;}
+    * @mapping {@literal named pendingUpdate Lnet/minecraft/entity/attribute/AttributeContainer;pendingUpdate:Ljava/util/Set;}
     */
-   private final Set<EntityAttributeInstance> f_xwjysvew = new ObjectOpenHashSet<>();
+   private final Set<EntityAttributeInstance> pendingUpdate = new ObjectOpenHashSet<>();
    /**
     * @mapping {@literal hashed f_ktubclms Lnet/minecraft/unmapped/C_cohbwqne;f_ktubclms:Lnet/minecraft/unmapped/C_sdjuuzrz;}
     * @mapping {@literal named fallback Lnet/minecraft/entity/attribute/AttributeContainer;fallback:Lnet/minecraft/entity/attribute/DefaultAttributeContainer;}
@@ -59,24 +61,26 @@
     * @mapping {@literal named updateTrackedStatus Lnet/minecraft/entity/attribute/AttributeContainer;updateTrackedStatus(Lnet/minecraft/entity/attribute/EntityAttributeInstance;)V}
     */
    private void updateTrackedStatus(EntityAttributeInstance instance) {
-      this.f_xwjysvew.add(instance);
+      this.pendingUpdate.add(instance);
       if (instance.getAttribute().value().isTracked()) {
-         this.f_fxhnugqm.add(instance);
+         this.pendingSync.add(instance);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kzjivbbd Lnet/minecraft/unmapped/C_cohbwqne;m_kzjivbbd()Ljava/util/Set;}
+    * @mapping {@literal named getAttributesToSync Lnet/minecraft/entity/attribute/AttributeContainer;getAttributesToSync()Ljava/util/Set;}
     */
-   public Set<EntityAttributeInstance> m_kzjivbbd() {
-      return this.f_fxhnugqm;
+   public Set<EntityAttributeInstance> getAttributesToSync() {
+      return this.pendingSync;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jhklrcmp Lnet/minecraft/unmapped/C_cohbwqne;m_jhklrcmp()Ljava/util/Set;}
+    * @mapping {@literal named getAttributesToUpdate Lnet/minecraft/entity/attribute/AttributeContainer;getAttributesToUpdate()Ljava/util/Set;}
     */
-   public Set<EntityAttributeInstance> m_jhklrcmp() {
-      return this.f_xwjysvew;
+   public Set<EntityAttributeInstance> getAttributesToUpdate() {
+      return this.pendingUpdate;
    }
 
    /**
@@ -112,9 +116,9 @@
     * @mapping {@literal hashed m_gsorkasz Lnet/minecraft/unmapped/C_cohbwqne;m_gsorkasz(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)Z}
     * @mapping {@literal named getModifier Lnet/minecraft/entity/attribute/AttributeContainer;getModifier(Lnet/minecraft/registry/Holder;Lnet/minecraft/util/Identifier;)Z}
     */
-   public boolean getModifier(Holder<EntityAttribute> attribute, Identifier arg2) {
+   public boolean getModifier(Holder<EntityAttribute> attribute, Identifier id) {
       EntityAttributeInstance lv = (EntityAttributeInstance)this.custom.get(attribute);
-      return lv != null ? lv.getModifier(arg2) != null : this.fallback.hasModifier(attribute, arg2);
+      return lv != null ? lv.getModifier(id) != null : this.fallback.hasModifier(attribute, id);
    }
 
    /**
@@ -139,16 +143,17 @@
     * @mapping {@literal hashed m_furmwbsi Lnet/minecraft/unmapped/C_cohbwqne;m_furmwbsi(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)D}
     * @mapping {@literal named getModifierValue Lnet/minecraft/entity/attribute/AttributeContainer;getModifierValue(Lnet/minecraft/registry/Holder;Lnet/minecraft/util/Identifier;)D}
     */
-   public double getModifierValue(Holder<EntityAttribute> attribute, Identifier arg2) {
+   public double getModifierValue(Holder<EntityAttribute> attribute, Identifier id) {
       EntityAttributeInstance lv = (EntityAttributeInstance)this.custom.get(attribute);
-      return lv != null ? lv.getModifier(arg2).amount() : this.fallback.getModifierValue(attribute, arg2);
+      return lv != null ? lv.getModifier(id).amount() : this.fallback.getModifierValue(attribute, id);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fkydwjmo Lnet/minecraft/unmapped/C_cohbwqne;m_fkydwjmo(Lcom/google/common/collect/Multimap;)V}
+    * @mapping {@literal named addTemporaryModifiers Lnet/minecraft/entity/attribute/AttributeContainer;addTemporaryModifiers(Lcom/google/common/collect/Multimap;)V}
     */
-   public void m_fkydwjmo(Multimap<Holder<EntityAttribute>, EntityAttributeModifier> multimap) {
-      multimap.forEach((arg, arg2) -> {
+   public void addTemporaryModifiers(Multimap<Holder<EntityAttribute>, EntityAttributeModifier> modifiers) {
+      modifiers.forEach((arg, arg2) -> {
          EntityAttributeInstance lv = this.getInstance(arg);
          if (lv != null) {
             lv.removeModifier(arg2.id());
@@ -158,10 +163,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yortiwsq Lnet/minecraft/unmapped/C_cohbwqne;m_yortiwsq(Lcom/google/common/collect/Multimap;)V}
+    * @mapping {@literal named removeModifiers Lnet/minecraft/entity/attribute/AttributeContainer;removeModifiers(Lcom/google/common/collect/Multimap;)V}
     */
-   public void m_yortiwsq(Multimap<Holder<EntityAttribute>, EntityAttributeModifier> multimap) {
-      multimap.asMap().forEach((arg, collection) -> {
+   public void removeModifiers(Multimap<Holder<EntityAttribute>, EntityAttributeModifier> modifiers) {
+      modifiers.asMap().forEach((arg, collection) -> {
          EntityAttributeInstance lv = (EntityAttributeInstance)this.custom.get(arg);
          if (lv != null) {
             collection.forEach(arg2 -> lv.removeModifier(arg2.id()));
@@ -170,25 +176,27 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qzikslsi Lnet/minecraft/unmapped/C_cohbwqne;m_qzikslsi(Lnet/minecraft/unmapped/C_cohbwqne;)V}
+    * @mapping {@literal named setValuesFrom Lnet/minecraft/entity/attribute/AttributeContainer;setValuesFrom(Lnet/minecraft/entity/attribute/AttributeContainer;)V}
     */
-   public void m_qzikslsi(AttributeContainer arg) {
-      arg.custom.values().forEach(argx -> {
-         EntityAttributeInstance lv = this.getInstance(argx.getAttribute());
+   public void setValuesFrom(AttributeContainer container) {
+      container.custom.values().forEach(arg -> {
+         EntityAttributeInstance lv = this.getInstance(arg.getAttribute());
          if (lv != null) {
-            lv.setFrom(argx);
+            lv.setFrom(arg);
          }
       });
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_iaixpnqz Lnet/minecraft/unmapped/C_cohbwqne;m_iaixpnqz(Lnet/minecraft/unmapped/C_cohbwqne;)V}
+    * @mapping {@literal named setBaseValuesFrom Lnet/minecraft/entity/attribute/AttributeContainer;setBaseValuesFrom(Lnet/minecraft/entity/attribute/AttributeContainer;)V}
     */
-   public void m_iaixpnqz(AttributeContainer arg) {
-      arg.custom.values().forEach(argx -> {
-         EntityAttributeInstance lv = this.getInstance(argx.getAttribute());
+   public void setBaseValuesFrom(AttributeContainer container) {
+      container.custom.values().forEach(arg -> {
+         EntityAttributeInstance lv = this.getInstance(arg.getAttribute());
          if (lv != null) {
-            lv.setBaseValue(argx.getBaseValue());
+            lv.setBaseValue(arg.getBaseValue());
          }
       });
    }
diff -bur namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeContainer.java namedSrc/net/minecraft/entity/attribute/DefaultAttributeContainer.java
--- namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeContainer.java	2024-07-09 01:56:11.040980653 +0000
+++ namedSrc/net/minecraft/entity/attribute/DefaultAttributeContainer.java	2024-07-09 01:54:56.564857792 +0000
@@ -59,10 +59,10 @@
     * @mapping {@literal hashed m_kgqvpjqf Lnet/minecraft/unmapped/C_sdjuuzrz;m_kgqvpjqf(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)D}
     * @mapping {@literal named getModifierValue Lnet/minecraft/entity/attribute/DefaultAttributeContainer;getModifierValue(Lnet/minecraft/registry/Holder;Lnet/minecraft/util/Identifier;)D}
     */
-   public double getModifierValue(Holder<EntityAttribute> attribute, Identifier arg2) {
-      EntityAttributeModifier lv = this.require(attribute).getModifier(arg2);
+   public double getModifierValue(Holder<EntityAttribute> attribute, Identifier id) {
+      EntityAttributeModifier lv = this.require(attribute).getModifier(id);
       if (lv == null) {
-         throw new IllegalArgumentException("Can't find modifier " + arg2 + " on attribute " + attribute.getRegisteredName());
+         throw new IllegalArgumentException("Can't find modifier " + id + " on attribute " + attribute.getRegisteredName());
       } else {
          return lv.amount();
       }
@@ -104,9 +104,9 @@
     * @mapping {@literal hashed m_idcvtmyt Lnet/minecraft/unmapped/C_sdjuuzrz;m_idcvtmyt(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_ncpywfca;)Z}
     * @mapping {@literal named hasModifier Lnet/minecraft/entity/attribute/DefaultAttributeContainer;hasModifier(Lnet/minecraft/registry/Holder;Lnet/minecraft/util/Identifier;)Z}
     */
-   public boolean hasModifier(Holder<EntityAttribute> attribute, Identifier arg2) {
+   public boolean hasModifier(Holder<EntityAttribute> attribute, Identifier id) {
       EntityAttributeInstance lv = (EntityAttributeInstance)this.instances.get(attribute);
-      return lv != null && lv.getModifier(arg2) != null;
+      return lv != null && lv.getModifier(id) != null;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java namedSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java	2024-07-09 01:56:10.984980564 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java	2024-07-09 01:54:56.496857675 +0000
@@ -25,17 +25,20 @@
  */
 public class EntityAttributeInstance {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jihvavrd Lnet/minecraft/unmapped/C_lzukavpx;f_jihvavrd:Ljava/lang/String;}
+    * @mapping {@literal named BASE_NBT_KEY Lnet/minecraft/entity/attribute/EntityAttributeInstance;BASE_NBT_KEY:Ljava/lang/String;}
     */
-   private static final String f_jihvavrd = "base";
+   private static final String BASE_NBT_KEY = "base";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hxrayccb Lnet/minecraft/unmapped/C_lzukavpx;f_hxrayccb:Ljava/lang/String;}
+    * @mapping {@literal named MODIFIERS_NBT_KEY Lnet/minecraft/entity/attribute/EntityAttributeInstance;MODIFIERS_NBT_KEY:Ljava/lang/String;}
     */
-   private static final String f_hxrayccb = "modifiers";
+   private static final String MODIFIERS_NBT_KEY = "modifiers";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bkqrbgay Lnet/minecraft/unmapped/C_lzukavpx;f_bkqrbgay:Ljava/lang/String;}
+    * @mapping {@literal named ID_NBT_KEY Lnet/minecraft/entity/attribute/EntityAttributeInstance;ID_NBT_KEY:Ljava/lang/String;}
     */
-   public static final String f_bkqrbgay = "id";
+   public static final String ID_NBT_KEY = "id";
    /**
     * @mapping {@literal hashed f_mlqjboam Lnet/minecraft/unmapped/C_lzukavpx;f_mlqjboam:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named type Lnet/minecraft/entity/attribute/EntityAttributeInstance;type:Lnet/minecraft/registry/Holder;}
@@ -141,16 +144,16 @@
     * @mapping {@literal named getModifier Lnet/minecraft/entity/attribute/EntityAttributeInstance;getModifier(Lnet/minecraft/util/Identifier;)Lnet/minecraft/entity/attribute/EntityAttributeModifier;}
     */
    @Nullable
-   public EntityAttributeModifier getModifier(Identifier arg) {
-      return (EntityAttributeModifier)this.idToModifiers.get(arg);
+   public EntityAttributeModifier getModifier(Identifier id) {
+      return (EntityAttributeModifier)this.idToModifiers.get(id);
    }
 
    /**
     * @mapping {@literal hashed m_gbtcpwti Lnet/minecraft/unmapped/C_lzukavpx;m_gbtcpwti(Lnet/minecraft/unmapped/C_ncpywfca;)Z}
     * @mapping {@literal named hasModifier Lnet/minecraft/entity/attribute/EntityAttributeInstance;hasModifier(Lnet/minecraft/util/Identifier;)Z}
     */
-   public boolean hasModifier(Identifier arg) {
-      return this.idToModifiers.get(arg) != null;
+   public boolean hasModifier(Identifier id) {
+      return this.idToModifiers.get(id) != null;
    }
 
    /**
@@ -192,9 +195,9 @@
 
    /**
     * @mapping {@literal hashed m_fcqlvfzc Lnet/minecraft/unmapped/C_lzukavpx;m_fcqlvfzc(Lnet/minecraft/unmapped/C_hdbqsqsm;)V}
-    * @mapping {@literal named m_fcqlvfzc Lnet/minecraft/entity/attribute/EntityAttributeInstance;m_fcqlvfzc(Lnet/minecraft/entity/attribute/EntityAttributeModifier;)V}
+    * @mapping {@literal named replacePersistentModifier Lnet/minecraft/entity/attribute/EntityAttributeInstance;replacePersistentModifier(Lnet/minecraft/entity/attribute/EntityAttributeModifier;)V}
     */
-   public void m_fcqlvfzc(EntityAttributeModifier modifier) {
+   public void replacePersistentModifier(EntityAttributeModifier modifier) {
       this.removeModifier(modifier.id());
       this.addModifier(modifier);
       this.persistentModifiers.put(modifier.id(), modifier);
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttribute.java namedSrc/net/minecraft/entity/attribute/EntityAttribute.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttribute.java	2024-07-09 01:56:10.984980564 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttribute.java	2024-07-09 01:54:56.496857675 +0000
@@ -45,9 +45,10 @@
     */
    private final String translationKey;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ffykkeba Lnet/minecraft/unmapped/C_ppzfbbsy;f_ffykkeba:Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;}
+    * @mapping {@literal named category Lnet/minecraft/entity/attribute/EntityAttribute;category:Lnet/minecraft/entity/attribute/EntityAttribute$Category;}
     */
-   private EntityAttribute.C_hgeqpcpn f_ffykkeba = EntityAttribute.C_hgeqpcpn.POSITIVE;
+   private EntityAttribute.Category category = EntityAttribute.Category.POSITIVE;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ppzfbbsy;<init>(Ljava/lang/String;D)V}
@@ -88,10 +89,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ieprxwbk Lnet/minecraft/unmapped/C_ppzfbbsy;m_ieprxwbk(Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;)Lnet/minecraft/unmapped/C_ppzfbbsy;}
+    * @mapping {@literal named setCategory Lnet/minecraft/entity/attribute/EntityAttribute;setCategory(Lnet/minecraft/entity/attribute/EntityAttribute$Category;)Lnet/minecraft/entity/attribute/EntityAttribute;}
     */
-   public EntityAttribute m_ieprxwbk(EntityAttribute.C_hgeqpcpn arg) {
-      this.f_ffykkeba = arg;
+   public EntityAttribute setCategory(EntityAttribute.Category category) {
+      this.category = category;
       return this;
    }
 
@@ -112,41 +114,43 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bpecfdak Lnet/minecraft/unmapped/C_ppzfbbsy;m_bpecfdak(Z)Lnet/minecraft/unmapped/C_tnezalvh;}
+    * @mapping {@literal named getFormatting Lnet/minecraft/entity/attribute/EntityAttribute;getFormatting(Z)Lnet/minecraft/util/Formatting;}
     */
-   public Formatting m_bpecfdak(boolean bl) {
-      return this.f_ffykkeba.m_dplecdbe(bl);
+   public Formatting getFormatting(boolean addition) {
+      return this.category.getFormatting(addition);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn}
-    * @mapping {@literal named net/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn}
+    * @mapping {@literal named net/minecraft/entity/attribute/EntityAttribute$Category}
     */
-   public static enum C_hgeqpcpn {
+   public static enum Category {
       /**
        * @mapping {@literal hashed f_suzcqmoj Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;f_suzcqmoj:Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;}
-       * @mapping {@literal named POSITIVE Lnet/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn;POSITIVE:Lnet/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn;}
+       * @mapping {@literal named POSITIVE Lnet/minecraft/entity/attribute/EntityAttribute$Category;POSITIVE:Lnet/minecraft/entity/attribute/EntityAttribute$Category;}
        */
       POSITIVE,
       /**
        * @mapping {@literal hashed f_djhdpeki Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;f_djhdpeki:Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;}
-       * @mapping {@literal named NEUTRAL Lnet/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn;NEUTRAL:Lnet/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn;}
+       * @mapping {@literal named NEUTRAL Lnet/minecraft/entity/attribute/EntityAttribute$Category;NEUTRAL:Lnet/minecraft/entity/attribute/EntityAttribute$Category;}
        */
       NEUTRAL,
       /**
        * @mapping {@literal hashed f_nswsvdbx Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;f_nswsvdbx:Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;}
-       * @mapping {@literal named NEGATIVE Lnet/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn;NEGATIVE:Lnet/minecraft/entity/attribute/EntityAttribute$C_hgeqpcpn;}
+       * @mapping {@literal named NEGATIVE Lnet/minecraft/entity/attribute/EntityAttribute$Category;NEGATIVE:Lnet/minecraft/entity/attribute/EntityAttribute$Category;}
        */
       NEGATIVE;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_dplecdbe Lnet/minecraft/unmapped/C_ppzfbbsy$C_hgeqpcpn;m_dplecdbe(Z)Lnet/minecraft/unmapped/C_tnezalvh;}
+       * @mapping {@literal named getFormatting Lnet/minecraft/entity/attribute/EntityAttribute$Category;getFormatting(Z)Lnet/minecraft/util/Formatting;}
        */
-      public Formatting m_dplecdbe(boolean bl) {
+      public Formatting getFormatting(boolean addition) {
          return switch (this) {
-            case POSITIVE -> bl ? Formatting.BLUE : Formatting.RED;
+            case POSITIVE -> addition ? Formatting.BLUE : Formatting.RED;
             case NEUTRAL -> Formatting.GRAY;
-            case NEGATIVE -> bl ? Formatting.RED : Formatting.BLUE;
+            case NEGATIVE -> addition ? Formatting.RED : Formatting.BLUE;
          };
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-07-09 01:56:10.844980341 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-07-09 01:54:56.316857363 +0000
@@ -23,7 +23,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_hdbqsqsm}
  * @mapping {@literal named net/minecraft/entity/attribute/EntityAttributeModifier}
  */
-public record EntityAttributeModifier(Identifier uuid, double value, EntityAttributeModifier.Operation operation) {
+public record EntityAttributeModifier(Identifier id, double value, EntityAttributeModifier.Operation operation) {
    /**
     * @mapping {@literal hashed f_owzzukjv Lnet/minecraft/unmapped/C_hdbqsqsm;f_owzzukjv:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/entity/attribute/EntityAttributeModifier;LOGGER:Lorg/slf4j/Logger;}
@@ -85,18 +85,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uwuvpbaf Lnet/minecraft/unmapped/C_hdbqsqsm;m_uwuvpbaf(Lnet/minecraft/unmapped/C_ncpywfca;)Z}
+    * @mapping {@literal named matches Lnet/minecraft/entity/attribute/EntityAttributeModifier;matches(Lnet/minecraft/util/Identifier;)Z}
     */
-   public boolean m_uwuvpbaf(Identifier arg) {
-      return arg.equals(this.uuid);
-   }
-
-   /**
-    * @mapping {@literal hashed m_ywspgsys Lnet/minecraft/unmapped/C_hdbqsqsm;m_ywspgsys()Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named id Lnet/minecraft/entity/attribute/EntityAttributeModifier;id()Lnet/minecraft/util/Identifier;}
-    */
-   public Identifier id() {
-      return this.uuid;
+   public boolean matches(Identifier id) {
+      return id.equals(this.id);
    }
 
    /**

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributes.java namedSrc/net/minecraft/entity/attribute/EntityAttributes.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributes.java	2024-07-09 01:56:10.932980481 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributes.java	2024-07-09 01:54:56.432857564 +0000
@@ -65,7 +65,7 @@
     */
    public static final Holder<EntityAttribute> GENERIC_BURNING_TIME = register(
       "generic.burning_time",
-      new ClampedEntityAttribute("attribute.name.generic.burning_time", 1.0, 0.0, 1024.0).setTracked(true).m_ieprxwbk(EntityAttribute.C_hgeqpcpn.NEGATIVE)
+      new ClampedEntityAttribute("attribute.name.generic.burning_time", 1.0, 0.0, 1024.0).setTracked(true).setCategory(EntityAttribute.Category.NEGATIVE)
    );
    /**
     * @mapping {@literal hashed f_udtnzgdo Lnet/minecraft/unmapped/C_jtywurvj;f_udtnzgdo:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -90,7 +90,7 @@
       "generic.fall_damage_multiplier",
       new ClampedEntityAttribute("attribute.name.generic.fall_damage_multiplier", 1.0, 0.0, 100.0)
          .setTracked(true)
-         .m_ieprxwbk(EntityAttribute.C_hgeqpcpn.NEGATIVE)
+         .setCategory(EntityAttribute.Category.NEGATIVE)
    );
    /**
     * @mapping {@literal hashed f_xqltxpyh Lnet/minecraft/unmapped/C_jtywurvj;f_xqltxpyh:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -112,7 +112,7 @@
     */
    public static final Holder<EntityAttribute> GENERIC_GRAVITY = register(
       "generic.gravity",
-      new ClampedEntityAttribute("attribute.name.generic.gravity", 0.08, -1.0, 1.0).setTracked(true).m_ieprxwbk(EntityAttribute.C_hgeqpcpn.NEUTRAL)
+      new ClampedEntityAttribute("attribute.name.generic.gravity", 0.08, -1.0, 1.0).setTracked(true).setCategory(EntityAttribute.Category.NEUTRAL)
    );
    /**
     * @mapping {@literal hashed f_ojjwlrim Lnet/minecraft/unmapped/C_jtywurvj;f_ojjwlrim:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -190,7 +190,7 @@
     */
    public static final Holder<EntityAttribute> GENERIC_SCALE = register(
       "generic.scale",
-      new ClampedEntityAttribute("attribute.name.generic.scale", 1.0, 0.0625, 16.0).setTracked(true).m_ieprxwbk(EntityAttribute.C_hgeqpcpn.NEUTRAL)
+      new ClampedEntityAttribute("attribute.name.generic.scale", 1.0, 0.0625, 16.0).setTracked(true).setCategory(EntityAttribute.Category.NEUTRAL)
    );
    /**
     * @mapping {@literal hashed f_khoaugfl Lnet/minecraft/unmapped/C_jtywurvj;f_khoaugfl:Lnet/minecraft/unmapped/C_cjzoxshv;}
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-07-09 01:56:10.772980226 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-07-09 01:54:56.220857197 +0000
@@ -493,13 +493,13 @@
             this.movePart(this.rightWing, (double)(z * 4.5F), 2.0, (double)(y * 4.5F));
             this.movePart(this.leftWing, (double)(z * -4.5F), 2.0, (double)(y * -4.5F));
             if (this.getWorld() instanceof ServerWorld lv9 && this.hurtTime == 0) {
-               this.m_qrovnyxu(
+               this.damageCollidingEntities(
                   lv9,
                   lv9.getOtherEntities(
                      this, this.rightWing.getBounds().expand(4.0, 2.0, 4.0).offset(0.0, -2.0, 0.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR
                   )
                );
-               this.m_qrovnyxu(
+               this.damageCollidingEntities(
                   lv9,
                   lv9.getOtherEntities(
                      this, this.leftWing.getBounds().expand(4.0, 2.0, 4.0).offset(0.0, -2.0, 0.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR
@@ -620,13 +620,13 @@
 
    /**
     * @mapping {@literal hashed m_qrovnyxu Lnet/minecraft/unmapped/C_bsmypcfq;m_qrovnyxu(Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/List;)V}
-    * @mapping {@literal named m_qrovnyxu Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;m_qrovnyxu(Lnet/minecraft/server/world/ServerWorld;Ljava/util/List;)V}
+    * @mapping {@literal named damageCollidingEntities Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;damageCollidingEntities(Lnet/minecraft/server/world/ServerWorld;Ljava/util/List;)V}
     */
-   private void m_qrovnyxu(ServerWorld world, List<Entity> list) {
+   private void damageCollidingEntities(ServerWorld world, List<Entity> collisions) {
       double d = (this.body.getBounds().minX + this.body.getBounds().maxX) / 2.0;
       double e = (this.body.getBounds().minZ + this.body.getBounds().maxZ) / 2.0;
 
-      for (Entity lv : list) {
+      for (Entity lv : collisions) {
          if (lv instanceof LivingEntity) {
             LivingEntity lv2 = (LivingEntity)lv;
             double f = lv.getX() - d;
@@ -1211,7 +1211,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_acybdbgv(boolean bl) {
+   public boolean canUsePortals(boolean allowVehicles) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java	2024-07-09 01:56:10.772980226 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java	2024-07-09 01:54:56.224857204 +0000
@@ -103,7 +103,7 @@
     * Mapping not found
     */
    @Override
-   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry arg) {
+   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry trackerEntry) {
       throw new UnsupportedOperationException();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.java	2024-07-09 01:56:10.956980520 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/AbstractSittingPhase.java	2024-07-09 01:54:56.460857612 +0000
@@ -33,7 +33,7 @@
       if (!(damageSource.getSource() instanceof PersistentProjectileEntity) && !(damageSource.getSource() instanceof WindChargeEntity)) {
          return super.modifyDamageTaken(damageSource, damage);
       } else {
-         damageSource.getSource().m_xbkkrydd(1.0F);
+         damageSource.getSource().setOnFireForSeconds(1.0F);
          return 0.0F;
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/DyingPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/DyingPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/DyingPhase.java	2024-07-09 01:56:10.848980347 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/DyingPhase.java	2024-07-09 01:54:56.324857377 +0000
@@ -38,9 +38,9 @@
    @Override
    public void clientTick() {
       if (this.ticks++ % 10 == 0) {
-         float f = (this.dragon.m_dlwxaobh().nextFloat() - 0.5F) * 8.0F;
-         float g = (this.dragon.m_dlwxaobh().nextFloat() - 0.5F) * 4.0F;
-         float h = (this.dragon.m_dlwxaobh().nextFloat() - 0.5F) * 8.0F;
+         float f = (this.dragon.getRandom().nextFloat() - 0.5F) * 8.0F;
+         float g = (this.dragon.getRandom().nextFloat() - 0.5F) * 4.0F;
+         float h = (this.dragon.getRandom().nextFloat() - 0.5F) * 8.0F;
          this.dragon
             .getWorld()
             .addParticle(
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java	2024-07-09 01:56:10.792980258 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java	2024-07-09 01:54:56.248857246 +0000
@@ -95,7 +95,7 @@
             .getWorld()
             .getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPortalFeature.m_pfwrysrc(this.dragon.getFightOrigin())));
          int i = this.dragon.getFight() == null ? 0 : this.dragon.getFight().getAliveEndCrystals();
-         if (this.dragon.m_dlwxaobh().nextInt(i + 3) == 0) {
+         if (this.dragon.getRandom().nextInt(i + 3) == 0) {
             this.dragon.getPhaseManager().setPhase(PhaseType.LANDING_APPROACH);
             return;
          }
@@ -110,7 +110,7 @@
             d = 64.0;
          }
 
-         if (lv2 != null && (this.dragon.m_dlwxaobh().nextInt((int)(d + 2.0)) == 0 || this.dragon.m_dlwxaobh().nextInt(i + 2) == 0)) {
+         if (lv2 != null && (this.dragon.getRandom().nextInt((int)(d + 2.0)) == 0 || this.dragon.getRandom().nextInt(i + 2) == 0)) {
             this.strafePlayer(lv2);
             return;
          }
@@ -119,7 +119,7 @@
       if (this.path == null || this.path.isFinished()) {
          int j = this.dragon.getNearestPathNodeIndex();
          int k = j;
-         if (this.dragon.m_dlwxaobh().nextInt(8) == 0) {
+         if (this.dragon.getRandom().nextInt(8) == 0) {
             this.shouldFindNewPath = !this.shouldFindNewPath;
             k = j + 6;
          }
@@ -172,7 +172,7 @@
 
          double f;
          do {
-            f = (double)((float)lv.getY() + this.dragon.m_dlwxaobh().nextFloat() * 20.0F);
+            f = (double)((float)lv.getY() + this.dragon.getRandom().nextFloat() * 20.0F);
          } while (f < (double)lv.getY());
 
          this.pathTarget = new Vec3d(d, f, e);
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.java	2024-07-09 01:56:10.988980570 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.java	2024-07-09 01:54:56.496857675 +0000
@@ -126,7 +126,7 @@
 
          double f;
          do {
-            f = (double)((float)lv.getY() + this.dragon.m_dlwxaobh().nextFloat() * 20.0F);
+            f = (double)((float)lv.getY() + this.dragon.getRandom().nextFloat() * 20.0F);
          } while (f < (double)lv.getY());
 
          this.pathTarget = new Vec3d(d, f, e);
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/LandingPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/LandingPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/LandingPhase.java	2024-07-09 01:56:10.780980239 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/LandingPhase.java	2024-07-09 01:54:56.232857218 +0000
@@ -39,7 +39,7 @@
       double f = this.dragon.head.getZ();
 
       for (int i = 0; i < 8; i++) {
-         RandomGenerator lv2 = this.dragon.m_dlwxaobh();
+         RandomGenerator lv2 = this.dragon.getRandom();
          double g = d + lv2.nextGaussian() / 2.0;
          double h = e + lv2.nextGaussian() / 2.0;
          double j = f + lv2.nextGaussian() / 2.0;
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.java	2024-07-09 01:56:10.916980456 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.java	2024-07-09 01:54:56.412857529 +0000
@@ -40,7 +40,7 @@
             SoundEvents.ENTITY_ENDER_DRAGON_GROWL,
             this.dragon.getSoundCategory(),
             2.5F,
-            0.8F + this.dragon.m_dlwxaobh().nextFloat() * 0.3F,
+            0.8F + this.dragon.getRandom().nextFloat() * 0.3F,
             false
          );
    }
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.java	2024-07-09 01:56:10.904980436 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.java	2024-07-09 01:54:56.400857509 +0000
@@ -68,9 +68,9 @@
          double f = this.dragon.head.getZ();
 
          for (int i = 0; i < 8; i++) {
-            double g = d + this.dragon.m_dlwxaobh().nextGaussian() / 2.0;
-            double h = e + this.dragon.m_dlwxaobh().nextGaussian() / 2.0;
-            double j = f + this.dragon.m_dlwxaobh().nextGaussian() / 2.0;
+            double g = d + this.dragon.getRandom().nextGaussian() / 2.0;
+            double h = e + this.dragon.getRandom().nextGaussian() / 2.0;
+            double j = f + this.dragon.getRandom().nextGaussian() / 2.0;
 
             for (int k = 0; k < 6; k++) {
                this.dragon.getWorld().addParticle(ParticleTypes.DRAGON_BREATH, g, h, j, -lv.x * 0.08F * (double)k, -lv.y * 0.6F, -lv.z * 0.08F * (double)k);
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-07-09 01:56:10.928980475 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-07-09 01:54:56.424857550 +0000
@@ -145,7 +145,7 @@
       if (this.path == null || this.path.isFinished()) {
          int i = this.dragon.getNearestPathNodeIndex();
          int j = i;
-         if (this.dragon.m_dlwxaobh().nextInt(8) == 0) {
+         if (this.dragon.getRandom().nextInt(8) == 0) {
             this.shouldFindNewPath = !this.shouldFindNewPath;
             j = i + 6;
          }
@@ -189,7 +189,7 @@
 
          double f;
          do {
-            f = (double)((float)lv.getY() + this.dragon.m_dlwxaobh().nextFloat() * 20.0F);
+            f = (double)((float)lv.getY() + this.dragon.getRandom().nextFloat() * 20.0F);
          } while (f < (double)lv.getY());
 
          this.pathTarget = new Vec3d(d, f, e);
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.java	2024-07-09 01:56:11.056980679 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.java	2024-07-09 01:54:56.580857819 +0000
@@ -103,7 +103,7 @@
 
             double d;
             do {
-               d = (double)((float)lv.getY() + this.dragon.m_dlwxaobh().nextFloat() * 20.0F);
+               d = (double)((float)lv.getY() + this.dragon.getRandom().nextFloat() * 20.0F);
             } while (d < (double)lv.getY());
 
             this.pathTarget = new Vec3d((double)lv.getX(), d, (double)lv.getZ());
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-07-09 01:56:10.792980258 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-07-09 01:54:56.248857246 +0000
@@ -631,12 +631,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_sephwywk Lnet/minecraft/unmapped/C_sggtxtfb;m_sephwywk(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;Z)V}
-    * @mapping {@literal named m_sephwywk Lnet/minecraft/entity/boss/WitherEntity;m_sephwywk(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;Z)V}
+    * Mapping not found
     */
    @Override
-   protected void m_sephwywk(ServerWorld world, DamageSource arg2, boolean bl) {
-      super.m_sephwywk(world, arg2, bl);
+   protected void dropCustomLoot(ServerWorld world, DamageSource source, boolean playerKill) {
+      super.dropCustomLoot(world, source, playerKill);
       ItemEntity lv = this.dropItem(Items.NETHER_STAR);
       if (lv != null) {
          lv.setCovetedItem();
@@ -744,7 +743,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_acybdbgv(boolean bl) {
+   public boolean canUsePortals(boolean allowVehicles) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/BreezeWindChargeEntity.java namedSrc/net/minecraft/entity/BreezeWindChargeEntity.java
--- namedTargetSrc/net/minecraft/entity/BreezeWindChargeEntity.java	2024-07-09 01:56:10.852980353 +0000
+++ namedSrc/net/minecraft/entity/BreezeWindChargeEntity.java	2024-07-09 01:54:56.332857391 +0000
@@ -38,15 +38,15 @@
     * Mapping not found
     */
    @Override
-   protected void createExplosion(Vec3d arg) {
+   protected void createExplosion(Vec3d pos) {
       this.getWorld()
          .createExplosion(
             this,
             null,
-            f_whsjpufz,
-            arg.getX(),
-            arg.getY(),
-            arg.getZ(),
+            EXPLOSION_BEHAVIOR,
+            pos.getX(),
+            pos.getY(),
+            pos.getZ(),
             3.0F,
             false,
             World.ExplosionSourceType.TRIGGER,
diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageSource.java namedSrc/net/minecraft/entity/damage/DamageSource.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageSource.java	2024-07-09 01:56:10.744980181 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageSource.java	2024-07-09 01:54:56.156857087 +0000
@@ -60,9 +60,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mxlcbtxu Lnet/minecraft/unmapped/C_sbxfkpyv;m_mxlcbtxu()Z}
+    * @mapping {@literal named isDirect Lnet/minecraft/entity/damage/DamageSource;isDirect()Z}
     */
-   public boolean m_mxlcbtxu() {
+   public boolean isDirect() {
       return this.attacker == this.source;
    }
 
@@ -128,11 +129,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_afzxcswo Lnet/minecraft/unmapped/C_sbxfkpyv;m_afzxcswo()Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named getWeaponStack Lnet/minecraft/entity/damage/DamageSource;getWeaponStack()Lnet/minecraft/item/ItemStack;}
     */
    @Nullable
-   public ItemStack m_afzxcswo() {
-      return this.source != null ? this.source.m_ywnmbdjz() : null;
+   public ItemStack getWeaponStack() {
+      return this.source != null ? this.source.getWeaponStack() : null;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageSources.java namedSrc/net/minecraft/entity/damage/DamageSources.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageSources.java	2024-07-09 01:56:10.888980411 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageSources.java	2024-07-09 01:54:56.380857474 +0000
@@ -31,9 +31,10 @@
     */
    private final DamageSource inFire;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lkntcxaf Lnet/minecraft/unmapped/C_lddxcbik;f_lkntcxaf:Lnet/minecraft/unmapped/C_sbxfkpyv;}
+    * @mapping {@literal named campfire Lnet/minecraft/entity/damage/DamageSources;campfire:Lnet/minecraft/entity/damage/DamageSource;}
     */
-   private final DamageSource f_lkntcxaf;
+   private final DamageSource campfire;
    /**
     * @mapping {@literal hashed f_ccgolnzd Lnet/minecraft/unmapped/C_lddxcbik;f_ccgolnzd:Lnet/minecraft/unmapped/C_sbxfkpyv;}
     * @mapping {@literal named lightningBolt Lnet/minecraft/entity/damage/DamageSources;lightningBolt:Lnet/minecraft/entity/damage/DamageSource;}
@@ -152,7 +153,7 @@
    public DamageSources(DynamicRegistryManager registryManager) {
       this.registry = registryManager.get(RegistryKeys.DAMAGE_TYPE);
       this.inFire = this.create(DamageTypes.IN_FIRE);
-      this.f_lkntcxaf = this.create(DamageTypes.f_aebymdih);
+      this.campfire = this.create(DamageTypes.CAMPFIRE);
       this.lightningBolt = this.create(DamageTypes.LIGHTNING_BOLT);
       this.onFire = this.create(DamageTypes.ON_FIRE);
       this.lava = this.create(DamageTypes.LAVA);
@@ -210,10 +211,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lxrwzlzj Lnet/minecraft/unmapped/C_lddxcbik;m_lxrwzlzj()Lnet/minecraft/unmapped/C_sbxfkpyv;}
+    * @mapping {@literal named campfire Lnet/minecraft/entity/damage/DamageSources;campfire()Lnet/minecraft/entity/damage/DamageSource;}
     */
-   public DamageSource m_lxrwzlzj() {
-      return this.f_lkntcxaf;
+   public DamageSource campfire() {
+      return this.campfire;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageTypes.java namedSrc/net/minecraft/entity/damage/DamageTypes.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageTypes.java	2024-07-09 01:56:10.828980315 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageTypes.java	2024-07-09 01:54:56.300857335 +0000
@@ -16,9 +16,10 @@
     */
    RegistryKey<DamageType> IN_FIRE = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, Identifier.ofDefault("in_fire"));
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_aebymdih Lnet/minecraft/unmapped/C_wshykkvq;f_aebymdih:Lnet/minecraft/unmapped/C_xhhleach;}
+    * @mapping {@literal named CAMPFIRE Lnet/minecraft/entity/damage/DamageTypes;CAMPFIRE:Lnet/minecraft/registry/RegistryKey;}
     */
-   RegistryKey<DamageType> f_aebymdih = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, Identifier.ofDefault("campfire"));
+   RegistryKey<DamageType> CAMPFIRE = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, Identifier.ofDefault("campfire"));
    /**
     * @mapping {@literal hashed f_nrpknljd Lnet/minecraft/unmapped/C_wshykkvq;f_nrpknljd:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named LIGHTNING_BOLT Lnet/minecraft/entity/damage/DamageTypes;LIGHTNING_BOLT:Lnet/minecraft/registry/RegistryKey;}
@@ -251,7 +252,7 @@
     */
    static void bootstrap(BootstrapContext<DamageType> context) {
       context.register(IN_FIRE, new DamageType("inFire", 0.1F, DamageEffects.BURNING));
-      context.register(f_aebymdih, new DamageType("inFire", 0.1F, DamageEffects.BURNING));
+      context.register(CAMPFIRE, new DamageType("inFire", 0.1F, DamageEffects.BURNING));
       context.register(LIGHTNING_BOLT, new DamageType("lightningBolt", 0.1F));
       context.register(ON_FIRE, new DamageType("onFire", 0.0F, DamageEffects.BURNING));
       context.register(LAVA, new DamageType("lava", 0.1F, DamageEffects.BURNING));
diff -bur namedTargetSrc/net/minecraft/entity/DamageUtil.java namedSrc/net/minecraft/entity/DamageUtil.java
--- namedTargetSrc/net/minecraft/entity/DamageUtil.java	2024-07-09 01:56:10.872980385 +0000
+++ namedSrc/net/minecraft/entity/DamageUtil.java	2024-07-09 01:54:56.356857432 +0000
@@ -39,13 +39,13 @@
 
    /**
     * @mapping {@literal hashed m_penyqeye Lnet/minecraft/unmapped/C_agstzlgm;m_penyqeye(Lnet/minecraft/unmapped/C_usxaxydn;FLnet/minecraft/unmapped/C_sbxfkpyv;FF)F}
-    * @mapping {@literal named m_penyqeye Lnet/minecraft/entity/DamageUtil;m_penyqeye(Lnet/minecraft/entity/LivingEntity;FLnet/minecraft/entity/damage/DamageSource;FF)F}
+    * @mapping {@literal named getArmorAdjustedDamage Lnet/minecraft/entity/DamageUtil;getArmorAdjustedDamage(Lnet/minecraft/entity/LivingEntity;FLnet/minecraft/entity/damage/DamageSource;FF)F}
     */
-   public static float m_penyqeye(LivingEntity entity, float f, DamageSource source, float g, float h) {
-      float i = 2.0F + h / 4.0F;
-      float j = MathHelper.clamp(g - f / i, g * 0.2F, 20.0F);
+   public static float getArmorAdjustedDamage(LivingEntity entity, float damage, DamageSource source, float armor, float armorToughness) {
+      float i = 2.0F + armorToughness / 4.0F;
+      float j = MathHelper.clamp(armor - damage / i, armor * 0.2F, 20.0F);
       float k = j / 25.0F;
-      ItemStack lv = source.m_afzxcswo();
+      ItemStack lv = source.getWeaponStack();
       float l;
       if (lv != null && entity.getWorld() instanceof ServerWorld lv2) {
          l = MathHelper.clamp(EnchantmentHelper.getArmorEffectiveness(lv2, lv, entity, source, k), 0.0F, 1.0F);
@@ -54,7 +54,7 @@
       }
 
       float n = 1.0F - l;
-      return f * n;
+      return damage * n;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-07-09 01:56:10.896980424 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-07-09 01:54:56.388857488 +0000
@@ -254,7 +254,7 @@
     * @mapping {@literal hashed f_jymqxprw Lnet/minecraft/unmapped/C_fegtripb;f_jymqxprw:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named WOLF_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;WOLF_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Holder<WolfVariant>> WOLF_VARIANT = TrackedDataHandler.create(WolfVariant.f_rspritba);
+   public static final TrackedDataHandler<Holder<WolfVariant>> WOLF_VARIANT = TrackedDataHandler.create(WolfVariant.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_vcohujss Lnet/minecraft/unmapped/C_fegtripb;f_vcohujss:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named FROG_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;FROG_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -264,7 +264,7 @@
     * @mapping {@literal hashed f_itlfqmle Lnet/minecraft/unmapped/C_fegtripb;f_itlfqmle:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named PAINTING_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;PAINTING_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Holder<PaintingVariant>> PAINTING_VARIANT = TrackedDataHandler.create(PaintingVariant.f_dkvvcxps);
+   public static final TrackedDataHandler<Holder<PaintingVariant>> PAINTING_VARIANT = TrackedDataHandler.create(PaintingVariant.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_zxvfivae Lnet/minecraft/unmapped/C_fegtripb;f_zxvfivae:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ARMADILLO_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ARMADILLO_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
diff -bur namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-07-09 01:56:11.060980685 +0000
+++ namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-07-09 01:54:56.584857827 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_mfdvqmsw;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
@@ -23,7 +22,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_jkvbjfnw}
  * @mapping {@literal named net/minecraft/entity/decoration/AbstractDecorationEntity}
  */
-public abstract class AbstractDecorationEntity extends C_mfdvqmsw {
+public abstract class AbstractDecorationEntity extends BlockAttachedEntity {
    /**
     * @mapping {@literal hashed f_eycxoxbt Lnet/minecraft/unmapped/C_jkvbjfnw;f_eycxoxbt:Ljava/util/function/Predicate;}
     * @mapping {@literal named PREDICATE Lnet/minecraft/entity/decoration/AbstractDecorationEntity;PREDICATE:Ljava/util/function/Predicate;}
@@ -62,16 +61,16 @@
       this.facing = facing;
       this.setYaw((float)(this.facing.getHorizontal() * 90));
       this.prevYaw = this.getYaw();
-      this.m_woivokxp();
+      this.updateBoundingBox();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   protected final void m_woivokxp() {
+   protected final void updateBoundingBox() {
       if (this.facing != null) {
-         Box lv = this.m_lbdhqjli(this.pos, this.facing);
+         Box lv = this.calculateBoundingBox(this.pos, this.facing);
          Vec3d lv2 = lv.getCenter();
          this.setPos(lv2.x, lv2.y, lv2.z);
          this.setBoundingBox(lv);
@@ -80,19 +79,19 @@
 
    /**
     * @mapping {@literal hashed m_lbdhqjli Lnet/minecraft/unmapped/C_jkvbjfnw;m_lbdhqjli(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_hbcjzgoe;}
-    * @mapping {@literal named m_lbdhqjli Lnet/minecraft/entity/decoration/AbstractDecorationEntity;m_lbdhqjli(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Box;}
+    * @mapping {@literal named calculateBoundingBox Lnet/minecraft/entity/decoration/AbstractDecorationEntity;calculateBoundingBox(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Box;}
     */
-   protected abstract Box m_lbdhqjli(BlockPos pos, Direction direction);
+   protected abstract Box calculateBoundingBox(BlockPos pos, Direction direction);
 
    /**
     * Mapping not found
     */
    @Override
-   public boolean m_uzlyxllu() {
+   public boolean canStayAttached() {
       if (!this.getWorld().isSpaceEmpty(this)) {
          return false;
       } else {
-         boolean bl = BlockPos.stream(this.m_rhbnmmyq()).allMatch(pos -> {
+         boolean bl = BlockPos.stream(this.calculateSupportBox()).allMatch(pos -> {
             BlockState lv = this.getWorld().getBlockState(pos);
             return lv.isSolid() || RedstoneDiodeBlock.isDiode(lv);
          });
@@ -101,10 +100,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rhbnmmyq Lnet/minecraft/unmapped/C_jkvbjfnw;m_rhbnmmyq()Lnet/minecraft/unmapped/C_hbcjzgoe;}
+    * @mapping {@literal named calculateSupportBox Lnet/minecraft/entity/decoration/AbstractDecorationEntity;calculateSupportBox()Lnet/minecraft/util/math/Box;}
     */
-   protected Box m_rhbnmmyq() {
-      return this.getBounds().m_nxboscxz(this.facing.getUnitVector().mul(-0.5F)).contract(1.0E-7);
+   protected Box calculateSupportBox() {
+      return this.getBounds().offset(this.facing.getUnitVector().mul(-0.5F)).contract(1.0E-7);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-07-09 01:56:10.932980481 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-07-09 01:54:56.432857564 +0000
@@ -645,7 +645,7 @@
             if (this.isOnFire()) {
                this.updateHealth(lv, source, 0.15F);
             } else {
-               this.m_xbkkrydd(5.0F);
+               this.setOnFireForSeconds(5.0F);
             }
 
             return false;
Only in namedSrc/net/minecraft/entity/decoration: BlockAttachedEntity.java
diff -bur namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-07-09 01:56:10.868980379 +0000
+++ namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-07-09 01:54:56.352857425 +0000
@@ -87,7 +87,7 @@
    public void tick() {
       this.endCrystalAge++;
       this.checkBlockCollision();
-      this.m_qehyjnid();
+      this.tickPortalTeleportation();
       if (this.getWorld() instanceof ServerWorld) {
          BlockPos lv = this.getBlockPos();
          if (((ServerWorld)this.getWorld()).getEnderDragonFight() != null && this.getWorld().getBlockState(lv).isAir()) {
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-07-09 01:56:10.824980309 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-07-09 01:54:56.292857322 +0000
@@ -61,17 +61,20 @@
     */
    public static final int ROTATIONS_COUNT = 8;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_nallonhx Lnet/minecraft/unmapped/C_hywnolpn;f_nallonhx:F}
+    * @mapping {@literal named DEPTH Lnet/minecraft/entity/decoration/ItemFrameEntity;DEPTH:F}
     */
-   private static final float f_nallonhx = 0.0625F;
+   private static final float DEPTH = 0.0625F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xrplubwv Lnet/minecraft/unmapped/C_hywnolpn;f_xrplubwv:F}
+    * @mapping {@literal named WIDTH Lnet/minecraft/entity/decoration/ItemFrameEntity;WIDTH:F}
     */
-   private static final float f_xrplubwv = 0.75F;
+   private static final float WIDTH = 0.75F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mitznpai Lnet/minecraft/unmapped/C_hywnolpn;f_mitznpai:F}
+    * @mapping {@literal named HEIGHT Lnet/minecraft/entity/decoration/ItemFrameEntity;HEIGHT:F}
     */
-   private static final float f_mitznpai = 0.75F;
+   private static final float HEIGHT = 0.75F;
    /**
     * @mapping {@literal hashed f_dnmfuadb Lnet/minecraft/unmapped/C_hywnolpn;f_dnmfuadb:F}
     * @mapping {@literal named itemDropChance Lnet/minecraft/entity/decoration/ItemFrameEntity;itemDropChance:F}
@@ -134,15 +137,14 @@
 
       this.prevPitch = this.getPitch();
       this.prevYaw = this.getYaw();
-      this.m_woivokxp();
+      this.updateBoundingBox();
    }
 
    /**
-    * @mapping {@literal hashed m_lbdhqjli Lnet/minecraft/unmapped/C_hywnolpn;m_lbdhqjli(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_hbcjzgoe;}
-    * @mapping {@literal named m_lbdhqjli Lnet/minecraft/entity/decoration/ItemFrameEntity;m_lbdhqjli(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Box;}
+    * Mapping not found
     */
    @Override
-   protected Box m_lbdhqjli(BlockPos pos, Direction direction) {
+   protected Box calculateBoundingBox(BlockPos pos, Direction direction) {
       float f = 0.46875F;
       Vec3d lv = Vec3d.ofCenter(pos).relative(direction, -0.46875);
       Direction.Axis lv2 = direction.getAxis();
@@ -156,7 +158,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_uzlyxllu() {
+   public boolean canStayAttached() {
       if (this.fixed) {
          return true;
       } else if (!this.getWorld().isSpaceEmpty(this)) {
@@ -242,10 +244,10 @@
     * Mapping not found
     */
    @Override
-   public void m_kulkifdk(@Nullable Entity arg) {
+   public void dropItem(@Nullable Entity breaker) {
       this.playSound(this.getBreakSound(), 1.0F, 1.0F);
-      this.dropHeldStack(arg, true);
-      this.emitGameEvent(GameEvent.BLOCK_CHANGE, arg);
+      this.dropHeldStack(breaker, true);
+      this.emitGameEvent(GameEvent.BLOCK_CHANGE, breaker);
    }
 
    /**
@@ -410,7 +412,7 @@
          stack.setHolder(this);
       }
 
-      this.m_woivokxp();
+      this.updateBoundingBox();
    }
 
    /**
@@ -545,8 +547,8 @@
     * Mapping not found
     */
    @Override
-   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry arg) {
-      return new EntitySpawnS2CPacket(this, this.facing.getId(), this.m_fodqxigf());
+   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry trackerEntry) {
+      return new EntitySpawnS2CPacket(this, this.facing.getId(), this.getAttachedBlockPos());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/LeashKnotEntity.java namedSrc/net/minecraft/entity/decoration/LeashKnotEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/LeashKnotEntity.java	2024-07-09 01:56:11.024980628 +0000
+++ namedSrc/net/minecraft/entity/decoration/LeashKnotEntity.java	2024-07-09 01:54:56.540857750 +0000
@@ -3,6 +3,7 @@
 import java.util.List;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.Leashable;
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -15,8 +16,6 @@
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.network.EntityTrackerEntry;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_gbavazgo;
-import net.minecraft.unmapped.C_mfdvqmsw;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -30,7 +29,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_nqadrnms}
  * @mapping {@literal named net/minecraft/entity/decoration/LeashKnotEntity}
  */
-public class LeashKnotEntity extends C_mfdvqmsw {
+public class LeashKnotEntity extends BlockAttachedEntity {
    /**
     * @mapping {@literal hashed f_qrvlfflk Lnet/minecraft/unmapped/C_nqadrnms;f_qrvlfflk:D}
     * @mapping {@literal named Y_OFFSET Lnet/minecraft/entity/decoration/LeashKnotEntity;Y_OFFSET:D}
@@ -65,7 +64,7 @@
     * Mapping not found
     */
    @Override
-   protected void m_woivokxp() {
+   protected void updateBoundingBox() {
       this.setPos((double)this.pos.getX() + 0.5, (double)this.pos.getY() + 0.375, (double)this.pos.getZ() + 0.5);
       double d = (double)this.getType().getWidth() / 2.0;
       double e = (double)this.getType().getHeight();
@@ -84,7 +83,7 @@
     * Mapping not found
     */
    @Override
-   public void m_kulkifdk(@Nullable Entity arg) {
+   public void dropItem(@Nullable Entity breaker) {
       this.playSound(SoundEvents.ENTITY_LEASH_KNOT_BREAK, 1.0F, 1.0F);
    }
 
@@ -111,14 +110,14 @@
          return ActionResult.SUCCESS;
       } else {
          boolean bl = false;
-         List<C_gbavazgo> list = LeadItem.m_utnycrat(this.getWorld(), this.m_fodqxigf(), arg2 -> {
-            Entity lvx = arg2.m_xkmzlwed();
+         List<Leashable> list = LeadItem.m_utnycrat(this.getWorld(), this.getAttachedBlockPos(), arg2 -> {
+            Entity lvx = arg2.getLeashHolder();
             return lvx == player || lvx == this;
          });
 
-         for (C_gbavazgo lv : list) {
-            if (lv.m_xkmzlwed() == player) {
-               lv.m_epgfrqcc(this, true);
+         for (Leashable lv : list) {
+            if (lv.getLeashHolder() == player) {
+               lv.attachLeash(this, true);
                bl = true;
             }
          }
@@ -127,9 +126,9 @@
          if (!bl) {
             this.discard();
             if (player.getAbilities().creativeMode) {
-               for (C_gbavazgo lv2 : list) {
-                  if (lv2.m_egrefywv() && lv2.m_xkmzlwed() == this) {
-                     lv2.m_yglfvmek(true, false);
+               for (Leashable lv2 : list) {
+                  if (lv2.isLeashed() && lv2.getLeashHolder() == this) {
+                     lv2.detachLeash(true, false);
                      bl2 = true;
                   }
                }
@@ -148,7 +147,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_uzlyxllu() {
+   public boolean canStayAttached() {
       return this.getWorld().getBlockState(this.pos).isIn(BlockTags.FENCES);
    }
 
@@ -164,7 +163,7 @@
       for (LeashKnotEntity lv : world.getNonSpectatingEntities(
          LeashKnotEntity.class, new Box((double)i - 1.0, (double)j - 1.0, (double)k - 1.0, (double)i + 1.0, (double)j + 1.0, (double)k + 1.0)
       )) {
-         if (lv.m_fodqxigf().equals(pos)) {
+         if (lv.getAttachedBlockPos().equals(pos)) {
             return lv;
          }
       }
@@ -175,9 +174,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fxwzcdqc Lnet/minecraft/unmapped/C_nqadrnms;m_fxwzcdqc()V}
+    * @mapping {@literal named playSound Lnet/minecraft/entity/decoration/LeashKnotEntity;playSound()V}
     */
-   public void m_fxwzcdqc() {
+   public void playSound() {
       this.playSound(SoundEvents.ENTITY_LEASH_KNOT_PLACE, 1.0F, 1.0F);
    }
 
@@ -185,8 +185,8 @@
     * Mapping not found
     */
    @Override
-   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry arg) {
-      return new EntitySpawnS2CPacket(this, 0, this.m_fodqxigf());
+   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry trackerEntry) {
+      return new EntitySpawnS2CPacket(this, 0, this.getAttachedBlockPos());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-07-09 01:56:10.756980200 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-07-09 01:54:56.184857135 +0000
@@ -50,16 +50,17 @@
     * @mapping {@literal hashed f_hgphohxe Lnet/minecraft/unmapped/C_xypmuulf;f_hgphohxe:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named MAP_CODEC Lnet/minecraft/entity/decoration/painting/PaintingEntity;MAP_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   public static final MapCodec<Holder<PaintingVariant>> MAP_CODEC = PaintingVariant.f_dfoybqqo.fieldOf("variant");
+   public static final MapCodec<Holder<PaintingVariant>> MAP_CODEC = PaintingVariant.CODEC.fieldOf("variant");
    /**
     * @mapping {@literal hashed f_jaaowbsw Lnet/minecraft/unmapped/C_xypmuulf;f_jaaowbsw:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/entity/decoration/painting/PaintingEntity;CODEC:Lcom/mojang/serialization/Codec;}
     */
    public static final Codec<Holder<PaintingVariant>> CODEC = MAP_CODEC.codec();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hkxbjxlp Lnet/minecraft/unmapped/C_xypmuulf;f_hkxbjxlp:F}
+    * @mapping {@literal named DEPTH Lnet/minecraft/entity/decoration/painting/PaintingEntity;DEPTH:F}
     */
-   public static final float f_hkxbjxlp = 0.0625F;
+   public static final float DEPTH = 0.0625F;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xypmuulf;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
@@ -74,7 +75,7 @@
     */
    @Override
    protected void initDataTracker(DataTracker.Builder builder) {
-      builder.add(VARIANT, (Holder<PaintingVariant>)this.getRegistryManager().get(RegistryKeys.PAINTING_VARIANT).m_vongjcbr().orElseThrow());
+      builder.add(VARIANT, (Holder<PaintingVariant>)this.getRegistryManager().get(RegistryKeys.PAINTING_VARIANT).getAny().orElseThrow());
    }
 
    /**
@@ -83,7 +84,7 @@
    @Override
    public void onTrackedDataSet(TrackedData<?> data) {
       if (VARIANT.equals(data)) {
-         this.m_woivokxp();
+         this.updateBoundingBox();
       }
    }
 
@@ -117,7 +118,7 @@
          lv.setFacing(direction);
          list.removeIf(painting -> {
             lv.setVariant(painting);
-            return !lv.m_uzlyxllu();
+            return !lv.canStayAttached();
          });
          if (list.isEmpty()) {
             return Optional.empty();
@@ -141,7 +142,7 @@
     * @mapping {@literal named getVariantArea Lnet/minecraft/entity/decoration/painting/PaintingEntity;getVariantArea(Lnet/minecraft/registry/Holder;)I}
     */
    private static int getVariantArea(Holder<PaintingVariant> holder) {
-      return holder.value().m_ghrmnkpe();
+      return holder.value().getArea();
    }
 
    /**
@@ -185,16 +186,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_lbdhqjli Lnet/minecraft/unmapped/C_xypmuulf;m_lbdhqjli(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_hbcjzgoe;}
-    * @mapping {@literal named m_lbdhqjli Lnet/minecraft/entity/decoration/painting/PaintingEntity;m_lbdhqjli(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/math/Box;}
+    * Mapping not found
     */
    @Override
-   protected Box m_lbdhqjli(BlockPos pos, Direction direction) {
+   protected Box calculateBoundingBox(BlockPos pos, Direction direction) {
       float f = 0.46875F;
       Vec3d lv = Vec3d.ofCenter(pos).relative(direction, -0.46875);
       PaintingVariant lv2 = this.getVariant().value();
-      double d = this.m_zksfobqk(lv2.width());
-      double e = this.m_zksfobqk(lv2.height());
+      double d = this.getOffset(lv2.width());
+      double e = this.getOffset(lv2.height());
       Direction lv3 = direction.rotateYCounterclockwise();
       Vec3d lv4 = lv.relative(lv3, d).relative(Direction.UP, e);
       Direction.Axis lv5 = direction.getAxis();
@@ -205,20 +205,21 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zksfobqk Lnet/minecraft/unmapped/C_xypmuulf;m_zksfobqk(I)D}
+    * @mapping {@literal named getOffset Lnet/minecraft/entity/decoration/painting/PaintingEntity;getOffset(I)D}
     */
-   private double m_zksfobqk(int i) {
-      return i % 2 == 0 ? 0.5 : 0.0;
+   private double getOffset(int width) {
+      return width % 2 == 0 ? 0.5 : 0.0;
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_kulkifdk(@Nullable Entity arg) {
+   public void dropItem(@Nullable Entity breaker) {
       if (this.getWorld().getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
          this.playSound(SoundEvents.ENTITY_PAINTING_BREAK, 1.0F, 1.0F);
-         if (arg instanceof PlayerEntity lv && lv.isInCreativeMode()) {
+         if (breaker instanceof PlayerEntity lv && lv.isInCreativeMode()) {
             return;
          }
 
@@ -262,8 +263,8 @@
     * Mapping not found
     */
    @Override
-   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry arg) {
-      return new EntitySpawnS2CPacket(this, this.facing.getId(), this.m_fodqxigf());
+   public Packet<ClientPlayPacketListener> createSpawnPacket(EntityTrackerEntry trackerEntry) {
+      return new EntitySpawnS2CPacket(this, this.facing.getId(), this.getAttachedBlockPos());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingVariant.java namedSrc/net/minecraft/entity/decoration/painting/PaintingVariant.java
--- namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingVariant.java	2024-07-09 01:56:10.768980220 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingVariant.java	2024-07-09 01:54:56.216857190 +0000
@@ -18,9 +18,10 @@
  */
 public record PaintingVariant(int width, int height, Identifier assetId) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_azsnvele Lnet/minecraft/unmapped/C_gbaxbrwg;f_azsnvele:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named DIRECT_CODEC Lnet/minecraft/entity/decoration/painting/PaintingVariant;DIRECT_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<PaintingVariant> f_azsnvele = RecordCodecBuilder.create(
+   public static final Codec<PaintingVariant> DIRECT_CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                Codecs.createRangedInt(1, 16).fieldOf("width").forGetter(PaintingVariant::width),
                Codecs.createRangedInt(1, 16).fieldOf("height").forGetter(PaintingVariant::height),
@@ -29,9 +30,10 @@
             .apply(instance, PaintingVariant::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dtfxxovq Lnet/minecraft/unmapped/C_gbaxbrwg;f_dtfxxovq:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named DIRECT_PACKET_CODEC Lnet/minecraft/entity/decoration/painting/PaintingVariant;DIRECT_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, PaintingVariant> f_dtfxxovq = PacketCodec.tuple(
+   public static final PacketCodec<ByteBuf, PaintingVariant> DIRECT_PACKET_CODEC = PacketCodec.tuple(
       PacketCodecs.VAR_INT,
       PaintingVariant::width,
       PacketCodecs.VAR_INT,
@@ -41,18 +43,23 @@
       PaintingVariant::new
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dfoybqqo Lnet/minecraft/unmapped/C_gbaxbrwg;f_dfoybqqo:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/entity/decoration/painting/PaintingVariant;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Holder<PaintingVariant>> f_dfoybqqo = RegistryElementCodec.of(RegistryKeys.PAINTING_VARIANT, f_azsnvele);
+   public static final Codec<Holder<PaintingVariant>> CODEC = RegistryElementCodec.of(RegistryKeys.PAINTING_VARIANT, DIRECT_CODEC);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dkvvcxps Lnet/minecraft/unmapped/C_gbaxbrwg;f_dkvvcxps:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/decoration/painting/PaintingVariant;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, Holder<PaintingVariant>> f_dkvvcxps = PacketCodecs.holder(RegistryKeys.PAINTING_VARIANT, f_dtfxxovq);
+   public static final PacketCodec<RegistryByteBuf, Holder<PaintingVariant>> PACKET_CODEC = PacketCodecs.holder(
+      RegistryKeys.PAINTING_VARIANT, DIRECT_PACKET_CODEC
+   );
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ghrmnkpe Lnet/minecraft/unmapped/C_gbaxbrwg;m_ghrmnkpe()I}
+    * @mapping {@literal named getArea Lnet/minecraft/entity/decoration/painting/PaintingVariant;getArea()I}
     */
-   public int m_ghrmnkpe() {
+   public int getArea() {
       return this.width() * this.height();
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingVariants.java namedSrc/net/minecraft/entity/decoration/painting/PaintingVariants.java
--- namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingVariants.java	2024-07-09 01:56:10.824980309 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingVariants.java	2024-07-09 01:54:56.292857322 +0000
@@ -266,63 +266,63 @@
     * @mapping {@literal named bootstrap Lnet/minecraft/entity/decoration/painting/PaintingVariants;bootstrap(Lnet/minecraft/registry/BootstrapContext;)V}
     */
    public static void bootstrap(BootstrapContext<PaintingVariant> context) {
-      m_vyjmbxzu(context, KEBAB, 1, 1);
-      m_vyjmbxzu(context, AZTEC, 1, 1);
-      m_vyjmbxzu(context, ALBAN, 1, 1);
-      m_vyjmbxzu(context, AZTEC2, 1, 1);
-      m_vyjmbxzu(context, BOMB, 1, 1);
-      m_vyjmbxzu(context, PLANT, 1, 1);
-      m_vyjmbxzu(context, WASTELAND, 1, 1);
-      m_vyjmbxzu(context, POOL, 2, 1);
-      m_vyjmbxzu(context, COURBET, 2, 1);
-      m_vyjmbxzu(context, SEA, 2, 1);
-      m_vyjmbxzu(context, SUNSET, 2, 1);
-      m_vyjmbxzu(context, CREEBET, 2, 1);
-      m_vyjmbxzu(context, WANDERER, 1, 2);
-      m_vyjmbxzu(context, GRAHAM, 1, 2);
-      m_vyjmbxzu(context, MATCH, 2, 2);
-      m_vyjmbxzu(context, BUST, 2, 2);
-      m_vyjmbxzu(context, STAGE, 2, 2);
-      m_vyjmbxzu(context, VOID, 2, 2);
-      m_vyjmbxzu(context, SKULL_AND_ROSES, 2, 2);
-      m_vyjmbxzu(context, WITHER, 2, 2);
-      m_vyjmbxzu(context, FIGHTERS, 4, 2);
-      m_vyjmbxzu(context, POINTER, 4, 4);
-      m_vyjmbxzu(context, PIGSCENE, 4, 4);
-      m_vyjmbxzu(context, BURNING_SKULL, 4, 4);
-      m_vyjmbxzu(context, SKELETON, 4, 3);
-      m_vyjmbxzu(context, EARTH, 2, 2);
-      m_vyjmbxzu(context, WIND, 2, 2);
-      m_vyjmbxzu(context, WATER, 2, 2);
-      m_vyjmbxzu(context, FIRE, 2, 2);
-      m_vyjmbxzu(context, DONKEY_KONG, 4, 3);
-      m_vyjmbxzu(context, BAROQUE, 2, 2);
-      m_vyjmbxzu(context, HUMBLE, 2, 2);
-      m_vyjmbxzu(context, MEDITATIVE, 1, 1);
-      m_vyjmbxzu(context, PRAIRIE_RIDE, 1, 2);
-      m_vyjmbxzu(context, UNPACKED, 4, 4);
-      m_vyjmbxzu(context, BACKYARD, 3, 4);
-      m_vyjmbxzu(context, BOUQUET, 3, 3);
-      m_vyjmbxzu(context, CAVEBIRD, 3, 3);
-      m_vyjmbxzu(context, CHANGING, 4, 2);
-      m_vyjmbxzu(context, COTAN, 3, 3);
-      m_vyjmbxzu(context, ENDBOSS, 3, 3);
-      m_vyjmbxzu(context, FERN, 3, 3);
-      m_vyjmbxzu(context, FINDING, 4, 2);
-      m_vyjmbxzu(context, LOWMIST, 4, 2);
-      m_vyjmbxzu(context, ORB, 4, 4);
-      m_vyjmbxzu(context, OWLEMONS, 3, 3);
-      m_vyjmbxzu(context, PASSAGE, 4, 2);
-      m_vyjmbxzu(context, POND, 3, 4);
-      m_vyjmbxzu(context, SUNFLOWERS, 3, 3);
-      m_vyjmbxzu(context, TIDES, 3, 3);
+      register(context, KEBAB, 1, 1);
+      register(context, AZTEC, 1, 1);
+      register(context, ALBAN, 1, 1);
+      register(context, AZTEC2, 1, 1);
+      register(context, BOMB, 1, 1);
+      register(context, PLANT, 1, 1);
+      register(context, WASTELAND, 1, 1);
+      register(context, POOL, 2, 1);
+      register(context, COURBET, 2, 1);
+      register(context, SEA, 2, 1);
+      register(context, SUNSET, 2, 1);
+      register(context, CREEBET, 2, 1);
+      register(context, WANDERER, 1, 2);
+      register(context, GRAHAM, 1, 2);
+      register(context, MATCH, 2, 2);
+      register(context, BUST, 2, 2);
+      register(context, STAGE, 2, 2);
+      register(context, VOID, 2, 2);
+      register(context, SKULL_AND_ROSES, 2, 2);
+      register(context, WITHER, 2, 2);
+      register(context, FIGHTERS, 4, 2);
+      register(context, POINTER, 4, 4);
+      register(context, PIGSCENE, 4, 4);
+      register(context, BURNING_SKULL, 4, 4);
+      register(context, SKELETON, 4, 3);
+      register(context, EARTH, 2, 2);
+      register(context, WIND, 2, 2);
+      register(context, WATER, 2, 2);
+      register(context, FIRE, 2, 2);
+      register(context, DONKEY_KONG, 4, 3);
+      register(context, BAROQUE, 2, 2);
+      register(context, HUMBLE, 2, 2);
+      register(context, MEDITATIVE, 1, 1);
+      register(context, PRAIRIE_RIDE, 1, 2);
+      register(context, UNPACKED, 4, 4);
+      register(context, BACKYARD, 3, 4);
+      register(context, BOUQUET, 3, 3);
+      register(context, CAVEBIRD, 3, 3);
+      register(context, CHANGING, 4, 2);
+      register(context, COTAN, 3, 3);
+      register(context, ENDBOSS, 3, 3);
+      register(context, FERN, 3, 3);
+      register(context, FINDING, 4, 2);
+      register(context, LOWMIST, 4, 2);
+      register(context, ORB, 4, 4);
+      register(context, OWLEMONS, 3, 3);
+      register(context, PASSAGE, 4, 2);
+      register(context, POND, 3, 4);
+      register(context, SUNFLOWERS, 3, 3);
+      register(context, TIDES, 3, 3);
    }
 
    /**
     * @mapping {@literal hashed m_vyjmbxzu Lnet/minecraft/unmapped/C_xzjscbit;m_vyjmbxzu(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;II)V}
-    * @mapping {@literal named m_vyjmbxzu Lnet/minecraft/entity/decoration/painting/PaintingVariants;m_vyjmbxzu(Lnet/minecraft/registry/BootstrapContext;Lnet/minecraft/registry/RegistryKey;II)V}
+    * @mapping {@literal named register Lnet/minecraft/entity/decoration/painting/PaintingVariants;register(Lnet/minecraft/registry/BootstrapContext;Lnet/minecraft/registry/RegistryKey;II)V}
     */
-   private static void m_vyjmbxzu(BootstrapContext<PaintingVariant> context, RegistryKey<PaintingVariant> registryKey, int width, int height) {
+   private static void register(BootstrapContext<PaintingVariant> context, RegistryKey<PaintingVariant> registryKey, int width, int height) {
       context.register(registryKey, new PaintingVariant(width, height, registryKey.getValue()));
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/effect/InfestedStatusEffect.java namedSrc/net/minecraft/entity/effect/InfestedStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/InfestedStatusEffect.java	2024-07-09 01:56:11.016980615 +0000
+++ namedSrc/net/minecraft/entity/effect/InfestedStatusEffect.java	2024-07-09 01:54:56.528857730 +0000
@@ -44,8 +44,8 @@
     */
    @Override
    public void onEntityHurt(LivingEntity entity, int amplifier, DamageSource source, float amount) {
-      if (entity.m_dlwxaobh().nextFloat() <= this.chanceToSpawn) {
-         int j = this.spawnCountFunction.applyAsInt(entity.m_dlwxaobh());
+      if (entity.getRandom().nextFloat() <= this.chanceToSpawn) {
+         int j = this.spawnCountFunction.applyAsInt(entity.getRandom());
 
          for (int k = 0; k < j; k++) {
             this.spawnSilverfish(entity.getWorld(), entity, entity.getX(), entity.getY() + (double)entity.getHeight() / 2.0, entity.getZ());
@@ -60,7 +60,7 @@
    private void spawnSilverfish(World world, LivingEntity entity, double x, double y, double z) {
       SilverfishEntity lv = EntityType.SILVERFISH.create(world);
       if (lv != null) {
-         RandomGenerator lv2 = entity.m_dlwxaobh();
+         RandomGenerator lv2 = entity.getRandom();
          float g = (float) (Math.PI / 2);
          float h = MathHelper.nextBetween(lv2, (float) (-Math.PI / 2), (float) (Math.PI / 2));
          Vector3f vector3f = entity.getRotationVector().toVector3f().mul(0.3F).mul(1.0F, 1.5F, 1.0F).rotateY(h);
diff -bur namedTargetSrc/net/minecraft/entity/effect/OozingStatusEffect.java namedSrc/net/minecraft/entity/effect/OozingStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/OozingStatusEffect.java	2024-07-09 01:56:10.992980576 +0000
+++ namedSrc/net/minecraft/entity/effect/OozingStatusEffect.java	2024-07-09 01:54:56.504857688 +0000
@@ -46,11 +46,11 @@
 
    /**
     * @mapping {@literal hashed m_veysajwx Lnet/minecraft/unmapped/C_koniavnx;m_veysajwx(ILnet/minecraft/unmapped/C_koniavnx$C_ehxlmbuh;I)I}
-    * @mapping {@literal named getSpawnedSlimeCount Lnet/minecraft/entity/effect/OozingStatusEffect;getSpawnedSlimeCount(ILnet/minecraft/entity/effect/OozingStatusEffect$C_ehxlmbuh;I)I}
+    * @mapping {@literal named getSpawnedSlimeCount Lnet/minecraft/entity/effect/OozingStatusEffect;getSpawnedSlimeCount(ILnet/minecraft/entity/effect/OozingStatusEffect$SlimeCounter;I)I}
     */
    @VisibleForTesting
-   protected static int getSpawnedSlimeCount(int maxEntityCramming, OozingStatusEffect.C_ehxlmbuh arg, int nearbySlimeCount) {
-      return maxEntityCramming < 1 ? nearbySlimeCount : MathHelper.clamp(0, maxEntityCramming - arg.count(maxEntityCramming), nearbySlimeCount);
+   protected static int getSpawnedSlimeCount(int maxEntityCramming, OozingStatusEffect.SlimeCounter counter, int nearbySlimeCount) {
+      return maxEntityCramming < 1 ? nearbySlimeCount : MathHelper.clamp(0, maxEntityCramming - counter.count(maxEntityCramming), nearbySlimeCount);
    }
 
    /**
@@ -59,10 +59,10 @@
    @Override
    public void onEntityRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
       if (reason == Entity.RemovalReason.KILLED) {
-         int j = this.slimeSpawnCountFunction.applyAsInt(entity.m_dlwxaobh());
+         int j = this.slimeSpawnCountFunction.applyAsInt(entity.getRandom());
          World lv = entity.getWorld();
          int k = lv.getGameRules().getIntValue(GameRules.MAX_ENTITY_CRAMMING);
-         int l = getSpawnedSlimeCount(k, OozingStatusEffect.C_ehxlmbuh.m_ttqtxznn(entity), j);
+         int l = getSpawnedSlimeCount(k, OozingStatusEffect.SlimeCounter.collectNearby(entity), j);
 
          for (int m = 0; m < l; m++) {
             this.spawnSlimes(entity.getWorld(), entity.getX(), entity.getY() + 0.5, entity.getZ());
@@ -85,22 +85,24 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_koniavnx$C_ehxlmbuh}
-    * @mapping {@literal named net/minecraft/entity/effect/OozingStatusEffect$C_ehxlmbuh}
+    * @mapping {@literal named net/minecraft/entity/effect/OozingStatusEffect$SlimeCounter}
     */
    @FunctionalInterface
-   protected interface C_ehxlmbuh {
+   protected interface SlimeCounter {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed count Lnet/minecraft/unmapped/C_koniavnx$C_ehxlmbuh;count(I)I}
+       * @mapping {@literal named count Lnet/minecraft/entity/effect/OozingStatusEffect$SlimeCounter;count(I)I}
        */
-      int count(int i);
+      int count(int limit);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ttqtxznn Lnet/minecraft/unmapped/C_koniavnx$C_ehxlmbuh;m_ttqtxznn(Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_koniavnx$C_ehxlmbuh;}
+       * @mapping {@literal named collectNearby Lnet/minecraft/entity/effect/OozingStatusEffect$SlimeCounter;collectNearby(Lnet/minecraft/entity/LivingEntity;)Lnet/minecraft/entity/effect/OozingStatusEffect$SlimeCounter;}
        */
-      static OozingStatusEffect.C_ehxlmbuh m_ttqtxznn(LivingEntity arg) {
+      static OozingStatusEffect.SlimeCounter collectNearby(LivingEntity entity) {
          return i -> {
             List<SlimeEntity> list = new ArrayList();
-            arg.getWorld().collectEntities(EntityType.SLIME, arg.getBounds().expand(2.0), arg2 -> arg2 != arg, list, i);
+            entity.getWorld().collectEntities(EntityType.SLIME, entity.getBounds().expand(2.0), arg2 -> arg2 != entity, list, i);
             return list.size();
          };
       }
diff -bur namedTargetSrc/net/minecraft/entity/effect/WeavingStatusEffect.java namedSrc/net/minecraft/entity/effect/WeavingStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/WeavingStatusEffect.java	2024-07-09 01:56:11.032980640 +0000
+++ namedSrc/net/minecraft/entity/effect/WeavingStatusEffect.java	2024-07-09 01:54:56.548857764 +0000
@@ -42,7 +42,7 @@
    public void onEntityRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
       if (reason == Entity.RemovalReason.KILLED
          && (entity instanceof PlayerEntity || entity.getWorld().getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING))) {
-         this.spawnCobwebs(entity.getWorld(), entity.m_dlwxaobh(), entity.getSteppingPosition());
+         this.spawnCobwebs(entity.getWorld(), entity.getRandom(), entity.getSteppingPosition());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java namedSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java	2024-07-09 01:56:10.820980303 +0000
+++ namedSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java	2024-07-09 01:54:56.292857322 +0000
@@ -29,11 +29,11 @@
          double d = entity.getX();
          double e = entity.getY() + (double)(entity.getHeight() / 2.0F);
          double f = entity.getZ();
-         float g = 3.0F + entity.m_dlwxaobh().nextFloat() * 2.0F;
+         float g = 3.0F + entity.getRandom().nextFloat() * 2.0F;
          lv.createExplosion(
             entity,
             null,
-            WindChargeProjectileEntity.f_whsjpufz,
+            WindChargeProjectileEntity.EXPLOSION_BEHAVIOR,
             d,
             e,
             f,


The remaining diff is too long!

Please sign in to comment.