Skip to content

Commit

Permalink
fix breeze wind charge name
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Mar 3, 2024
1 parent 29246f3 commit 77f27a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ...ntity/projectile/BreezeWindCharge.mapping → ...projectile/BreezeWindChargeEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CLASS net/minecraft/unmapped/C_uqkupzdc net/minecraft/entity/projectile/BreezeWindCharge
CLASS net/minecraft/unmapped/C_uqkupzdc net/minecraft/entity/projectile/BreezeWindChargeEntity
METHOD <init> (Lnet/minecraft/unmapped/C_nqresjkz;Lnet/minecraft/unmapped/C_cdctfzbn;)V
ARG 1 breeze

3 comments on commit 77f27a4

@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 77f27a4, 222 file(s) were updated with 1262 line(s) added and 1203 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-03-03 04:42:33.823026366 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-03-03 04:41:23.410669201 +0000
@@ -298,7 +298,7 @@
          return to;
       } else {
          for (Entity lv2 : world.getOtherEntities(null, lv.getBoundingBox())) {
-            double d = VoxelShapes.calculateMaxOffset(Direction.Axis.Y, lv2.m_lgqlkcep().offset(0.0, 1.0, 0.0), List.of(lv), -1.0);
+            double d = VoxelShapes.calculateMaxOffset(Direction.Axis.Y, lv2.getBounds().offset(0.0, 1.0, 0.0), List.of(lv), -1.0);
             lv2.teleportToOffset(0.0, 1.0 + d, 0.0);
          }
 
diff -bur namedTargetSrc/net/minecraft/block/BrushableBlock.java namedSrc/net/minecraft/block/BrushableBlock.java
--- namedTargetSrc/net/minecraft/block/BrushableBlock.java	2024-03-03 04:42:33.787026182 +0000
+++ namedSrc/net/minecraft/block/BrushableBlock.java	2024-03-03 04:41:23.366668974 +0000
@@ -142,7 +142,7 @@
     */
    @Override
    public void onDestroyedOnLanding(World world, BlockPos pos, FallingBlockEntity fallingBlockEntity) {
-      Vec3d lv = fallingBlockEntity.m_lgqlkcep().getCenter();
+      Vec3d lv = fallingBlockEntity.getBounds().getCenter();
       world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, BlockPos.fromPosition(lv), Block.getRawIdFromState(fallingBlockEntity.getBlockState()));
       world.emitGameEvent(fallingBlockEntity, GameEvent.BLOCK_DESTROY, lv);
    }
diff -bur namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java namedSrc/net/minecraft/block/CarvedPumpkinBlock.java
--- namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-03-03 04:42:33.643025443 +0000
+++ namedSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-03-03 04:41:23.194668088 +0000
@@ -135,7 +135,7 @@
       entity.refreshPositionAndAngles((double)pos.getX() + 0.5, (double)pos.getY() + 0.05, (double)pos.getZ() + 0.5, 0.0F, 0.0F);
       world.spawnEntity(entity);
 
-      for (ServerPlayerEntity lv : world.getNonSpectatingEntities(ServerPlayerEntity.class, entity.m_lgqlkcep().expand(5.0))) {
+      for (ServerPlayerEntity lv : world.getNonSpectatingEntities(ServerPlayerEntity.class, entity.getBounds().expand(5.0))) {
          Criteria.SUMMONED_ENTITY.trigger(lv, entity);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java namedSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java
--- namedTargetSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java	2024-03-03 04:42:33.727025874 +0000
+++ namedSrc/net/minecraft/block/cauldron/AbstractCauldronBlock.java	2024-03-03 04:41:23.302668644 +0000
@@ -107,7 +107,7 @@
     * @mapping {@literal named isEntityTouchingFluid Lnet/minecraft/block/cauldron/AbstractCauldronBlock;isEntityTouchingFluid(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)Z}
     */
    protected boolean isEntityTouchingFluid(BlockState state, BlockPos pos, Entity entity) {
-      return entity.getY() < (double)pos.getY() + this.getFluidHeight(state) && entity.m_lgqlkcep().maxY > (double)pos.getY() + 0.25;
+      return entity.getY() < (double)pos.getY() + this.getFluidHeight(state) && entity.getBounds().maxY > (double)pos.getY() + 0.25;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/EndPortalBlock.java namedSrc/net/minecraft/block/EndPortalBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalBlock.java	2024-03-03 04:42:33.683025649 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-03-03 04:41:23.254668397 +0000
@@ -74,7 +74,7 @@
       if (world instanceof ServerWorld
          && entity.canUsePortals()
          && VoxelShapes.matchesAnywhere(
-            VoxelShapes.cuboid(entity.m_lgqlkcep().offset((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ()))),
+            VoxelShapes.cuboid(entity.getBounds().offset((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ()))),
             state.getOutlineShape(world, pos),
             BooleanBiFunction.AND
          )) {
diff -bur namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java namedSrc/net/minecraft/block/entity/HopperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-03-03 04:42:33.571025075 +0000
+++ namedSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-03-03 04:41:23.102667614 +0000
@@ -633,7 +633,7 @@
    public static void onEntityCollided(World world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
       if (entity instanceof ItemEntity lv
          && !lv.getStack().isEmpty()
-         && entity.m_lgqlkcep().offset((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ())).intersects(blockEntity.m_ugmqjpia())) {
+         && entity.getBounds().offset((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ())).intersects(blockEntity.m_ugmqjpia())) {
          insertAndExtract(world, pos, state, blockEntity, () -> extract(blockEntity, lv));
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-03-03 04:42:33.783026160 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-03-03 04:41:23.362668953 +0000
@@ -263,7 +263,7 @@
 
                for (Box lv6 : list2) {
                   Box lv7 = Boxes.stretch(offsetHeadBox(pos, lv6, blockEntity), lv, d);
-                  Box lv8 = lv4.m_lgqlkcep();
+                  Box lv8 = lv4.getBounds();
                   if (lv7.intersects(lv8)) {
                      i = Math.max(i, getIntersectionSize(lv7, lv, lv8));
                      if (i >= d) {
@@ -382,7 +382,7 @@
     * @mapping {@literal named push Lnet/minecraft/block/entity/PistonBlockEntity;push(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Direction;D)V}
     */
    private static void push(BlockPos pos, Entity entity, Direction direction, double amount) {
-      Box lv = entity.m_lgqlkcep();
+      Box lv = entity.getBounds();
       Box lv2 = VoxelShapes.fullCube().getBoundingBox().offset(pos);
       if (lv.intersects(lv2)) {
          Direction lv3 = direction.getOpposite();
diff -bur namedTargetSrc/net/minecraft/block/PowderSnowBlock.java namedSrc/net/minecraft/block/PowderSnowBlock.java
--- namedTargetSrc/net/minecraft/block/PowderSnowBlock.java	2024-03-03 04:42:33.595025198 +0000
+++ namedSrc/net/minecraft/block/PowderSnowBlock.java	2024-03-03 04:41:23.126667737 +0000
@@ -111,7 +111,7 @@
     */
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
-      if (!(entity instanceof LivingEntity) || entity.m_lhatfyyd().isOf(this)) {
+      if (!(entity instanceof LivingEntity) || entity.getBlockStateAtPos().isOf(this)) {
          entity.setMovementMultiplier(state, new Vec3d(0.9F, 1.5, 0.9F));
          if (world.isClient) {
             RandomGenerator lv = world.getRandom();
diff -bur namedTargetSrc/net/minecraft/block/WitherSkullBlock.java namedSrc/net/minecraft/block/WitherSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WitherSkullBlock.java	2024-03-03 04:42:33.787026182 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2024-03-03 04:41:23.370668994 +0000
@@ -102,7 +102,7 @@
                   lv3.bodyYaw = lv2.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F;
                   lv3.onSummoned();
 
-                  for (ServerPlayerEntity lv5 : world.getNonSpectatingEntities(ServerPlayerEntity.class, lv3.m_lgqlkcep().expand(50.0))) {
+                  for (ServerPlayerEntity lv5 : world.getNonSpectatingEntities(ServerPlayerEntity.class, lv3.getBounds().expand(50.0))) {
                      Criteria.SUMMONED_ENTITY.trigger(lv5, lv3);
                   }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-03-03 04:42:33.691025689 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-03-03 04:41:23.262668439 +0000
@@ -737,7 +737,7 @@
     * @mapping {@literal named wouldCollideAt Lnet/minecraft/client/network/ClientPlayerEntity;wouldCollideAt(Lnet/minecraft/util/math/BlockPos;)Z}
     */
    private boolean wouldCollideAt(BlockPos pos) {
-      Box lv = this.m_lgqlkcep();
+      Box lv = this.getBounds();
       Box lv2 = new Box((double)pos.getX(), lv.minY, (double)pos.getZ(), (double)pos.getX() + 1.0, lv.maxY, (double)pos.getZ() + 1.0).contract(1.0E-7);
       return this.getWorld().collidesWithSuffocatingBlock(this, lv2);
    }
@@ -870,9 +870,9 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      super.m_efnedaed(arg);
-      if (LIVING_FLAGS.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      super.onTrackedDataSet(data);
+      if (LIVING_FLAGS.equals(data)) {
          boolean bl = (this.dataTracker.get(LIVING_FLAGS) & 1) > 0;
          Hand lv = (this.dataTracker.get(LIVING_FLAGS) & 2) > 0 ? Hand.OFF_HAND : Hand.MAIN_HAND;
          if (bl && !this.usingItem) {
@@ -882,7 +882,7 @@
          }
       }
 
-      if (FLAGS.equals(arg) && this.isFallFlying() && !this.falling) {
+      if (FLAGS.equals(data) && this.isFallFlying() && !this.falling) {
          this.client.getSoundManager().play(new ElytraSoundInstance(this));
       }
    }
@@ -1349,7 +1349,7 @@
          float o = (float)(lv6.x * lv5.x + lv6.z * lv5.z);
          if (!(o < -0.15F)) {
             ShapeContext lv7 = ShapeContext.of(this);
-            BlockPos lv8 = BlockPos.create(this.getX(), this.m_lgqlkcep().maxY, this.getZ());
+            BlockPos lv8 = BlockPos.create(this.getX(), this.getBounds().maxY, this.getZ());
             BlockState lv9 = this.getWorld().getBlockState(lv8);
             if (lv9.getCollisionShape(this.getWorld(), lv8, lv7).isEmpty()) {
                lv8 = lv8.up();
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-03-03 04:42:33.815026325 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-03-03 04:41:23.406669181 +0000
@@ -43,7 +43,7 @@
     */
    @Override
    public boolean shouldRender(double distance) {
-      double e = this.m_lgqlkcep().getAverageSideLength() * 10.0;
+      double e = this.getBounds().getAverageSideLength() * 10.0;
       if (Double.isNaN(e)) {
          e = 1.0;
       }
diff -bur namedTargetSrc/net/minecraft/client/render/debug/CollisionDebugRenderer.java namedSrc/net/minecraft/client/render/debug/CollisionDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/CollisionDebugRenderer.java	2024-03-03 04:42:33.639025423 +0000
+++ namedSrc/net/minecraft/client/render/debug/CollisionDebugRenderer.java	2024-03-03 04:41:23.190668067 +0000
@@ -54,7 +54,7 @@
       if (g - this.lastUpdateTime > 1.0E8) {
          this.lastUpdateTime = g;
          Entity lv = this.client.gameRenderer.getCamera().getFocusedEntity();
-         this.collisions = ImmutableList.copyOf(lv.getWorld().getCollisions(lv, lv.m_lgqlkcep().expand(6.0)));
+         this.collisions = ImmutableList.copyOf(lv.getWorld().getCollisions(lv, lv.getBounds().expand(6.0)));
       }
 
       VertexConsumer lv2 = vertexConsumers.getBuffer(RenderLayer.getLines());
diff -bur namedTargetSrc/net/minecraft/client/render/debug/DebugRenderer.java namedSrc/net/minecraft/client/render/debug/DebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/DebugRenderer.java	2024-03-03 04:42:33.619025320 +0000
+++ namedSrc/net/minecraft/client/render/debug/DebugRenderer.java	2024-03-03 04:41:23.158667902 +0000
@@ -225,7 +225,7 @@
          Vec3d lv = entity.getEyePos();
          Vec3d lv2 = entity.getRotationVec(1.0F).multiply((double)maxDistance);
          Vec3d lv3 = lv.add(lv2);
-         Box lv4 = entity.m_lgqlkcep().stretch(lv2).expand(1.0);
+         Box lv4 = entity.getBounds().stretch(lv2).expand(1.0);
          int j = maxDistance * maxDistance;
          Predicate<Entity> predicate = checkedEntity -> !checkedEntity.isSpectator() && checkedEntity.collides();
          EntityHitResult lv5 = ProjectileUtil.raycast(entity, lv, lv3, lv4, predicate, (double)j);
diff -bur namedTargetSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-03-03 04:42:33.679025628 +0000
+++ namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-03-03 04:41:23.246668356 +0000
@@ -56,7 +56,7 @@
       if (g - this.lastUpdateTime > 1.0E8) {
          this.lastUpdateTime = g;
          Entity lv = this.client.gameRenderer.getCamera().getFocusedEntity();
-         this.surroundingEntities = ImmutableList.copyOf(lv.getWorld().getOtherEntities(lv, lv.m_lgqlkcep().expand(16.0)));
+         this.surroundingEntities = ImmutableList.copyOf(lv.getWorld().getOtherEntities(lv, lv.getBounds().expand(16.0)));
       }
 
       PlayerEntity lv2 = this.client.player;
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-03-03 04:42:33.539024912 +0000
+++ namedSrc/net/minecraft/client/render/entity/BoatEntityRenderer.java	2024-03-03 04:41:23.062667408 +0000
@@ -83,14 +83,14 @@
       matrices.push();
       matrices.translate(0.0F, 0.375F, 0.0F);
       matrices.rotate(Axis.Y_POSITIVE.rotationDegrees(180.0F - f));
-      float h = (float)arg.m_gbbedxeg() - g;
-      float j = arg.m_zqlwnnzm() - g;
+      float h = (float)arg.getDamageWobbleTicks() - g;
+      float j = arg.getDamageWobbleStrength() - g;
       if (j < 0.0F) {
          j = 0.0F;
       }
 
       if (h > 0.0F) {
-         matrices.rotate(Axis.X_POSITIVE.rotationDegrees(MathHelper.sin(h) * h * j / 10.0F * (float)arg.m_votqnvdy()));
+         matrices.rotate(Axis.X_POSITIVE.rotationDegrees(MathHelper.sin(h) * h * j / 10.0F * (float)arg.getDamageWobbleSide()));
       }
 
       float k = arg.interpolateBubbleWobble(g);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2024-03-03 04:42:33.539024912 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2024-03-03 04:41:23.058667387 +0000
@@ -301,7 +301,7 @@
     * @mapping {@literal named renderHitbox Lnet/minecraft/client/render/entity/EntityRenderDispatcher;renderHitbox(Lnet/minecraft/client/util/math/MatrixStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/entity/Entity;F)V}
     */
    private static void renderHitbox(MatrixStack matrices, VertexConsumer vertices, Entity entity, float tickDelta) {
-      Box lv = entity.m_lgqlkcep().offset(-entity.getX(), -entity.getY(), -entity.getZ());
+      Box lv = entity.getBounds().offset(-entity.getX(), -entity.getY(), -entity.getZ());
       WorldRenderer.drawBox(matrices, vertices, lv, 1.0F, 1.0F, 1.0F, 1.0F);
       if (entity instanceof EnderDragonEntity) {
          double d = -MathHelper.lerp((double)tickDelta, entity.lastRenderX, entity.getX());
@@ -314,7 +314,7 @@
             double i = e + MathHelper.lerp((double)tickDelta, lv2.lastRenderY, lv2.getY());
             double j = g + MathHelper.lerp((double)tickDelta, lv2.lastRenderZ, lv2.getZ());
             matrices.translate(h, i, j);
-            WorldRenderer.drawBox(matrices, vertices, lv2.m_lgqlkcep().offset(-lv2.getX(), -lv2.getY(), -lv2.getZ()), 0.25F, 1.0F, 0.0F, 1.0F);
+            WorldRenderer.drawBox(matrices, vertices, lv2.getBounds().offset(-lv2.getX(), -lv2.getY(), -lv2.getZ()), 0.25F, 1.0F, 0.0F, 1.0F);
             matrices.pop();
          }
       }
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-03-03 04:42:33.659025526 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-03-03 04:41:23.214668191 +0000
@@ -9,8 +9,8 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAttachmentType;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_biqpbxns;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
@@ -154,7 +154,7 @@
    protected void renderLabelIfPresent(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, float tickDelta) {
       double d = this.dispatcher.getSquaredDistanceToCamera(entity);
       if (!(d > 4096.0)) {
-         Vec3d lv = entity.m_zoivpnyj().m_rfotkcao(C_biqpbxns.NAME_TAG, 0, entity.getYaw(tickDelta));
+         Vec3d lv = entity.m_zoivpnyj().m_rfotkcao(EntityAttachmentType.NAME_TAG, 0, entity.getYaw(tickDelta));
          if (lv != null) {
             boolean bl = !entity.isSneaky();
             int j = "deadmau5".equals(text.getString()) ? -10 : 0;
diff -bur namedTargetSrc/net/minecraft/client/render/entity/FallingBlockEntityRenderer.java namedSrc/net/minecraft/client/render/entity/FallingBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/FallingBlockEntityRenderer.java	2024-03-03 04:42:33.807026283 +0000
+++ namedSrc/net/minecraft/client/render/entity/FallingBlockEntityRenderer.java	2024-03-03 04:41:23.394669119 +0000
@@ -47,7 +47,7 @@
          World lv2 = arg.getWorld();
          if (lv != lv2.getBlockState(arg.getBlockPos()) && lv.getRenderType() != BlockRenderType.INVISIBLE) {
             matrices.push();
-            BlockPos lv3 = BlockPos.create(arg.getX(), arg.m_lgqlkcep().maxY, arg.getZ());
+            BlockPos lv3 = BlockPos.create(arg.getX(), arg.getBounds().maxY, arg.getZ());
             matrices.translate(-0.5, 0.0, -0.5);
             this.blockRenderManager
                .getModelRenderer()
diff -bur namedTargetSrc/net/minecraft/client/render/entity/MinecartEntityRenderer.java namedSrc/net/minecraft/client/render/entity/MinecartEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/MinecartEntityRenderer.java	2024-03-03 04:42:33.743025956 +0000
+++ namedSrc/net/minecraft/client/render/entity/MinecartEntityRenderer.java	2024-03-03 04:41:23.318668727 +0000
@@ -93,14 +93,14 @@
       matrices.translate(0.0F, 0.375F, 0.0F);
       matrices.rotate(Axis.Y_POSITIVE.rotationDegrees(180.0F - f));
       matrices.rotate(Axis.Z_POSITIVE.rotationDegrees(-o));
-      float p = (float)arg.m_gbbedxeg() - g;
-      float q = arg.m_zqlwnnzm() - g;
+      float p = (float)arg.getDamageWobbleTicks() - g;
+      float q = arg.getDamageWobbleStrength() - g;
       if (q < 0.0F) {
          q = 0.0F;
       }
 
       if (p > 0.0F) {
-         matrices.rotate(Axis.X_POSITIVE.rotationDegrees(MathHelper.sin(p) * p * q / 10.0F * (float)arg.m_votqnvdy()));
+         matrices.rotate(Axis.X_POSITIVE.rotationDegrees(MathHelper.sin(p) * p * q / 10.0F * (float)arg.getDamageWobbleSide()));
       }
 
       int r = arg.getBlockOffset();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/SnifferEntityModel.java namedSrc/net/minecraft/client/render/entity/model/SnifferEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/SnifferEntityModel.java	2024-03-03 04:42:33.659025526 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/SnifferEntityModel.java	2024-03-03 04:41:23.214668191 +0000
@@ -138,7 +138,7 @@
       this.getPart().traverse().forEach(ModelPart::resetTransform);
       this.head.pitch = j * (float) (Math.PI / 180.0);
       this.head.yaw = i * (float) (Math.PI / 180.0);
-      if (arg.m_ibvekfzg()) {
+      if (arg.isSearching()) {
          this.animateWalk(SnifferEntityAnimations.SNIFF_SEARCH, f, g, 9.0F, 100.0F);
       } else {
          this.animateWalk(SnifferEntityAnimations.WALK, f, g, 9.0F, 100.0F);
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-03-03 04:42:33.595025198 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-03-03 04:41:23.126667737 +0000
@@ -1302,7 +1302,7 @@
       Vec3d lv3 = arg.getRotationVec(f);
       Vec3d lv4 = lv.add(lv3.x * g, lv3.y * g, lv3.z * g);
       float j = 1.0F;
-      Box lv5 = arg.m_lgqlkcep().stretch(lv3.multiply(g)).expand(1.0, 1.0, 1.0);
+      Box lv5 = arg.getBounds().stretch(lv3.multiply(g)).expand(1.0, 1.0, 1.0);
       EntityHitResult lv6 = ProjectileUtil.raycast(arg, lv, lv4, lv5, argx -> !argx.isSpectator() && argx.collides(), h);
       return lv6 != null && lv6.getPos().squaredDistanceTo(lv) < i ? m_itpnfnbt(lv6, lv, b) : m_itpnfnbt(lv2, lv, a);
    }
diff -bur namedTargetSrc/net/minecraft/client/sound/BubbleColumnSoundPlayer.java namedSrc/net/minecraft/client/sound/BubbleColumnSoundPlayer.java
--- namedTargetSrc/net/minecraft/client/sound/BubbleColumnSoundPlayer.java	2024-03-03 04:42:33.555024994 +0000
+++ namedSrc/net/minecraft/client/sound/BubbleColumnSoundPlayer.java	2024-03-03 04:41:23.082667511 +0000
@@ -46,7 +46,7 @@
    @Override
    public void tick() {
       World lv = this.player.getWorld();
-      BlockState lv2 = (BlockState)lv.getStatesInBoxIfLoaded(this.player.m_lgqlkcep().expand(0.0, -0.4F, 0.0).contract(1.0E-6))
+      BlockState lv2 = (BlockState)lv.getStatesInBoxIfLoaded(this.player.getBounds().expand(0.0, -0.4F, 0.0).contract(1.0E-6))
          .filter(state -> state.isOf(Blocks.BUBBLE_COLUMN))
          .findFirst()
          .orElse(null);
diff -bur namedTargetSrc/net/minecraft/command/EntitySelector.java namedSrc/net/minecraft/command/EntitySelector.java
--- namedTargetSrc/net/minecraft/command/EntitySelector.java	2024-03-03 04:42:33.799026243 +0000
+++ namedSrc/net/minecraft/command/EntitySelector.java	2024-03-03 04:41:23.382669056 +0000
@@ -367,7 +367,7 @@
       Predicate<Entity> predicate = this.basePredicate;
       if (this.box != null) {
          Box lv = this.box.offset(pos);
-         predicate = predicate.and(entity -> lv.intersects(entity.m_lgqlkcep()));
+         predicate = predicate.and(entity -> lv.intersects(entity.getBounds()));
       }
 
       if (!this.distance.isDummy()) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-03-03 04:42:33.743025956 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-03-03 04:41:23.318668727 +0000
@@ -46,7 +46,7 @@
     */
    protected void sense(ServerWorld world, MobEntity arg2) {
       Brain<?> lv = arg2.getBrain();
-      List<ItemEntity> list = world.getEntitiesByClass(ItemEntity.class, arg2.m_lgqlkcep().expand(32.0, 16.0, 32.0), arg -> true);
+      List<ItemEntity> list = world.getEntitiesByClass(ItemEntity.class, arg2.getBounds().expand(32.0, 16.0, 32.0), arg -> true);
       list.sort(Comparator.comparingDouble(arg2::squaredDistanceTo));
       Optional<ItemEntity> optional = list.stream()
          .filter(arg2x -> arg2.canGather(arg2x.getStack()))
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.java	2024-03-03 04:42:33.719025833 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.java	2024-03-03 04:41:23.290668582 +0000
@@ -21,7 +21,7 @@
     */
    @Override
    protected void sense(ServerWorld world, T entity) {
-      Box lv = entity.m_lgqlkcep().expand((double)this.horizontalRadius(), (double)this.verticalRadius(), (double)this.horizontalRadius());
+      Box lv = entity.getBounds().expand((double)this.horizontalRadius(), (double)this.verticalRadius(), (double)this.horizontalRadius());
       List<LivingEntity> list = world.getEntitiesByClass(LivingEntity.class, lv, arg2 -> arg2 != entity && arg2.isAlive());
       list.sort(Comparator.comparingDouble(entity::squaredDistanceTo));
       Brain<?> lv2 = entity.getBrain();
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-03-03 04:42:33.747025977 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-03-03 04:41:23.322668747 +0000
@@ -133,7 +133,7 @@
     * @mapping {@literal named keepRunning Lnet/minecraft/entity/ai/brain/task/RamImpactTask;keepRunning(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/GoatEntity;J)V}
     */
    protected void keepRunning(ServerWorld world, GoatEntity arg2, long l) {
-      List<LivingEntity> list = world.getTargets(LivingEntity.class, this.targetPredicate, arg2, arg2.m_lgqlkcep());
+      List<LivingEntity> list = world.getTargets(LivingEntity.class, this.targetPredicate, arg2, arg2.getBounds());
       Brain<?> lv = arg2.getBrain();
       if (!list.isEmpty()) {
          LivingEntity lv2 = (LivingEntity)list.get(0);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-03-03 04:42:33.591025178 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-03-03 04:41:23.126667737 +0000
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityAttachmentType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.MemoryModuleState;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
@@ -10,7 +11,6 @@
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_biqpbxns;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -116,7 +116,7 @@
             .filter(arg2::isEnemy)
             .filter(arg2x -> arg2.isInRange(arg2x, 15.0, 20.0))
             .ifPresent(arg3 -> {
-               Vec3d lv = arg2.getPos().add(arg2.m_zoivpnyj().m_mhnyqnyc(C_biqpbxns.WARDEN_CHEST, 0, arg2.getYaw()));
+               Vec3d lv = arg2.getPos().add(arg2.m_zoivpnyj().m_mhnyqnyc(EntityAttachmentType.WARDEN_CHEST, 0, arg2.getYaw()));
                Vec3d lv2 = arg3.getEyePos().subtract(lv);
                Vec3d lv3 = lv2.normalize();
                int i = MathHelper.floor(lv2.length()) + 7;
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/LookControl.java namedSrc/net/minecraft/entity/ai/control/LookControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/LookControl.java	2024-03-03 04:42:33.663025546 +0000
+++ namedSrc/net/minecraft/entity/ai/control/LookControl.java	2024-03-03 04:41:23.218668211 +0000
@@ -212,6 +212,6 @@
     * @mapping {@literal named getLookingHeightFor Lnet/minecraft/entity/ai/control/LookControl;getLookingHeightFor(Lnet/minecraft/entity/Entity;)D}
     */
    private static double getLookingHeightFor(Entity entity) {
-      return entity instanceof LivingEntity ? entity.getEyeY() : (entity.m_lgqlkcep().minY + entity.m_lgqlkcep().maxY) / 2.0;
+      return entity instanceof LivingEntity ? entity.getEyeY() : (entity.getBounds().minY + entity.getBounds().maxY) / 2.0;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java namedSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java	2024-03-03 04:42:33.703025751 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java	2024-03-03 04:41:23.274668500 +0000
@@ -119,7 +119,7 @@
     */
    @Nullable
    private AnimalEntity findMate() {
-      List<? extends AnimalEntity> list = this.world.getTargets(this.entityClass, VALID_MATE_PREDICATE, this.animal, this.animal.m_lgqlkcep().expand(8.0));
+      List<? extends AnimalEntity> list = this.world.getTargets(this.entityClass, VALID_MATE_PREDICATE, this.animal, this.animal.getBounds().expand(8.0));
       double d = Double.MAX_VALUE;
       AnimalEntity lv = null;
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-03-03 04:42:33.639025423 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-03-03 04:41:23.190668067 +0000
@@ -52,7 +52,7 @@
     */
    @Override
    public boolean canStart() {
-      List<BoatEntity> list = this.mob.getWorld().getNonSpectatingEntities(BoatEntity.class, this.mob.m_lgqlkcep().expand(5.0));
+      List<BoatEntity> list = this.mob.getWorld().getNonSpectatingEntities(BoatEntity.class, this.mob.getBounds().expand(5.0));
       boolean bl = false;
 
       for (BoatEntity lv : list) {
@@ -90,7 +90,7 @@
     */
    @Override
    public void start() {
-      for (BoatEntity lv : this.mob.getWorld().getNonSpectatingEntities(BoatEntity.class, this.mob.m_lgqlkcep().expand(5.0))) {
+      for (BoatEntity lv : this.mob.getWorld().getNonSpectatingEntities(BoatEntity.class, this.mob.getBounds().expand(5.0))) {
          if (lv.getPrimaryPassenger() instanceof PlayerEntity lv2) {
             this.passenger = lv2;
             break;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java namedSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java	2024-03-03 04:42:33.755026017 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java	2024-03-03 04:41:23.330668788 +0000
@@ -135,7 +135,7 @@
          .getClosestEntity(
             this.mob
                .getWorld()
-               .getEntitiesByClass(this.classToFleeFrom, this.mob.m_lgqlkcep().expand((double)this.fleeDistance, 3.0, (double)this.fleeDistance), arg -> true),
+               .getEntitiesByClass(this.classToFleeFrom, this.mob.getBounds().expand((double)this.fleeDistance, 3.0, (double)this.fleeDistance), arg -> true),
             this.withinRangePredicate,
             this.mob,
             this.mob.getX(),
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-03-03 04:42:33.535024891 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.java	2024-03-03 04:41:23.054667367 +0000
@@ -65,7 +65,7 @@
          Predicate<SchoolingFishEntity> predicate = fish -> fish.canHaveMoreFishInGroup() || !fish.hasLeader();
          List<? extends SchoolingFishEntity> list = this.fish
             .getWorld()
-            .getEntitiesByClass(this.fish.getClass(), this.fish.m_lgqlkcep().expand(8.0, 8.0, 8.0), predicate);
+            .getEntitiesByClass(this.fish.getClass(), this.fish.getBounds().expand(8.0, 8.0, 8.0), predicate);
          SchoolingFishEntity lv = DataFixUtils.orElse(list.stream().filter(SchoolingFishEntity::canHaveMoreFishInGroup).findAny(), this.fish);
          lv.pullInOtherFish(list.stream().filter(fish -> !fish.hasLeader()));
          return this.fish.hasLeader();
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-03-03 04:42:33.699025731 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowMobGoal.java	2024-03-03 04:41:23.270668479 +0000
@@ -87,7 +87,7 @@
    public boolean canStart() {
       List<MobEntity> list = this.mob
          .getWorld()
-         .getEntitiesByClass(MobEntity.class, this.mob.m_lgqlkcep().expand((double)this.maxDistance), this.targetPredicate);
+         .getEntitiesByClass(MobEntity.class, this.mob.getBounds().expand((double)this.maxDistance), this.targetPredicate);
       if (!list.isEmpty()) {
          for (MobEntity lv : list) {
             if (!lv.isInvisible()) {
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-03-03 04:42:33.635025403 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-03-03 04:41:23.182668026 +0000
@@ -231,7 +231,7 @@
             return false;
          } else {
             BlockPos lv3 = pos.subtract(this.tameable.getBlockPos());
-            return this.world.isSpaceEmpty(this.tameable, this.tameable.m_lgqlkcep().offset(lv3));
+            return this.world.isSpaceEmpty(this.tameable, this.tameable.getBounds().offset(lv3));
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FollowParentGoal.java namedSrc/net/minecraft/entity/ai/goal/FollowParentGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FollowParentGoal.java	2024-03-03 04:42:33.699025731 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowParentGoal.java	2024-03-03 04:41:23.274668500 +0000
@@ -65,7 +65,7 @@
       } else {
          List<? extends AnimalEntity> list = this.animal
             .getWorld()
-            .getNonSpectatingEntities(this.animal.getClass(), this.animal.m_lgqlkcep().expand(8.0, 4.0, 8.0));
+            .getNonSpectatingEntities(this.animal.getClass(), this.animal.getBounds().expand(8.0, 4.0, 8.0));
          AnimalEntity lv = null;
          double d = Double.MAX_VALUE;
 
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-03-03 04:42:33.631025383 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FormCaravanGoal.java	2024-03-03 04:41:23.178668005 +0000
@@ -50,7 +50,7 @@
    @Override
    public boolean canStart() {
       if (!this.llama.isLeashed() && !this.llama.isFollowing()) {
-         List<Entity> list = this.llama.getWorld().getOtherEntities(this.llama, this.llama.m_lgqlkcep().expand(9.0, 4.0, 9.0), entity -> {
+         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;
          });
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-03-03 04:42:33.771026099 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java	2024-03-03 04:41:23.346668871 +0000
@@ -64,7 +64,7 @@
                this.golem.getX(),
                this.golem.getY(),
                this.golem.getZ(),
-               this.golem.m_lgqlkcep().expand(6.0, 2.0, 6.0)
+               this.golem.getBounds().expand(6.0, 2.0, 6.0)
             );
          return this.targetVillager != null;
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.java namedSrc/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.java	2024-03-03 04:42:33.807026283 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.java	2024-03-03 04:41:23.394669119 +0000
@@ -90,7 +90,7 @@
    @Nullable
    private Vec3d findVillagerPos() {
       ServerWorld lv = (ServerWorld)this.mob.getWorld();
-      List<VillagerEntity> list = lv.getEntitiesByType(EntityType.VILLAGER, this.mob.m_lgqlkcep().expand(32.0), this::canVillagerSummonGolem);
+      List<VillagerEntity> list = lv.getEntitiesByType(EntityType.VILLAGER, this.mob.getBounds().expand(32.0), this::canVillagerSummonGolem);
       if (list.isEmpty()) {
          return null;
       } else {
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-03-03 04:42:33.743025956 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java	2024-03-03 04:41:23.318668727 +0000
@@ -117,7 +117,7 @@
                .getClosestEntity(
                   this.mob
                      .getWorld()
-                     .getEntitiesByClass(this.targetType, this.mob.m_lgqlkcep().expand((double)this.range, 3.0, (double)this.range), arg -> true),
+                     .getEntitiesByClass(this.targetType, this.mob.getBounds().expand((double)this.range, 3.0, (double)this.range), arg -> true),
                   this.targetPredicate,
                   this.mob,
                   this.mob.getX(),
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.java namedSrc/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.java	2024-03-03 04:42:33.587025157 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.java	2024-03-03 04:41:23.114667676 +0000
@@ -100,7 +100,7 @@
          List<RaiderEntity> list = this.actor
             .getWorld()
             .getEntitiesByClass(
-               RaiderEntity.class, this.actor.m_lgqlkcep().expand(16.0), arg2 -> !arg2.hasActiveRaid() && RaidManager.isValidRaiderFor(arg2, raid)
+               RaiderEntity.class, this.actor.getBounds().expand(16.0), arg2 -> !arg2.hasActiveRaid() && RaidManager.isValidRaiderFor(arg2, raid)
             );
          set.addAll(list);
 
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-03-03 04:42:33.755026017 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SitOnOwnerShoulderGoal.java	2024-03-03 04:41:23.334668810 +0000
@@ -65,7 +65,7 @@
    @Override
    public void tick() {
       if (!this.mounted && !this.tameable.isInSittingPose() && !this.tameable.isLeashed()) {
-         if (this.tameable.m_lgqlkcep().intersects(this.owner.m_lgqlkcep())) {
+         if (this.tameable.getBounds().intersects(this.owner.getBounds())) {
             this.mounted = this.tameable.mountOnto(this.owner);
          }
       }
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-03-03 04:42:33.775026120 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TargetGoal.java	2024-03-03 04:41:23.354668913 +0000
@@ -103,7 +103,7 @@
     * @mapping {@literal named getSearchBox Lnet/minecraft/entity/ai/goal/TargetGoal;getSearchBox(D)Lnet/minecraft/util/math/Box;}
     */
    protected Box getSearchBox(double distance) {
-      return this.mob.m_lgqlkcep().expand(distance, 4.0, distance);
+      return this.mob.getBounds().expand(distance, 4.0, distance);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.java namedSrc/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.java	2024-03-03 04:42:33.555024994 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.java	2024-03-03 04:41:23.078667490 +0000
@@ -47,7 +47,7 @@
     */
    @Override
    public boolean canStart() {
-      Box lv = this.golem.m_lgqlkcep().expand(10.0, 8.0, 10.0);
+      Box lv = this.golem.getBounds().expand(10.0, 8.0, 10.0);
       List<? extends LivingEntity> list = this.golem.getWorld().getTargets(VillagerEntity.class, this.targetPredicate, this.golem, lv);
       List<PlayerEntity> list2 = this.golem.getWorld().getPlayers(this.targetPredicate, this.golem, lv);
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java	2024-03-03 04:42:33.767026079 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/AmphibiousPathNodeMaker.java	2024-03-03 04:41:23.346668871 +0000
@@ -70,9 +70,9 @@
          ? super.getStart()
          : this.m_etdbalqp(
             new BlockPos(
-               MathHelper.floor(this.entity.m_lgqlkcep().minX),
-               MathHelper.floor(this.entity.m_lgqlkcep().minY + 0.5),
-               MathHelper.floor(this.entity.m_lgqlkcep().minZ)
+               MathHelper.floor(this.entity.getBounds().minX),
+               MathHelper.floor(this.entity.getBounds().minY + 0.5),
+               MathHelper.floor(this.entity.getBounds().minZ)
             )
          );
    }
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-03-03 04:42:33.531024871 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.java	2024-03-03 04:41:23.050667346 +0000
@@ -370,7 +370,7 @@
     */
    private Iterable<BlockPos> m_ugfyngjc(MobEntity arg) {
       float f = 1.0F;
-      Box lv = arg.m_lgqlkcep();
+      Box lv = arg.getBounds();
       boolean bl = lv.getAverageSideLength() < 1.0;
       if (!bl) {
          return List.of(
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java	2024-03-03 04:42:33.783026160 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/LandPathNodeMaker.java	2024-03-03 04:41:23.362668953 +0000
@@ -121,7 +121,7 @@
 
       BlockPos lv4 = this.entity.getBlockPos();
       if (!this.m_wblphwtk(lv.set(lv4.getX(), i, lv4.getZ()))) {
-         Box lv5 = this.entity.m_lgqlkcep();
+         Box lv5 = this.entity.getBounds();
          if (this.m_wblphwtk(lv.set(lv5.minX, (double)i, lv5.minZ))
             || this.m_wblphwtk(lv.set(lv5.minX, (double)i, lv5.maxZ))
             || this.m_wblphwtk(lv.set(lv5.maxX, (double)i, lv5.minZ))
@@ -242,7 +242,7 @@
     * @mapping {@literal named isBlocked Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;isBlocked(Lnet/minecraft/entity/ai/pathing/PathNode;)Z}
     */
    private boolean isBlocked(PathNode node) {
-      Box lv = this.entity.m_lgqlkcep();
+      Box lv = this.entity.getBounds();
       Vec3d lv2 = new Vec3d(
          (double)node.x - this.entity.getX() + lv.getXLength() / 2.0,
          (double)node.y - this.entity.getY() + lv.getYLength() / 2.0,
diff -bur namedTargetSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java namedSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java
--- namedTargetSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java	2024-03-03 04:42:33.671025588 +0000
+++ namedSrc/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.java	2024-03-03 04:41:23.234668294 +0000
@@ -65,9 +65,7 @@
    @Override
    public PathNode getStart() {
       return this.getNode(
-         MathHelper.floor(this.entity.m_lgqlkcep().minX),
-         MathHelper.floor(this.entity.m_lgqlkcep().minY + 0.5),
-         MathHelper.floor(this.entity.m_lgqlkcep().minZ)
+         MathHelper.floor(this.entity.getBounds().minX), MathHelper.floor(this.entity.getBounds().minY + 0.5), MathHelper.floor(this.entity.getBounds().minZ)
       );
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/AnimationState.java namedSrc/net/minecraft/entity/AnimationState.java
--- namedTargetSrc/net/minecraft/entity/AnimationState.java	2024-03-03 04:42:33.595025198 +0000
+++ namedSrc/net/minecraft/entity/AnimationState.java	2024-03-03 04:41:23.126667737 +0000
@@ -86,11 +86,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cpvhojvm Lnet/minecraft/unmapped/C_kxntavoz;m_cpvhojvm(IF)V}
+    * @mapping {@literal named fastForward Lnet/minecraft/entity/AnimationState;fastForward(IF)V}
     */
-   public void m_cpvhojvm(int i, float f) {
+   public void fastForward(int seconds, float speedMultiplier) {
       if (this.isAnimating()) {
-         this.time += (long)((float)(i * 1000) * f) / 20L;
+         this.time += (long)((float)(seconds * 1000) * speedMultiplier) / 20L;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java
--- namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-03-03 04:42:33.631025383 +0000
+++ namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-03-03 04:41:23.182668026 +0000
@@ -92,9 +92,10 @@
     */
    public static final float HEIGHT = 0.5F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dwirhsfw Lnet/minecraft/unmapped/C_dtsrsfye;f_dwirhsfw:Ljava/lang/String;}
+    * @mapping {@literal named EFFECTS_KEY Lnet/minecraft/entity/AreaEffectCloudEntity;EFFECTS_KEY:Ljava/lang/String;}
     */
-   private static final String f_dwirhsfw = "effects";
+   private static final String EFFECTS_KEY = "effects";
    /**
     * @mapping {@literal hashed f_zalphvck Lnet/minecraft/unmapped/C_dtsrsfye;f_zalphvck:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named potion Lnet/minecraft/entity/AreaEffectCloudEntity;potion:Lnet/minecraft/registry/Holder;}
@@ -180,11 +181,11 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(COLOR, 0);
-      arg.m_jeliigji(RADIUS, 3.0F);
-      arg.m_jeliigji(WAITING, false);
-      arg.m_jeliigji(PARTICLE_ID, ParticleTypes.ENTITY_EFFECT);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(COLOR, 0);
+      builder.add(RADIUS, 3.0F);
+      builder.add(WAITING, false);
+      builder.add(PARTICLE_ID, ParticleTypes.ENTITY_EFFECT);
    }
 
    /**
@@ -221,8 +222,8 @@
     * @mapping {@literal hashed m_owoqxnhs Lnet/minecraft/unmapped/C_dtsrsfye;m_owoqxnhs(Lnet/minecraft/unmapped/C_cjzoxshv;)V}
     * @mapping {@literal named setPotion Lnet/minecraft/entity/AreaEffectCloudEntity;setPotion(Lnet/minecraft/registry/Holder;)V}
     */
-   public void setPotion(Holder<Potion> arg) {
-      this.potion = arg;
+   public void setPotion(Holder<Potion> potion) {
+      this.potion = potion;
       if (!this.customColor) {
          this.updateColor();
       }
@@ -405,7 +406,7 @@
             if (list.isEmpty()) {
                this.affectedEntities.clear();
             } else {
-               List<LivingEntity> list2 = this.getWorld().getNonSpectatingEntities(LivingEntity.class, this.m_lgqlkcep());
+               List<LivingEntity> list2 = this.getWorld().getNonSpectatingEntities(LivingEntity.class, this.getBounds());
                if (!list2.isEmpty()) {
                   for (LivingEntity lv3 : list2) {
                      if (!this.affectedEntities.containsKey(lv3) && lv3.isAffectedBySplashPotions()) {
@@ -557,7 +558,7 @@
 
       if (nbt.contains("Particle", NbtElement.STRING_TYPE)) {
          try {
-            this.setParticleType(ParticleEffectArgumentType.parse(new StringReader(nbt.getString("Particle")), this.m_jofogjft()));
+            this.setParticleType(ParticleEffectArgumentType.parse(new StringReader(nbt.getString("Particle")), this.getRegistryManager()));
          } catch (CommandSyntaxException var5) {
             LOGGER.warn("Couldn't load custom particle {}", nbt.getString("Particle"), var5);
          }
@@ -597,7 +598,7 @@
       nbt.putFloat("RadiusOnUse", this.radiusOnUse);
       nbt.putFloat("RadiusPerTick", this.radiusGrowth);
       nbt.putFloat("Radius", this.getRadius());
-      nbt.putString("Particle", this.getParticleType().asString(this.m_jofogjft()));
+      nbt.putString("Particle", this.getParticleType().asString(this.getRegistryManager()));
       if (this.ownerUuid != null) {
          nbt.putUuid("Owner", this.ownerUuid);
       }
@@ -626,12 +627,12 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (RADIUS.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (RADIUS.equals(data)) {
          this.calculateDimensions();
       }
 
-      super.m_efnedaed(arg);
+      super.onTrackedDataSet(data);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java namedSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java
--- namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java	2024-03-03 04:42:33.555024994 +0000
+++ namedSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java	2024-03-03 04:41:23.086667531 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.mob.AbstractSkeletonEntity;
 import net.minecraft.entity.mob.BlazeEntity;
+import net.minecraft.entity.mob.BoggedEntity;
 import net.minecraft.entity.mob.BreezeEntity;
 import net.minecraft.entity.mob.CaveSpiderEntity;
 import net.minecraft.entity.mob.CreeperEntity;
@@ -79,7 +80,6 @@
 import net.minecraft.entity.passive.WolfEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_zsgzopda;
 import net.minecraft.util.Util;
 import org.slf4j.Logger;
 
@@ -107,7 +107,7 @@
       .put(EntityType.BAT, BatEntity.createAttributes().build())
       .put(EntityType.BEE, BeeEntity.createAttributes().build())
       .put(EntityType.BLAZE, BlazeEntity.createAttributes().build())
-      .put(EntityType.BOGGED, C_zsgzopda.m_hspcdijf().build())
+      .put(EntityType.BOGGED, BoggedEntity.m_hspcdijf().build())
       .put(EntityType.CAT, CatEntity.createAttributes().build())
       .put(EntityType.CAMEL, CamelEntity.createAttributes().build())
       .put(EntityType.CAVE_SPIDER, CaveSpiderEntity.createAttributes().build())
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java namedSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java	2024-03-03 04:42:33.739025935 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java	2024-03-03 04:41:23.314668707 +0000
@@ -157,9 +157,9 @@
 
    /**
     * @mapping {@literal hashed m_mrmrewks Lnet/minecraft/unmapped/C_lzukavpx;m_mrmrewks(Lnet/minecraft/unmapped/C_hdbqsqsm;)V}
-    * @mapping {@literal named m_mrmrewks Lnet/minecraft/entity/attribute/EntityAttributeInstance;m_mrmrewks(Lnet/minecraft/entity/attribute/EntityAttributeModifier;)V}
+    * @mapping {@literal named updateModifier Lnet/minecraft/entity/attribute/EntityAttributeInstance;updateModifier(Lnet/minecraft/entity/attribute/EntityAttributeModifier;)V}
     */
-   public void m_mrmrewks(EntityAttributeModifier value) {
+   public void updateModifier(EntityAttributeModifier value) {
       EntityAttributeModifier lv = (EntityAttributeModifier)this.idToModifiers.putIfAbsent(value.getId(), value);
       if (value != lv) {
          Set<EntityAttributeModifier> set = this.getModifiers(value.getOperation());
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-03-03 04:42:33.627025362 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-03-03 04:41:23.170667964 +0000
@@ -35,7 +35,7 @@
    public static final Codec<EntityAttributeModifier> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                UuidUtil.INT_STREAM_CODEC.fieldOf("UUID").forGetter(EntityAttributeModifier::getId),
-               Codec.STRING.fieldOf("Name").forGetter(arg -> arg.name),
+               Codec.STRING.fieldOf("Name").forGetter(modifier -> modifier.name),
                Codec.DOUBLE.fieldOf("Amount").forGetter(EntityAttributeModifier::getValue),
                EntityAttributeModifier.Operation.CODEC.fieldOf("Operation").forGetter(EntityAttributeModifier::getOperation)
             )
@@ -142,7 +142,7 @@
       NbtCompound lv = new NbtCompound();
       lv.putString("Name", this.name);
       lv.putDouble("Amount", this.value);
-      lv.putInt("Operation", this.operation.m_tzqcenkk());
+      lv.putInt("Operation", this.operation.getId());
       lv.putUuid("UUID", this.uuid);
       return lv;
    }
@@ -155,7 +155,7 @@
    public static EntityAttributeModifier fromNbt(NbtCompound nbt) {
       try {
          UUID uUID = nbt.getUuid("UUID");
-         EntityAttributeModifier.Operation lv = (EntityAttributeModifier.Operation)EntityAttributeModifier.Operation.f_qrkmptcr.apply(nbt.getInt("Operation"));
+         EntityAttributeModifier.Operation lv = (EntityAttributeModifier.Operation)EntityAttributeModifier.Operation.BY_ID.apply(nbt.getInt("Operation"));
          return new EntityAttributeModifier(uUID, nbt.getString("Name"), nbt.getDouble("Amount"), lv);
       } catch (Exception var3) {
          LOGGER.warn("Unable to create attribute: {}", var3.getMessage());
@@ -197,16 +197,18 @@
       MULTIPLY_TOTAL("multiply_total", 2);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qrkmptcr Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_qrkmptcr:Ljava/util/function/IntFunction;}
+       * @mapping {@literal named BY_ID Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;BY_ID:Ljava/util/function/IntFunction;}
        */
-      public static final IntFunction<EntityAttributeModifier.Operation> f_qrkmptcr = IdListUtil.sortArray(
-         EntityAttributeModifier.Operation::m_tzqcenkk, values(), IdListUtil.OutOfBoundsHandler.ZERO
+      public static final IntFunction<EntityAttributeModifier.Operation> BY_ID = IdListUtil.sortArray(
+         EntityAttributeModifier.Operation::getId, values(), IdListUtil.OutOfBoundsHandler.ZERO
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_umhgvzca Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_umhgvzca:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, EntityAttributeModifier.Operation> f_umhgvzca = PacketCodecs.m_oxatcqxo(
-         f_qrkmptcr, EntityAttributeModifier.Operation::m_tzqcenkk
+      public static final PacketCodec<ByteBuf, EntityAttributeModifier.Operation> PACKET_CODEC = PacketCodecs.m_oxatcqxo(
+         BY_ID, EntityAttributeModifier.Operation::getId
       );
       /**
        * @mapping {@literal hashed f_wzjuqzpc Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_wzjuqzpc:Lcom/mojang/serialization/Codec;}
@@ -216,27 +218,31 @@
          EntityAttributeModifier.Operation::values
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ztrdibur Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_ztrdibur:Ljava/lang/String;}
+       * @mapping {@literal named name Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;name:Ljava/lang/String;}
        */
-      private final String f_ztrdibur;
+      private final String name;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_dqfeqgfg Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_dqfeqgfg:I}
+       * @mapping {@literal named id Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;id:I}
        */
-      private final int f_dqfeqgfg;
+      private final int id;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;<init>(Ljava/lang/String;ILjava/lang/String;I)V}
+       * @mapping {@literal named <init> Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;<init>(Ljava/lang/String;ILjava/lang/String;I)V}
        */
-      private Operation(String string2, int j) {
-         this.f_ztrdibur = string2;
-         this.f_dqfeqgfg = j;
+      private Operation(String name, int id) {
+         this.name = name;
+         this.id = id;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_tzqcenkk Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;m_tzqcenkk()I}
+       * @mapping {@literal named getId Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;getId()I}
        */
-      public int m_tzqcenkk() {
-         return this.f_dqfeqgfg;
+      public int getId() {
+         return this.id;
       }
 
       /**
@@ -244,7 +250,7 @@
        */
       @Override
       public String asString() {
-         return this.f_ztrdibur;
+         return this.name;
       }
    }
 }

@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/boss/dragon/EnderDragonEntity.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-03-03 04:42:33.559025014 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-03-03 04:41:23.086667531 +0000
@@ -193,9 +193,9 @@
    private EnderDragonFight fight;
    /**
     * @mapping {@literal hashed f_pehnbpli Lnet/minecraft/unmapped/C_bsmypcfq;f_pehnbpli:Lnet/minecraft/unmapped/C_hynzadkk;}
-    * @mapping {@literal named pos Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;pos:Lnet/minecraft/util/math/BlockPos;}
+    * @mapping {@literal named fightOrigin Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;fightOrigin:Lnet/minecraft/util/math/BlockPos;}
     */
-   private BlockPos pos = BlockPos.ORIGIN;
+   private BlockPos fightOrigin = BlockPos.ORIGIN;
    /**
     * @mapping {@literal hashed f_wuxpwaau Lnet/minecraft/unmapped/C_bsmypcfq;f_wuxpwaau:Lnet/minecraft/unmapped/C_hnmrcewa;}
     * @mapping {@literal named phaseManager Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;phaseManager:Lnet/minecraft/entity/boss/dragon/phase/PhaseManager;}
@@ -254,25 +254,27 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_nhbsapge Lnet/minecraft/unmapped/C_bsmypcfq;m_nhbsapge(Lnet/minecraft/unmapped/C_hxzjzvro;)V}
+    * @mapping {@literal named setFight Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;setFight(Lnet/minecraft/entity/boss/dragon/EnderDragonFight;)V}
     */
-   public void m_nhbsapge(EnderDragonFight arg) {
-      this.fight = arg;
+   public void setFight(EnderDragonFight fight) {
+      this.fight = fight;
    }
 
    /**
     * @mapping {@literal hashed m_pamvmrhq Lnet/minecraft/unmapped/C_bsmypcfq;m_pamvmrhq(Lnet/minecraft/unmapped/C_hynzadkk;)V}
-    * @mapping {@literal named m_pamvmrhq Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;m_pamvmrhq(Lnet/minecraft/util/math/BlockPos;)V}
+    * @mapping {@literal named setFightOrigin Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;setFightOrigin(Lnet/minecraft/util/math/BlockPos;)V}
     */
-   public void m_pamvmrhq(BlockPos pos) {
-      this.pos = pos;
+   public void setFightOrigin(BlockPos pos) {
+      this.fightOrigin = pos;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rmzrqzqk Lnet/minecraft/unmapped/C_bsmypcfq;m_rmzrqzqk()Lnet/minecraft/unmapped/C_hynzadkk;}
+    * @mapping {@literal named getFightOrigin Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;getFightOrigin()Lnet/minecraft/util/math/BlockPos;}
     */
-   public BlockPos m_rmzrqzqk() {
-      return this.pos;
+   public BlockPos getFightOrigin() {
+      return this.fightOrigin;
    }
 
    /**
@@ -317,9 +319,9 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(PHASE_TYPE, PhaseType.HOVER.getTypeId());
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(PHASE_TYPE, PhaseType.HOVER.getTypeId());
    }
 
    /**
@@ -493,20 +495,20 @@
                this.launchLivingEntities(
                   this.getWorld()
                      .getOtherEntities(
-                        this, this.rightWing.m_lgqlkcep().expand(4.0, 2.0, 4.0).offset(0.0, -2.0, 0.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR
+                        this, this.rightWing.getBounds().expand(4.0, 2.0, 4.0).offset(0.0, -2.0, 0.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR
                      )
                );
                this.launchLivingEntities(
                   this.getWorld()
                      .getOtherEntities(
-                        this, this.leftWing.m_lgqlkcep().expand(4.0, 2.0, 4.0).offset(0.0, -2.0, 0.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR
+                        this, this.leftWing.getBounds().expand(4.0, 2.0, 4.0).offset(0.0, -2.0, 0.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR
                      )
                );
                this.damageLivingEntities(
-                  this.getWorld().getOtherEntities(this, this.head.m_lgqlkcep().expand(1.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)
+                  this.getWorld().getOtherEntities(this, this.head.getBounds().expand(1.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)
                );
                this.damageLivingEntities(
-                  this.getWorld().getOtherEntities(this, this.neck.m_lgqlkcep().expand(1.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)
+                  this.getWorld().getOtherEntities(this, this.neck.getBounds().expand(1.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)
                );
             }
 
@@ -541,9 +543,9 @@
             }
 
             if (!this.getWorld().isClient) {
-               this.slowedDownByBlock = this.destroyBlocks(this.head.m_lgqlkcep())
-                  | this.destroyBlocks(this.neck.m_lgqlkcep())
-                  | this.destroyBlocks(this.body.m_lgqlkcep());
+               this.slowedDownByBlock = this.destroyBlocks(this.head.getBounds())
+                  | this.destroyBlocks(this.neck.getBounds())
+                  | this.destroyBlocks(this.body.getBounds());
                if (this.fight != null) {
                   this.fight.updateFight(this);
                }
@@ -603,7 +605,7 @@
       }
 
       if (this.random.nextInt(10) == 0) {
-         List<EndCrystalEntity> list = this.getWorld().getNonSpectatingEntities(EndCrystalEntity.class, this.m_lgqlkcep().expand(32.0));
+         List<EndCrystalEntity> list = this.getWorld().getNonSpectatingEntities(EndCrystalEntity.class, this.getBounds().expand(32.0));
          EndCrystalEntity lv = null;
          double d = Double.MAX_VALUE;
 
@@ -624,8 +626,8 @@
     * @mapping {@literal named launchLivingEntities Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;launchLivingEntities(Ljava/util/List;)V}
     */
    private void launchLivingEntities(List<Entity> entities) {
-      double d = (this.body.m_lgqlkcep().minX + this.body.m_lgqlkcep().maxX) / 2.0;
-      double e = (this.body.m_lgqlkcep().minZ + this.body.m_lgqlkcep().maxZ) / 2.0;
+      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 : entities) {
          if (lv instanceof LivingEntity) {
@@ -1095,7 +1097,7 @@
       PhaseType<? extends Phase> lv2 = lv.getType();
       double e;
       if (lv2 == PhaseType.LANDING || lv2 == PhaseType.TAKEOFF) {
-         BlockPos lv3 = this.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.pos));
+         BlockPos lv3 = this.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.fightOrigin));
          double d = Math.max(Math.sqrt(lv3.getSquaredDistanceToCenter(this.getPos())) / 4.0, 1.0);
          e = (double)segmentOffset / d;
       } else if (lv.isSittingOrHovering()) {
@@ -1118,7 +1120,7 @@
       PhaseType<? extends Phase> lv2 = lv.getType();
       Vec3d lv4;
       if (lv2 == PhaseType.LANDING || lv2 == PhaseType.TAKEOFF) {
-         BlockPos lv3 = this.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.pos));
+         BlockPos lv3 = this.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.fightOrigin));
          float g = Math.max((float)Math.sqrt(lv3.getSquaredDistanceToCenter(this.getPos())) / 4.0F, 1.0F);
          float h = 6.0F / g;
          float i = this.getPitch();
@@ -1162,12 +1164,12 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (PHASE_TYPE.equals(arg) && this.getWorld().isClient) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (PHASE_TYPE.equals(data) && this.getWorld().isClient) {
          this.phaseManager.setPhase(PhaseType.getFromId(this.getDataTracker().get(PHASE_TYPE)));
       }
 
-      super.m_efnedaed(arg);
+      super.onTrackedDataSet(data);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java	2024-03-03 04:42:33.575025095 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonFight.java	2024-03-03 04:41:23.102667614 +0000
@@ -111,9 +111,10 @@
     */
    public static final int DRAGON_SPAWN_HEIGHT = 128;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bnqjwejj Lnet/minecraft/unmapped/C_hxzjzvro;f_bnqjwejj:Ljava/util/function/Predicate;}
+    * @mapping {@literal named validPlayer Lnet/minecraft/entity/boss/dragon/EnderDragonFight;validPlayer:Ljava/util/function/Predicate;}
     */
-   private final Predicate<Entity> f_bnqjwejj;
+   private final Predicate<Entity> validPlayer;
    /**
     * @mapping {@literal hashed f_pgxxivge Lnet/minecraft/unmapped/C_hxzjzvro;f_pgxxivge:Lnet/minecraft/unmapped/C_fnaldpbu;}
     * @mapping {@literal named bossBar Lnet/minecraft/entity/boss/dragon/EnderDragonFight;bossBar:Lnet/minecraft/entity/boss/ServerBossBar;}
@@ -129,9 +130,10 @@
     */
    private final ServerWorld world;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tcqxzkfm Lnet/minecraft/unmapped/C_hxzjzvro;f_tcqxzkfm:Lnet/minecraft/unmapped/C_hynzadkk;}
+    * @mapping {@literal named origin Lnet/minecraft/entity/boss/dragon/EnderDragonFight;origin:Lnet/minecraft/util/math/BlockPos;}
     */
-   private final BlockPos f_tcqxzkfm;
+   private final BlockPos origin;
    /**
     * @mapping {@literal hashed f_vpshgwjp Lnet/minecraft/unmapped/C_hxzjzvro;f_vpshgwjp:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;}
     * @mapping {@literal named gateways Lnet/minecraft/entity/boss/dragon/EnderDragonFight;gateways:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;}
@@ -173,9 +175,10 @@
     */
    private boolean previouslyKilled;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vozrskjd Lnet/minecraft/unmapped/C_hxzjzvro;f_vozrskjd:Z}
+    * @mapping {@literal named skipChunksLoadedCheck Lnet/minecraft/entity/boss/dragon/EnderDragonFight;skipChunksLoadedCheck:Z}
     */
-   private boolean f_vozrskjd = false;
+   private boolean skipChunksLoadedCheck = false;
    /**
     * @mapping {@literal hashed f_reynxnzf Lnet/minecraft/unmapped/C_hxzjzvro;f_reynxnzf:Ljava/util/UUID;}
     * @mapping {@literal named dragonUuid Lnet/minecraft/entity/boss/dragon/EnderDragonFight;dragonUuid:Ljava/util/UUID;}
@@ -215,31 +218,31 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hxzjzvro;<init>(Lnet/minecraft/unmapped/C_bdwnwhiu;JLnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/boss/dragon/EnderDragonFight;<init>(Lnet/minecraft/server/world/ServerWorld;JLnet/minecraft/entity/boss/dragon/EnderDragonFight$State;)V}
     */
-   public EnderDragonFight(ServerWorld world, long l, EnderDragonFight.State arg2) {
-      this(world, l, arg2, BlockPos.ORIGIN);
+   public EnderDragonFight(ServerWorld world, long randomSeed, EnderDragonFight.State state) {
+      this(world, randomSeed, state, BlockPos.ORIGIN);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hxzjzvro;<init>(Lnet/minecraft/unmapped/C_bdwnwhiu;JLnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;Lnet/minecraft/unmapped/C_hynzadkk;)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/boss/dragon/EnderDragonFight;<init>(Lnet/minecraft/server/world/ServerWorld;JLnet/minecraft/entity/boss/dragon/EnderDragonFight$State;Lnet/minecraft/util/math/BlockPos;)V}
     */
-   public EnderDragonFight(ServerWorld world, long l, EnderDragonFight.State arg2, BlockPos pos) {
+   public EnderDragonFight(ServerWorld world, long randomSeed, EnderDragonFight.State state, BlockPos origin) {
       this.world = world;
-      this.f_tcqxzkfm = pos;
-      this.f_bnqjwejj = EntityPredicates.VALID_ENTITY
-         .and(EntityPredicates.maxDistance((double)pos.getX(), (double)(128 + pos.getY()), (double)pos.getZ(), 192.0));
-      this.doLegacyCheck = arg2.needsStateScanning;
-      this.dragonUuid = (UUID)arg2.dragonUuid.orElse(null);
-      this.dragonKilled = arg2.dragonKilled;
-      this.previouslyKilled = arg2.previouslyKilled;
-      if (arg2.isRespawning) {
+      this.origin = origin;
+      this.validPlayer = EntityPredicates.VALID_ENTITY
+         .and(EntityPredicates.maxDistance((double)origin.getX(), (double)(128 + origin.getY()), (double)origin.getZ(), 192.0));
+      this.doLegacyCheck = state.needsStateScanning;
+      this.dragonUuid = (UUID)state.dragonUuid.orElse(null);
+      this.dragonKilled = state.dragonKilled;
+      this.previouslyKilled = state.previouslyKilled;
+      if (state.isRespawning) {
          this.dragonSpawnState = EnderDragonSpawnState.START;
       }
 
-      this.exitPortalLocation = (BlockPos)arg2.exitPortalLocation.orElse(null);
-      this.gateways.addAll((Collection<? extends Integer>)arg2.gateways.orElseGet(() -> {
+      this.exitPortalLocation = (BlockPos)state.exitPortalLocation.orElse(null);
+      this.gateways.addAll((Collection<? extends Integer>)state.gateways.orElseGet(() -> {
          ObjectArrayList<Integer> objectArrayList = new ObjectArrayList<>(ContiguousSet.create(Range.closedOpen(0, 20), DiscreteDomain.integers()));
-         Util.shuffle(objectArrayList, RandomGenerator.createLegacy(l));
+         Util.shuffle(objectArrayList, RandomGenerator.createLegacy(randomSeed));
          return objectArrayList;
       }));
       this.endPortalPattern = BlockPatternBuilder.start()
@@ -253,18 +256,20 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vyjemojf Lnet/minecraft/unmapped/C_hxzjzvro;m_vyjemojf()V}
+    * @mapping {@literal named setSkipChunksLoadedCheck Lnet/minecraft/entity/boss/dragon/EnderDragonFight;setSkipChunksLoadedCheck()V}
     */
    @Deprecated
    @VisibleForTesting
-   public void m_vyjemojf() {
-      this.f_vozrskjd = true;
+   public void setSkipChunksLoadedCheck() {
+      this.skipChunksLoadedCheck = true;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kgnlaawg Lnet/minecraft/unmapped/C_hxzjzvro;m_kgnlaawg()Lnet/minecraft/unmapped/C_hxzjzvro$C_tunbvwoo;}
+    * @mapping {@literal named createState Lnet/minecraft/entity/boss/dragon/EnderDragonFight;createState()Lnet/minecraft/entity/boss/dragon/EnderDragonFight$State;}
     */
-   public EnderDragonFight.State m_kgnlaawg() {
+   public EnderDragonFight.State createState() {
       return new EnderDragonFight.State(
          this.doLegacyCheck,
          this.dragonKilled,
@@ -423,7 +428,7 @@
     */
    @Nullable
    private BlockPattern.Result findEndPortal() {
-      ChunkPos lv = new ChunkPos(this.f_tcqxzkfm);
+      ChunkPos lv = new ChunkPos(this.origin);
 
       for (int i = -8 + lv.x; i <= 8 + lv.x; i++) {
          for (int j = -8 + lv.z; j <= 8 + lv.z; j++) {
@@ -445,7 +450,7 @@
          }
       }
 
-      BlockPos lv6 = EndPortalFeature.m_pfwrysrc(this.f_tcqxzkfm);
+      BlockPos lv6 = EndPortalFeature.m_pfwrysrc(this.origin);
       int k = this.world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, lv6).getY();
 
       for (int l = k; l >= this.world.getBottomY(); l--) {
@@ -467,10 +472,10 @@
     * @mapping {@literal named loadChunks Lnet/minecraft/entity/boss/dragon/EnderDragonFight;loadChunks()Z}
     */
    private boolean loadChunks() {
-      if (this.f_vozrskjd) {
+      if (this.skipChunksLoadedCheck) {
          return true;
       } else {
-         ChunkPos lv = new ChunkPos(this.f_tcqxzkfm);
+         ChunkPos lv = new ChunkPos(this.origin);
 
          for (int i = -8 + lv.x; i <= 8 + lv.x; i++) {
             for (int j = 8 + lv.z; j <= 8 + lv.z; j++) {
@@ -497,7 +502,7 @@
    private void updatePlayers() {
       Set<ServerPlayerEntity> set = Sets.<ServerPlayerEntity>newHashSet();
 
-      for (ServerPlayerEntity lv : this.world.getMatchingPlayers(this.f_bnqjwejj)) {
+      for (ServerPlayerEntity lv : this.world.getMatchingPlayers(this.validPlayer)) {
          this.bossBar.addPlayer(lv);
          set.add(lv);
       }
@@ -538,7 +543,7 @@
          if (!this.previouslyKilled) {
             this.world
                .setBlockState(
-                  this.world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, EndPortalFeature.m_pfwrysrc(this.f_tcqxzkfm)), Blocks.DRAGON_EGG.getDefaultState()
+                  this.world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, EndPortalFeature.m_pfwrysrc(this.origin)), Blocks.DRAGON_EGG.getDefaultState()
                );
          }
 
@@ -548,11 +553,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_caaoxrzq Lnet/minecraft/unmapped/C_hxzjzvro;m_caaoxrzq()V}
+    * @mapping {@literal named clearGateways Lnet/minecraft/entity/boss/dragon/EnderDragonFight;clearGateways()V}
     */
    @Deprecated
    @VisibleForTesting
-   public void m_caaoxrzq() {
+   public void clearGateways() {
       this.gateways.clear();
    }
 
@@ -580,7 +586,7 @@
          .getOptional(RegistryKeys.CONFIGURED_FEATURE)
          .flatMap(registry -> registry.getHolder(EndConfiguredFeatures.END_GATEWAY_DELAYED))
          .ifPresent(
-            arg2 -> ((ConfiguredFeature)arg2.value())
+            feature -> ((ConfiguredFeature)feature.value())
                   .generate(this.world, this.world.getChunkManager().getChunkGenerator(), RandomGenerator.createLegacy(), pos)
          );
    }
@@ -592,7 +598,7 @@
    private void generateEndPortal(boolean previouslyKilled) {
       EndPortalFeature lv = new EndPortalFeature(previouslyKilled);
       if (this.exitPortalLocation == null) {
-         this.exitPortalLocation = this.world.getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.f_tcqxzkfm)).down();
+         this.exitPortalLocation = this.world.getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.origin)).down();
 
          while (this.world.getBlockState(this.exitPortalLocation).isOf(Blocks.BEDROCK) && this.exitPortalLocation.getY() > this.world.getSeaLevel()) {
             this.exitPortalLocation = this.exitPortalLocation.down();
@@ -613,18 +619,14 @@
     */
    @Nullable
    private EnderDragonEntity createDragon() {
-      this.world.getWorldChunk(new BlockPos(this.f_tcqxzkfm.getX(), 128 + this.f_tcqxzkfm.getY(), this.f_tcqxzkfm.getZ()));
+      this.world.getWorldChunk(new BlockPos(this.origin.getX(), 128 + this.origin.getY(), this.origin.getZ()));
       EnderDragonEntity lv = EntityType.ENDER_DRAGON.create(this.world);
       if (lv != null) {
-         lv.m_nhbsapge(this);
-         lv.m_pamvmrhq(this.f_tcqxzkfm);
+         lv.setFight(this);
+         lv.setFightOrigin(this.origin);
          lv.getPhaseManager().setPhase(PhaseType.HOLDING_PATTERN);
          lv.refreshPositionAndAngles(
-            (double)this.f_tcqxzkfm.getX(),
-            (double)(128 + this.f_tcqxzkfm.getY()),
-            (double)this.f_tcqxzkfm.getZ(),
-            this.world.random.nextFloat() * 360.0F,
-            0.0F
+            (double)this.origin.getX(), (double)(128 + this.origin.getY()), (double)this.origin.getZ(), this.world.random.nextFloat() * 360.0F, 0.0F
          );
          this.world.spawnEntity(lv);
          this.dragonUuid = lv.getUuid();
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-03-03 04:42:33.563025034 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java	2024-03-03 04:41:23.090667552 +0000
@@ -48,7 +48,7 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
+   protected void initDataTracker(DataTracker.Builder builder) {
    }
 
    /**
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-03-03 04:42:33.631025383 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/DyingPhase.java	2024-03-03 04:41:23.174667985 +0000
@@ -62,7 +62,7 @@
    public void serverTick() {
       this.ticks++;
       if (this.target == null) {
-         BlockPos lv = this.dragon.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING, EndPortalFeature.m_pfwrysrc(this.dragon.m_rmzrqzqk()));
+         BlockPos lv = this.dragon.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING, EndPortalFeature.m_pfwrysrc(this.dragon.getFightOrigin()));
          this.target = Vec3d.ofBottomCenter(lv);
       }
 
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-03-03 04:42:33.583025137 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java	2024-03-03 04:41:23.114667676 +0000
@@ -93,7 +93,7 @@
       if (this.path != null && this.path.isFinished()) {
          BlockPos lv = this.dragon
             .getWorld()
-            .getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPortalFeature.m_pfwrysrc(this.dragon.m_rmzrqzqk())));
+            .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.getRandom().nextInt(i + 3) == 0) {
             this.dragon.getPhaseManager().setPhase(PhaseType.LANDING_APPROACH);
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-03-03 04:42:33.743025956 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.java	2024-03-03 04:41:23.318668727 +0000
@@ -86,7 +86,9 @@
    private void updatePath() {
       if (this.path == null || this.path.isFinished()) {
          int i = this.dragon.getNearestPathNodeIndex();
-         BlockPos lv = this.dragon.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.dragon.m_rmzrqzqk()));
+         BlockPos lv = this.dragon
+            .getWorld()
+            .getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.dragon.getFightOrigin()));
          PlayerEntity lv2 = this.dragon
             .getWorld()
             .getClosestPlayer(PLAYERS_IN_RANGE_PREDICATE, this.dragon, (double)lv.getX(), (double)lv.getY(), (double)lv.getZ());
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-03-03 04:42:33.571025075 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/LandingPhase.java	2024-03-03 04:41:23.098667593 +0000
@@ -56,7 +56,7 @@
    public void serverTick() {
       if (this.target == null) {
          this.target = Vec3d.ofBottomCenter(
-            this.dragon.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.dragon.m_rmzrqzqk()))
+            this.dragon.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.dragon.getFightOrigin()))
          );
       }
 
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-03-03 04:42:33.807026283 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.java	2024-03-03 04:41:23.394669119 +0000
@@ -45,7 +45,9 @@
    @Override
    public void serverTick() {
       if (!this.shouldFindNewPath && this.path != null) {
-         BlockPos lv = this.dragon.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.dragon.m_rmzrqzqk()));
+         BlockPos lv = this.dragon
+            .getWorld()
+            .getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.m_pfwrysrc(this.dragon.getFightOrigin()));
          if (!lv.isCenterWithinDistance(this.dragon.getPos(), 10.0)) {
             this.dragon.getPhaseManager().setPhase(PhaseType.HOLDING_PATTERN);
          }
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-03-03 04:42:33.583025137 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-03-03 04:41:23.114667676 +0000
@@ -182,12 +182,12 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(TRACKED_ENTITY_ID_1, 0);
-      arg.m_jeliigji(TRACKED_ENTITY_ID_2, 0);
-      arg.m_jeliigji(TRACKED_ENTITY_ID_3, 0);
-      arg.m_jeliigji(INVUL_TIMER, 0);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(TRACKED_ENTITY_ID_1, 0);
+      builder.add(TRACKED_ENTITY_ID_2, 0);
+      builder.add(TRACKED_ENTITY_ID_3, 0);
+      builder.add(INVUL_TIMER, 0);
    }
 
    /**
@@ -401,7 +401,7 @@
                   }
                } else {
                   List<LivingEntity> list = this.getWorld()
-                     .getTargets(LivingEntity.class, HEAD_TARGET_PREDICATE, this, this.m_lgqlkcep().expand(20.0, 8.0, 20.0));
+                     .getTargets(LivingEntity.class, HEAD_TARGET_PREDICATE, this, this.getBounds().expand(20.0, 8.0, 20.0));
                   if (!list.isEmpty()) {
                      LivingEntity lv2 = (LivingEntity)list.get(this.random.nextInt(list.size()));
                      this.setTrackedEntityId(j, lv2.getId());
diff -bur namedTargetSrc/net/minecraft/entity/data/DataTracker.java namedSrc/net/minecraft/entity/data/DataTracker.java
--- namedTargetSrc/net/minecraft/entity/data/DataTracker.java	2024-03-03 04:42:33.555024994 +0000
+++ namedSrc/net/minecraft/entity/data/DataTracker.java	2024-03-03 04:41:23.082667511 +0000
@@ -8,8 +8,7 @@
 import java.util.Locale;
 import java.util.Objects;
 import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.unmapped.C_rxdtwnzk;
-import net.minecraft.unmapped.C_uvkvnqfu;
+import net.minecraft.util.collection.ClassTreeIdRegistry;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -30,14 +29,15 @@
     */
    private static final int MAX_ID_VALUE = 254;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yproqpbr Lnet/minecraft/unmapped/C_pyoaoolj;f_yproqpbr:Lnet/minecraft/unmapped/C_rxdtwnzk;}
+    * @mapping {@literal named ID_REGISTRY Lnet/minecraft/entity/data/DataTracker;ID_REGISTRY:Lnet/minecraft/util/collection/ClassTreeIdRegistry;}
     */
-   static final C_rxdtwnzk f_yproqpbr = new C_rxdtwnzk();
+   static final ClassTreeIdRegistry ID_REGISTRY = new ClassTreeIdRegistry();
    /**
     * @mapping {@literal hashed f_qfptogll Lnet/minecraft/unmapped/C_pyoaoolj;f_qfptogll:Lnet/minecraft/unmapped/C_uvkvnqfu;}
-    * @mapping {@literal named trackedEntity Lnet/minecraft/entity/data/DataTracker;trackedEntity:Lnet/minecraft/unmapped/C_uvkvnqfu;}
+    * @mapping {@literal named trackedEntity Lnet/minecraft/entity/data/DataTracker;trackedEntity:Lnet/minecraft/entity/data/TrackedDataHolder;}
     */
-   private final C_uvkvnqfu trackedEntity;
+   private final TrackedDataHolder trackedEntity;
    /**
     * @mapping {@literal hashed f_ypqieorz Lnet/minecraft/unmapped/C_pyoaoolj;f_ypqieorz:[Lnet/minecraft/unmapped/C_pyoaoolj$C_wtgrkbrh;}
     * @mapping {@literal named entries Lnet/minecraft/entity/data/DataTracker;entries:[Lnet/minecraft/entity/data/DataTracker$Entry;}
@@ -51,9 +51,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pyoaoolj;<init>(Lnet/minecraft/unmapped/C_uvkvnqfu;[Lnet/minecraft/unmapped/C_pyoaoolj$C_wtgrkbrh;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/data/DataTracker;<init>(Lnet/minecraft/unmapped/C_uvkvnqfu;[Lnet/minecraft/entity/data/DataTracker$Entry;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/data/DataTracker;<init>(Lnet/minecraft/entity/data/TrackedDataHolder;[Lnet/minecraft/entity/data/DataTracker$Entry;)V}
     */
-   DataTracker(C_uvkvnqfu trackedEntity, DataTracker.Entry<?>[] entries) {
+   DataTracker(TrackedDataHolder trackedEntity, DataTracker.Entry<?>[] entries) {
       this.trackedEntity = trackedEntity;
       this.entries = entries;
    }
@@ -62,7 +62,7 @@
     * @mapping {@literal hashed m_ukdkpyuu Lnet/minecraft/unmapped/C_pyoaoolj;m_ukdkpyuu(Ljava/lang/Class;Lnet/minecraft/unmapped/C_xrzqxzbg;)Lnet/minecraft/unmapped/C_rinmcaxy;}
     * @mapping {@literal named registerData Lnet/minecraft/entity/data/DataTracker;registerData(Ljava/lang/Class;Lnet/minecraft/entity/data/TrackedDataHandler;)Lnet/minecraft/entity/data/TrackedData;}
     */
-   public static <T> TrackedData<T> registerData(Class<? extends C_uvkvnqfu> entityClass, TrackedDataHandler<T> dataHandler) {
+   public static <T> TrackedData<T> registerData(Class<? extends TrackedDataHolder> entityClass, TrackedDataHandler<T> dataHandler) {
       if (LOGGER.isDebugEnabled()) {
          try {
             Class<?> lv = Class.forName(Thread.currentThread().getStackTrace()[2].getClassName());
@@ -73,7 +73,7 @@
          }
       }
 
-      int i = f_yproqpbr.m_ouqgimsv(entityClass);
+      int i = ID_REGISTRY.put(entityClass);
       if (i > 254) {
          throw new IllegalArgumentException("Data value id is too big with " + i + "! (Max is 254)");
       } else {
@@ -86,7 +86,7 @@
     * @mapping {@literal named getEntry Lnet/minecraft/entity/data/DataTracker;getEntry(Lnet/minecraft/entity/data/TrackedData;)Lnet/minecraft/entity/data/DataTracker$Entry;}
     */
    private <T> DataTracker.Entry<T> getEntry(TrackedData<T> key) {
-      return (DataTracker.Entry<T>)this.entries[key.m_dimpnjhp()];
+      return (DataTracker.Entry<T>)this.entries[key.getId()];
    }
 
    /**
@@ -113,7 +113,7 @@
       DataTracker.Entry<T> lv = this.getEntry(data);
       if (alwaysSet || ObjectUtils.notEqual(value, lv.get())) {
          lv.set(value);
-         this.trackedEntity.m_efnedaed(data);
+         this.trackedEntity.onTrackedDataSet(data);
          lv.setDirty(true);
          this.dirty = true;
       }
@@ -179,10 +179,10 @@
       for (DataTracker.SerializedEntry<?> lv : serializedEntries) {
          DataTracker.Entry<?> lv2 = this.entries[lv.id];
          this.copyToFrom(lv2, lv);
-         this.trackedEntity.m_efnedaed(lv2.getData());
+         this.trackedEntity.onTrackedDataSet(lv2.getData());
       }
 
-      this.trackedEntity.m_zobtcszk(serializedEntries);
+      this.trackedEntity.onTrackedDataUpdate(serializedEntries);
    }
 
    /**
@@ -190,12 +190,12 @@
     * @mapping {@literal named copyToFrom Lnet/minecraft/entity/data/DataTracker;copyToFrom(Lnet/minecraft/entity/data/DataTracker$Entry;Lnet/minecraft/entity/data/DataTracker$SerializedEntry;)V}
     */
    private <T> void copyToFrom(DataTracker.Entry<T> entry, DataTracker.SerializedEntry<?> serializedEntry) {
-      if (!Objects.equals(serializedEntry.serializer(), entry.data.m_sjjrmdzi())) {
+      if (!Objects.equals(serializedEntry.serializer(), entry.data.getDataType())) {
          throw new IllegalStateException(
             String.format(
                Locale.ROOT,
                "Invalid entity data item type for field %d on entity %s: old=%s(%s), new=%s(%s)",
-               entry.data.m_dimpnjhp(),
+               entry.data.getId(),
                this.trackedEntity,
                entry.value,
                entry.value.getClass(),
@@ -210,55 +210,59 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu}
-    * @mapping {@literal named net/minecraft/entity/data/DataTracker$C_oqzxcugu}
+    * @mapping {@literal named net/minecraft/entity/data/DataTracker$Builder}
     */
-   public static class C_oqzxcugu {
+   public static class Builder {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_zqmepqxn Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;f_zqmepqxn:Lnet/minecraft/unmapped/C_uvkvnqfu;}
+       * @mapping {@literal named entity Lnet/minecraft/entity/data/DataTracker$Builder;entity:Lnet/minecraft/entity/data/TrackedDataHolder;}
        */
-      private final C_uvkvnqfu f_zqmepqxn;
+      private final TrackedDataHolder entity;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_oprcrnxm Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;f_oprcrnxm:[Lnet/minecraft/unmapped/C_pyoaoolj$C_wtgrkbrh;}
+       * @mapping {@literal named entries Lnet/minecraft/entity/data/DataTracker$Builder;entries:[Lnet/minecraft/entity/data/DataTracker$Entry;}
        */
-      private final DataTracker.Entry<?>[] f_oprcrnxm;
+      private final DataTracker.Entry<?>[] entries;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;<init>(Lnet/minecraft/unmapped/C_uvkvnqfu;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/entity/data/DataTracker$Builder;<init>(Lnet/minecraft/entity/data/TrackedDataHolder;)V}
        */
-      public C_oqzxcugu(C_uvkvnqfu arg) {
-         this.f_zqmepqxn = arg;
-         this.f_oprcrnxm = new DataTracker.Entry[DataTracker.f_yproqpbr.m_zbkgjmeq(arg.getClass())];
+      public Builder(TrackedDataHolder entity) {
+         this.entity = entity;
+         this.entries = new DataTracker.Entry[DataTracker.ID_REGISTRY.getNext(entity.getClass())];
       }
 
       /**
        * @mapping {@literal hashed m_jeliigji Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;m_jeliigji(Lnet/minecraft/unmapped/C_rinmcaxy;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;}
-       * @mapping {@literal named m_jeliigji Lnet/minecraft/entity/data/DataTracker$C_oqzxcugu;m_jeliigji(Lnet/minecraft/entity/data/TrackedData;Ljava/lang/Object;)Lnet/minecraft/entity/data/DataTracker$C_oqzxcugu;}
+       * @mapping {@literal named add Lnet/minecraft/entity/data/DataTracker$Builder;add(Lnet/minecraft/entity/data/TrackedData;Ljava/lang/Object;)Lnet/minecraft/entity/data/DataTracker$Builder;}
        */
-      public <T> DataTracker.C_oqzxcugu m_jeliigji(TrackedData<T> data, T value) {
-         int i = data.m_dimpnjhp();
-         if (i > this.f_oprcrnxm.length) {
-            throw new IllegalArgumentException("Data value id is too big with " + i + "! (Max is " + this.f_oprcrnxm.length + ")");
-         } else if (this.f_oprcrnxm[i] != null) {
+      public <T> DataTracker.Builder add(TrackedData<T> data, T value) {
+         int i = data.getId();
+         if (i > this.entries.length) {
+            throw new IllegalArgumentException("Data value id is too big with " + i + "! (Max is " + this.entries.length + ")");
+         } else if (this.entries[i] != null) {
             throw new IllegalArgumentException("Duplicate id value for " + i + "!");
-         } else if (TrackedDataHandlerRegistry.getId(data.m_sjjrmdzi()) < 0) {
-            throw new IllegalArgumentException("Unregistered serializer " + data.m_sjjrmdzi() + " for " + i + "!");
+         } else if (TrackedDataHandlerRegistry.getId(data.getDataType()) < 0) {
+            throw new IllegalArgumentException("Unregistered serializer " + data.getDataType() + " for " + i + "!");
          } else {
-            this.f_oprcrnxm[data.m_dimpnjhp()] = new DataTracker.Entry<>(data, value);
+            this.entries[data.getId()] = new DataTracker.Entry<>(data, value);
             return this;
          }
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_cytzdxkd Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;m_cytzdxkd()Lnet/minecraft/unmapped/C_pyoaoolj;}
+       * @mapping {@literal named build Lnet/minecraft/entity/data/DataTracker$Builder;build()Lnet/minecraft/entity/data/DataTracker;}
        */
-      public DataTracker m_cytzdxkd() {
-         for (DataTracker.Entry<?> lv : this.f_oprcrnxm) {
+      public DataTracker build() {
+         for (DataTracker.Entry<?> lv : this.entries) {
             if (lv == null) {
-               throw new IllegalStateException("Entity " + this.f_zqmepqxn + " did not have all synched data values defined");
+               throw new IllegalStateException("Entity " + this.entity + " did not have all synched data values defined");
             }
          }
 
-         return new DataTracker(this.f_zqmepqxn, this.f_oprcrnxm);
+         return new DataTracker(this.entity, this.entries);
       }
    }
 
@@ -366,45 +370,45 @@
        * @mapping {@literal named create Lnet/minecraft/entity/data/DataTracker$SerializedEntry;create(Lnet/minecraft/entity/data/TrackedData;Ljava/lang/Object;)Lnet/minecraft/entity/data/DataTracker$SerializedEntry;}
        */
       public static <T> DataTracker.SerializedEntry<T> create(TrackedData<T> data, T value) {
-         TrackedDataHandler<T> lv = data.m_sjjrmdzi();
-         return new DataTracker.SerializedEntry<>(data.m_dimpnjhp(), lv, lv.copy(value));
+         TrackedDataHandler<T> lv = data.getDataType();
+         return new DataTracker.SerializedEntry<>(data.getId(), lv, lv.copy(value));
       }
 
       /**
        * @mapping {@literal hashed m_gcwpkycf Lnet/minecraft/unmapped/C_pyoaoolj$C_ujwzqgsv;m_gcwpkycf(Lnet/minecraft/unmapped/C_bngyzsts;)V}
        * @mapping {@literal named write Lnet/minecraft/entity/data/DataTracker$SerializedEntry;write(Lnet/minecraft/network/RegistryByteBuf;)V}
        */
-      public void write(RegistryByteBuf arg) {
+      public void write(RegistryByteBuf buf) {
          int i = TrackedDataHandlerRegistry.getId(this.serializer);
          if (i < 0) {
             throw new EncoderException("Unknown serializer type " + this.serializer);
          } else {
-            arg.writeByte(this.id);
-            arg.writeVarInt(i);
-            this.serializer.codec().encode(arg, this.value);
+            buf.writeByte(this.id);
+            buf.writeVarInt(i);
+            this.serializer.codec().encode(buf, this.value);
          }
       }
 
       /**
        * @mapping {@literal hashed m_mfgwshcg Lnet/minecraft/unmapped/C_pyoaoolj$C_ujwzqgsv;m_mfgwshcg(Lnet/minecraft/unmapped/C_bngyzsts;I)Lnet/minecraft/unmapped/C_pyoaoolj$C_ujwzqgsv;}
-       * @mapping {@literal named m_mfgwshcg Lnet/minecraft/entity/data/DataTracker$SerializedEntry;m_mfgwshcg(Lnet/minecraft/network/RegistryByteBuf;I)Lnet/minecraft/entity/data/DataTracker$SerializedEntry;}
+       * @mapping {@literal named read Lnet/minecraft/entity/data/DataTracker$SerializedEntry;read(Lnet/minecraft/network/RegistryByteBuf;I)Lnet/minecraft/entity/data/DataTracker$SerializedEntry;}
        */
-      public static DataTracker.SerializedEntry<?> m_mfgwshcg(RegistryByteBuf arg, int id) {
-         int j = arg.readVarInt();
+      public static DataTracker.SerializedEntry<?> read(RegistryByteBuf buf, int id) {
+         int j = buf.readVarInt();
          TrackedDataHandler<?> lv = TrackedDataHandlerRegistry.get(j);
          if (lv == null) {
             throw new DecoderException("Unknown serializer type " + j);
          } else {
-            return m_pdgmtwub(arg, id, lv);
+            return read(buf, id, lv);
          }
       }
 
       /**
        * @mapping {@literal hashed m_pdgmtwub Lnet/minecraft/unmapped/C_pyoaoolj$C_ujwzqgsv;m_pdgmtwub(Lnet/minecraft/unmapped/C_bngyzsts;ILnet/minecraft/unmapped/C_xrzqxzbg;)Lnet/minecraft/unmapped/C_pyoaoolj$C_ujwzqgsv;}
-       * @mapping {@literal named m_pdgmtwub Lnet/minecraft/entity/data/DataTracker$SerializedEntry;m_pdgmtwub(Lnet/minecraft/network/RegistryByteBuf;ILnet/minecraft/entity/data/TrackedDataHandler;)Lnet/minecraft/entity/data/DataTracker$SerializedEntry;}
+       * @mapping {@literal named read Lnet/minecraft/entity/data/DataTracker$SerializedEntry;read(Lnet/minecraft/network/RegistryByteBuf;ILnet/minecraft/entity/data/TrackedDataHandler;)Lnet/minecraft/entity/data/DataTracker$SerializedEntry;}
        */
-      private static <T> DataTracker.SerializedEntry<T> m_pdgmtwub(RegistryByteBuf arg, int id, TrackedDataHandler<T> serializer) {
-         return new DataTracker.SerializedEntry<>(id, serializer, serializer.codec().decode(arg));
+      private static <T> DataTracker.SerializedEntry<T> read(RegistryByteBuf buf, int id, TrackedDataHandler<T> serializer) {
+         return new DataTracker.SerializedEntry<>(id, serializer, serializer.codec().decode(buf));
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandler.java namedSrc/net/minecraft/entity/data/TrackedDataHandler.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandler.java	2024-03-03 04:42:33.539024912 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandler.java	2024-03-03 04:41:23.058667387 +0000
@@ -9,7 +9,8 @@
  */
 public interface TrackedDataHandler<T> {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed codec Lnet/minecraft/unmapped/C_xrzqxzbg;codec()Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named codec Lnet/minecraft/entity/data/TrackedDataHandler;codec()Lnet/minecraft/network/codec/PacketCodec;}
     */
    PacketCodec<? super RegistryByteBuf, T> codec();
 
@@ -22,15 +23,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed copy Lnet/minecraft/unmapped/C_xrzqxzbg;copy(Ljava/lang/Object;)Ljava/lang/Object;}
+    * @mapping {@literal named copy Lnet/minecraft/entity/data/TrackedDataHandler;copy(Ljava/lang/Object;)Ljava/lang/Object;}
     */
    T copy(T object);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eoamrvbe Lnet/minecraft/unmapped/C_xrzqxzbg;m_eoamrvbe(Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_xrzqxzbg;}
+    * @mapping {@literal named create Lnet/minecraft/entity/data/TrackedDataHandler;create(Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   static <T> TrackedDataHandler<T> m_eoamrvbe(PacketCodec<? super RegistryByteBuf, T> arg) {
-      return () -> arg;
+   static <T> TrackedDataHandler<T> create(PacketCodec<? super RegistryByteBuf, T> codec) {
+      return () -> codec;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-03-03 04:42:33.667025566 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-03-03 04:41:23.226668253 +0000
@@ -49,37 +49,37 @@
     * @mapping {@literal hashed f_wgeyibzj Lnet/minecraft/unmapped/C_fegtripb;f_wgeyibzj:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named BYTE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;BYTE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Byte> BYTE = TrackedDataHandler.m_eoamrvbe(PacketCodecs.BYTE);
+   public static final TrackedDataHandler<Byte> BYTE = TrackedDataHandler.create(PacketCodecs.BYTE);
    /**
     * @mapping {@literal hashed f_mzinrkcd Lnet/minecraft/unmapped/C_fegtripb;f_mzinrkcd:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named INTEGER Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;INTEGER:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Integer> INTEGER = TrackedDataHandler.m_eoamrvbe(PacketCodecs.VAR_INT);
+   public static final TrackedDataHandler<Integer> INTEGER = TrackedDataHandler.create(PacketCodecs.VAR_INT);
    /**
     * @mapping {@literal hashed f_jkldjhwk Lnet/minecraft/unmapped/C_fegtripb;f_jkldjhwk:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named LONG Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;LONG:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Long> LONG = TrackedDataHandler.m_eoamrvbe(PacketCodecs.VAR_LONG);
+   public static final TrackedDataHandler<Long> LONG = TrackedDataHandler.create(PacketCodecs.VAR_LONG);
    /**
     * @mapping {@literal hashed f_xworvico Lnet/minecraft/unmapped/C_fegtripb;f_xworvico:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named FLOAT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;FLOAT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Float> FLOAT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.FLOAT);
+   public static final TrackedDataHandler<Float> FLOAT = TrackedDataHandler.create(PacketCodecs.FLOAT);
    /**
     * @mapping {@literal hashed f_idrgfatj Lnet/minecraft/unmapped/C_fegtripb;f_idrgfatj:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named STRING Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;STRING:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<String> STRING = TrackedDataHandler.m_eoamrvbe(PacketCodecs.STRING);
+   public static final TrackedDataHandler<String> STRING = TrackedDataHandler.create(PacketCodecs.STRING);
    /**
     * @mapping {@literal hashed f_ssxntddt Lnet/minecraft/unmapped/C_fegtripb;f_ssxntddt:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named TEXT_COMPONENT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;TEXT_COMPONENT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Text> TEXT_COMPONENT = TrackedDataHandler.m_eoamrvbe(TextCodecs.REGISTRY_TEXT_CODEC);
+   public static final TrackedDataHandler<Text> TEXT_COMPONENT = TrackedDataHandler.create(TextCodecs.REGISTRY_TEXT_CODEC);
    /**
     * @mapping {@literal hashed f_uzqfcssr Lnet/minecraft/unmapped/C_fegtripb;f_uzqfcssr:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_TEXT_COMPONENT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_TEXT_COMPONENT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<Text>> OPTIONAL_TEXT_COMPONENT = TrackedDataHandler.m_eoamrvbe(TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC);
+   public static final TrackedDataHandler<Optional<Text>> OPTIONAL_TEXT_COMPONENT = TrackedDataHandler.create(TextCodecs.REGISTRY_OPTIONAL_TEXT_CODEC);
    /**
     * @mapping {@literal hashed f_hdycstqt Lnet/minecraft/unmapped/C_fegtripb;f_hdycstqt:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ITEM_STACK Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ITEM_STACK:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -105,11 +105,12 @@
     * @mapping {@literal hashed f_dhomndic Lnet/minecraft/unmapped/C_fegtripb;f_dhomndic:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named BLOCK_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;BLOCK_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<BlockState> BLOCK_STATE = TrackedDataHandler.m_eoamrvbe(PacketCodecs.m_jqcxtmyk(Block.STATE_IDS));
+   public static final TrackedDataHandler<BlockState> BLOCK_STATE = TrackedDataHandler.create(PacketCodecs.m_jqcxtmyk(Block.STATE_IDS));
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ibwlbgzc Lnet/minecraft/unmapped/C_fegtripb;f_ibwlbgzc:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named OPTIONAL_BLOCK_STATE_CODEC Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_BLOCK_STATE_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   private static final PacketCodec<ByteBuf, Optional<BlockState>> f_ibwlbgzc = new PacketCodec<ByteBuf, Optional<BlockState>>() {
+   private static final PacketCodec<ByteBuf, Optional<BlockState>> OPTIONAL_BLOCK_STATE_CODEC = new PacketCodec<ByteBuf, Optional<BlockState>>() {
       /**
        * @mapping {@literal hashed encode Lnet/minecraft/unmapped/C_fegtripb$C_huudfcnd;encode(Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V}
        * @mapping {@literal named encode Lnet/minecraft/entity/data/TrackedDataHandlerRegistry$C_huudfcnd;encode(Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V}
@@ -135,49 +136,49 @@
     * @mapping {@literal hashed f_huqcfqmn Lnet/minecraft/unmapped/C_fegtripb;f_huqcfqmn:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_BLOCK_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_BLOCK_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<BlockState>> OPTIONAL_BLOCK_STATE = TrackedDataHandler.m_eoamrvbe(f_ibwlbgzc);
+   public static final TrackedDataHandler<Optional<BlockState>> OPTIONAL_BLOCK_STATE = TrackedDataHandler.create(OPTIONAL_BLOCK_STATE_CODEC);
    /**
     * @mapping {@literal hashed f_wxlsskxb Lnet/minecraft/unmapped/C_fegtripb;f_wxlsskxb:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named BOOLEAN Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;BOOLEAN:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Boolean> BOOLEAN = TrackedDataHandler.m_eoamrvbe(PacketCodecs.BOOL);
+   public static final TrackedDataHandler<Boolean> BOOLEAN = TrackedDataHandler.create(PacketCodecs.BOOL);
    /**
     * @mapping {@literal hashed f_qquxpqxb Lnet/minecraft/unmapped/C_fegtripb;f_qquxpqxb:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named PARTICLE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;PARTICLE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<ParticleEffect> PARTICLE = TrackedDataHandler.m_eoamrvbe(ParticleTypes.CODEC);
+   public static final TrackedDataHandler<ParticleEffect> PARTICLE = TrackedDataHandler.create(ParticleTypes.CODEC);
    /**
     * @mapping {@literal hashed f_bhjosbpm Lnet/minecraft/unmapped/C_fegtripb;f_bhjosbpm:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ROTATION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ROTATION:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<EulerAngle> ROTATION = TrackedDataHandler.m_eoamrvbe(EulerAngle.f_levhkgbx);
+   public static final TrackedDataHandler<EulerAngle> ROTATION = TrackedDataHandler.create(EulerAngle.CODEC);
    /**
     * @mapping {@literal hashed f_qprbpdxq Lnet/minecraft/unmapped/C_fegtripb;f_qprbpdxq:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named BLOCK_POS Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;BLOCK_POS:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<BlockPos> BLOCK_POS = TrackedDataHandler.m_eoamrvbe(BlockPos.f_mcthbtbh);
+   public static final TrackedDataHandler<BlockPos> BLOCK_POS = TrackedDataHandler.create(BlockPos.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_adnhcqal Lnet/minecraft/unmapped/C_fegtripb;f_adnhcqal:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_BLOCK_POS Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_BLOCK_POS:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<BlockPos>> OPTIONAL_BLOCK_POS = TrackedDataHandler.m_eoamrvbe(
-      BlockPos.f_mcthbtbh.apply(PacketCodecs::m_ciouqnhu)
+   public static final TrackedDataHandler<Optional<BlockPos>> OPTIONAL_BLOCK_POS = TrackedDataHandler.create(
+      BlockPos.PACKET_CODEC.apply(PacketCodecs::m_ciouqnhu)
    );
    /**
     * @mapping {@literal hashed f_aytkmhuo Lnet/minecraft/unmapped/C_fegtripb;f_aytkmhuo:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named DIRECTION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;DIRECTION:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Direction> DIRECTION = TrackedDataHandler.m_eoamrvbe(Direction.f_nxrqizwh);
+   public static final TrackedDataHandler<Direction> DIRECTION = TrackedDataHandler.create(Direction.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_dwamwwzn Lnet/minecraft/unmapped/C_fegtripb;f_dwamwwzn:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_UUID Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_UUID:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<UUID>> OPTIONAL_UUID = TrackedDataHandler.m_eoamrvbe(UuidUtil.packetCodec.apply(PacketCodecs::m_ciouqnhu));
+   public static final TrackedDataHandler<Optional<UUID>> OPTIONAL_UUID = TrackedDataHandler.create(UuidUtil.packetCodec.apply(PacketCodecs::m_ciouqnhu));
    /**
     * @mapping {@literal hashed f_ifjlggjg Lnet/minecraft/unmapped/C_fegtripb;f_ifjlggjg:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_GLOBAL_POSITION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_GLOBAL_POSITION:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<GlobalPos>> OPTIONAL_GLOBAL_POSITION = TrackedDataHandler.m_eoamrvbe(
+   public static final TrackedDataHandler<Optional<GlobalPos>> OPTIONAL_GLOBAL_POSITION = TrackedDataHandler.create(
       GlobalPos.f_pchoperd.apply(PacketCodecs::m_ciouqnhu)
    );
    /**
@@ -205,11 +206,12 @@
     * @mapping {@literal hashed f_yoecocbx Lnet/minecraft/unmapped/C_fegtripb;f_yoecocbx:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named VILLAGER_DATA Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;VILLAGER_DATA:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<VillagerData> VILLAGER_DATA = TrackedDataHandler.m_eoamrvbe(VillagerData.PACKET_CODEC);
+   public static final TrackedDataHandler<VillagerData> VILLAGER_DATA = TrackedDataHandler.create(VillagerData.PACKET_CODEC);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_iirhoqep Lnet/minecraft/unmapped/C_fegtripb;f_iirhoqep:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named OPTIONAL_UNSIGNED_INT_CODEC Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_UNSIGNED_INT_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   private static final PacketCodec<ByteBuf, OptionalInt> f_iirhoqep = new PacketCodec<ByteBuf, OptionalInt>() {
+   private static final PacketCodec<ByteBuf, OptionalInt> OPTIONAL_UNSIGNED_INT_CODEC = new PacketCodec<ByteBuf, OptionalInt>() {
       /**
        * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_fegtripb$C_ztdbwdxk;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/OptionalInt;}
        * @mapping {@literal named decode Lnet/minecraft/entity/data/TrackedDataHandlerRegistry$C_ztdbwdxk;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/OptionalInt;}
@@ -231,49 +233,49 @@
     * @mapping {@literal hashed f_izuxtjlv Lnet/minecraft/unmapped/C_fegtripb;f_izuxtjlv:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named FIREWORK_DATA Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;FIREWORK_DATA:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<OptionalInt> FIREWORK_DATA = TrackedDataHandler.m_eoamrvbe(f_iirhoqep);
+   public static final TrackedDataHandler<OptionalInt> FIREWORK_DATA = TrackedDataHandler.create(OPTIONAL_UNSIGNED_INT_CODEC);
    /**
     * @mapping {@literal hashed f_cdzoruas Lnet/minecraft/unmapped/C_fegtripb;f_cdzoruas:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ENTITY_POSE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ENTITY_POSE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<EntityPose> ENTITY_POSE = TrackedDataHandler.m_eoamrvbe(EntityPose.f_drjcyate);
+   public static final TrackedDataHandler<EntityPose> ENTITY_POSE = TrackedDataHandler.create(EntityPose.CODEC);
    /**
     * @mapping {@literal hashed f_ykhchcdb Lnet/minecraft/unmapped/C_fegtripb;f_ykhchcdb:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named CAT_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;CAT_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<CatVariant> CAT_VARIANT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.registryValue(RegistryKeys.CAT_VARIANT));
+   public static final TrackedDataHandler<CatVariant> CAT_VARIANT = TrackedDataHandler.create(PacketCodecs.registryValue(RegistryKeys.CAT_VARIANT));
    /**
     * @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;}
     */
-   public static final TrackedDataHandler<FrogVariant> FROG_VARIANT = TrackedDataHandler.m_eoamrvbe(PacketCodecs.registryValue(RegistryKeys.FROG_VARIANT));
+   public static final TrackedDataHandler<FrogVariant> FROG_VARIANT = TrackedDataHandler.create(PacketCodecs.registryValue(RegistryKeys.FROG_VARIANT));
    /**
     * @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.m_eoamrvbe(
+   public static final TrackedDataHandler<Holder<PaintingVariant>> PAINTING_VARIANT = TrackedDataHandler.create(
       PacketCodecs.registryEntry(RegistryKeys.PAINTING_VARIANT)
    );
    /**
     * @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;}
     */
-   public static final TrackedDataHandler<ArmadilloEntity.State> ARMADILLO_STATE = TrackedDataHandler.m_eoamrvbe(ArmadilloEntity.State.f_anjxyhoc);
+   public static final TrackedDataHandler<ArmadilloEntity.State> ARMADILLO_STATE = TrackedDataHandler.create(ArmadilloEntity.State.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_abgbckne Lnet/minecraft/unmapped/C_fegtripb;f_abgbckne:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named SNIFFER_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;SNIFFER_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<SnifferEntity.State> SNIFFER_STATE = TrackedDataHandler.m_eoamrvbe(SnifferEntity.State.f_jiyqkeyh);
+   public static final TrackedDataHandler<SnifferEntity.State> SNIFFER_STATE = TrackedDataHandler.create(SnifferEntity.State.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_teokfohv Lnet/minecraft/unmapped/C_fegtripb;f_teokfohv:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named VECTOR3F Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;VECTOR3F:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Vector3f> VECTOR3F = TrackedDataHandler.m_eoamrvbe(PacketCodecs.VECTOR3F);
+   public static final TrackedDataHandler<Vector3f> VECTOR3F = TrackedDataHandler.create(PacketCodecs.VECTOR3F);
    /**
     * @mapping {@literal hashed f_kyenxrse Lnet/minecraft/unmapped/C_fegtripb;f_kyenxrse:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named QUATERNIONF Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;QUATERNIONF:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Quaternionf> QUATERNIONF = TrackedDataHandler.m_eoamrvbe(PacketCodecs.QUATERNIONF);
+   public static final TrackedDataHandler<Quaternionf> QUATERNIONF = TrackedDataHandler.create(PacketCodecs.QUATERNIONF);
 
    /**
     * @mapping {@literal hashed m_bhodhirr Lnet/minecraft/unmapped/C_fegtripb;m_bhodhirr(Lnet/minecraft/unmapped/C_xrzqxzbg;)V}
Only in namedSrc/net/minecraft/entity/data: TrackedDataHolder.java
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedData.java namedSrc/net/minecraft/entity/data/TrackedData.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedData.java	2024-03-03 04:42:33.635025403 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedData.java	2024-03-03 04:41:23.186668047 +0000
@@ -35,16 +35,18 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dimpnjhp Lnet/minecraft/unmapped/C_rinmcaxy;m_dimpnjhp()I}
+    * @mapping {@literal named getId Lnet/minecraft/entity/data/TrackedData;getId()I}
     */
-   public int m_dimpnjhp() {
+   public int getId() {
       return this.id;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_sjjrmdzi Lnet/minecraft/unmapped/C_rinmcaxy;m_sjjrmdzi()Lnet/minecraft/unmapped/C_xrzqxzbg;}
+    * @mapping {@literal named getDataType Lnet/minecraft/entity/data/TrackedData;getDataType()Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public TrackedDataHandler<T> m_sjjrmdzi() {
+   public TrackedDataHandler<T> getDataType() {
       return this.dataType;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-03-03 04:42:33.811026304 +0000
+++ namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-03-03 04:41:23.394669119 +0000
@@ -79,7 +79,7 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
+   protected void initDataTracker(DataTracker.Builder builder) {
    }
 
    /**
@@ -181,7 +181,7 @@
             }
          }
 
-         return this.getWorld().getOtherEntities(this, this.m_lgqlkcep(), PREDICATE).isEmpty();
+         return this.getWorld().getOtherEntities(this, this.getBounds(), PREDICATE).isEmpty();
       }
    }

@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/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-03-03 04:42:33.691025689 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-03-03 04:41:23.262668439 +0000
@@ -308,15 +308,15 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(ARMOR_STAND_FLAGS, (byte)0);
-      arg.m_jeliigji(TRACKER_HEAD_ROTATION, DEFAULT_HEAD_ROTATION);
-      arg.m_jeliigji(TRACKER_BODY_ROTATION, DEFAULT_BODY_ROTATION);
-      arg.m_jeliigji(TRACKER_LEFT_ARM_ROTATION, DEFAULT_LEFT_ARM_ROTATION);
-      arg.m_jeliigji(TRACKER_RIGHT_ARM_ROTATION, DEFAULT_RIGHT_ARM_ROTATION);
-      arg.m_jeliigji(TRACKER_LEFT_LEG_ROTATION, DEFAULT_LEFT_LEG_ROTATION);
-      arg.m_jeliigji(TRACKER_RIGHT_LEG_ROTATION, DEFAULT_RIGHT_LEG_ROTATION);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(ARMOR_STAND_FLAGS, (byte)0);
+      builder.add(TRACKER_HEAD_ROTATION, DEFAULT_HEAD_ROTATION);
+      builder.add(TRACKER_BODY_ROTATION, DEFAULT_BODY_ROTATION);
+      builder.add(TRACKER_LEFT_ARM_ROTATION, DEFAULT_LEFT_ARM_ROTATION);
+      builder.add(TRACKER_RIGHT_ARM_ROTATION, DEFAULT_RIGHT_ARM_ROTATION);
+      builder.add(TRACKER_LEFT_LEG_ROTATION, DEFAULT_LEFT_LEG_ROTATION);
+      builder.add(TRACKER_RIGHT_LEG_ROTATION, DEFAULT_RIGHT_LEG_ROTATION);
    }
 
    /**
@@ -530,7 +530,7 @@
     */
    @Override
    protected void tickCramming() {
-      for (Entity lv : this.getWorld().getOtherEntities(this, this.m_lgqlkcep(), RIDEABLE_MINECART_PREDICATE)) {
+      for (Entity lv : this.getWorld().getOtherEntities(this, this.getBounds(), RIDEABLE_MINECART_PREDICATE)) {
          if (this.squaredDistanceTo(lv) <= 0.2) {
             lv.pushAwayFrom(this);
          }
@@ -712,7 +712,7 @@
     */
    @Override
    public boolean shouldRender(double distance) {
-      double e = this.m_lgqlkcep().getAverageSideLength() * 4.0;
+      double e = this.getBounds().getAverageSideLength() * 4.0;
       if (Double.isNaN(e) || e == 0.0) {
          e = 4.0;
       }
@@ -1187,13 +1187,13 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (ARMOR_STAND_FLAGS.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (ARMOR_STAND_FLAGS.equals(data)) {
          this.calculateDimensions();
          this.inanimate = !this.isMarker();
       }
 
-      super.m_efnedaed(arg);
+      super.onTrackedDataSet(data);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java namedSrc/net/minecraft/entity/decoration/DisplayEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-03-03 04:42:33.563025034 +0000
+++ namedSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-03-03 04:41:23.090667552 +0000
@@ -131,14 +131,14 @@
     * @mapping {@literal named RENDER_STATE_IDS Lnet/minecraft/entity/decoration/DisplayEntity;RENDER_STATE_IDS:Lit/unimi/dsi/fastutil/ints/IntSet;}
     */
    private static final IntSet RENDER_STATE_IDS = IntSet.of(
-      TRANSLATION.m_dimpnjhp(),
-      SCALE.m_dimpnjhp(),
-      LEFT_ROTATION.m_dimpnjhp(),
-      RIGHT_ROTATION.m_dimpnjhp(),
-      BILLBOARD_RENDER_CONSTRAINTS.m_dimpnjhp(),
-      BRIGHTNESS_OVERRIDE.m_dimpnjhp(),
-      SHADOW_RADIUS.m_dimpnjhp(),
-      SHADOW_STRENGTH.m_dimpnjhp()
+      TRANSLATION.getId(),
+      SCALE.getId(),
+      LEFT_ROTATION.getId(),
+      RIGHT_ROTATION.getId(),
+      BILLBOARD_RENDER_CONSTRAINTS.getId(),
+      BRIGHTNESS_OVERRIDE.getId(),
+      SHADOW_RADIUS.getId(),
+      SHADOW_STRENGTH.getId()
    );
    /**
     * @mapping {@literal hashed f_wpcewhgi Lnet/minecraft/unmapped/C_zdeutotk;f_wpcewhgi:F}
@@ -267,28 +267,28 @@
       super(arg, world);
       this.noClip = true;
       this.ignoreCameraFrustum = true;
-      this.visibleBoundingBox = this.m_lgqlkcep();
+      this.visibleBoundingBox = this.getBounds();
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      super.m_efnedaed(arg);
-      if (HEIGHT.equals(arg) || WIDTH.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      super.onTrackedDataSet(data);
+      if (HEIGHT.equals(data) || WIDTH.equals(data)) {
          this.updateVisibleBoundingBox();
       }
 
-      if (f_irdedhug.equals(arg)) {
+      if (f_irdedhug.equals(data)) {
          this.updateStartTick = true;
       }
 
-      if (f_xlyoeing.equals(arg)) {
+      if (f_xlyoeing.equals(data)) {
          this.updateInterpolationDuration = true;
       }
 
-      if (RENDER_STATE_IDS.contains(arg.m_dimpnjhp())) {
+      if (RENDER_STATE_IDS.contains(data.getId())) {
          this.updateRenderState = true;
       }
    }
@@ -365,22 +365,22 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(f_exeyhnpz, 0);
-      arg.m_jeliigji(f_irdedhug, 0);
-      arg.m_jeliigji(f_xlyoeing, 0);
-      arg.m_jeliigji(TRANSLATION, new Vector3f());
-      arg.m_jeliigji(SCALE, new Vector3f(1.0F, 1.0F, 1.0F));
-      arg.m_jeliigji(RIGHT_ROTATION, new Quaternionf());
-      arg.m_jeliigji(LEFT_ROTATION, new Quaternionf());
-      arg.m_jeliigji(BILLBOARD_RENDER_CONSTRAINTS, DisplayEntity.BillboardRenderConstraints.FIXED.getValue());
-      arg.m_jeliigji(BRIGHTNESS_OVERRIDE, -1);
-      arg.m_jeliigji(VIEW_RANGE, 1.0F);
-      arg.m_jeliigji(SHADOW_RADIUS, 0.0F);
-      arg.m_jeliigji(SHADOW_STRENGTH, 1.0F);
-      arg.m_jeliigji(WIDTH, 0.0F);
-      arg.m_jeliigji(HEIGHT, 0.0F);
-      arg.m_jeliigji(GLOW_COLOR_OVERRIDE, -1);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(f_exeyhnpz, 0);
+      builder.add(f_irdedhug, 0);
+      builder.add(f_xlyoeing, 0);
+      builder.add(TRANSLATION, new Vector3f());
+      builder.add(SCALE, new Vector3f(1.0F, 1.0F, 1.0F));
+      builder.add(RIGHT_ROTATION, new Quaternionf());
+      builder.add(LEFT_ROTATION, new Quaternionf());
+      builder.add(BILLBOARD_RENDER_CONSTRAINTS, DisplayEntity.BillboardRenderConstraints.FIXED.getValue());
+      builder.add(BRIGHTNESS_OVERRIDE, -1);
+      builder.add(VIEW_RANGE, 1.0F);
+      builder.add(SHADOW_RADIUS, 0.0F);
+      builder.add(SHADOW_STRENGTH, 1.0F);
+      builder.add(WIDTH, 0.0F);
+      builder.add(HEIGHT, 0.0F);
+      builder.add(GLOW_COLOR_OVERRIDE, -1);
    }
 
    /**
@@ -998,18 +998,18 @@
        * Mapping not found
        */
       @Override
-      protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-         super.initDataTracker(arg);
-         arg.m_jeliigji(STATE, Blocks.AIR.getDefaultState());
+      protected void initDataTracker(DataTracker.Builder builder) {
+         super.initDataTracker(builder);
+         builder.add(STATE, Blocks.AIR.getDefaultState());
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public void m_efnedaed(TrackedData<?> arg) {
-         super.m_efnedaed(arg);
-         if (arg.equals(STATE)) {
+      public void onTrackedDataSet(TrackedData<?> data) {
+         super.onTrackedDataSet(data);
+         if (data.equals(STATE)) {
             this.updateRenderState = true;
          }
       }
@@ -1241,19 +1241,19 @@
        * Mapping not found
        */
       @Override
-      protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-         super.initDataTracker(arg);
-         arg.m_jeliigji(STACK, ItemStack.EMPTY);
-         arg.m_jeliigji(TRANSFORMATION_MODE, ModelTransformationMode.NONE.getValue());
+      protected void initDataTracker(DataTracker.Builder builder) {
+         super.initDataTracker(builder);
+         builder.add(STACK, ItemStack.EMPTY);
+         builder.add(TRANSFORMATION_MODE, ModelTransformationMode.NONE.getValue());
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public void m_efnedaed(TrackedData<?> arg) {
-         super.m_efnedaed(arg);
-         if (STACK.equals(arg) || TRANSFORMATION_MODE.equals(arg)) {
+      public void onTrackedDataSet(TrackedData<?> data) {
+         super.onTrackedDataSet(data);
+         if (STACK.equals(data) || TRANSFORMATION_MODE.equals(data)) {
             this.updateRenderState = true;
          }
       }
@@ -1506,7 +1506,7 @@
        * @mapping {@literal named RENDER_STATE_IDS Lnet/minecraft/entity/decoration/DisplayEntity$TextDisplayEntity;RENDER_STATE_IDS:Lit/unimi/dsi/fastutil/ints/IntSet;}
        */
       private static final IntSet RENDER_STATE_IDS = IntSet.of(
-         TEXT.m_dimpnjhp(), LINE_WIDTH.m_dimpnjhp(), BACKGROUND_COLOR.m_dimpnjhp(), TEXT_OPACITY.m_dimpnjhp(), TEXT_DISPLAY_FLAGS.m_dimpnjhp()
+         TEXT.getId(), LINE_WIDTH.getId(), BACKGROUND_COLOR.getId(), TEXT_OPACITY.getId(), TEXT_DISPLAY_FLAGS.getId()
       );
       /**
        * @mapping {@literal hashed f_pfyjwtvs Lnet/minecraft/unmapped/C_zdeutotk$C_ruprkvfh;f_pfyjwtvs:Lnet/minecraft/unmapped/C_zdeutotk$C_ruprkvfh$C_hkiddmgs;}
@@ -1533,22 +1533,22 @@
        * Mapping not found
        */
       @Override
-      protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-         super.initDataTracker(arg);
-         arg.m_jeliigji(TEXT, Text.empty());
-         arg.m_jeliigji(LINE_WIDTH, 200);
-         arg.m_jeliigji(BACKGROUND_COLOR, 1073741824);
-         arg.m_jeliigji(TEXT_OPACITY, (byte)-1);
-         arg.m_jeliigji(TEXT_DISPLAY_FLAGS, (byte)0);
+      protected void initDataTracker(DataTracker.Builder builder) {
+         super.initDataTracker(builder);
+         builder.add(TEXT, Text.empty());
+         builder.add(LINE_WIDTH, 200);
+         builder.add(BACKGROUND_COLOR, 1073741824);
+         builder.add(TEXT_OPACITY, (byte)-1);
+         builder.add(TEXT_DISPLAY_FLAGS, (byte)0);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public void m_efnedaed(TrackedData<?> arg) {
-         super.m_efnedaed(arg);
-         if (RENDER_STATE_IDS.contains(arg.m_dimpnjhp())) {
+      public void onTrackedDataSet(TrackedData<?> data) {
+         super.onTrackedDataSet(data);
+         if (RENDER_STATE_IDS.contains(data.getId())) {
             this.updateRenderState = true;
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-03-03 04:42:33.643025443 +0000
+++ namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-03-03 04:41:23.198668108 +0000
@@ -75,9 +75,9 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(BEAM_TARGET, Optional.empty());
-      arg.m_jeliigji(SHOW_BOTTOM, true);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(BEAM_TARGET, Optional.empty());
+      builder.add(SHOW_BOTTOM, true);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-03-03 04:42:33.611025280 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-03-03 04:41:23.146667840 +0000
@@ -105,9 +105,9 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(ITEM_STACK, ItemStack.EMPTY);
-      arg.m_jeliigji(ROTATION, 0);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(ITEM_STACK, ItemStack.EMPTY);
+      builder.add(ROTATION, 0);
    }
 
    /**
@@ -175,7 +175,7 @@
       } else {
          BlockState lv = this.getWorld().getBlockState(this.attachmentPos.offset(this.facing.getOpposite()));
          return lv.isSolid() || this.facing.getAxis().isHorizontal() && RedstoneDiodeBlock.isDiode(lv)
-            ? this.getWorld().getOtherEntities(this, this.m_lgqlkcep(), PREDICATE).isEmpty()
+            ? this.getWorld().getOtherEntities(this, this.getBounds(), PREDICATE).isEmpty()
             : false;
       }
    }
@@ -439,8 +439,8 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (arg.equals(ITEM_STACK)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (data.equals(ITEM_STACK)) {
          this.onItemChanged(this.getHeldItemStack());
       }
    }
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-03-03 04:42:33.543024932 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-03-03 04:41:23.066667428 +0000
@@ -75,16 +75,16 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(VARIANT, getDefaultVariant());
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(VARIANT, getDefaultVariant());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (VARIANT.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (VARIANT.equals(data)) {
          this.updateAttachmentPosition();
       }
    }
Only in namedSrc/net/minecraft/entity: EntityAttachmentType.java
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-03-03 04:42:33.739025935 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-03-03 04:41:23.310668685 +0000
@@ -35,6 +35,7 @@
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.data.TrackedDataHolder;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.entity.vehicle.BoatEntity;
@@ -80,10 +81,7 @@
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_biqpbxns;
-import net.minecraft.unmapped.C_jslwmoew;
 import net.minecraft.unmapped.C_pubtmkke;
-import net.minecraft.unmapped.C_uvkvnqfu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.BlockMirror;
@@ -135,7 +133,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_astfners}
  * @mapping {@literal named net/minecraft/entity/Entity}
  */
-public abstract class Entity implements C_uvkvnqfu, Nameable, EntityLike, CommandOutput, ScoreHolder {
+public abstract class Entity implements TrackedDataHolder, Nameable, EntityLike, CommandOutput, ScoreHolder {
    /**
     * @mapping {@literal hashed f_ssljujsr Lnet/minecraft/unmapped/C_astfners;f_ssljujsr:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/entity/Entity;LOGGER:Lorg/slf4j/Logger;}
@@ -201,9 +199,10 @@
     */
    public static final int FREEZE_DAMAGE_FREQUENCY = 40;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qtxalbwz Lnet/minecraft/unmapped/C_astfners;f_qtxalbwz:I}
+    * @mapping {@literal named SAFE_FALL_DISTANCE Lnet/minecraft/entity/Entity;SAFE_FALL_DISTANCE:I}
     */
-   public static final int f_qtxalbwz = 3;
+   public static final int SAFE_FALL_DISTANCE = 3;
    /**
     * @mapping {@literal hashed f_cdurbrqe Lnet/minecraft/unmapped/C_astfners;f_cdurbrqe:Lnet/minecraft/unmapped/C_hbcjzgoe;}
     * @mapping {@literal named NULL_BOX Lnet/minecraft/entity/Entity;NULL_BOX:Lnet/minecraft/util/math/Box;}
@@ -705,17 +704,17 @@
       this.pos = Vec3d.ZERO;
       this.blockPos = BlockPos.ORIGIN;
       this.chunkPos = ChunkPos.ORIGIN;
-      DataTracker.C_oqzxcugu lv = new DataTracker.C_oqzxcugu(this);
-      lv.m_jeliigji(FLAGS, (byte)0);
-      lv.m_jeliigji(AIR, this.getMaxAir());
-      lv.m_jeliigji(NAME_VISIBLE, false);
-      lv.m_jeliigji(CUSTOM_NAME, Optional.empty());
-      lv.m_jeliigji(SILENT, false);
-      lv.m_jeliigji(NO_GRAVITY, false);
-      lv.m_jeliigji(POSE, EntityPose.STANDING);
-      lv.m_jeliigji(FROZEN_TICKS, 0);
+      DataTracker.Builder lv = new DataTracker.Builder(this);
+      lv.add(FLAGS, (byte)0);
+      lv.add(AIR, this.getMaxAir());
+      lv.add(NAME_VISIBLE, false);
+      lv.add(CUSTOM_NAME, Optional.empty());
+      lv.add(SILENT, false);
+      lv.add(NO_GRAVITY, false);
+      lv.add(POSE, EntityPose.STANDING);
+      lv.add(FROZEN_TICKS, 0);
       this.initDataTracker(lv);
-      this.dataTracker = lv.m_cytzdxkd();
+      this.dataTracker = lv.build();
       this.setPosition(0.0, 0.0, 0.0);
       this.standingEyeHeight = this.dimensions.eyeHeight();
    }
@@ -727,7 +726,7 @@
    public boolean collidesWithStateAtPos(BlockPos pos, BlockState state) {
       VoxelShape lv = state.getCollisionShape(this.getWorld(), pos, ShapeContext.of(this));
       VoxelShape lv2 = lv.offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
-      return VoxelShapes.matchesAnywhere(lv2, VoxelShapes.cuboid(this.m_lgqlkcep()), BooleanBiFunction.AND);
+      return VoxelShapes.matchesAnywhere(lv2, VoxelShapes.cuboid(this.getBounds()), BooleanBiFunction.AND);
    }
 
    /**
@@ -854,9 +853,9 @@
 
    /**
     * @mapping {@literal hashed m_lwugwlsw Lnet/minecraft/unmapped/C_astfners;m_lwugwlsw(Lnet/minecraft/unmapped/C_pyoaoolj$C_oqzxcugu;)V}
-    * @mapping {@literal named initDataTracker Lnet/minecraft/entity/Entity;initDataTracker(Lnet/minecraft/entity/data/DataTracker$C_oqzxcugu;)V}
+    * @mapping {@literal named initDataTracker Lnet/minecraft/entity/Entity;initDataTracker(Lnet/minecraft/entity/data/DataTracker$Builder;)V}
     */
-   protected abstract void initDataTracker(DataTracker.C_oqzxcugu arg);
+   protected abstract void initDataTracker(DataTracker.Builder builder);
 
    /**
     * @mapping {@literal hashed m_tcblutba Lnet/minecraft/unmapped/C_astfners;m_tcblutba()Lnet/minecraft/unmapped/C_pyoaoolj;}
@@ -1206,7 +1205,7 @@
     * @mapping {@literal named doesNotCollide Lnet/minecraft/entity/Entity;doesNotCollide(DDD)Z}
     */
    public boolean doesNotCollide(double offsetX, double offsetY, double offsetZ) {
-      return this.doesNotCollide(this.m_lgqlkcep().offset(offsetX, offsetY, offsetZ));
+      return this.doesNotCollide(this.getBounds().offset(offsetX, offsetY, offsetZ));
    }
 
    /**
@@ -1249,7 +1248,7 @@
     */
    protected void updateSupportingBlock(boolean onGround, @Nullable Vec3d movementVector) {
       if (onGround) {
-         Box lv = this.m_lgqlkcep();
+         Box lv = this.getBounds();
          Box lv2 = new Box(lv.minX, lv.minY - 1.0E-6, lv.minZ, lv.maxX, lv.minY, lv.maxZ);
          Optional<BlockPos> optional = this.world.findSupportingBlock(this, lv2);
          if (optional.isPresent() || this.onGroundNoBlocks) {
@@ -1400,7 +1399,7 @@
             float h = this.getVelocityMultiplier();
             this.setVelocity(this.getVelocity().multiply((double)h, 1.0, (double)h));
             if (this.getWorld()
-               .getStatesInBoxIfLoaded(this.m_lgqlkcep().contract(1.0E-6))
+               .getStatesInBoxIfLoaded(this.getBounds().contract(1.0E-6))
                .noneMatch(state -> state.isIn(BlockTags.FIRE) || state.isOf(Blocks.LAVA))) {
                if (this.fireTicks <= 0) {
                   this.setFireTicks(-this.getBurningDuration());
@@ -1641,7 +1640,7 @@
     * @mapping {@literal named adjustMovementForCollisions Lnet/minecraft/entity/Entity;adjustMovementForCollisions(Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Vec3d;}
     */
    private Vec3d adjustMovementForCollisions(Vec3d movement) {
-      Box lv = this.m_lgqlkcep();
+      Box lv = this.getBounds();
       List<VoxelShape> list = this.getWorld().getEntityCollisions(this, lv.stretch(movement));
       Vec3d lv2 = movement.lengthSquared() == 0.0 ? movement : adjustSingleAxisMovementForCollisions(this, movement, lv, this.getWorld(), list);
       boolean bl = movement.x != lv2.x;
@@ -1768,7 +1767,7 @@
     * @mapping {@literal named checkBlockCollision Lnet/minecraft/entity/Entity;checkBlockCollision()V}
     */
    protected void checkBlockCollision() {
-      Box lv = this.m_lgqlkcep();
+      Box lv = this.getBounds();
       BlockPos lv2 = BlockPos.create(lv.minX + 1.0E-7, lv.minY + 1.0E-7, lv.minZ + 1.0E-7);
       BlockPos lv3 = BlockPos.create(lv.maxX - 1.0E-7, lv.maxY - 1.0E-7, lv.maxZ - 1.0E-7);
       if (this.getWorld().isRegionLoaded(lv2, lv3)) {
@@ -2115,7 +2114,7 @@
     */
    private boolean isBeingRainedOn() {
       BlockPos lv = this.getBlockPos();
-      return this.getWorld().hasRain(lv) || this.getWorld().hasRain(BlockPos.create((double)lv.getX(), this.m_lgqlkcep().maxY, (double)lv.getZ()));
+      return this.getWorld().hasRain(lv) || this.getWorld().hasRain(BlockPos.create((double)lv.getX(), this.getBounds().maxY, (double)lv.getZ()));
    }
 
    /**
@@ -2231,7 +2230,7 @@
       this.submergedInWater = this.isSubmergedIn(FluidTags.WATER);
       this.submergedFluidTag.clear();
       double d = this.getEyeY();
-      if (this.getVehicle() instanceof BoatEntity lv2 && !lv2.isSubmergedInWater() && lv2.m_lgqlkcep().maxY >= d && lv2.m_lgqlkcep().minY <= d) {
+      if (this.getVehicle() instanceof BoatEntity lv2 && !lv2.isSubmergedInWater() && lv2.getBounds().maxY >= d && lv2.getBounds().minY <= d) {
          return;
       }
 
@@ -2728,7 +2727,7 @@
     * @mapping {@literal named shouldRender Lnet/minecraft/entity/Entity;shouldRender(D)Z}
     */
    public boolean shouldRender(double distance) {
-      double e = this.m_lgqlkcep().getAverageSideLength();
+      double e = this.getBounds().getAverageSideLength();
       if (Double.isNaN(e)) {
          e = 1.0;
       }
@@ -3145,7 +3144,7 @@
     * Mapping not found
     */
    public Vec3d m_xyjymteg(Entity arg) {
-      return this.m_zoivpnyj().m_mhnyqnyc(C_biqpbxns.VEHICLE, 0, this.yaw);
+      return this.m_zoivpnyj().m_mhnyqnyc(EntityAttachmentType.VEHICLE, 0, this.yaw);
    }
 
    /**
@@ -3167,7 +3166,7 @@
     */
    protected static Vec3d m_ckeimykr(Entity arg, Entity arg2, C_pubtmkke arg3) {
       int i = arg.getPassengerList().indexOf(arg2);
-      return arg3.m_tcqsnpme(C_biqpbxns.PASSENGER, i, arg.yaw);
+      return arg3.m_tcqsnpme(EntityAttachmentType.PASSENGER, i, arg.yaw);
    }
 
    /**
@@ -4524,15 +4523,15 @@
     * Mapping not found
     */
    @Override
-   public void m_zobtcszk(List<DataTracker.SerializedEntry<?>> list) {
+   public void onTrackedDataUpdate(List<DataTracker.SerializedEntry<?>> entries) {
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (POSE.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (POSE.equals(data)) {
          this.calculateDimensions();
       }
    }
@@ -4573,7 +4572,7 @@
          VoxelShape lv5 = VoxelShapes.cuboid(Box.of(lv4, d, e, d));
          this.getWorld()
             .findClosestCollision(this, lv5, lv4, (double)lv3.width(), (double)lv3.height(), (double)lv3.width())
-            .ifPresent(arg2 -> this.setPosition(arg2.add(0.0, (double)(-lv3.height()) / 2.0, 0.0)));
+            .ifPresent(pos -> this.setPosition(pos.add(0.0, (double)(-lv3.height()) / 2.0, 0.0)));
       }
    }
 
@@ -4613,7 +4612,7 @@
     * Mapping not found
     */
    @Override
-   public final Box m_lgqlkcep() {
+   public final Box getBounds() {
       return this.entityBounds;
    }
 
@@ -4622,7 +4621,7 @@
     * @mapping {@literal named getVisibilityBoundingBox Lnet/minecraft/entity/Entity;getVisibilityBoundingBox()Lnet/minecraft/util/math/Box;}
     */
    public Box getVisibilityBoundingBox() {
-      return this.m_lgqlkcep();
+      return this.getBounds();
    }
 
    /**
@@ -4803,10 +4802,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_psgotipc Lnet/minecraft/unmapped/C_astfners;m_psgotipc(Lnet/minecraft/unmapped/C_ltpsyvhj;)Lnet/minecraft/unmapped/C_jslwmoew;}
+    * @mapping {@literal named getProjectileDeflector Lnet/minecraft/entity/Entity;getProjectileDeflector(Lnet/minecraft/entity/projectile/ProjectileEntity;)Lnet/minecraft/entity/ProjectileDeflector;}
     */
-   public C_jslwmoew m_psgotipc(ProjectileEntity arg) {
-      return this.getType().isIn(EntityTypeTags.DEFLECTS_PROJECTILES) ? C_jslwmoew.f_jcluacrw : C_jslwmoew.f_jpxrdlxe;
+   public ProjectileDeflector getProjectileDeflector(ProjectileEntity projectile) {
+      return this.getType().isIn(EntityTypeTags.DEFLECTS_PROJECTILES) ? ProjectileDeflector.REVERSE : ProjectileDeflector.NONE;
    }
 
    /**
@@ -4898,10 +4898,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vkrbjcra Lnet/minecraft/unmapped/C_astfners;m_vkrbjcra()I}
+    * @mapping {@literal named getRidingPlayerCount Lnet/minecraft/entity/Entity;getRidingPlayerCount()I}
     */
-   public int m_vkrbjcra() {
-      return (int)this.streamIntoPassengers().filter(arg -> arg instanceof PlayerEntity).count();
+   public int getRidingPlayerCount() {
+      return (int)this.streamIntoPassengers().filter(rider -> rider instanceof PlayerEntity).count();
    }
 
    /**
@@ -4909,7 +4910,7 @@
     * @mapping {@literal named hasPlayerRider Lnet/minecraft/entity/Entity;hasPlayerRider()Z}
     */
    public boolean hasPlayerRider() {
-      return this.m_vkrbjcra() == 1;
+      return this.getRidingPlayerCount() == 1;
    }
 
    /**
@@ -4986,7 +4987,7 @@
     * @mapping {@literal named updatePassengerForDismount Lnet/minecraft/entity/Entity;updatePassengerForDismount(Lnet/minecraft/entity/LivingEntity;)Lnet/minecraft/util/math/Vec3d;}
     */
    public Vec3d updatePassengerForDismount(LivingEntity passenger) {
-      return new Vec3d(this.getX(), this.m_lgqlkcep().maxY, this.getZ());
+      return new Vec3d(this.getX(), this.getBounds().maxY, this.getZ());
    }
 
    /**
@@ -5118,7 +5119,7 @@
       if (this.isRegionUnloaded()) {
          return false;
       } else {
-         Box lv = this.m_lgqlkcep().contract(0.001);
+         Box lv = this.getBounds().contract(0.001);
          int i = MathHelper.floor(lv.minX);
          int j = MathHelper.ceil(lv.maxX);
          int k = MathHelper.floor(lv.minY);
@@ -5193,7 +5194,7 @@
     * @mapping {@literal named isRegionUnloaded Lnet/minecraft/entity/Entity;isRegionUnloaded()Z}
     */
    public boolean isRegionUnloaded() {
-      Box lv = this.m_lgqlkcep().expand(1.0);
+      Box lv = this.getBounds().expand(1.0);
       int i = MathHelper.floor(lv.minX);
       int j = MathHelper.ceil(lv.maxX);
       int k = MathHelper.floor(lv.minZ);
@@ -5304,9 +5305,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lhatfyyd Lnet/minecraft/unmapped/C_astfners;m_lhatfyyd()Lnet/minecraft/unmapped/C_txtbiemp;}
+    * @mapping {@literal named getBlockStateAtPos Lnet/minecraft/entity/Entity;getBlockStateAtPos()Lnet/minecraft/block/BlockState;}
     */
-   public BlockState m_lhatfyyd() {
+   public BlockState getBlockStateAtPos() {
       if (this.state == null) {
          this.state = this.getWorld().getBlockState(this.getBlockPos());
       }
@@ -5742,9 +5744,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jofogjft Lnet/minecraft/unmapped/C_astfners;m_jofogjft()Lnet/minecraft/unmapped/C_wqxmvzdq;}
+    * @mapping {@literal named getRegistryManager Lnet/minecraft/entity/Entity;getRegistryManager()Lnet/minecraft/registry/DynamicRegistryManager;}
     */
-   public DynamicRegistryManager m_jofogjft() {
+   public DynamicRegistryManager getRegistryManager() {
       return this.getWorld().getRegistryManager();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/EntityPose.java namedSrc/net/minecraft/entity/EntityPose.java
--- namedTargetSrc/net/minecraft/entity/EntityPose.java	2024-03-03 04:42:33.583025137 +0000
+++ namedSrc/net/minecraft/entity/EntityPose.java	2024-03-03 04:41:23.114667676 +0000
@@ -103,29 +103,34 @@
    INHALING(17);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_iutbzuhu Lnet/minecraft/unmapped/C_ufdjspmk;f_iutbzuhu:Ljava/util/function/IntFunction;}
+    * @mapping {@literal named BY_ID Lnet/minecraft/entity/EntityPose;BY_ID:Ljava/util/function/IntFunction;}
     */
-   public static final IntFunction<EntityPose> f_iutbzuhu = IdListUtil.sortArray(EntityPose::m_hbfckuwh, values(), IdListUtil.OutOfBoundsHandler.ZERO);
+   public static final IntFunction<EntityPose> BY_ID = IdListUtil.sortArray(EntityPose::getId, values(), IdListUtil.OutOfBoundsHandler.ZERO);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_drjcyate Lnet/minecraft/unmapped/C_ufdjspmk;f_drjcyate:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named CODEC Lnet/minecraft/entity/EntityPose;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, EntityPose> f_drjcyate = PacketCodecs.m_oxatcqxo(f_iutbzuhu, EntityPose::m_hbfckuwh);
+   public static final PacketCodec<ByteBuf, EntityPose> CODEC = PacketCodecs.m_oxatcqxo(BY_ID, EntityPose::getId);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lpaujdpk Lnet/minecraft/unmapped/C_ufdjspmk;f_lpaujdpk:I}
+    * @mapping {@literal named id Lnet/minecraft/entity/EntityPose;id:I}
     */
-   private final int f_lpaujdpk;
+   private final int id;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ufdjspmk;<init>(Ljava/lang/String;II)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/EntityPose;<init>(Ljava/lang/String;II)V}
     */
-   private EntityPose(int j) {
-      this.f_lpaujdpk = j;
+   private EntityPose(int id) {
+      this.id = id;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hbfckuwh Lnet/minecraft/unmapped/C_ufdjspmk;m_hbfckuwh()I}
+    * @mapping {@literal named getId Lnet/minecraft/entity/EntityPose;getId()I}
     */
-   public int m_hbfckuwh() {
-      return this.f_lpaujdpk;
+   public int getId() {
+      return this.id;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/EntityStatuses.java namedSrc/net/minecraft/entity/EntityStatuses.java
--- namedTargetSrc/net/minecraft/entity/EntityStatuses.java	2024-03-03 04:42:33.771026099 +0000
+++ namedSrc/net/minecraft/entity/EntityStatuses.java	2024-03-03 04:41:23.350668891 +0000
@@ -291,7 +291,8 @@
     */
    public static final byte SNIFFER_DIGGING_SOUND = 63;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_crvcbgcl Lnet/minecraft/unmapped/C_vuauwont;f_crvcbgcl:B}
+    * @mapping {@literal named ARMADILLO_PEEK Lnet/minecraft/entity/EntityStatuses;ARMADILLO_PEEK:B}
     */
-   public static final byte f_crvcbgcl = 64;
+   public static final byte ARMADILLO_PEEK = 64;
 }
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-03-03 04:42:33.567025055 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-03-03 04:41:23.094667573 +0000
@@ -25,6 +25,7 @@
 import net.minecraft.entity.decoration.LeashKnotEntity;
 import net.minecraft.entity.decoration.painting.PaintingEntity;
 import net.minecraft.entity.mob.BlazeEntity;
+import net.minecraft.entity.mob.BoggedEntity;
 import net.minecraft.entity.mob.BreezeEntity;
 import net.minecraft.entity.mob.CaveSpiderEntity;
 import net.minecraft.entity.mob.CreeperEntity;
@@ -107,6 +108,7 @@
 import net.minecraft.entity.passive.WolfEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ArrowEntity;
+import net.minecraft.entity.projectile.BreezeWindChargeEntity;
 import net.minecraft.entity.projectile.DragonFireballEntity;
 import net.minecraft.entity.projectile.FireballEntity;
 import net.minecraft.entity.projectile.FireworkRocketEntity;
@@ -147,10 +149,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_biqpbxns;
 import net.minecraft.unmapped.C_pubtmkke;
-import net.minecraft.unmapped.C_uqkupzdc;
-import net.minecraft.unmapped.C_zsgzopda;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
@@ -298,9 +297,9 @@
     * @mapping {@literal hashed f_rtypzama Lnet/minecraft/unmapped/C_ogavsvbr;f_rtypzama:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named BOGGED Lnet/minecraft/entity/EntityType;BOGGED:Lnet/minecraft/entity/EntityType;}
     */
-   public static final EntityType<C_zsgzopda> BOGGED = register(
+   public static final EntityType<BoggedEntity> BOGGED = register(
       "bogged",
-      EntityType.Builder.create(C_zsgzopda::new, SpawnGroup.MONSTER)
+      EntityType.Builder.create(BoggedEntity::new, SpawnGroup.MONSTER)
          .setDimensions(0.6F, 1.99F)
          .setEyeHeight(1.74F)
          .maxTrackingRange(8)
@@ -322,9 +321,9 @@
     * @mapping {@literal hashed f_pgfkuyth Lnet/minecraft/unmapped/C_ogavsvbr;f_pgfkuyth:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named BREEZE_WIND_CHARGE Lnet/minecraft/entity/EntityType;BREEZE_WIND_CHARGE:Lnet/minecraft/entity/EntityType;}
     */
-   public static final EntityType<C_uqkupzdc> BREEZE_WIND_CHARGE = register(
+   public static final EntityType<BreezeWindChargeEntity> BREEZE_WIND_CHARGE = register(
       "breeze_wind_charge",
-      EntityType.Builder.<C_uqkupzdc>create(C_uqkupzdc::new, SpawnGroup.MISC)
+      EntityType.Builder.<BreezeWindChargeEntity>create(BreezeWindChargeEntity::new, SpawnGroup.MISC)
          .setDimensions(0.3125F, 0.3125F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(4)
@@ -1339,7 +1338,7 @@
       EntityType.Builder.create(WardenEntity::new, SpawnGroup.MONSTER)
          .setDimensions(0.9F, 2.9F)
          .m_bqfegnvp(3.15F)
-         .m_fzrrurer(C_biqpbxns.WARDEN_CHEST, 0.0F, 1.6F, 0.0F)
+         .m_fzrrurer(EntityAttachmentType.WARDEN_CHEST, 0.0F, 1.6F, 0.0F)
          .maxTrackingRange(16)
          .makeFireImmune()
    );
@@ -1732,7 +1731,7 @@
          double d;
          if (bl) {
             lv.setPosition((double)pos.getX() + 0.5, (double)(pos.getY() + 1), (double)pos.getZ() + 0.5);
-            d = getOriginY(world, pos, invertY, lv.m_lgqlkcep());
+            d = getOriginY(world, pos, invertY, lv.getBounds());
          } else {
             d = 0.0;
          }
@@ -2250,7 +2249,7 @@
        */
       public EntityType.Builder<T> m_bqfegnvp(float... fs) {
          for (float f : fs) {
-            this.f_rzcfynrt = this.f_rzcfynrt.m_awxtqxkn(C_biqpbxns.PASSENGER, 0.0F, f, 0.0F);
+            this.f_rzcfynrt = this.f_rzcfynrt.m_awxtqxkn(EntityAttachmentType.PASSENGER, 0.0F, f, 0.0F);
          }
 
          return this;
@@ -2261,7 +2260,7 @@
        */
       public EntityType.Builder<T> m_camhzzdi(Vec3d... args) {
          for (Vec3d lv : args) {
-            this.f_rzcfynrt = this.f_rzcfynrt.m_wgusdhab(C_biqpbxns.PASSENGER, lv);
+            this.f_rzcfynrt = this.f_rzcfynrt.m_wgusdhab(EntityAttachmentType.PASSENGER, lv);
          }
 
          return this;
@@ -2271,14 +2270,14 @@
        * Mapping not found
        */
       public EntityType.Builder<T> m_tyhsjfkq(Vec3d arg) {
-         return this.m_vwlaksox(C_biqpbxns.VEHICLE, arg);
+         return this.m_vwlaksox(EntityAttachmentType.VEHICLE, arg);
       }
 
       /**
        * Mapping not found
        */
       public EntityType.Builder<T> m_wkiuunbk(float f) {
-         return this.m_fzrrurer(C_biqpbxns.VEHICLE, 0.0F, -f, 0.0F);
+         return this.m_fzrrurer(EntityAttachmentType.VEHICLE, 0.0F, -f, 0.0F);
       }
 
       /**
@@ -2286,23 +2285,23 @@
        * @mapping {@literal named m_ckqplxmv Lnet/minecraft/entity/EntityType$Builder;m_ckqplxmv(F)Lnet/minecraft/entity/EntityType$Builder;}
        */
       public EntityType.Builder<T> m_ckqplxmv(float y) {
-         return this.m_fzrrurer(C_biqpbxns.NAME_TAG, 0.0F, y, 0.0F);
+         return this.m_fzrrurer(EntityAttachmentType.NAME_TAG, 0.0F, y, 0.0F);
       }
 
       /**
        * @mapping {@literal hashed m_fzrrurer Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;m_fzrrurer(Lnet/minecraft/unmapped/C_biqpbxns;FFF)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;}
-       * @mapping {@literal named m_fzrrurer Lnet/minecraft/entity/EntityType$Builder;m_fzrrurer(Lnet/minecraft/unmapped/C_biqpbxns;FFF)Lnet/minecraft/entity/EntityType$Builder;}
+       * @mapping {@literal named m_fzrrurer Lnet/minecraft/entity/EntityType$Builder;m_fzrrurer(Lnet/minecraft/entity/EntityAttachmentType;FFF)Lnet/minecraft/entity/EntityType$Builder;}
        */
-      public EntityType.Builder<T> m_fzrrurer(C_biqpbxns key, float x, float y, float z) {
+      public EntityType.Builder<T> m_fzrrurer(EntityAttachmentType key, float x, float y, float z) {
          this.f_rzcfynrt = this.f_rzcfynrt.m_awxtqxkn(key, x, y, z);
          return this;
       }
 
       /**
        * @mapping {@literal hashed m_vwlaksox Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;m_vwlaksox(Lnet/minecraft/unmapped/C_biqpbxns;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;}
-       * @mapping {@literal named m_vwlaksox Lnet/minecraft/entity/EntityType$Builder;m_vwlaksox(Lnet/minecraft/unmapped/C_biqpbxns;Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/entity/EntityType$Builder;}
+       * @mapping {@literal named m_vwlaksox Lnet/minecraft/entity/EntityType$Builder;m_vwlaksox(Lnet/minecraft/entity/EntityAttachmentType;Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/entity/EntityType$Builder;}
        */
-      public EntityType.Builder<T> m_vwlaksox(C_biqpbxns key, Vec3d arg2) {
+      public EntityType.Builder<T> m_vwlaksox(EntityAttachmentType key, Vec3d arg2) {
          this.f_rzcfynrt = this.f_rzcfynrt.m_wgusdhab(key, arg2);
          return this;
       }
diff -bur namedTargetSrc/net/minecraft/entity/ExperienceOrbEntity.java namedSrc/net/minecraft/entity/ExperienceOrbEntity.java
--- namedTargetSrc/net/minecraft/entity/ExperienceOrbEntity.java	2024-03-03 04:42:33.771026099 +0000
+++ namedSrc/net/minecraft/entity/ExperienceOrbEntity.java	2024-03-03 04:41:23.350668891 +0000
@@ -109,7 +109,7 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
+   protected void initDataTracker(DataTracker.Builder builder) {
    }
 
    /**
@@ -141,8 +141,8 @@
          );
       }
 
-      if (!this.getWorld().isSpaceEmpty(this.m_lgqlkcep())) {
-         this.pushOutOfBlocks(this.getX(), (this.m_lgqlkcep().minY + this.m_lgqlkcep().maxY) / 2.0, this.getZ());
+      if (!this.getWorld().isSpaceEmpty(this.getBounds())) {
+         this.pushOutOfBlocks(this.getX(), (this.getBounds().minY + this.getBounds().maxY) / 2.0, this.getZ());
       }
 
       if (this.age % 20 == 1) {
@@ -208,7 +208,7 @@
 
       if (this.getWorld() instanceof ServerWorld) {
          for (ExperienceOrbEntity lv : this.getWorld()
-            .getEntitiesByType(TypeFilter.instanceOf(ExperienceOrbEntity.class), this.m_lgqlkcep().expand(0.5), this::isMergeable)) {
+            .getEntitiesByType(TypeFilter.instanceOf(ExperienceOrbEntity.class), this.getBounds().expand(0.5), this::isMergeable)) {
             this.merge(lv);
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/EyeOfEnderEntity.java namedSrc/net/minecraft/entity/EyeOfEnderEntity.java
--- namedTargetSrc/net/minecraft/entity/EyeOfEnderEntity.java	2024-03-03 04:42:33.599025218 +0000
+++ namedSrc/net/minecraft/entity/EyeOfEnderEntity.java	2024-03-03 04:41:23.134667779 +0000
@@ -89,8 +89,8 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(ITEM, this.m_ilhdyacs());
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(ITEM, this.m_ilhdyacs());
    }
 
    /**
@@ -98,7 +98,7 @@
     */
    @Override
    public boolean shouldRender(double distance) {
-      double e = this.m_lgqlkcep().getAverageSideLength() * 4.0;
+      double e = this.getBounds().getAverageSideLength() * 4.0;
       if (Double.isNaN(e)) {
          e = 4.0;
       }
diff -bur namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java namedSrc/net/minecraft/entity/FallingBlockEntity.java
--- namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java	2024-03-03 04:42:33.791026202 +0000
+++ namedSrc/net/minecraft/entity/FallingBlockEntity.java	2024-03-03 04:41:23.370668994 +0000
@@ -178,8 +178,8 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(BLOCK_POS, BlockPos.ORIGIN);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(BLOCK_POS, BlockPos.ORIGIN);
    }
 
    /**
@@ -329,7 +329,7 @@
             Predicate<Entity> predicate = EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR.and(EntityPredicates.VALID_LIVING_ENTITY);
             DamageSource lv2 = this.block.getBlock() instanceof LandingBlock lv ? lv.getDamageSource(this) : this.getDamageSources().fallingBlock(this);
             float h = (float)Math.min(MathHelper.floor((float)i * this.fallHurtAmount), this.fallHurtMax);
-            this.getWorld().getOtherEntities(this, this.m_lgqlkcep(), predicate).forEach(entity -> entity.damage(lv2, h));
+            this.getWorld().getOtherEntities(this, this.getBounds(), predicate).forEach(entity -> entity.damage(lv2, h));
             boolean bl = this.block.isIn(BlockTags.ANVILS);
             if (bl && h > 0.0F && this.random.nextFloat() < 0.05F + (float)i * 0.05F) {
                BlockState lv3 = AnvilBlock.getLandingState(this.block);
diff -bur namedTargetSrc/net/minecraft/entity/InteractionEntity.java namedSrc/net/minecraft/entity/InteractionEntity.java
--- namedTargetSrc/net/minecraft/entity/InteractionEntity.java	2024-03-03 04:42:33.607025260 +0000
+++ namedSrc/net/minecraft/entity/InteractionEntity.java	2024-03-03 04:41:23.142667820 +0000
@@ -99,10 +99,10 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(WIDTH, 1.0F);
-      arg.m_jeliigji(HEIGHT, 1.0F);
-      arg.m_jeliigji(RESPONSE, false);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(WIDTH, 1.0F);
+      builder.add(HEIGHT, 1.0F);
+      builder.add(RESPONSE, false);
    }
 
    /**
@@ -162,9 +162,9 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      super.m_efnedaed(arg);
-      if (HEIGHT.equals(arg) || WIDTH.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      super.onTrackedDataSet(data);
+      if (HEIGHT.equals(data) || WIDTH.equals(data)) {
          this.setBoundingBox(this.calculateBoundingBox());
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ItemEntity.java namedSrc/net/minecraft/entity/ItemEntity.java
--- namedTargetSrc/net/minecraft/entity/ItemEntity.java	2024-03-03 04:42:33.563025034 +0000
+++ namedSrc/net/minecraft/entity/ItemEntity.java	2024-03-03 04:41:23.094667573 +0000
@@ -190,8 +190,8 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(STACK, ItemStack.EMPTY);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(STACK, ItemStack.EMPTY);
    }
 
    /**
@@ -230,9 +230,9 @@
          if (this.getWorld().isClient) {
             this.noClip = false;
          } else {
-            this.noClip = !this.getWorld().isSpaceEmpty(this, this.m_lgqlkcep().contract(1.0E-7));
+            this.noClip = !this.getWorld().isSpaceEmpty(this, this.getBounds().contract(1.0E-7));
             if (this.noClip) {
-               this.pushOutOfBlocks(this.getX(), (this.m_lgqlkcep().minY + this.m_lgqlkcep().maxY) / 2.0, this.getZ());
+               this.pushOutOfBlocks(this.getX(), (this.getBounds().minY + this.getBounds().maxY) / 2.0, this.getZ());
             }
          }
 
@@ -311,7 +311,7 @@
    private void tryMerge() {
       if (this.canMerge()) {
          for (ItemEntity lv : this.getWorld()
-            .getEntitiesByClass(ItemEntity.class, this.m_lgqlkcep().expand(0.5, 0.0, 0.5), itemEntity -> itemEntity != this && itemEntity.canMerge())) {
+            .getEntitiesByClass(ItemEntity.class, this.getBounds().expand(0.5, 0.0, 0.5), itemEntity -> itemEntity != this && itemEntity.canMerge())) {
             if (lv.canMerge()) {
                this.tryMerge(lv);
                if (this.isRemoved()) {
@@ -547,9 +547,9 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      super.m_efnedaed(arg);
-      if (STACK.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      super.onTrackedDataSet(data);
+      if (STACK.equals(data)) {
          this.getStack().setHolder(this);
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/LightningEntity.java namedSrc/net/minecraft/entity/LightningEntity.java
--- namedTargetSrc/net/minecraft/entity/LightningEntity.java	2024-03-03 04:42:33.599025218 +0000
+++ namedSrc/net/minecraft/entity/LightningEntity.java	2024-03-03 04:41:23.134667779 +0000
@@ -341,7 +341,7 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
+   protected void initDataTracker(DataTracker.Builder builder) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2024-03-03 04:42:33.703025751 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-03-03 04:41:23.274668500 +0000
@@ -727,14 +727,14 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      arg.m_jeliigji(LIVING_FLAGS, (byte)0);
-      arg.m_jeliigji(POTION_SWIRLS_COLOR, 0);
-      arg.m_jeliigji(POTION_SWIRLS_AMBIENT, false);
-      arg.m_jeliigji(STUCK_ARROW_COUNT, 0);
-      arg.m_jeliigji(STINGER_COUNT, 0);
-      arg.m_jeliigji(HEALTH, 1.0F);
-      arg.m_jeliigji(SLEEPING_POSITION, Optional.empty());
+   protected void initDataTracker(DataTracker.Builder builder) {
+      builder.add(LIVING_FLAGS, (byte)0);
+      builder.add(POTION_SWIRLS_COLOR, 0);
+      builder.add(POTION_SWIRLS_AMBIENT, false);
+      builder.add(STUCK_ARROW_COUNT, 0);
+      builder.add(STINGER_COUNT, 0);
+      builder.add(HEALTH, 1.0F);
+      builder.add(SLEEPING_POSITION, Optional.empty());
    }
 
    /**
@@ -837,7 +837,7 @@
          if (!this.getWorld().isClient) {
             if (this.isInsideWall()) {
                this.damage(this.getDamageSources().inWall(), 1.0F);
-            } else if (bl && !this.getWorld().getWorldBorder().contains(this.m_lgqlkcep())) {
+            } else if (bl && !this.getWorld().getWorldBorder().contains(this.getBounds())) {
                double d = this.getWorld().getWorldBorder().getDistanceInsideBorder(this) + this.getWorld().getWorldBorder().getSafeZone();
                if (d < 0.0) {
                   double e = this.getWorld().getWorldBorder().getDamagePerBlock();
@@ -2471,7 +2471,7 @@
     * @mapping {@literal named getHitbox Lnet/minecraft/entity/LivingEntity;getHitbox()Lnet/minecraft/util/math/Box;}
     */
    protected Box getHitbox() {
-      Box lv = this.m_lgqlkcep();
+      Box lv = this.getBounds();
       Entity lv2 = this.getVehicle();
       if (lv2 != null) {
          Vec3d lv3 = lv2.m_pxzrmrny(this);
@@ -2522,7 +2522,7 @@
          return false;
       } else {
          BlockPos lv = this.getBlockPos();
-         BlockState lv2 = this.m_lhatfyyd();
+         BlockState lv2 = this.getBlockStateAtPos();
          if (lv2.isIn(BlockTags.CLIMBABLE)) {
             this.climbingPos = Optional.of(lv);
             return true;
@@ -3542,7 +3542,7 @@
       this.move(MovementType.SELF, this.getVelocity());
       Vec3d lv = this.getVelocity();
       if ((this.horizontalCollision || this.jumping)
-         && (this.isClimbing() || this.m_lhatfyyd().isOf(Blocks.POWDER_SNOW) && PowderSnowBlock.canWalkOnPowderSnow(this))) {
+         && (this.isClimbing() || this.getBlockStateAtPos().isOf(Blocks.POWDER_SNOW) && PowderSnowBlock.canWalkOnPowderSnow(this))) {
          lv = new Vec3d(lv.x, 0.2, lv.z);
       }
 
@@ -3579,7 +3579,7 @@
          double d = MathHelper.clamp(motion.x, -0.15F, 0.15F);
          double e = MathHelper.clamp(motion.z, -0.15F, 0.15F);
          double g = Math.max(motion.y, -0.15F);
-         if (g < 0.0 && !this.m_lhatfyyd().isOf(Blocks.SCAFFOLDING) && this.isHoldingOntoLadder() && this instanceof PlayerEntity) {
+         if (g < 0.0 && !this.getBlockStateAtPos().isOf(Blocks.SCAFFOLDING) && this.isHoldingOntoLadder() && this instanceof PlayerEntity) {
             g = 0.0;
          }
 
@@ -4015,7 +4015,7 @@
       this.sidewaysSpeed *= 0.98F;
       this.forwardSpeed *= 0.98F;
       this.tickFallFlying();
-      Box lv2 = this.m_lgqlkcep();
+      Box lv2 = this.getBounds();
       Vec3d lv3 = new Vec3d((double)this.sidewaysSpeed, (double)this.upwardSpeed, (double)this.forwardSpeed);
       if (this.hasStatusEffect(StatusEffects.SLOW_FALLING) || this.hasStatusEffect(StatusEffects.LEVITATION)) {
          this.resetFallDistance();
@@ -4051,7 +4051,7 @@
       this.getWorld().getProfiler().push("push");
       if (this.riptideTicks > 0) {
          this.riptideTicks--;
-         this.tickRiptide(lv2, this.m_lgqlkcep());
+         this.tickRiptide(lv2, this.getBounds());
       }
 
       this.tickCramming();
@@ -4114,10 +4114,10 @@
    protected void tickCramming() {
       if (this.getWorld().isClient()) {
          this.getWorld()
-            .getEntitiesByType(TypeFilter.instanceOf(PlayerEntity.class), this.m_lgqlkcep(), EntityPredicates.canBePushedBy(this))
+            .getEntitiesByType(TypeFilter.instanceOf(PlayerEntity.class), this.getBounds(), EntityPredicates.canBePushedBy(this))
             .forEach(this::pushAway);
       } else {
-         List<Entity> list = this.getWorld().getOtherEntities(this, this.m_lgqlkcep(), EntityPredicates.canBePushedBy(this));
+         List<Entity> list = this.getWorld().getOtherEntities(this, this.getBounds(), EntityPredicates.canBePushedBy(this));
          if (!list.isEmpty()) {
             int i = this.getWorld().getGameRules().getIntValue(GameRules.MAX_ENTITY_CRAMMING);
             if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
@@ -4561,13 +4561,13 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      super.m_efnedaed(arg);
-      if (SLEEPING_POSITION.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      super.onTrackedDataSet(data);
+      if (SLEEPING_POSITION.equals(data)) {
          if (this.getWorld().isClient) {
             this.getSleepingPosition().ifPresent(this::setPositionInBed);
          }
-      } else if (LIVING_FLAGS.equals(arg) && this.getWorld().isClient) {
+      } else if (LIVING_FLAGS.equals(data) && this.getWorld().isClient) {
          if (this.isUsingItem() && this.activeItemStack.isEmpty()) {
             this.activeItemStack = this.getStackInHand(this.getActiveHand());
             if (!this.activeItemStack.isEmpty()) {
@@ -4783,7 +4783,7 @@
 
          if (bl3) {
             this.tryTeleportAndDismount(x, j, z);
-            if (lv2.isSpaceEmpty(this) && !lv2.containsFluid(this.m_lgqlkcep())) {
+            if (lv2.isSpaceEmpty(this) && !lv2.containsFluid(this.getBounds())) {
                bl2 = true;
             }
          }
@@ -5094,7 +5094,7 @@
    public Box getVisibilityBoundingBox() {
       if (this.getEquippedStack(EquipmentSlot.HEAD).isOf(Items.DRAGON_HEAD)) {
          float f = 0.5F;
-         return this.m_lgqlkcep().expand(0.5, 0.5, 0.5);
+         return this.getBounds().expand(0.5, 0.5, 0.5);
       } else {
          return super.getVisibilityBoundingBox();
       }
diff -bur namedTargetSrc/net/minecraft/entity/MarkerEntity.java namedSrc/net/minecraft/entity/MarkerEntity.java
--- namedTargetSrc/net/minecraft/entity/MarkerEntity.java	2024-03-03 04:42:33.575025095 +0000
+++ namedSrc/net/minecraft/entity/MarkerEntity.java	2024-03-03 04:41:23.102667614 +0000
@@ -45,7 +45,7 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
+   protected void initDataTracker(DataTracker.Builder builder) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/AbstractPiglinEntity.java namedSrc/net/minecraft/entity/mob/AbstractPiglinEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/AbstractPiglinEntity.java	2024-03-03 04:42:33.619025320 +0000
+++ namedSrc/net/minecraft/entity/mob/AbstractPiglinEntity.java	2024-03-03 04:41:23.158667902 +0000
@@ -89,9 +89,9 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(IMMUNE_TO_ZOMBIFICATION, false);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(IMMUNE_TO_ZOMBIFICATION, false);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/BlazeEntity.java namedSrc/net/minecraft/entity/mob/BlazeEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/BlazeEntity.java	2024-03-03 04:42:33.643025443 +0000
+++ namedSrc/net/minecraft/entity/mob/BlazeEntity.java	2024-03-03 04:41:23.194668088 +0000
@@ -92,9 +92,9 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(BLAZE_FLAGS, (byte)0);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(BLAZE_FLAGS, (byte)0);
    }
 
    /**
Only in namedSrc/net/minecraft/entity/mob: BoggedEntity.java
diff -bur namedTargetSrc/net/minecraft/entity/mob/BreezeEntity.java namedSrc/net/minecraft/entity/mob/BreezeEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/BreezeEntity.java	2024-03-03 04:42:33.563025034 +0000
+++ namedSrc/net/minecraft/entity/mob/BreezeEntity.java	2024-03-03 04:41:23.086667531 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.ProjectileDeflector;
 import net.minecraft.entity.ai.brain.Brain;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.attribute.DefaultAttributeContainer;
@@ -26,7 +27,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_gxdsshkk;
 import net.minecraft.unmapped.C_hahxxnjs;
-import net.minecraft.unmapped.C_jslwmoew;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
@@ -106,9 +106,9 @@
    /**
     * Mapping not found
     */
-   private static final C_jslwmoew f_kzzgclad = (arg, arg2, random) -> {
+   private static final ProjectileDeflector f_kzzgclad = (arg, arg2, random) -> {
       arg2.getWorld().playSoundFromEntity(arg2, SoundEvents.ENTITY_BREEZE_DEFLECT, arg2.getSoundCategory(), 1.0F, 1.0F);
-      C_jslwmoew.f_jcluacrw.deflect(arg, arg2, random);
+      ProjectileDeflector.REVERSE.deflect(arg, arg2, random);
    };
 
    /**
@@ -161,8 +161,8 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (this.getWorld().isClient() && POSE.equals(arg)) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (this.getWorld().isClient() && POSE.equals(data)) {
          this.m_sinilvic();
          EntityPose lv = this.getPose();
          switch (lv) {
@@ -177,7 +177,7 @@
          }
       }
 
-      super.m_efnedaed(arg);
+      super.onTrackedDataSet(data);
    }
 
    /**
@@ -235,7 +235,7 @@
     */
    public void m_qzaybzaa() {
       if (++this.f_ryffbosw <= 5) {
-         BlockState lv = !this.m_lhatfyyd().isAir() ? this.m_lhatfyyd() : this.getLandingBlockState();
+         BlockState lv = !this.getBlockStateAtPos().isAir() ? this.getBlockStateAtPos() : this.getLandingBlockState();
          Vec3d lv2 = this.getVelocity();
          Vec3d lv3 = this.getPos().add(lv2).add(0.0, 0.1F, 0.0);
 
@@ -250,9 +250,9 @@
     */
    public void m_bgkirkwb(int i) {
       if (!this.hasVehicle()) {
-         Vec3d lv = this.m_lgqlkcep().getCenter();
+         Vec3d lv = this.getBounds().getCenter();
          Vec3d lv2 = new Vec3d(lv.x, this.getPos().y, lv.z);
-         BlockState lv3 = !this.m_lhatfyyd().isAir() ? this.m_lhatfyyd() : this.getLandingBlockState();
+         BlockState lv3 = !this.getBlockStateAtPos().isAir() ? this.getBlockStateAtPos() : this.getLandingBlockState();
          if (lv3.getRenderType() != BlockRenderType.INVISIBLE) {
             for (int j = 0; j < i; j++) {
                this.getWorld().addParticle(new BlockStateParticleEffect(ParticleTypes.BLOCK, lv3), lv2.x, lv2.y, lv2.z, 0.0, 0.0, 0.0);
@@ -284,8 +284,8 @@
     * Mapping not found
     */
    @Override
-   public C_jslwmoew m_psgotipc(ProjectileEntity arg) {
-      return arg.getType() == EntityType.BREEZE_WIND_CHARGE ? C_jslwmoew.f_jpxrdlxe : f_kzzgclad;
+   public ProjectileDeflector getProjectileDeflector(ProjectileEntity projectile) {
+      return projectile.getType() == EntityType.BREEZE_WIND_CHARGE ? ProjectileDeflector.NONE : f_kzzgclad;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/CreeperEntity.java namedSrc/net/minecraft/entity/mob/CreeperEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/CreeperEntity.java	2024-03-03 04:42:33.623025342 +0000
+++ namedSrc/net/minecraft/entity/mob/CreeperEntity.java	2024-03-03 04:41:23.162667923 +0000
@@ -147,11 +147,11 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(FUSE_SPEED, -1);
-      arg.m_jeliigji(CHARGED, false);
-      arg.m_jeliigji(IGNITED, false);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(FUSE_SPEED, -1);
+      builder.add(CHARGED, false);
+      builder.add(IGNITED, false);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/EndermanEntity.java namedSrc/net/minecraft/entity/mob/EndermanEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EndermanEntity.java	2024-03-03 04:42:33.551024972 +0000
+++ namedSrc/net/minecraft/entity/mob/EndermanEntity.java	2024-03-03 04:41:23.074667470 +0000
@@ -205,11 +205,11 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
-      arg.m_jeliigji(CARRIED_BLOCK, Optional.empty());
-      arg.m_jeliigji(ANGRY, false);
-      arg.m_jeliigji(PROVOKED, false);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
+      builder.add(CARRIED_BLOCK, Optional.empty());
+      builder.add(ANGRY, false);
+      builder.add(PROVOKED, false);
    }
 
    /**
@@ -270,12 +270,12 @@
     * Mapping not found
     */
    @Override
-   public void m_efnedaed(TrackedData<?> arg) {
-      if (ANGRY.equals(arg) && this.isProvoked() && this.getWorld().isClient) {
+   public void onTrackedDataSet(TrackedData<?> data) {
+      if (ANGRY.equals(data) && this.isProvoked() && this.getWorld().isClient) {
          this.playAngrySound();
       }
 
-      super.m_efnedaed(arg);
+      super.onTrackedDataSet(data);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/EvokerEntity.java namedSrc/net/minecraft/entity/mob/EvokerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EvokerEntity.java	2024-03-03 04:42:33.675025608 +0000
+++ namedSrc/net/minecraft/entity/mob/EvokerEntity.java	2024-03-03 04:41:23.238668314 +0000
@@ -95,8 +95,8 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
-      super.initDataTracker(arg);
+   protected void initDataTracker(DataTracker.Builder builder) {
+      super.initDataTracker(builder);
    }
 
    /**
@@ -352,7 +352,7 @@
             return false;
          } else {
             int i = EvokerEntity.this.getWorld()
-               .getTargets(VexEntity.class, this.closeVexPredicate, EvokerEntity.this, EvokerEntity.this.m_lgqlkcep().expand(16.0))
+               .getTargets(VexEntity.class, this.closeVexPredicate, EvokerEntity.this, EvokerEntity.this.getBounds().expand(16.0))
                .size();
             return EvokerEntity.this.random.nextInt(8) + 1 > i;
          }
@@ -446,7 +446,7 @@
             return false;
          } else {
             List<SheepEntity> list = EvokerEntity.this.getWorld()
-               .getTargets(SheepEntity.class, this.convertibleSheepPredicate, EvokerEntity.this, EvokerEntity.this.m_lgqlkcep().expand(16.0, 4.0, 16.0));
+               .getTargets(SheepEntity.class, this.convertibleSheepPredicate, EvokerEntity.this, EvokerEntity.this.getBounds().expand(16.0, 4.0, 16.0));
             if (list.isEmpty()) {
                return false;
             } else {
diff -bur namedTargetSrc/net/minecraft/entity/mob/EvokerFangsEntity.java namedSrc/net/minecraft/entity/mob/EvokerFangsEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EvokerFangsEntity.java	2024-03-03 04:42:33.799026243 +0000
+++ namedSrc/net/minecraft/entity/mob/EvokerFangsEntity.java	2024-03-03 04:41:23.386669078 +0000
@@ -91,7 +91,7 @@
     * Mapping not found
     */
    @Override
-   protected void initDataTracker(DataTracker.C_oqzxcugu arg) {
+   protected void initDataTracker(DataTracker.Builder builder) {
    }
 
    /**
@@ -164,7 +164,7 @@
          }
       } else if (--this.warmup < 0) {
          if (this.warmup == -8) {
-            for (LivingEntity lv : this.getWorld().getNonSpectatingEntities(LivingEntity.class, this.m_lgqlkcep().expand(0.2, 0.0, 0.2))) {
+            for (LivingEntity lv : this.getWorld().getNonSpectatingEntities(LivingEntity.class, this.getBounds().expand(0.2, 0.0, 0.2))) {
                this.damage(lv);
             }
          }


The remaining diff is too long!

Please sign in to comment.