Skip to content

Commit

Permalink
some progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Oct 16, 2024
1 parent 3ea998f commit f6df2d1
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 0 deletions.
13 changes: 13 additions & 0 deletions mappings/net/minecraft/entity/ElytraAnimationState.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CLASS net/minecraft/unmapped/C_raqyxzkb net/minecraft/entity/ElytraAnimationState
FIELD f_abffbhoa yaw F
FIELD f_cqtoagfd DEFAULT_PITCH F
FIELD f_euxkgdhp roll F
FIELD f_gtjjiatm lastRoll F
FIELD f_mqktoujp lastPitch F
FIELD f_ondamjfd lastYaw F
FIELD f_tvmvorkj DEFAULT_ROLL F
FIELD f_yerwbabc pitch F
METHOD m_hbtboris getRoll (F)F
METHOD m_krukcnbc getYaw (F)F
METHOD m_srnvybfn getPitch (F)F
METHOD m_vqxiufsb tick ()V
7 changes: 7 additions & 0 deletions mappings/net/minecraft/entity/Entity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
METHOD m_fqsmgmzi setMovementMultiplier (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vgpupfxx;)V
ARG 1 state
ARG 2 multiplier
METHOD m_fuenwjjy damage (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z
ARG 2 source
ARG 3 amount
METHOD m_fymcirnf setCustomName (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
ARG 1 name
METHOD m_fzshfvfl isSprinting ()Z
Expand Down Expand Up @@ -433,6 +436,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 1 cooldown
METHOD m_imqrqpcf getRotationVec (F)Lnet/minecraft/unmapped/C_vgpupfxx;
ARG 1 tickDelta
METHOD m_ioabfmzu damageSided (Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z
ARG 1 source
METHOD m_iohdoxun teleportPassengers ()V
METHOD m_iqvzwgkr canModifyAt (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z
ARG 2 pos
Expand All @@ -443,6 +448,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 2 damageMultiplier
ARG 3 damageSource
METHOD m_jaflucyh canSprintAsVehicle ()Z
METHOD m_jaiycnbg damageClient (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z
ARG 1 source
METHOD m_jfqciigr hasCollidedSoftly (Lnet/minecraft/unmapped/C_vgpupfxx;)Z
ARG 1 adjustedMovement
METHOD m_jjhhwbds updateDynamicGameEventListener (Ljava/util/function/BiConsumer;)V
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/LimbData.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_okagbxbh net/minecraft/entity/LimbData
FIELD f_gxxxtoep scale F
FIELD f_phygrlmu oldLimbDistance F
FIELD f_rwiixyou totalLimbDistance F
FIELD f_tvhydwyb limbDistance F
Expand All @@ -12,5 +13,7 @@ CLASS net/minecraft/unmapped/C_okagbxbh net/minecraft/entity/LimbData
METHOD m_ojyzwoun updateLimbs (FFF)V
ARG 1 limbDistance
ARG 2 delta
ARG 3 scale
METHOD m_zhsfjxjq getLimbDistance (F)F
ARG 1 tickDelta
METHOD m_ztvseqvg reset ()V
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/LivingEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
FIELD f_asrrjfdz attributes Lnet/minecraft/unmapped/C_cohbwqne;
FIELD f_atqwrmrh lastDamageTaken F
FIELD f_avsswxpi ELYTRA_DAMAGE_PER_FREE_FALL_TICKS I
FIELD f_aydtoono elytraState Lnet/minecraft/unmapped/C_raqyxzkb;
FIELD f_bwbjmspv DAMAGE_SOURCE_TIMEOUT I
FIELD f_chuibjnv PLAYER_NOT_WEARING_GAZE_DISGUISE Ljava/util/function/Predicate;
FIELD f_coityhpi jumping Z
FIELD f_dddwkxrr bodyArmor Lnet/minecraft/unmapped/C_sddaxwyk;
FIELD f_debofomg riptideTicks I
Expand Down

3 comments on commit f6df2d1

@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 f6df2d1, 220 file(s) were updated with 1185 line(s) added and 1206 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-10-16 01:43:51.031239659 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-10-16 01:42:40.843347942 +0000
@@ -125,7 +125,7 @@
    public VertexConsumer normal(float normalX, float normalY, float normalZ) {
       this.delegate.normal(normalX, normalY, normalZ);
       Vector3f vector3f = this.normalInverseMatrix.transform(normalX, normalY, normalZ, this.normal);
-      Direction lv = Direction.m_ckfxacqi(vector3f.x(), vector3f.y(), vector3f.z());
+      Direction lv = Direction.getFacing(vector3f.x(), vector3f.y(), vector3f.z());
       Vector3f vector3f2 = this.cameraInverseMatrix.transformPosition(this.x, this.y, this.z, this.position);
       vector3f2.rotateY((float) Math.PI);
       vector3f2.rotateX((float) (-Math.PI / 2));
diff -bur namedTargetSrc/com/mojang/blaze3d/vertex/VertexConsumer.java namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java
--- namedTargetSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-10-16 01:43:51.075239597 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-10-16 01:42:40.887347875 +0000
@@ -122,7 +122,7 @@
     */
    default void quad(MatrixStack.Entry matrix, BakedQuad quad, float[] brightness, float r, float g, float b, float alpha, int[] uv1, int v, boolean blendColor) {
       int[] js = quad.getVertexData();
-      Vec3i lv = quad.getFace().m_uinacubi();
+      Vec3i lv = quad.getFace().asVec3i();
       Matrix4f matrix4f = matrix.getModel();
       Vector3f vector3f = matrix.transformNormal((float)lv.getX(), (float)lv.getY(), (float)lv.getZ(), new Vector3f());
       int k = 8;
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-10-16 01:43:50.855239906 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-16 01:42:40.631348264 +0000
@@ -42,6 +42,7 @@
 import net.minecraft.loot.context.LootContextTypes;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderSet;
+import net.minecraft.registry.KeyedValue;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -53,7 +54,6 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.State;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_jquyxssk;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -1971,15 +1971,15 @@
       private RegistryKey<Block> key;
       /**
        * @mapping {@literal hashed f_pxqjcqnw Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_pxqjcqnw:Lnet/minecraft/unmapped/C_jquyxssk;}
-       * @mapping {@literal named lootTableId Lnet/minecraft/block/AbstractBlock$Settings;lootTableId:Lnet/minecraft/unmapped/C_jquyxssk;}
+       * @mapping {@literal named lootTableId Lnet/minecraft/block/AbstractBlock$Settings;lootTableId:Lnet/minecraft/registry/KeyedValue;}
        */
-      private C_jquyxssk<Block, Optional<RegistryKey<LootTable>>> lootTableId = key -> Optional.of(
+      private KeyedValue<Block, Optional<RegistryKey<LootTable>>> lootTableId = key -> Optional.of(
             RegistryKey.of(RegistryKeys.LOOT_TABLE, key.getValue().withPrefix("blocks/"))
          );
       /**
        * Mapping not found
        */
-      private C_jquyxssk<Block, String> f_gxswpnob = arg -> Util.createTranslationKey("block", arg.getValue());
+      private KeyedValue<Block, String> f_gxswpnob = arg -> Util.createTranslationKey("block", arg.getValue());
       /**
        * @mapping {@literal hashed f_obppjqdx Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_obppjqdx:Z}
        * @mapping {@literal named opaque Lnet/minecraft/block/AbstractBlock$Settings;opaque:Z}
@@ -2309,15 +2309,16 @@
        * @mapping {@literal named dropsNothing Lnet/minecraft/block/AbstractBlock$Settings;dropsNothing()Lnet/minecraft/block/AbstractBlock$Settings;}
        */
       public AbstractBlock.Settings dropsNothing() {
-         this.lootTableId = C_jquyxssk.fixed(Optional.empty());
+         this.lootTableId = KeyedValue.fixed(Optional.empty());
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_nbpsnvhc Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_nbpsnvhc(Ljava/util/Optional;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
+       * @mapping {@literal named m_nbpsnvhc Lnet/minecraft/block/AbstractBlock$Settings;m_nbpsnvhc(Ljava/util/Optional;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings m_nbpsnvhc(Optional<RegistryKey<LootTable>> optional) {
-         this.lootTableId = C_jquyxssk.fixed(optional);
+      public AbstractBlock.Settings m_nbpsnvhc(Optional<RegistryKey<LootTable>> value) {
+         this.lootTableId = KeyedValue.fixed(value);
          return this;
       }
 
@@ -2548,10 +2549,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_oileiccy Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_oileiccy(Ljava/lang/String;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
+       * @mapping {@literal named m_oileiccy Lnet/minecraft/block/AbstractBlock$Settings;m_oileiccy(Ljava/lang/String;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings m_oileiccy(String string) {
-         this.f_gxswpnob = C_jquyxssk.fixed(string);
+      public AbstractBlock.Settings m_oileiccy(String value) {
+         this.f_gxswpnob = KeyedValue.fixed(value);
          return this;
       }
 
diff -bur namedTargetSrc/net/minecraft/block/BambooBlock.java namedSrc/net/minecraft/block/BambooBlock.java
--- namedTargetSrc/net/minecraft/block/BambooBlock.java	2024-10-16 01:43:50.843239923 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2024-10-16 01:42:40.619348282 +0000
@@ -145,7 +145,7 @@
    protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       VoxelShape lv = state.get(LEAVES) == BambooLeaves.LARGE ? LARGE_LEAVES_SHAPE : SMALL_LEAVES_SHAPE;
       Vec3d lv2 = state.getModelOffset(pos);
-      return lv.m_nxfuxmhj(lv2.x, lv2.y, lv2.z);
+      return lv.offset(lv2.x, lv2.y, lv2.z);
    }
 
    /**
@@ -162,7 +162,7 @@
    @Override
    protected VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       Vec3d lv = state.getModelOffset(pos);
-      return LEAFLESS_SHAPE.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return LEAFLESS_SHAPE.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/BambooSaplingBlock.java namedSrc/net/minecraft/block/BambooSaplingBlock.java
--- namedTargetSrc/net/minecraft/block/BambooSaplingBlock.java	2024-10-16 01:43:51.019239676 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2024-10-16 01:42:40.827347966 +0000
@@ -61,7 +61,7 @@
    @Override
    protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       Vec3d lv = state.getModelOffset(pos);
-      return SHAPE.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return SHAPE.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-10-16 01:43:51.139239507 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-16 01:42:40.983347729 +0000
@@ -291,7 +291,7 @@
     */
    public static BlockState pushEntitiesUpBeforeBlockChange(BlockState from, BlockState to, WorldAccess world, BlockPos pos) {
       VoxelShape lv = VoxelShapes.combine(from.getCollisionShape(world, pos), to.getCollisionShape(world, pos), BooleanBiFunction.ONLY_SECOND)
-         .m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
+         .offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
       if (lv.isEmpty()) {
          return to;
       } else {
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-16 01:43:51.091239575 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-16 01:42:40.927347814 +0000
@@ -2,10 +2,10 @@
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -26,13 +26,13 @@
     * @mapping {@literal hashed f_iqvprvdq Lnet/minecraft/unmapped/C_hzrcnxyg;f_iqvprvdq:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named boatType Lnet/minecraft/block/dispenser/BoatDispenserBehavior;boatType:Lnet/minecraft/entity/EntityType;}
     */
-   private final EntityType<? extends C_sfpofsgc> boatType;
+   private final EntityType<? extends AbstractBoatEntity> boatType;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hzrcnxyg;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/dispenser/BoatDispenserBehavior;<init>(Lnet/minecraft/entity/EntityType;)V}
     */
-   public BoatDispenserBehavior(EntityType<? extends C_sfpofsgc> boatType) {
+   public BoatDispenserBehavior(EntityType<? extends AbstractBoatEntity> boatType) {
       this.boatType = boatType;
    }
 
@@ -60,7 +60,7 @@
          h = 0.0;
       }
 
-      C_sfpofsgc lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
+      AbstractBoatEntity lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
       if (lv5 != null) {
          lv5.m_busvmoue(e, f + h, g);
          EntityType.createDefaultStackSpawnConfig(lv2, stack, null).accept(lv5);
diff -bur namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-16 01:43:51.087239580 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-16 01:42:40.927347814 +0000
@@ -190,7 +190,7 @@
     * @mapping {@literal named playSound Lnet/minecraft/block/entity/BarrelBlockEntity;playSound(Lnet/minecraft/block/BlockState;Lnet/minecraft/sound/SoundEvent;)V}
     */
    void playSound(BlockState state, SoundEvent soundEvent) {
-      Vec3i lv = ((Direction)state.get(BarrelBlock.FACING)).m_uinacubi();
+      Vec3i lv = ((Direction)state.get(BarrelBlock.FACING)).asVec3i();
       double d = (double)this.pos.getX() + 0.5 + (double)lv.getX() / 2.0;
       double e = (double)this.pos.getY() + 0.5 + (double)lv.getY() / 2.0;
       double f = (double)this.pos.getZ() + 0.5 + (double)lv.getZ() / 2.0;
diff -bur namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-16 01:43:50.975239738 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-16 01:42:40.771348051 +0000
@@ -330,7 +330,7 @@
                   double e = (double)pos.getX() + 0.5 + d * (double)lv.getOffsetX();
                   double g = (double)pos.getY() + 0.5 - (double)(lv3.getHeight() / 2.0F);
                   double h = (double)pos.getZ() + 0.5 + d * (double)lv.getOffsetZ();
-                  lv3.refreshPositionAndAngles(e, g, h, lv3.m_ndosmusf(), lv3.m_ahrprint());
+                  lv3.refreshPositionAndAngles(e, g, h, lv3.getYaw(), lv3.getPitch());
                }
 
                world.playSound(null, pos, SoundEvents.BLOCK_BEEHIVE_EXIT, SoundCategory.BLOCKS, 1.0F, 1.0F);
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-16 01:43:51.095239569 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-16 01:42:40.935347802 +0000
@@ -534,7 +534,7 @@
          double d = (double)((float)this.facing.getOffsetX() * f);
          double e = (double)((float)this.facing.getOffsetY() * f);
          double g = (double)((float)this.facing.getOffsetZ() * f);
-         return VoxelShapes.union(lv, lv4.getCollisionShape(world, pos).m_nxfuxmhj(d, e, g));
+         return VoxelShapes.union(lv, lv4.getCollisionShape(world, pos).offset(d, e, g));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/FlowerBlock.java namedSrc/net/minecraft/block/FlowerBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerBlock.java	2024-10-16 01:43:51.079239592 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-10-16 01:42:40.891347869 +0000
@@ -86,7 +86,7 @@
    @Override
    protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       Vec3d lv = state.getModelOffset(pos);
-      return SHAPE.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return SHAPE.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/HoneyBlock.java namedSrc/net/minecraft/block/HoneyBlock.java
--- namedTargetSrc/net/minecraft/block/HoneyBlock.java	2024-10-16 01:43:51.055239625 +0000
+++ namedSrc/net/minecraft/block/HoneyBlock.java	2024-10-16 01:42:40.867347905 +0000
@@ -6,12 +6,12 @@
 import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.TntEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
@@ -75,7 +75,7 @@
     * @mapping {@literal named hasHoneyBlockEffects Lnet/minecraft/block/HoneyBlock;hasHoneyBlockEffects(Lnet/minecraft/entity/Entity;)Z}
     */
    private static boolean hasHoneyBlockEffects(Entity entity) {
-      return entity instanceof LivingEntity || entity instanceof AbstractMinecartEntity || entity instanceof TntEntity || entity instanceof C_sfpofsgc;
+      return entity instanceof LivingEntity || entity instanceof AbstractMinecartEntity || entity instanceof TntEntity || entity instanceof AbstractBoatEntity;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/LilyPadBlock.java namedSrc/net/minecraft/block/LilyPadBlock.java
--- namedTargetSrc/net/minecraft/block/LilyPadBlock.java	2024-10-16 01:43:51.007239693 +0000
+++ namedSrc/net/minecraft/block/LilyPadBlock.java	2024-10-16 01:42:40.811347990 +0000
@@ -2,10 +2,10 @@
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
@@ -49,7 +49,7 @@
    @Override
    protected void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
       super.onEntityCollision(state, world, pos, entity);
-      if (world instanceof ServerWorld && entity instanceof C_sfpofsgc) {
+      if (world instanceof ServerWorld && entity instanceof AbstractBoatEntity) {
          world.breakBlock(new BlockPos(pos), true, entity);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-10-16 01:43:50.827239945 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-10-16 01:42:40.603348307 +0000
@@ -132,7 +132,7 @@
          lv2 = SHAPES[state.get(AGE_4)];
       }
 
-      return lv2.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return lv2.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-16 01:43:50.883239867 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-16 01:42:40.667348209 +0000
@@ -454,7 +454,7 @@
       }
 
       Vec3d lv8 = state.getModelOffset(pos);
-      return lv2.m_nxfuxmhj(lv8.x, 0.0, lv8.z);
+      return lv2.offset(lv8.x, 0.0, lv8.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ScaffoldingBlock.java namedSrc/net/minecraft/block/ScaffoldingBlock.java
--- namedTargetSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-16 01:43:51.039239647 +0000
+++ namedSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-16 01:42:40.847347935 +0000
@@ -54,7 +54,7 @@
     * @mapping {@literal hashed f_bvlredpv Lnet/minecraft/unmapped/C_gtgfyrcn;f_bvlredpv:Lnet/minecraft/unmapped/C_zscvhwbd;}
     * @mapping {@literal named OUTLINE_SHAPE Lnet/minecraft/block/ScaffoldingBlock;OUTLINE_SHAPE:Lnet/minecraft/util/shape/VoxelShape;}
     */
-   private static final VoxelShape OUTLINE_SHAPE = VoxelShapes.fullCube().m_nxfuxmhj(0.0, -1.0, 0.0);
+   private static final VoxelShape OUTLINE_SHAPE = VoxelShapes.fullCube().offset(0.0, -1.0, 0.0);
    /**
     * @mapping {@literal hashed f_ngmcspig Lnet/minecraft/unmapped/C_gtgfyrcn;f_ngmcspig:I}
     * @mapping {@literal named MAX_DISTANCE Lnet/minecraft/block/ScaffoldingBlock;MAX_DISTANCE:I}
diff -bur namedTargetSrc/net/minecraft/block/SweetBerryBushBlock.java namedSrc/net/minecraft/block/SweetBerryBushBlock.java
--- namedTargetSrc/net/minecraft/block/SweetBerryBushBlock.java	2024-10-16 01:43:51.123239530 +0000
+++ namedSrc/net/minecraft/block/SweetBerryBushBlock.java	2024-10-16 01:42:40.963347759 +0000
@@ -132,7 +132,7 @@
                double d = Math.abs(lv3.getX());
                double e = Math.abs(lv3.getZ());
                if (d >= 0.003F || e >= 0.003F) {
-                  entity.m_fuenwjjy(lv, world.getDamageSources().sweetBerryBush(), 1.0F);
+                  entity.damage(lv, world.getDamageSources().sweetBerryBush(), 1.0F);
                }
             }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-16 01:43:51.103239558 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-16 01:42:40.939347796 +0000
@@ -474,7 +474,7 @@
          );
          list.add(
             String.format(
-               Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", lv8, string11, MathHelper.wrapDegrees(lv7.m_ndosmusf()), MathHelper.wrapDegrees(lv7.m_ahrprint())
+               Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", lv8, string11, MathHelper.wrapDegrees(lv7.getYaw()), MathHelper.wrapDegrees(lv7.getPitch())
             )
          );
          WorldChunk lv11 = this.getClientChunk();
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-16 01:43:50.951239771 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-16 01:42:40.743348093 +0000
@@ -126,8 +126,8 @@
       float j = -1.0F;
       float k = 1.0F;
       float l = -0.5F;
-      float m = -client.player.m_ndosmusf() / 64.0F;
-      float n = client.player.m_ahrprint() / 64.0F;
+      float m = -client.player.getYaw() / 64.0F;
+      float n = client.player.getPitch() / 64.0F;
       Matrix4f matrix4f = matrices.peek().getModel();
       BufferBuilder lv2 = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
       lv2.xyz(matrix4f, -1.0F, -1.0F, -0.5F).uv0(4.0F + m, 4.0F + n);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-16 01:43:50.863239895 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-16 01:42:40.635348257 +0000
@@ -164,15 +164,15 @@
       Quaternionf quaternionf2 = new Quaternionf().rotateX(q * 20.0F * (float) (Math.PI / 180.0));
       quaternionf.mul(quaternionf2);
       float r = entity.bodyYaw;
-      float s = entity.m_ndosmusf();
-      float t = entity.m_ahrprint();
+      float s = entity.getYaw();
+      float t = entity.getPitch();
       float u = entity.prevHeadYaw;
       float v = entity.headYaw;
       entity.bodyYaw = 180.0F + p * 20.0F;
       entity.setYaw(180.0F + p * 40.0F);
       entity.setPitch(-q * 20.0F);
-      entity.headYaw = entity.m_ndosmusf();
-      entity.prevHeadYaw = entity.m_ndosmusf();
+      entity.headYaw = entity.getYaw();
+      entity.prevHeadYaw = entity.getYaw();
       float w = entity.getScaleFactor();
       Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + offsetY * w, 0.0F);
       float x = (float)size / w;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-16 01:43:50.999239704 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-16 01:42:40.799348008 +0000
@@ -169,8 +169,8 @@
       this.display.setShowArms(true);
       this.display.bodyYaw = 210.0F;
       this.display.setPitch(25.0F);
-      this.display.headYaw = this.display.m_ndosmusf();
-      this.display.prevHeadYaw = this.display.m_ndosmusf();
+      this.display.headYaw = this.display.getYaw();
+      this.display.prevHeadYaw = this.display.getYaw();
       this.displayStack(this.handler.getSlot(3).getStack());
    }
 
diff -bur namedTargetSrc/net/minecraft/client/Keyboard.java namedSrc/net/minecraft/client/Keyboard.java
--- namedTargetSrc/net/minecraft/client/Keyboard.java	2024-10-16 01:43:50.983239726 +0000
+++ namedSrc/net/minecraft/client/Keyboard.java	2024-10-16 01:42:40.783348033 +0000
@@ -245,8 +245,8 @@
                         this.client.player.getX(),
                         this.client.player.getY(),
                         this.client.player.getZ(),
-                        this.client.player.m_ndosmusf(),
-                        this.client.player.m_ahrprint()
+                        this.client.player.getYaw(),
+                        this.client.player.getPitch()
                      )
                   );
                   return true;
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-10-16 01:43:50.867239890 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-16 01:42:40.647348239 +0000
@@ -3857,8 +3857,8 @@
       int k = this.window.getFramebufferWidth();
       int l = this.window.getFramebufferHeight();
       Framebuffer lv = new SimpleFramebuffer(width, height, true);
-      float f = this.player.m_ahrprint();
-      float g = this.player.m_ndosmusf();
+      float f = this.player.getPitch();
+      float g = this.player.getYaw();
       float h = this.player.prevPitch;
       float m = this.player.prevYaw;
       this.gameRenderer.setBlockOutlineEnabled(false);
@@ -3897,8 +3897,8 @@
                   this.player.setPitch(90.0F);
             }
 
-            this.player.prevYaw = this.player.m_ndosmusf();
-            this.player.prevPitch = this.player.m_ahrprint();
+            this.player.prevYaw = this.player.getYaw();
+            this.player.prevPitch = this.player.getPitch();
             lv.beginWrite(true);
             this.gameRenderer.renderWorld(DeltaTracker.ONE);
 
diff -bur namedTargetSrc/net/minecraft/client/model/Model.java namedSrc/net/minecraft/client/model/Model.java
--- namedTargetSrc/net/minecraft/client/model/Model.java	2024-10-16 01:43:51.095239569 +0000
+++ namedSrc/net/minecraft/client/model/Model.java	2024-10-16 01:42:40.935347802 +0000
@@ -133,7 +133,7 @@
     * Mapping not found
     */
    protected void m_emzlezbo(AnimationState arg, Animation arg2, float f, float g) {
-      arg.animateIfValid(arg2x -> Animator.animate(this, arg2, (long)((float)arg2x.m_hbqomwtk(f) * g), 1.0F, f_qfztkxfk));
+      arg.animateIfValid(arg2x -> Animator.animate(this, arg2, (long)((float)arg2x.getTimeMillis(f) * g), 1.0F, f_qfztkxfk));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-16 01:43:50.991239715 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-16 01:42:40.795348015 +0000
@@ -53,6 +53,7 @@
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerAbilities;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
@@ -75,7 +76,6 @@
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_bjnewvkq;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_zcisasac;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ClickType;
@@ -391,7 +391,7 @@
     */
    @Override
    public float getPitch(float tickDelta) {
-      return this.m_ahrprint();
+      return this.getPitch();
    }
 
    /**
@@ -399,7 +399,7 @@
     */
    @Override
    public float getYaw(float tickDelta) {
-      return this.hasVehicle() ? super.getYaw(tickDelta) : this.m_ndosmusf();
+      return this.hasVehicle() ? super.getYaw(tickDelta) : this.getYaw();
    }
 
    /**
@@ -416,7 +416,7 @@
       }
 
       if (this.hasVehicle()) {
-         this.networkHandler.send(new PlayerMoveC2SPacket.LookAndOnGround(this.m_ndosmusf(), this.m_ahrprint(), this.isOnGround(), this.horizontalCollision));
+         this.networkHandler.send(new PlayerMoveC2SPacket.LookAndOnGround(this.getYaw(), this.getPitch(), this.isOnGround(), this.horizontalCollision));
          Entity lv = this.getRootVehicle();
          if (lv != this && lv.isLogicalSideForUpdatingMovement()) {
             this.networkHandler.send(new VehicleMoveC2SPacket(lv));
@@ -458,8 +458,8 @@
          double d = this.getX() - this.lastX;
          double e = this.getY() - this.f_scgekrvy;
          double f = this.getZ() - this.lastZ;
-         double g = (double)(this.m_ndosmusf() - this.lastYaw);
-         double h = (double)(this.m_ahrprint() - this.lastPitch);
+         double g = (double)(this.getYaw() - this.lastYaw);
+         double h = (double)(this.getPitch() - this.lastPitch);
          this.ticksSinceLastPositionPacketSent++;
          boolean bl = MathHelper.lengthSquared(d, e, f) > MathHelper.square(2.0E-4) || this.ticksSinceLastPositionPacketSent >= 20;
          boolean bl2 = g != 0.0 || h != 0.0;
@@ -467,15 +467,14 @@
             this.networkHandler
                .send(
                   new PlayerMoveC2SPacket.Full(
-                     this.getX(), this.getY(), this.getZ(), this.m_ndosmusf(), this.m_ahrprint(), this.isOnGround(), this.horizontalCollision
+                     this.getX(), this.getY(), this.getZ(), this.getYaw(), this.getPitch(), this.isOnGround(), this.horizontalCollision
                   )
                );
          } else if (bl) {
             this.networkHandler
                .send(new PlayerMoveC2SPacket.PositionAndOnGround(this.getX(), this.getY(), this.getZ(), this.isOnGround(), this.horizontalCollision));
          } else if (bl2) {
-            this.networkHandler
-               .send(new PlayerMoveC2SPacket.LookAndOnGround(this.m_ndosmusf(), this.m_ahrprint(), this.isOnGround(), this.horizontalCollision));
+            this.networkHandler.send(new PlayerMoveC2SPacket.LookAndOnGround(this.getYaw(), this.getPitch(), this.isOnGround(), this.horizontalCollision));
          } else if (this.lastOnGround != this.isOnGround() || this.f_rcgfrcgp != this.horizontalCollision) {
             this.networkHandler.send(new PlayerMoveC2SPacket.OnGroundOnly(this.isOnGround(), this.horizontalCollision));
          }
@@ -488,8 +487,8 @@
          }
 
          if (bl2) {
-            this.lastYaw = this.m_ndosmusf();
-            this.lastPitch = this.m_ahrprint();
+            this.lastYaw = this.getYaw();
+            this.lastPitch = this.getPitch();
          }
 
          this.lastOnGround = this.isOnGround();
@@ -1011,8 +1010,8 @@
          this.jumping = this.input.f_ywxgimqb.jump();
          this.lastRenderYaw = this.renderYaw;
          this.lastRenderPitch = this.renderPitch;
-         this.renderPitch = this.renderPitch + (this.m_ahrprint() - this.renderPitch) * 0.5F;
-         this.renderYaw = this.renderYaw + (this.m_ndosmusf() - this.renderYaw) * 0.5F;
+         this.renderPitch = this.renderPitch + (this.getPitch() - this.renderPitch) * 0.5F;
+         this.renderYaw = this.renderYaw + (this.getYaw() - this.renderYaw) * 0.5F;
       }
    }
 
@@ -1272,7 +1271,7 @@
    public void tickRiding() {
       super.tickRiding();
       this.riding = false;
-      if (this.getControlledVehicle() instanceof C_sfpofsgc lv) {
+      if (this.getControlledVehicle() instanceof AbstractBoatEntity lv) {
          lv.m_wdzivrij(this.input.f_ywxgimqb.left(), this.input.f_ywxgimqb.right(), this.input.f_ywxgimqb.forward(), this.input.f_ywxgimqb.backward());
          this.riding = this.riding
             | (this.input.f_ywxgimqb.left() || this.input.f_ywxgimqb.right() || this.input.f_ywxgimqb.forward() || this.input.f_ywxgimqb.backward());
@@ -1346,8 +1345,8 @@
             Vec2f lv4 = this.input.m_jpymendx();
             float j = h * lv4.x;
             float k = h * lv4.y;
-            float l = MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0));
-            float m = MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0));
+            float l = MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0));
+            float m = MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0));
             lv3 = new Vec3d((double)(j * m - k * l), lv3.y, (double)(k * m + j * l));
             i = (float)lv3.lengthSquared();
             if (i <= 0.001F) {
@@ -1437,7 +1436,7 @@
     */
    @Override
    protected boolean hasCollidedSoftly(Vec3d adjustedMovement) {
-      float f = this.m_ndosmusf() * (float) (Math.PI / 180.0);
+      float f = this.getYaw() * (float) (Math.PI / 180.0);
       double d = (double)MathHelper.sin(f);
       double e = (double)MathHelper.cos(f);
       double g = (double)this.sidewaysSpeed * e - (double)this.forwardSpeed * d;
@@ -1589,8 +1588,8 @@
    @Override
    public Vec3d getLeashHoldPosition(float delta) {
       if (this.client.options.getPerspective().isFirstPerson()) {
-         float g = MathHelper.lerp(delta * 0.5F, this.m_ndosmusf(), this.prevYaw) * (float) (Math.PI / 180.0);
-         float h = MathHelper.lerp(delta * 0.5F, this.m_ahrprint(), this.prevPitch) * (float) (Math.PI / 180.0);
+         float g = MathHelper.lerp(delta * 0.5F, this.getYaw(), this.prevYaw) * (float) (Math.PI / 180.0);
+         float h = MathHelper.lerp(delta * 0.5F, this.getPitch(), this.prevPitch) * (float) (Math.PI / 180.0);
          double d = this.getMainArm() == Arm.RIGHT ? -1.0 : 1.0;
          Vec3d lv = new Vec3d(0.39 * d, -0.6, 0.3);
          return lv.rotateX(-h).rotateY(-g).add(this.getLerpedEyePos(delta));
@@ -1612,7 +1611,7 @@
     */
    @Override
    public float getVisualYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-16 01:43:50.811239968 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-16 01:42:40.587348330 +0000
@@ -454,7 +454,7 @@
          this.syncSelectedSlot();
          MutableObject<ActionResult> mutableObject = new MutableObject<>();
          this.sendActionPacket(this.client.world, i -> {
-            PlayerInteractionWithItemC2SPacket lv = new PlayerInteractionWithItemC2SPacket(hand, i, player.m_ndosmusf(), player.m_ahrprint());
+            PlayerInteractionWithItemC2SPacket lv = new PlayerInteractionWithItemC2SPacket(hand, i, player.getYaw(), player.getPitch());
             ItemStack lv2 = player.getStackInHand(hand);
             if (player.getItemCooldownManager().isCoolingDown(lv2)) {
                mutableObject.setValue(ActionResult.PASS);
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-16 01:43:51.115239541 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-16 01:42:40.955347772 +0000
@@ -87,6 +87,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.projectile.ExplosiveProjectileEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.inventory.SimpleInventory;
@@ -297,7 +298,6 @@
 import net.minecraft.unmapped.C_npripfjn;
 import net.minecraft.unmapped.C_poljqryj;
 import net.minecraft.unmapped.C_rrcmfgnk;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_uepzhiii;
 import net.minecraft.unmapped.C_uqhumrao;
 import net.minecraft.unmapped.C_wkpqgkjo;
@@ -802,8 +802,8 @@
                      this.client.player.getX(),
                      this.client.player.getY(),
                      this.client.player.getZ(),
-                     this.client.player.m_ndosmusf(),
-                     this.client.player.m_ahrprint(),
+                     this.client.player.getYaw(),
+                     this.client.player.getPitch(),
                      false,
                      false
                   )
@@ -945,7 +945,7 @@
          m_noarotfs(packet.change(), packet.relatives(), lv, false);
       }
 
-      this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.m_ndosmusf(), lv.m_ahrprint(), false, false));
+      this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.getYaw(), lv.getPitch(), false, false));
       this.connection.send(new TeleportConfirmationC2SPacket(packet.id()));
    }
 
@@ -983,7 +983,7 @@
       lv.setYaw(arg.yRot());
       lv.setPitch(arg.xRot());
       lv.m_kashyvjh();
-      this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.m_ndosmusf(), lv.m_ahrprint(), false, false));
+      this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.getYaw(), lv.getPitch(), false, false));
    }
 
    /**
@@ -1346,10 +1346,10 @@
                if (lv2 == this.client.player) {
                   this.f_mhfzfcqe = OptionalInt.empty();
                   if (!bl) {
-                     if (lv instanceof C_sfpofsgc) {
-                        this.client.player.prevYaw = lv.m_ndosmusf();
-                        this.client.player.setYaw(lv.m_ndosmusf());
-                        this.client.player.setHeadYaw(lv.m_ndosmusf());
+                     if (lv instanceof AbstractBoatEntity) {
+                        this.client.player.prevYaw = lv.getYaw();
+                        this.client.player.setYaw(lv.getYaw());
+                        this.client.player.setHeadYaw(lv.getYaw());
                      }
 
                      Text lv3 = Text.translatable("mount.onboard", this.client.options.sneakKey.getKeyName());
@@ -1501,8 +1501,8 @@
          }
 
          lv8.setVelocity(lv4.getVelocity());
-         lv8.setYaw(lv4.m_ndosmusf());
-         lv8.setPitch(lv4.m_ahrprint());
+         lv8.setYaw(lv4.getYaw());
+         lv8.setPitch(lv4.getPitch());
       } else {
          lv8.init();
          lv8.setYaw(-180.0F);
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-16 01:43:51.135239513 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-16 01:42:40.975347741 +0000
@@ -56,7 +56,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_jaiycnbg(DamageSource arg) {
+   public boolean damageClient(DamageSource source) {
       return true;
    }
 
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-10-16 01:43:50.979239732 +0000
+++ namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-16 01:42:40.779348039 +0000
@@ -136,7 +136,7 @@
             .world
             .getBlockState(pos)
             .getCollisionShape(this.client.world, pos, ShapeContext.absent())
-            .m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()),
+            .offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()),
          -cameraX,
          -cameraY,
          -cameraZ,
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java	2024-10-16 01:43:50.811239968 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java	2024-10-16 01:42:40.587348330 +0000
@@ -54,8 +54,8 @@
    public void m_tskwgjqs(ArmadilloEntity arg, C_sawfkyic arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_wpyoivpi = arg.shouldHideInShell();
-      arg2.f_hscpjuca.m_fjeaaddd(arg.scaredState);
-      arg2.f_ycqmlbam.m_fjeaaddd(arg.unrollingState);
-      arg2.f_tpqeczpy.m_fjeaaddd(arg.rollingState);
+      arg2.f_hscpjuca.copyFrom(arg.scaredState);
+      arg2.f_ycqmlbam.copyFrom(arg.unrollingState);
+      arg2.f_tpqeczpy.copyFrom(arg.rollingState);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java	2024-10-16 01:43:50.899239844 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java	2024-10-16 01:42:40.687348179 +0000
@@ -84,11 +84,11 @@
    public void m_uigfpsip(ArmorStandEntity arg, C_ykegzsxw arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       BipedEntityRenderer.m_smedlblp(arg, arg2, f);
-      arg2.f_jywehgew = MathHelper.lerpDegrees(f, arg.prevYaw, arg.m_ndosmusf());
+      arg2.f_jywehgew = MathHelper.lerpDegrees(f, arg.prevYaw, arg.getYaw());
       arg2.f_oiqminhv = arg.isMarker();
       arg2.f_qoqillii = arg.isSmall();
-      arg2.f_vffanfrv = arg.m_fjamjtjb();
-      arg2.f_alkggoeq = arg.m_kruazguc();
+      arg2.f_vffanfrv = arg.showsArms();
+      arg2.f_alkggoeq = arg.showsBasePlate();
       arg2.f_jbfyhrpp = arg.getBodyRotation();
       arg2.f_yulwaqpa = arg.getHeadRotation();
       arg2.f_pmwdwspv = arg.getLeftArmRotation();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-16 01:43:51.079239592 +0000
+++ namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-16 01:42:40.915347832 +0000
@@ -51,7 +51,7 @@
    public void m_uigfpsip(BatEntity arg, C_hioibjxt arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_ywaiepfu = arg.isRoosting();
-      arg2.f_spvloupe.m_fjeaaddd(arg.flyingState);
-      arg2.f_ixqtgflh.m_fjeaaddd(arg.roostingState);
+      arg2.f_spvloupe.copyFrom(arg.flyingState);
+      arg2.f_ixqtgflh.copyFrom(arg.roostingState);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-16 01:43:51.027239664 +0000
+++ namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-16 01:42:40.835347954 +0000
@@ -84,9 +84,9 @@
       arg2.f_pepbakja = (float)CrossbowItem.getLoadingTime(entity.getActiveItem(), entity);
       arg2.f_jamiehth = entity.getItemUseTime();
       arg2.f_vdjfqfsy = entity.isUsingItem();
-      arg2.f_qolsfybw = entity.f_aydtoono.m_srnvybfn(f);
-      arg2.f_cyxaecyl = entity.f_aydtoono.m_krukcnbc(f);
-      arg2.f_zsxuvwrs = entity.f_aydtoono.m_hbtboris(f);
+      arg2.f_qolsfybw = entity.elytraState.getPitch(f);
+      arg2.f_cyxaecyl = entity.elytraState.getYaw(f);
+      arg2.f_zsxuvwrs = entity.elytraState.getRoll(f);
       arg2.f_yculljvb = entity.getEquippedStack(EquipmentSlot.CHEST).copy();
       arg2.f_zczpquho = entity.getEquippedStack(EquipmentSlot.LEGS).copy();
       arg2.f_njlfynem = entity.getEquippedStack(EquipmentSlot.FEET).copy();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-16 01:43:50.839239929 +0000
+++ namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-16 01:42:40.615348288 +0000
@@ -67,12 +67,12 @@
     */
    public void m_tskwgjqs(BreezeEntity arg, C_wijpudah arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_upawnodv.m_fjeaaddd(arg.idleState);
-      arg2.f_dolazhda.m_fjeaaddd(arg.shootingState);
-      arg2.f_ckbyqlwp.m_fjeaaddd(arg.slidingState);
-      arg2.f_hbjarxro.m_fjeaaddd(arg.slidingBackState);
-      arg2.f_oytitiyk.m_fjeaaddd(arg.inhalingState);
-      arg2.f_pvumklox.m_fjeaaddd(arg.longJumpState);
+      arg2.f_upawnodv.copyFrom(arg.idleState);
+      arg2.f_dolazhda.copyFrom(arg.shootingState);
+      arg2.f_ckbyqlwp.copyFrom(arg.slidingState);
+      arg2.f_hbjarxro.copyFrom(arg.slidingBackState);
+      arg2.f_oytitiyk.copyFrom(arg.inhalingState);
+      arg2.f_pvumklox.copyFrom(arg.longJumpState);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java namedSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java	2024-10-16 01:43:51.031239659 +0000
+++ namedSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java	2024-10-16 01:42:40.839347948 +0000
@@ -54,10 +54,10 @@
       arg2.f_jakaoofo = arg.isSaddled();
       arg2.f_kdpdiedc = arg.hasPassengers();
       arg2.f_iqqzwnsn = Math.max((float)arg.getJumpCooldown() - f, 0.0F);
-      arg2.f_mdvlisqf.m_fjeaaddd(arg.sitState);
-      arg2.f_hnjtngys.m_fjeaaddd(arg.sittingState);
-      arg2.f_tkktkquu.m_fjeaaddd(arg.standUpState);
-      arg2.f_qgiqqlrv.m_fjeaaddd(arg.idleState);
-      arg2.f_waluzkih.m_fjeaaddd(arg.dashState);
+      arg2.f_mdvlisqf.copyFrom(arg.sitState);
+      arg2.f_hnjtngys.copyFrom(arg.sittingState);
+      arg2.f_tkktkquu.copyFrom(arg.standUpState);
+      arg2.f_qgiqqlrv.copyFrom(arg.idleState);
+      arg2.f_waluzkih.copyFrom(arg.dashState);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-16 01:43:51.051239631 +0000
+++ namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-16 01:42:40.863347912 +0000
@@ -72,7 +72,7 @@
     */
    public void m_tskwgjqs(EvokerFangsEntity arg, C_slughlgb arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_bbxrwgra = arg.m_ndosmusf();
+      arg2.f_bbxrwgra = arg.getYaw();
       arg2.f_ipsdfzci = arg.getAnimationProgress(f);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-16 01:43:50.855239906 +0000
+++ namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-16 01:42:40.631348264 +0000
@@ -45,10 +45,10 @@
    public void m_tskwgjqs(FrogEntity arg, C_jvfahcsc arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_ohjecduc = arg.isInsideWaterOrBubbleColumn();
-      arg2.f_yokqubjx.m_fjeaaddd(arg.longJumpAnimationState);
-      arg2.f_kbepgwtm.m_fjeaaddd(arg.croakAnimationState);
-      arg2.f_oxuvptfa.m_fjeaaddd(arg.tongueAnimationState);
-      arg2.f_yesvirgh.m_fjeaaddd(arg.floatAnimationState);
+      arg2.f_yokqubjx.copyFrom(arg.longJumpAnimationState);
+      arg2.f_kbepgwtm.copyFrom(arg.croakAnimationState);
+      arg2.f_oxuvptfa.copyFrom(arg.tongueAnimationState);
+      arg2.f_yesvirgh.copyFrom(arg.floatAnimationState);
       arg2.f_qioxjbek = arg.getVariant().getValue().textureId();
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-16 01:43:51.047239637 +0000
+++ namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-16 01:42:40.855347924 +0000
@@ -53,11 +53,11 @@
    public void m_tskwgjqs(SnifferEntity arg, C_aqiuqico arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_ztfjaurp = arg.isSearching();
-      arg2.f_xidorafg.m_fjeaaddd(arg.diggingAnimationState);
-      arg2.f_jfcgrhob.m_fjeaaddd(arg.sniffingAnimationState);
-      arg2.f_utldhivl.m_fjeaaddd(arg.risingAnimationState);
-      arg2.f_twimsecs.m_fjeaaddd(arg.happyAnimationState);
-      arg2.f_zvcpcfxp.m_fjeaaddd(arg.scentingAnimationState);
+      arg2.f_xidorafg.copyFrom(arg.diggingAnimationState);
+      arg2.f_jfcgrhob.copyFrom(arg.sniffingAnimationState);
+      arg2.f_utldhivl.copyFrom(arg.risingAnimationState);
+      arg2.f_twimsecs.copyFrom(arg.happyAnimationState);
+      arg2.f_zvcpcfxp.copyFrom(arg.scentingAnimationState);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/WardenRenderer.java namedSrc/net/minecraft/client/render/entity/WardenRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-16 01:43:50.967239749 +0000
+++ namedSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-16 01:42:40.759348069 +0000
@@ -102,11 +102,11 @@
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_qzhodwgz = arg.getTendrilAnimation(f);
       arg2.f_xvqlqmho = arg.getHeartAnimation(f);
-      arg2.f_tyvlitng.m_fjeaaddd(arg.roaringAnimation);
-      arg2.f_cgkhsdqx.m_fjeaaddd(arg.sniffingAnimation);
-      arg2.f_itqcqpad.m_fjeaaddd(arg.emergingAnimation);
-      arg2.f_suovhsuq.m_fjeaaddd(arg.diggingAnimation);
-      arg2.f_osqqucmn.m_fjeaaddd(arg.attackingAnimation);
-      arg2.f_qmcfvwub.m_fjeaaddd(arg.sonicBoomAnimation);
+      arg2.f_tyvlitng.copyFrom(arg.roaringAnimation);
+      arg2.f_cgkhsdqx.copyFrom(arg.sniffingAnimation);
+      arg2.f_itqcqpad.copyFrom(arg.emergingAnimation);
+      arg2.f_suovhsuq.copyFrom(arg.diggingAnimation);
+      arg2.f_osqqucmn.copyFrom(arg.attackingAnimation);
+      arg2.f_qmcfvwub.copyFrom(arg.sonicBoomAnimation);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-10-16 01:43:50.859239901 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-10-16 01:42:40.635348257 +0000
@@ -491,7 +491,7 @@
       Vec3d lv = hit.getPos();
       if (!lv.withinRange(pos, range)) {
          Vec3d lv2 = hit.getPos();
-         Direction lv3 = Direction.m_aceixrsp(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
+         Direction lv3 = Direction.getFacing(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
          return BlockHitResult.createMissed(lv2, lv3, BlockPos.fromPosition(lv2));
       } else {
          return hit;
diff -bur namedTargetSrc/net/minecraft/client/render/model/BakedQuadFactory.java namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java
--- namedTargetSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-16 01:43:50.839239929 +0000
+++ namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-16 01:42:40.615348288 +0000
@@ -293,7 +293,7 @@
          float f = 0.0F;
 
          for (Direction lv2 : Direction.values()) {
-            Vec3i lv3 = lv2.m_uinacubi();
+            Vec3i lv3 = lv2.asVec3i();
             Vector3f vector3f7 = new Vector3f((float)lv3.getX(), (float)lv3.getY(), (float)lv3.getZ());
             float g = vector3f6.dot(vector3f7);
             if (g >= 0.0F && g > f) {
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-10-16 01:43:51.031239659 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-16 01:42:40.839347948 +0000
@@ -536,7 +536,7 @@
       Entity lv = this.getEntityLookup().get(entityId);
       if (lv != null) {
          lv.setRemoved(removalReason);
-         lv.onRemoved();
+         lv.onRemovedClient();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorReader.java namedSrc/net/minecraft/command/EntitySelectorReader.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-16 01:43:51.079239592 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-16 01:42:40.915347832 +0000
@@ -430,11 +430,11 @@
     */
    private void buildPredicate() {
       if (this.pitchRange != FloatRangeArgument.ANY) {
-         this.predicates.add(this.rotationPredicate(this.pitchRange, Entity::m_ahrprint));
+         this.predicates.add(this.rotationPredicate(this.pitchRange, Entity::getPitch));
       }
 
       if (this.yawRange != FloatRangeArgument.ANY) {
-         this.predicates.add(this.rotationPredicate(this.yawRange, Entity::m_ndosmusf));
+         this.predicates.add(this.rotationPredicate(this.yawRange, Entity::getYaw));
       }
 
       if (!this.levelRange.isDummy()) {
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-16 01:43:51.079239592 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-16 01:42:40.915347832 +0000
@@ -1010,7 +1010,7 @@
       LootCondition.Builder[] lvs = (LootCondition.Builder[])ComparatorBlock.FACING.getValues().stream().map(direction -> {
          StatePredicate.Builder lv = StatePredicate.Builder.create().exactMatch(ComparatorBlock.FACING, direction);
          BlockPredicate.Builder lv2 = BlockPredicate.Builder.create().m_woxmzfan(arg, Blocks.COMPARATOR).state(lv);
-         return LocationCheckLootCondition.builder(LocationPredicate.Builder.create().block(lv2), new BlockPos(direction.getOpposite().m_uinacubi()));
+         return LocationCheckLootCondition.builder(LocationPredicate.Builder.create().block(lv2), new BlockPos(direction.getOpposite().asVec3i()));
       }).toArray(LootCondition.Builder[]::new);
       return ItemUsedOnLocationCriterionTrigger.Conditions.create(BlockStatePropertyLootCondition.builder(block), AnyOfLootCondition.create(lvs));
    }
@@ -1030,7 +1030,7 @@
                StatePredicate.Builder lv = StatePredicate.Builder.create().exactMatch(ComparatorBlock.FACING, direction);
                BlockStatePropertyLootCondition.Builder lv2 = new BlockStatePropertyLootCondition.Builder(Blocks.COMPARATOR).properties(lv);
                LootCondition.Builder lv3 = LocationCheckLootCondition.builder(
-                  LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().m_woxmzfan(arg, block)), new BlockPos(direction.m_uinacubi())
+                  LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().m_woxmzfan(arg, block)), new BlockPos(direction.asVec3i())
                );
                return AllOfLootCondition.builder(lv2, lv3);
             }
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/DamageEntity.java namedSrc/net/minecraft/enchantment/effect/DamageEntity.java
--- namedTargetSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-10-16 01:43:50.915239822 +0000
+++ namedSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-10-16 01:42:40.703348154 +0000
@@ -36,7 +36,7 @@
    @Override
    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity entity, Vec3d pos) {
       float f = MathHelper.nextBetween(entity.getRandom(), this.minDamage.getValue(level), this.maxDamage.getValue(level));
-      entity.m_fuenwjjy(world, new DamageSource(this.damageType, context.owner()), f);
+      entity.damage(world, new DamageSource(this.damageType, context.owner()), f);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/SummonEntity.java namedSrc/net/minecraft/enchantment/effect/SummonEntity.java
--- namedTargetSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-16 01:43:50.831239940 +0000
+++ namedSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-16 01:42:40.603348307 +0000
@@ -55,7 +55,7 @@
                   world.getScoreboard().addPlayerToTeam(lv2.getProfileName(), entity.getScoreboardTeam());
                }
 
-               lv2.refreshPositionAndAngles(pos.x, pos.y, pos.z, lv2.m_ndosmusf(), lv2.m_ahrprint());
+               lv2.refreshPositionAndAngles(pos.x, pos.y, pos.z, lv2.getYaw(), lv2.getPitch());
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/AttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-16 01:43:51.111239546 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-16 01:42:40.951347778 +0000
@@ -30,7 +30,7 @@
                      if (lv.isInRange(arg6, (double)distance) && instance.<VisibleLivingEntitiesCache>getValue(arg5).contains(lv)) {
                         arg3.remember(new EntityLookTarget(lv, true));
                         arg6.getMoveControl().strafeTo(-forwardMovement, 0.0F);
-                        arg6.setYaw(MathHelper.stepAngleTowards(arg6.m_ndosmusf(), arg6.headYaw, 0.0F));
+                        arg6.setYaw(MathHelper.stepAngleTowards(arg6.getYaw(), arg6.headYaw, 0.0F));
                         return true;
                      } else {
                         return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-16 01:43:50.783240007 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-16 01:42:40.555348379 +0000
@@ -110,7 +110,7 @@
             lv.removeItem(Items.WHEAT, m);
             ItemStack lv2 = lv.addStack(new ItemStack(Items.BREAD, l));
             if (!lv2.isEmpty()) {
-               entity.m_bxezczwg(world, lv2, 0.5F);
+               entity.dropStack(world, lv2, 0.5F);
             }
          }
       }
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-10-16 01:43:51.055239625 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-10-16 01:42:40.867347905 +0000
@@ -141,7 +141,7 @@
       if (!list.isEmpty()) {
          LivingEntity lv2 = (LivingEntity)list.get(0);
          DamageSource lv3 = world.getDamageSources().mobAttackNoAggro(arg2);
-         if (lv2.m_fuenwjjy(world, lv3, (float)arg2.getAttributeValue(EntityAttributes.ATTACK_DAMAGE))) {
+         if (lv2.damage(world, lv3, (float)arg2.getAttributeValue(EntityAttributes.ATTACK_DAMAGE))) {
             EnchantmentHelper.onEntityDamaged(world, lv2, lv3);
          }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-16 01:43:51.007239693 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-16 01:42:40.811347990 +0000
@@ -60,7 +60,7 @@
    protected void run(ServerWorld world, MobEntity arg2, long l) {
       RandomGenerator lv = arg2.getRandom();
       float f = MathHelper.clamp(lv.nextFloat() * this.pitchRange + this.minPitch, -90.0F, 90.0F);
-      float g = MathHelper.wrapDegrees(arg2.m_ndosmusf() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
+      float g = MathHelper.wrapDegrees(arg2.getYaw() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
       Vec3d lv2 = Vec3d.fromPolar(f, g);
       arg2.getBrain().remember(MemoryModuleType.LOOK_TARGET, new BlockPosLookTarget(arg2.getEyePos().add(lv2)));
       arg2.getBrain().remember(MemoryModuleType.GAZE_COOLDOWN_TICKS, this.interval.get(lv));
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-10-16 01:43:50.855239906 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-10-16 01:42:40.635348257 +0000
@@ -117,7 +117,7 @@
             .filter(arg2::isEnemy)
             .filter(entity -> arg2.isInRange(entity, 15.0, 20.0))
             .ifPresent(entity -> {
-               Vec3d lv = arg2.getPos().add(arg2.getAttachments().getPoint(EntityAttachmentType.WARDEN_CHEST, 0, arg2.m_ndosmusf()));
+               Vec3d lv = arg2.getPos().add(arg2.getAttachments().getPoint(EntityAttachmentType.WARDEN_CHEST, 0, arg2.getYaw()));
                Vec3d lv2 = entity.getEyePos().subtract(lv);
                Vec3d lv3 = lv2.normalize();
                int i = MathHelper.floor(lv2.length()) + 7;
@@ -128,7 +128,7 @@
                }
 
                arg2.playSound(SoundEvents.ENTITY_WARDEN_SONIC_BOOM, 3.0F, 1.0F);
-               if (entity.m_fuenwjjy(world, world.getDamageSources().sonicBoom(arg2), 10.0F)) {
+               if (entity.damage(world, world.getDamageSources().sonicBoom(arg2), 10.0F)) {
                   double d = 0.5 * (1.0 - entity.getAttributeValue(EntityAttributes.KNOCKBACK_RESISTANCE));
                   double e = 2.5 * (1.0 - entity.getAttributeValue(EntityAttributes.KNOCKBACK_RESISTANCE));
                   entity.addVelocity(lv3.getX() * e, lv3.getY() * d, lv3.getZ() * e);
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/AquaticLookControl.java namedSrc/net/minecraft/entity/ai/control/AquaticLookControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/AquaticLookControl.java	2024-10-16 01:43:51.115239541 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticLookControl.java	2024-10-16 01:42:40.955347772 +0000
@@ -41,10 +41,10 @@
       if (this.lookAtCooldown > 0) {
          this.lookAtCooldown--;
          this.getTargetYaw().ifPresent(arg -> this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, arg + 20.0F, this.yawSpeed));
-         this.getTargetPitch().ifPresent(arg -> this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), arg + 10.0F, this.pitchSpeed)));
+         this.getTargetPitch().ifPresent(arg -> this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), arg + 10.0F, this.pitchSpeed)));
       } else {
          if (this.entity.getNavigation().isIdle()) {
-            this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), 0.0F, 5.0F));
+            this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), 0.0F, 5.0F));
          }
 
          this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, this.entity.bodyYaw, this.yawSpeed);

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-10-16 01:43:51.135239513 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-10-16 01:42:40.975347741 +0000
@@ -76,9 +76,9 @@
             this.entity.setForwardSpeed(0.0F);
          } else {
             float h = (float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F;
-            this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), h, (float)this.yawChange));
-            this.entity.bodyYaw = this.entity.m_ndosmusf();
-            this.entity.headYaw = this.entity.m_ndosmusf();
+            this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), h, (float)this.yawChange));
+            this.entity.bodyYaw = this.entity.getYaw();
+            this.entity.headYaw = this.entity.getYaw();
             float i = (float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED));
             if (this.entity.isTouchingWater()) {
                this.entity.setMovementSpeed(i * this.speedInWater);
@@ -86,15 +86,15 @@
                if (Math.abs(e) > 1.0E-5F || Math.abs(j) > 1.0E-5F) {
                   float k = -((float)(MathHelper.atan2(e, j) * 180.0F / (float)Math.PI));
                   k = MathHelper.clamp(MathHelper.wrapDegrees(k), (float)(-this.pitchChange), (float)this.pitchChange);
-                  this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), k, 5.0F));
+                  this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), k, 5.0F));
                }
 
-               float l = MathHelper.cos(this.entity.m_ahrprint() * (float) (Math.PI / 180.0));
-               float m = MathHelper.sin(this.entity.m_ahrprint() * (float) (Math.PI / 180.0));
+               float l = MathHelper.cos(this.entity.getPitch() * (float) (Math.PI / 180.0));
+               float m = MathHelper.sin(this.entity.getPitch() * (float) (Math.PI / 180.0));
                this.entity.forwardSpeed = l * i;
                this.entity.upwardSpeed = -m * i;
             } else {
-               float n = Math.abs(MathHelper.wrapDegrees(this.entity.m_ndosmusf() - h));
+               float n = Math.abs(MathHelper.wrapDegrees(this.entity.getYaw() - h));
                float o = calcAirSpeedMultiplier(n);
                this.entity.setMovementSpeed(i * this.speedInAir * o);
             }
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/BodyControl.java namedSrc/net/minecraft/entity/ai/control/BodyControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-16 01:43:50.971239744 +0000
+++ namedSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-16 01:42:40.767348058 +0000
@@ -54,7 +54,7 @@
     */
    public void tick() {
       if (this.isMoving()) {
-         this.entity.bodyYaw = this.entity.m_ndosmusf();
+         this.entity.bodyYaw = this.entity.getYaw();
          this.rotateHead();
          this.lastHeadYaw = this.entity.headYaw;
          this.activeTicks = 0;
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/FlightMoveControl.java namedSrc/net/minecraft/entity/ai/control/FlightMoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/FlightMoveControl.java	2024-10-16 01:43:50.907239833 +0000
+++ namedSrc/net/minecraft/entity/ai/control/FlightMoveControl.java	2024-10-16 01:42:40.695348166 +0000
@@ -49,7 +49,7 @@
          }
 
          float h = (float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F;
-         this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), h, 90.0F));
+         this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), h, 90.0F));
          float i;
          if (this.entity.isOnGround()) {
             i = (float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED));
@@ -61,7 +61,7 @@
          double k = Math.sqrt(d * d + f * f);
          if (Math.abs(e) > 1.0E-5F || Math.abs(k) > 1.0E-5F) {
             float l = (float)(-(MathHelper.atan2(e, k) * 180.0F / (float)Math.PI));
-            this.entity.setPitch(this.wrapDegrees(this.entity.m_ahrprint(), l, (float)this.maxPitchChange));
+            this.entity.setPitch(this.wrapDegrees(this.entity.getPitch(), l, (float)this.maxPitchChange));
             this.entity.setUpwardSpeed(e > 0.0 ? i : -i);
          }
       } else {
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-10-16 01:43:50.951239771 +0000
+++ namedSrc/net/minecraft/entity/ai/control/LookControl.java	2024-10-16 01:42:40.743348093 +0000
@@ -114,7 +114,7 @@
       if (this.lookAtCooldown > 0) {
          this.lookAtCooldown--;
          this.getTargetYaw().ifPresent(yaw -> this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, yaw, this.yawSpeed));
-         this.getTargetPitch().ifPresent(pitch -> this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), pitch, this.pitchSpeed)));
+         this.getTargetPitch().ifPresent(pitch -> this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), pitch, this.pitchSpeed)));
       } else {
          this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, this.entity.bodyYaw, 10.0F);
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java namedSrc/net/minecraft/entity/ai/control/MoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-16 01:43:50.935239794 +0000
+++ namedSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-16 01:42:40.723348124 +0000
@@ -141,8 +141,8 @@
          j = g / j;
          h *= j;
          i *= j;
-         float k = MathHelper.sin(this.entity.m_ndosmusf() * (float) (Math.PI / 180.0));
-         float l = MathHelper.cos(this.entity.m_ndosmusf() * (float) (Math.PI / 180.0));
+         float k = MathHelper.sin(this.entity.getYaw() * (float) (Math.PI / 180.0));
+         float l = MathHelper.cos(this.entity.getYaw() * (float) (Math.PI / 180.0));
          float m = h * l - i * k;
          float n = i * l + h * k;
          if (!this.isWalkable(m, n)) {
@@ -166,7 +166,7 @@
          }
 
          float q = (float)(MathHelper.atan2(e, d) * 180.0F / (float)Math.PI) - 90.0F;
-         this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), q, 90.0F));
+         this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), q, 90.0F));
          this.entity.setMovementSpeed((float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED)));
          BlockPos lv = this.entity.getBlockPos();
          BlockState lv2 = this.entity.getWorld().getBlockState(lv);
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-10-16 01:43:50.923239811 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-10-16 01:42:40.711348142 +0000
@@ -5,7 +5,7 @@
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.mob.PathAwareEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.unmapped.C_sfpofsgc;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -52,10 +52,10 @@
     */
    @Override
    public boolean canStart() {
-      List<C_sfpofsgc> list = this.mob.getWorld().getNonSpectatingEntities(C_sfpofsgc.class, this.mob.getBounds().expand(5.0));
+      List<AbstractBoatEntity> list = this.mob.getWorld().getNonSpectatingEntities(AbstractBoatEntity.class, this.mob.getBounds().expand(5.0));
       boolean bl = false;
 
-      for (C_sfpofsgc lv : list) {
+      for (AbstractBoatEntity lv : list) {
          Entity lv2 = lv.getPrimaryPassenger();
          if (lv2 instanceof PlayerEntity
             && (MathHelper.abs(((PlayerEntity)lv2).sidewaysSpeed) > 0.0F || MathHelper.abs(((PlayerEntity)lv2).forwardSpeed) > 0.0F)) {
@@ -90,7 +90,7 @@
     */
    @Override
    public void start() {
-      for (C_sfpofsgc lv : this.mob.getWorld().getNonSpectatingEntities(C_sfpofsgc.class, this.mob.getBounds().expand(5.0))) {
+      for (AbstractBoatEntity lv : this.mob.getWorld().getNonSpectatingEntities(AbstractBoatEntity.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/DolphinJumpGoal.java namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-10-16 01:43:50.995239709 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-10-16 01:42:40.799348008 +0000
@@ -91,7 +91,7 @@
    @Override
    public boolean shouldContinue() {
       double d = this.dolphin.getVelocity().y;
-      return (!(d * d < 0.03F) || this.dolphin.m_ahrprint() == 0.0F || !(Math.abs(this.dolphin.m_ahrprint()) < 10.0F) || !this.dolphin.isTouchingWater())
+      return (!(d * d < 0.03F) || this.dolphin.getPitch() == 0.0F || !(Math.abs(this.dolphin.getPitch()) < 10.0F) || !this.dolphin.isTouchingWater())
          && !this.dolphin.isOnGround();
    }
 
@@ -137,8 +137,8 @@
       }
 
       Vec3d lv2 = this.dolphin.getVelocity();
-      if (lv2.y * lv2.y < 0.03F && this.dolphin.m_ahrprint() != 0.0F) {
-         this.dolphin.setPitch(MathHelper.lerpDegrees(0.2F, this.dolphin.m_ahrprint(), 0.0F));
+      if (lv2.y * lv2.y < 0.03F && this.dolphin.getPitch() != 0.0F) {
+         this.dolphin.setPitch(MathHelper.lerpDegrees(0.2F, this.dolphin.getPitch(), 0.0F));
       } else if (lv2.length() > 1.0E-5F) {
          double d = lv2.horizontalLength();
          double e = Math.atan2(-lv2.y, d) * 180.0F / (float)Math.PI;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/TemptGoal.java namedSrc/net/minecraft/entity/ai/goal/TemptGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TemptGoal.java	2024-10-16 01:43:50.975239738 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TemptGoal.java	2024-10-16 01:42:40.771348051 +0000
@@ -133,8 +133,8 @@
                return false;
             }
 
-            if (Math.abs((double)this.closestPlayer.m_ahrprint() - this.lastPlayerPitch) > 5.0
-               || Math.abs((double)this.closestPlayer.m_ndosmusf() - this.lastPlayerYaw) > 5.0) {
+            if (Math.abs((double)this.closestPlayer.getPitch() - this.lastPlayerPitch) > 5.0
+               || Math.abs((double)this.closestPlayer.getYaw() - this.lastPlayerYaw) > 5.0) {
                return false;
             }
          } else {
@@ -143,8 +143,8 @@
             this.lastPlayerZ = this.closestPlayer.getZ();
          }
 
-         this.lastPlayerPitch = (double)this.closestPlayer.m_ahrprint();
-         this.lastPlayerYaw = (double)this.closestPlayer.m_ndosmusf();
+         this.lastPlayerPitch = (double)this.closestPlayer.getPitch();
+         this.lastPlayerYaw = (double)this.closestPlayer.getYaw();
       }
 
       return this.canStart();
diff -bur namedTargetSrc/net/minecraft/entity/AnimationState.java namedSrc/net/minecraft/entity/AnimationState.java
--- namedTargetSrc/net/minecraft/entity/AnimationState.java	2024-10-16 01:43:50.859239901 +0000
+++ namedSrc/net/minecraft/entity/AnimationState.java	2024-10-16 01:42:40.639348252 +0000
@@ -9,20 +9,21 @@
 public class AnimationState {
    /**
     * @mapping {@literal hashed f_mynxnfft Lnet/minecraft/unmapped/C_kxntavoz;f_mynxnfft:I}
-    * @mapping {@literal named INVALID_TIME Lnet/minecraft/entity/AnimationState;INVALID_TIME:I}
+    * @mapping {@literal named STOPPED Lnet/minecraft/entity/AnimationState;STOPPED:I}
     */
-   private static final int INVALID_TIME = Integer.MIN_VALUE;
+   private static final int STOPPED = Integer.MIN_VALUE;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_slrycntl Lnet/minecraft/unmapped/C_kxntavoz;f_slrycntl:I}
+    * @mapping {@literal named startTick Lnet/minecraft/entity/AnimationState;startTick:I}
     */
-   private int f_slrycntl = Integer.MIN_VALUE;
+   private int startTick = Integer.MIN_VALUE;
 
    /**
     * @mapping {@literal hashed m_nbtuouwc Lnet/minecraft/unmapped/C_kxntavoz;m_nbtuouwc(I)V}
     * @mapping {@literal named restart Lnet/minecraft/entity/AnimationState;restart(I)V}
     */
    public void restart(int start) {
-      this.f_slrycntl = start;
+      this.startTick = start;
    }
 
    /**
@@ -52,7 +53,7 @@
     * @mapping {@literal named stop Lnet/minecraft/entity/AnimationState;stop()V}
     */
    public void stop() {
-      this.f_slrycntl = Integer.MIN_VALUE;
+      this.startTick = Integer.MIN_VALUE;
    }
 
    /**
@@ -71,15 +72,16 @@
     */
    public void fastForward(int seconds, float speedMultiplier) {
       if (this.isAnimating()) {
-         this.f_slrycntl -= (int)((float)seconds * speedMultiplier);
+         this.startTick -= (int)((float)seconds * speedMultiplier);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hbqomwtk Lnet/minecraft/unmapped/C_kxntavoz;m_hbqomwtk(F)J}
+    * @mapping {@literal named getTimeMillis Lnet/minecraft/entity/AnimationState;getTimeMillis(F)J}
     */
-   public long m_hbqomwtk(float f) {
-      float g = f - (float)this.f_slrycntl;
+   public long getTimeMillis(float ticks) {
+      float g = ticks - (float)this.startTick;
       return (long)(g * 50.0F);
    }
 
@@ -88,13 +90,14 @@
     * @mapping {@literal named isAnimating Lnet/minecraft/entity/AnimationState;isAnimating()Z}
     */
    public boolean isAnimating() {
-      return this.f_slrycntl != Integer.MIN_VALUE;
+      return this.startTick != Integer.MIN_VALUE;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fjeaaddd Lnet/minecraft/unmapped/C_kxntavoz;m_fjeaaddd(Lnet/minecraft/unmapped/C_kxntavoz;)V}
+    * @mapping {@literal named copyFrom Lnet/minecraft/entity/AnimationState;copyFrom(Lnet/minecraft/entity/AnimationState;)V}
     */
-   public void m_fjeaaddd(AnimationState arg) {
-      this.f_slrycntl = arg.f_slrycntl;
+   public void copyFrom(AnimationState state) {
+      this.startTick = state.startTick;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java
--- namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-10-16 01:43:50.911239828 +0000
+++ namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-10-16 01:42:40.699348161 +0000
@@ -586,11 +586,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_dtsrsfye;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/AreaEffectCloudEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public final boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
+   public final boolean damage(ServerWorld world, DamageSource source, float amount) {
       return false;
    }
 }
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-10-16 01:43:50.823239951 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-10-16 01:42:40.599348312 +0000
@@ -367,11 +367,11 @@
             this.wingPosition += i;
          }
 
-         this.setYaw(MathHelper.wrapDegrees(this.m_ndosmusf()));
+         this.setYaw(MathHelper.wrapDegrees(this.getYaw()));
          if (this.isAiDisabled()) {
             this.wingPosition = 0.5F;
          } else {
-            this.f_vhinbehd.m_yqwgsyyn(this.getY(), this.m_ndosmusf());
+            this.f_vhinbehd.m_yqwgsyyn(this.getY(), this.getYaw());
             if (this.getWorld() instanceof ServerWorld lv4) {
                Phase lv6 = this.phaseManager.getCurrent();
                lv6.serverTick(lv4);
@@ -393,22 +393,22 @@
                   }
 
                   this.setVelocity(this.getVelocity().add(0.0, e * 0.01, 0.0));
-                  this.setYaw(MathHelper.wrapDegrees(this.m_ndosmusf()));
+                  this.setYaw(MathHelper.wrapDegrees(this.getYaw()));
                   Vec3d lv8 = lv7.subtract(this.getX(), this.getY(), this.getZ()).normalize();
                   Vec3d lv9 = new Vec3d(
-                        (double)MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0)),
+                        (double)MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0)),
                         this.getVelocity().y,
-                        (double)(-MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0)))
+                        (double)(-MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0)))
                      )
                      .normalize();
                   float n = Math.max(((float)lv9.dotProduct(lv8) + 0.5F) / 1.5F, 0.0F);
                   if (Math.abs(d) > 1.0E-5F || Math.abs(j) > 1.0E-5F) {
                      float o = MathHelper.clamp(
-                        MathHelper.wrapDegrees(180.0F - (float)MathHelper.atan2(d, j) * (180.0F / (float)Math.PI) - this.m_ndosmusf()), -50.0F, 50.0F
+                        MathHelper.wrapDegrees(180.0F - (float)MathHelper.atan2(d, j) * (180.0F / (float)Math.PI) - this.getYaw()), -50.0F, 50.0F
                      );
                      this.yawAcceleration *= 0.8F;
                      this.yawAcceleration = this.yawAcceleration + o * lv6.getYawAcceleration();
-                     this.setYaw(this.m_ndosmusf() + this.yawAcceleration * 0.1F);
+                     this.setYaw(this.getYaw() + this.yawAcceleration * 0.1F);
                   }
 
                   float p = (float)(2.0 / (k + 1.0));
@@ -437,7 +437,7 @@
                this.m_hwaiduvv();
             }
 
-            this.bodyYaw = this.m_ndosmusf();
+            this.bodyYaw = this.getYaw();
             Vec3d[] lvs = new Vec3d[this.parts.length];
 
             for (int s = 0; s < this.parts.length; s++) {
@@ -447,7 +447,7 @@
             float t = (float)(this.f_vhinbehd.m_ksknxywx(5).y() - this.f_vhinbehd.m_ksknxywx(10).y()) * 10.0F * (float) (Math.PI / 180.0);
             float u = MathHelper.cos(t);
             float v = MathHelper.sin(t);
-            float w = this.m_ndosmusf() * (float) (Math.PI / 180.0);
+            float w = this.getYaw() * (float) (Math.PI / 180.0);
             float x = MathHelper.sin(w);
             float y = MathHelper.cos(w);
             this.movePart(this.body, (double)(x * 0.5F), 0.0, (double)(-y * 0.5F));
@@ -470,8 +470,8 @@
                this.m_hubnvizl(lv11, lv11.getOtherEntities(this, this.neck.getBounds().expand(1.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR));
             }
 
-            float z = MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
-            float aa = MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
+            float z = MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
+            float aa = MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
             float ab = this.getHeadVerticalMovement();
             this.movePart(this.head, (double)(z * 6.5F * u), (double)(ab + v * 6.5F), (double)(-aa * 6.5F * u));
             this.movePart(this.neck, (double)(z * 5.5F * u), (double)(ab + v * 5.5F), (double)(-aa * 5.5F * u));
@@ -492,7 +492,7 @@
                }
 
                C_iozihrig.C_oggeyhcs lv14 = this.f_vhinbehd.m_ksknxywx(12 + ac * 2);
-               float ad = this.m_ndosmusf() * (float) (Math.PI / 180.0) + this.wrapYawChange((double)(lv14.yRot() - lv12.yRot())) * (float) (Math.PI / 180.0);
+               float ad = this.getYaw() * (float) (Math.PI / 180.0) + this.wrapYawChange((double)(lv14.yRot() - lv12.yRot())) * (float) (Math.PI / 180.0);
                float ae = MathHelper.sin(ad);
                float af = MathHelper.cos(ad);
                float ag = 1.5F;
@@ -598,7 +598,7 @@
             lv.addVelocity(f / h * 4.0, 0.2F, g / h * 4.0);
             if (!this.phaseManager.getCurrent().isSittingOrHovering() && lv2.getLastAttackedTime() < lv.age - 2) {
                DamageSource lv3 = this.getDamageSources().mobAttack(this);
-               lv.m_fuenwjjy(world, lv3, 5.0F);
+               lv.damage(world, lv3, 5.0F);
                EnchantmentHelper.onEntityDamaged(world, lv, lv3);
             }
          }
@@ -613,7 +613,7 @@
       for (Entity lv : list) {
          if (lv instanceof LivingEntity) {
             DamageSource lv2 = this.getDamageSources().mobAttack(this);
-            lv.m_fuenwjjy(world, lv2, 10.0F);
+            lv.damage(world, lv2, 10.0F);
             EnchantmentHelper.onEntityDamaged(world, lv, lv2);
          }
       }
@@ -704,12 +704,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_bsmypcfq;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
-      return this.m_pmbrehqc(world, this.body, arg2, f);
+   public boolean damage(ServerWorld world, DamageSource source, float amount) {
+      return this.m_pmbrehqc(world, this.body, source, amount);
    }
 
    /**
@@ -717,7 +716,7 @@
     * @mapping {@literal named parentDamage Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;parentDamage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)V}
     */
    protected void parentDamage(ServerWorld world, DamageSource source, float amount) {
-      super.m_fuenwjjy(world, source, amount);
+      super.damage(world, source, amount);
    }
 
    /**
@@ -1061,13 +1060,13 @@
          BlockPos lv3 = this.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.offsetFightOrigin(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.m_ahrprint();
+         float i = this.getPitch();
          float j = 1.5F;
          this.setPitch(-h * 1.5F * 5.0F);
          lv4 = this.getRotationVec(tickDelta);
          this.setPitch(i);
       } else if (lv.isSittingOrHovering()) {
-         float k = this.m_ahrprint();
+         float k = this.getPitch();
          float l = 1.5F;
          this.setPitch(-45.0F);
          lv4 = this.getRotationVec(tickDelta);
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-10-16 01:43:50.827239945 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java	2024-10-16 01:42:40.603348307 +0000
@@ -85,12 +85,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_coyfpkdd;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/boss/dragon/EnderDragonPart;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public final boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
-      return this.m_rqhapnud(arg2) ? false : this.owner.m_pmbrehqc(world, this, arg2, f);
+   public final boolean damage(ServerWorld world, DamageSource source, float amount) {
+      return this.m_rqhapnud(source) ? false : this.owner.m_pmbrehqc(world, this, source, amount);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java	2024-10-16 01:43:50.971239744 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java	2024-10-16 01:42:40.767348058 +0000
@@ -72,9 +72,9 @@
          } else {
             Vec3d lv2 = new Vec3d(lv.getX() - this.dragon.getX(), 0.0, lv.getZ() - this.dragon.getZ()).normalize();
             Vec3d lv3 = new Vec3d(
-                  (double)MathHelper.sin(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)),
+                  (double)MathHelper.sin(this.dragon.getYaw() * (float) (Math.PI / 180.0)),
                   0.0,
-                  (double)(-MathHelper.cos(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)))
+                  (double)(-MathHelper.cos(this.dragon.getYaw() * (float) (Math.PI / 180.0)))
                )
                .normalize();
             float f = (float)lv3.dotProduct(lv2);
@@ -83,7 +83,7 @@
                double d = lv.getX() - this.dragon.head.getX();
                double e = lv.getZ() - this.dragon.head.getZ();
                double h = MathHelper.clamp(
-                  MathHelper.wrapDegrees(180.0 - MathHelper.atan2(d, e) * 180.0F / (float)Math.PI - (double)this.dragon.m_ndosmusf()), -100.0, 100.0
+                  MathHelper.wrapDegrees(180.0 - MathHelper.atan2(d, e) * 180.0F / (float)Math.PI - (double)this.dragon.getYaw()), -100.0, 100.0
                );
                this.dragon.yawAcceleration *= 0.8F;
                float i = (float)Math.sqrt(d * d + e * e) + 1.0F;
@@ -93,7 +93,7 @@
                }
 
                this.dragon.yawAcceleration += (float)h * (0.7F / i / j);
-               this.dragon.setYaw(this.dragon.m_ndosmusf() + this.dragon.yawAcceleration);
+               this.dragon.setYaw(this.dragon.getYaw() + this.dragon.yawAcceleration);
             }
          }
       } else if (this.ticks >= 100) {
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-10-16 01:43:50.987239721 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-10-16 01:42:40.787348027 +0000
@@ -96,9 +96,9 @@
                this.seenTargetTimes++;
                Vec3d lv = new Vec3d(this.target.getX() - this.dragon.getX(), 0.0, this.target.getZ() - this.dragon.getZ()).normalize();
                Vec3d lv2 = new Vec3d(
-                     (double)MathHelper.sin(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)),
+                     (double)MathHelper.sin(this.dragon.getYaw() * (float) (Math.PI / 180.0)),
                      0.0,
-                     (double)(-MathHelper.cos(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)))
+                     (double)(-MathHelper.cos(this.dragon.getYaw() * (float) (Math.PI / 180.0)))
                   )
                   .normalize();
                float l = (float)lv2.dotProduct(lv);
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-16 01:43:50.847239918 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-16 01:42:40.619348282 +0000
@@ -591,26 +591,25 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_sggtxtfb;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/boss/WitherEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
-      if (this.m_luzswycb(world, arg2)) {
+   public boolean damage(ServerWorld world, DamageSource source, float amount) {
+      if (this.m_luzswycb(world, source)) {
          return false;
-      } else if (arg2.isTypeIn(DamageTypeTags.WITHER_IMMUNE_TO) || arg2.getAttacker() instanceof WitherEntity) {
+      } else if (source.isTypeIn(DamageTypeTags.WITHER_IMMUNE_TO) || source.getAttacker() instanceof WitherEntity) {
          return false;
-      } else if (this.getInvulnerableTimer() > 0 && !arg2.isTypeIn(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
+      } else if (this.getInvulnerableTimer() > 0 && !source.isTypeIn(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
          return false;
       } else {
          if (this.m_ozoswikq()) {
-            Entity lv = arg2.getSource();
+            Entity lv = source.getSource();
             if (lv instanceof PersistentProjectileEntity || lv instanceof WindChargeEntity) {
                return false;
             }
          }
 
-         Entity lv2 = arg2.getAttacker();
+         Entity lv2 = source.getAttacker();
          if (lv2 != null && lv2.getType().isIn(EntityTypeTags.WITHER_FRIENDS)) {
             return false;
          } else {
@@ -622,7 +621,7 @@
                this.chargedSkullCooldowns[i] = this.chargedSkullCooldowns[i] + 3;
             }
 
-            return super.m_fuenwjjy(world, arg2, f);
+            return super.damage(world, source, amount);
          }
       }
    }
@@ -633,7 +632,7 @@
    @Override
    protected void dropCustomLoot(ServerWorld world, DamageSource source, boolean playerKill) {
       super.dropCustomLoot(world, source, playerKill);
-      ItemEntity lv = this.m_xrhuexzc(world, Items.NETHER_STAR);
+      ItemEntity lv = this.dropStack(world, Items.NETHER_STAR);
       if (lv != null) {
          lv.setCovetedItem();
       }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-10-16 01:43:51.127239524 +0000
+++ namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-10-16 01:42:40.967347754 +0000
@@ -61,7 +61,7 @@
       Validate.isTrue(facing.getAxis().isHorizontal());
       this.facing = facing;
       this.setYaw((float)(this.facing.getHorizontal() * 90));
-      this.prevYaw = this.m_ndosmusf();
+      this.prevYaw = this.getYaw();
       this.updateBoundingBox();
    }
 
@@ -123,15 +123,14 @@
    public abstract void onPlace();
 
    /**
-    * @mapping {@literal hashed m_bxezczwg Lnet/minecraft/unmapped/C_jkvbjfnw;m_bxezczwg(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_bxezczwg Lnet/minecraft/entity/decoration/AbstractDecorationEntity;m_bxezczwg(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;}
+    * Mapping not found
     */
    @Override
-   public ItemEntity m_bxezczwg(ServerWorld world, ItemStack stack, float f) {
+   public ItemEntity dropStack(ServerWorld world, ItemStack stack, float yOffset) {
       ItemEntity lv = new ItemEntity(
          this.getWorld(),
          this.getX() + (double)((float)this.facing.getOffsetX() * 0.15F),
-         this.getY() + (double)f,
+         this.getY() + (double)yOffset,
          this.getZ() + (double)((float)this.facing.getOffsetZ() * 0.15F),
          stack
       );
@@ -158,7 +157,7 @@
          }
       }
 
-      float f = MathHelper.wrapDegrees(this.m_ndosmusf());
+      float f = MathHelper.wrapDegrees(this.getYaw());
 
       return switch (rotation) {
          case CLOCKWISE_180 -> f + 180.0F;
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-16 01:43:50.995239709 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-16 01:42:40.795348015 +0000
@@ -403,9 +403,9 @@
       nbt.put("HandItems", lv3);
       nbt.putBoolean("Invisible", this.isInvisible());
       nbt.putBoolean("Small", this.isSmall());
-      nbt.putBoolean("ShowArms", this.m_fjamjtjb());
+      nbt.putBoolean("ShowArms", this.showsArms());
       nbt.putInt("DisabledSlots", this.disabledSlots);
-      nbt.putBoolean("NoBasePlate", !this.m_kruazguc());
+      nbt.putBoolean("NoBasePlate", !this.showsBasePlate());
       if (this.isMarker()) {
          nbt.putBoolean("Marker", this.isMarker());
       }
@@ -552,7 +552,7 @@
                return ActionResult.FAIL;
             }
 
-            if (lv2.getType() == EquipmentSlot.Type.HAND && !this.m_fjamjtjb()) {
+            if (lv2.getType() == EquipmentSlot.Type.HAND && !this.showsArms()) {
                return ActionResult.FAIL;
             }
 
@@ -594,7 +594,7 @@
     * @mapping {@literal named isSlotDisabled Lnet/minecraft/entity/decoration/ArmorStandEntity;isSlotDisabled(Lnet/minecraft/entity/EquipmentSlot;)Z}
     */
    private boolean isSlotDisabled(EquipmentSlot slot) {
-      return (this.disabledSlots & 1 << slot.m_jjdtlure(0)) != 0 || slot.getType() == EquipmentSlot.Type.HAND && !this.m_fjamjtjb();
+      return (this.disabledSlots & 1 << slot.offsetId(0)) != 0 || slot.getType() == EquipmentSlot.Type.HAND && !this.showsArms();
    }
 
    /**
@@ -603,9 +603,9 @@
     */
    private boolean equip(PlayerEntity player, EquipmentSlot slot, ItemStack stack, Hand hand) {
       ItemStack lv = this.getEquippedStack(slot);
-      if (!lv.isEmpty() && (this.disabledSlots & 1 << slot.m_jjdtlure(8)) != 0) {
+      if (!lv.isEmpty() && (this.disabledSlots & 1 << slot.offsetId(8)) != 0) {
          return false;
-      } else if (lv.isEmpty() && (this.disabledSlots & 1 << slot.m_jjdtlure(16)) != 0) {
+      } else if (lv.isEmpty() && (this.disabledSlots & 1 << slot.offsetId(16)) != 0) {
          return false;
       } else if (player.isInCreativeMode() && lv.isEmpty() && !stack.isEmpty()) {
          this.equipStack(slot, stack.copyWithCount(1));
@@ -623,46 +623,45 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_nknvrhfn;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/decoration/ArmorStandEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
+   public boolean damage(ServerWorld world, DamageSource source, float amount) {
       if (this.isRemoved()) {
          return false;
-      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
+      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && source.getAttacker() instanceof MobEntity) {
          return false;
-      } else if (arg2.isTypeIn(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
+      } else if (source.isTypeIn(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
          this.kill(world);
          return false;
-      } else if (this.m_luzswycb(world, arg2) || this.invisible || this.isMarker()) {
+      } else if (this.m_luzswycb(world, source) || this.invisible || this.isMarker()) {
          return false;
-      } else if (arg2.isTypeIn(DamageTypeTags.IS_EXPLOSION)) {
-         this.onBreak(world, arg2);
+      } else if (source.isTypeIn(DamageTypeTags.IS_EXPLOSION)) {
+         this.onBreak(world, source);
          this.kill(world);
          return false;
-      } else if (arg2.isTypeIn(DamageTypeTags.IGNITES_ARMOR_STANDS)) {
+      } else if (source.isTypeIn(DamageTypeTags.IGNITES_ARMOR_STANDS)) {
          if (this.isOnFire()) {
-            this.updateHealth(world, arg2, 0.15F);
+            this.updateHealth(world, source, 0.15F);
          } else {
             this.setOnFireForSeconds(5.0F);
          }
 
          return false;
-      } else if (arg2.isTypeIn(DamageTypeTags.BURNS_ARMOR_STANDS) && this.getHealth() > 0.5F) {
-         this.updateHealth(world, arg2, 4.0F);
+      } else if (source.isTypeIn(DamageTypeTags.BURNS_ARMOR_STANDS) && this.getHealth() > 0.5F) {
+         this.updateHealth(world, source, 4.0F);
          return false;
       } else {
-         boolean bl = arg2.isTypeIn(DamageTypeTags.CAN_BREAK_ARMOR_STAND);
-         boolean bl2 = arg2.isTypeIn(DamageTypeTags.ALWAYS_KILLS_ARMOR_STANDS);
+         boolean bl = source.isTypeIn(DamageTypeTags.CAN_BREAK_ARMOR_STAND);
+         boolean bl2 = source.isTypeIn(DamageTypeTags.ALWAYS_KILLS_ARMOR_STANDS);
          if (!bl && !bl2) {
             return false;
          } else {
-            if (arg2.getAttacker() instanceof PlayerEntity lv && !lv.getAbilities().allowModifyWorld) {
+            if (source.getAttacker() instanceof PlayerEntity lv && !lv.getAbilities().allowModifyWorld) {
                return false;
             }
 
-            if (arg2.isSourceCreativePlayer()) {
+            if (source.isSourceCreativePlayer()) {
                this.playBreakSound();
                this.spawnBreakParticles();
                this.kill(world);
@@ -671,10 +670,10 @@
                long l = world.getTime();
                if (l - this.lastHitTime > 5L && !bl2) {
                   world.sendEntityStatus(this, EntityStatuses.HIT_ARMOR_STAND);
-                  this.emitGameEvent(GameEvent.ENTITY_DAMAGE, arg2.getAttacker());
+                  this.emitGameEvent(GameEvent.ENTITY_DAMAGE, source.getAttacker());
                   this.lastHitTime = l;
                } else {
-                  this.breakAndDropItem(world, arg2);
+                  this.breakAndDropItem(world, source);
                   this.spawnBreakParticles();
                   this.kill(world);
                }
@@ -801,7 +800,7 @@
    @Override
    protected float turnHead(float bodyRotation, float headRotation) {
       this.prevBodyYaw = this.prevYaw;
-      this.bodyYaw = this.m_ndosmusf();
+      this.bodyYaw = this.getYaw();
       return 0.0F;
    }
 
@@ -953,9 +952,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fjamjtjb Lnet/minecraft/unmapped/C_nknvrhfn;m_fjamjtjb()Z}
+    * @mapping {@literal named showsArms Lnet/minecraft/entity/decoration/ArmorStandEntity;showsArms()Z}
     */
-   public boolean m_fjamjtjb() {
+   public boolean showsArms() {
       return (this.dataTracker.get(ARMOR_STAND_FLAGS) & 4) != 0;
    }
 
@@ -968,9 +968,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kruazguc Lnet/minecraft/unmapped/C_nknvrhfn;m_kruazguc()Z}
+    * @mapping {@literal named showsBasePlate Lnet/minecraft/entity/decoration/ArmorStandEntity;showsBasePlate()Z}
     */
-   public boolean m_kruazguc() {
+   public boolean showsBasePlate() {
       return (this.dataTracker.get(ARMOR_STAND_FLAGS) & 8) == 0;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java namedSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java	2024-10-16 01:43:50.879239873 +0000
+++ namedSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java	2024-10-16 01:42:40.663348215 +0000
@@ -99,7 +99,7 @@
    @Override
    public boolean handleAttack(Entity entity) {
       if (entity instanceof PlayerEntity lv) {
-         return !this.getWorld().canPlayerModifyAt(lv, this.pos) ? true : this.m_ioabfmzu(this.getDamageSources().playerAttack(lv), 0.0F);
+         return !this.getWorld().canPlayerModifyAt(lv, this.pos) ? true : this.damageSided(this.getDamageSources().playerAttack(lv), 0.0F);
       } else {
          return false;
       }
@@ -109,25 +109,24 @@
     * Mapping not found
     */
    @Override
-   public boolean m_jaiycnbg(DamageSource arg) {
-      return !this.m_rqhapnud(arg);
+   public boolean damageClient(DamageSource source) {
+      return !this.m_rqhapnud(source);
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_mfdvqmsw;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/decoration/BlockAttachedEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
-      if (this.m_rqhapnud(arg2)) {
+   public boolean damage(ServerWorld world, DamageSource source, float amount) {
+      if (this.m_rqhapnud(source)) {
          return false;
-      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && arg2.getAttacker() instanceof MobEntity) {
+      } else if (!world.getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING) && source.getAttacker() instanceof MobEntity) {
          return false;
       } else {
          if (!this.isRemoved()) {
             this.kill(world);
             this.scheduleVelocityUpdate();
-            this.dropItem(world, arg2.getAttacker());
+            this.dropItem(world, source.getAttacker());
          }
 
          return true;
diff -bur namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java namedSrc/net/minecraft/entity/decoration/DisplayEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-10-16 01:43:50.823239951 +0000
+++ namedSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-10-16 01:42:40.599348312 +0000
@@ -306,11 +306,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_zdeutotk;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/decoration/DisplayEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public final boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
+   public final boolean damage(ServerWorld world, DamageSource source, float amount) {
       return false;
    }
 
@@ -554,7 +553,7 @@
     */
    @Override
    public float getLerpTargetPitch() {
-      return this.interpolationTarget != null ? (float)this.interpolationTarget.pitch : this.m_ahrprint();
+      return this.interpolationTarget != null ? (float)this.interpolationTarget.pitch : this.getPitch();
    }
 
    /**
@@ -562,7 +561,7 @@
     */
    @Override
    public float getLerpTargetYaw() {
-      return this.interpolationTarget != null ? (float)this.interpolationTarget.yaw : this.m_ndosmusf();
+      return this.interpolationTarget != null ? (float)this.interpolationTarget.yaw : this.getYaw();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-10-16 01:43:50.931239799 +0000
+++ namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-10-16 01:42:40.719348130 +0000
@@ -131,29 +131,28 @@
     * Mapping not found
     */
    @Override
-   public final boolean m_jaiycnbg(DamageSource arg) {
-      return this.m_rqhapnud(arg) ? false : !(arg.getAttacker() instanceof EnderDragonEntity);
+   public final boolean damageClient(DamageSource source) {
+      return this.m_rqhapnud(source) ? false : !(source.getAttacker() instanceof EnderDragonEntity);
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_akvrfxgg;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/decoration/EndCrystalEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public final boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
-      if (this.m_rqhapnud(arg2)) {
+   public final boolean damage(ServerWorld world, DamageSource source, float amount) {
+      if (this.m_rqhapnud(source)) {
          return false;
-      } else if (arg2.getAttacker() instanceof EnderDragonEntity) {
+      } else if (source.getAttacker() instanceof EnderDragonEntity) {
          return false;
       } else {
          if (!this.isRemoved()) {
             this.remove(Entity.RemovalReason.KILLED);
-            if (!arg2.isTypeIn(DamageTypeTags.IS_EXPLOSION)) {
-               DamageSource lv = arg2.getAttacker() != null ? this.getDamageSources().explosion(this, arg2.getAttacker()) : null;
+            if (!source.isTypeIn(DamageTypeTags.IS_EXPLOSION)) {
+               DamageSource lv = source.getAttacker() != null ? this.getDamageSources().explosion(this, source.getAttacker()) : null;
                world.spawnExplosion(this, lv, null, this.getX(), this.getY(), this.getZ(), 6.0F, false, World.ExplosionSourceType.BLOCK);
             }
 
-            this.crystalDestroyed(world, arg2);
+            this.crystalDestroyed(world, source);
          }
 
          return 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-10-16 01:43:50.879239873 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-10-16 01:42:40.667348209 +0000
@@ -136,8 +136,8 @@
          this.setYaw(0.0F);
       }
 
-      this.prevPitch = this.m_ahrprint();
-      this.prevYaw = this.m_ndosmusf();
+      this.prevPitch = this.getPitch();
+      this.prevYaw = this.getYaw();
       this.updateBoundingBox();
    }
 
@@ -219,29 +219,28 @@
     * Mapping not found
     */
    @Override
-   public boolean m_jaiycnbg(DamageSource arg) {
-      return this.fixed && !m_keyxxrxa(arg) ? false : !this.m_rqhapnud(arg);
+   public boolean damageClient(DamageSource source) {
+      return this.fixed && !m_keyxxrxa(source) ? false : !this.m_rqhapnud(source);
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_hywnolpn;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/decoration/ItemFrameEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
+   public boolean damage(ServerWorld world, DamageSource source, float amount) {
       if (!this.fixed) {
-         if (this.m_rqhapnud(arg2)) {
+         if (this.m_rqhapnud(source)) {
             return false;
-         } else if (this.m_yuwqubzg(arg2)) {
-            this.m_arihumii(world, arg2.getAttacker(), false);
-            this.emitGameEvent(GameEvent.BLOCK_CHANGE, arg2.getAttacker());
+         } else if (this.m_yuwqubzg(source)) {
+            this.m_arihumii(world, source.getAttacker(), false);
+            this.emitGameEvent(GameEvent.BLOCK_CHANGE, source.getAttacker());
             this.playSound(this.getRemoveItemSound(), 1.0F, 1.0F);
             return true;
          } else {
-            return super.m_fuenwjjy(world, arg2, f);
+            return super.damage(world, source, amount);
          }
       } else {
-         return m_keyxxrxa(arg2) && super.m_fuenwjjy(world, arg2, f);
+         return m_keyxxrxa(source) && super.damage(world, source, amount);
       }
    }
 
@@ -316,14 +315,14 @@
             }
 
             if (bl) {
-               this.m_bujlfnum(world, this.getAsItemStack());
+               this.dropStack(world, this.getAsItemStack());
             }
 
             if (!lv.isEmpty()) {
                lv = lv.copy();
                this.removeFromFrame(lv);
                if (this.random.nextFloat() < this.itemDropChance) {
-                  this.m_bujlfnum(world, lv);
+                  this.dropStack(world, lv);
                }
             }
          }
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-10-16 01:43:50.803239980 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-10-16 01:42:40.579348343 +0000
@@ -224,7 +224,7 @@
             return;
          }
 
-         this.m_xrhuexzc(world, Items.PAINTING);
+         this.dropStack(world, Items.PAINTING);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.java namedSrc/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.java	2024-10-16 01:43:50.931239799 +0000
+++ namedSrc/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.java	2024-10-16 01:42:40.723348124 +0000
@@ -33,7 +33,7 @@
       if (this.isDamage == entity.isUndead()) {
          entity.heal((float)Math.max(4 << amplifier, 0));
       } else {
-         entity.m_fuenwjjy(world, entity.getDamageSources().magic(), (float)(6 << amplifier));
+         entity.damage(world, entity.getDamageSources().magic(), (float)(6 << amplifier));
       }
 
       return true;
@@ -52,9 +52,9 @@
       } else {
          int k = (int)(proximity * (double)(6 << amplifier) + 0.5);
          if (source == null) {
-            livingEntity.m_fuenwjjy(world, livingEntity.getDamageSources().magic(), (float)k);
+            livingEntity.damage(world, livingEntity.getDamageSources().magic(), (float)k);
          } else {
-            livingEntity.m_fuenwjjy(world, livingEntity.getDamageSources().indirectMagic(source, attacker), (float)k);
+            livingEntity.damage(world, livingEntity.getDamageSources().indirectMagic(source, attacker), (float)k);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/effect/PoisonStatusEffect.java namedSrc/net/minecraft/entity/effect/PoisonStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/PoisonStatusEffect.java	2024-10-16 01:43:50.891239856 +0000
+++ namedSrc/net/minecraft/entity/effect/PoisonStatusEffect.java	2024-10-16 01:42:40.675348197 +0000
@@ -22,7 +22,7 @@
    @Override
    public boolean applyUpdateEffect(ServerWorld world, LivingEntity entity, int amplifier) {
       if (entity.getHealth() > 1.0F) {
-         entity.m_fuenwjjy(world, entity.getDamageSources().magic(), 1.0F);
+         entity.damage(world, entity.getDamageSources().magic(), 1.0F);
       }
 
       return true;
diff -bur namedTargetSrc/net/minecraft/entity/effect/WitherStatusEffect.java namedSrc/net/minecraft/entity/effect/WitherStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/WitherStatusEffect.java	2024-10-16 01:43:51.063239614 +0000
+++ namedSrc/net/minecraft/entity/effect/WitherStatusEffect.java	2024-10-16 01:42:40.875347893 +0000
@@ -21,7 +21,7 @@
     */
    @Override
    public boolean applyUpdateEffect(ServerWorld world, LivingEntity entity, int amplifier) {
-      entity.m_fuenwjjy(world, entity.getDamageSources().wither(), 1.0F);
+      entity.damage(world, entity.getDamageSources().wither(), 1.0F);
       return true;
    }
 
Only in namedSrc/net/minecraft/entity: ElytraAnimationState.java

@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/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-10-16 01:43:51.047239637 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-10-16 01:42:40.859347917 +0000
@@ -46,6 +46,7 @@
 import net.minecraft.entity.data.TrackedDataHolder;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.inventory.StackReference;
@@ -93,7 +94,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_crougwaz;
 import net.minecraft.unmapped.C_dxakxzow;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
@@ -686,17 +686,20 @@
    @Nullable
    private BlockState state = null;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lwsftgrz Lnet/minecraft/unmapped/C_astfners;f_lwsftgrz:Ljava/util/List;}
+    * @mapping {@literal named queuedCollisionChecks Lnet/minecraft/entity/Entity;queuedCollisionChecks:Ljava/util/List;}
     */
-   private final List<Entity.C_aipuagbw> f_lwsftgrz = new ArrayList();
+   private final List<Entity.Movement> queuedCollisionChecks = new ArrayList();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ujgsyoqm Lnet/minecraft/unmapped/C_astfners;f_ujgsyoqm:Ljava/util/Set;}
+    * @mapping {@literal named collidingBlocks Lnet/minecraft/entity/Entity;collidingBlocks:Ljava/util/Set;}
     */
-   private final Set<BlockState> f_ujgsyoqm = new ReferenceArraySet<>();
+   private final Set<BlockState> collidingBlocks = new ReferenceArraySet<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qckvmvwz Lnet/minecraft/unmapped/C_astfners;f_qckvmvwz:Lit/unimi/dsi/fastutil/longs/LongSet;}
+    * @mapping {@literal named collidingBlockPositions Lnet/minecraft/entity/Entity;collidingBlockPositions:Lit/unimi/dsi/fastutil/longs/LongSet;}
     */
-   private final LongSet f_qckvmvwz = new LongOpenHashSet();
+   private final LongSet collidingBlockPositions = new LongOpenHashSet();
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_astfners;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
@@ -730,7 +733,7 @@
     */
    public boolean collidesWithStateAtPos(BlockPos pos, BlockState state) {
       VoxelShape lv = state.getCollisionShape(this.getWorld(), pos, ShapeContext.of(this));
-      VoxelShape lv2 = lv.m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
+      VoxelShape lv2 = lv.offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
       return VoxelShapes.matchesAnywhere(lv2, VoxelShapes.cuboid(this.getBounds()), BooleanBiFunction.AND);
    }
 
@@ -896,15 +899,16 @@
 
    /**
     * @mapping {@literal hashed m_bjibgujk Lnet/minecraft/unmapped/C_astfners;m_bjibgujk()V}
-    * @mapping {@literal named onRemoved Lnet/minecraft/entity/Entity;onRemoved()V}
+    * @mapping {@literal named onRemovedClient Lnet/minecraft/entity/Entity;onRemovedClient()V}
     */
-   public void onRemoved() {
+   public void onRemovedClient() {
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gbjymqob Lnet/minecraft/unmapped/C_astfners;m_gbjymqob(Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V}
+    * @mapping {@literal named onRemoved Lnet/minecraft/entity/Entity;onRemoved(Lnet/minecraft/entity/Entity$RemovalReason;)V}
     */
-   public void m_gbjymqob(Entity.RemovalReason arg) {
+   public void onRemoved(Entity.RemovalReason reason) {
    }
 
    /**
@@ -999,9 +1003,9 @@
    public void changeLookDirection(double cursorDeltaX, double cursorDeltaY) {
       float f = (float)cursorDeltaY * 0.15F;
       float g = (float)cursorDeltaX * 0.15F;
-      this.setPitch(this.m_ahrprint() + f);
-      this.setYaw(this.m_ndosmusf() + g);
-      this.setPitch(MathHelper.clamp(this.m_ahrprint(), -90.0F, 90.0F));
+      this.setPitch(this.getPitch() + f);
+      this.setYaw(this.getYaw() + g);
+      this.setPitch(MathHelper.clamp(this.getPitch(), -90.0F, 90.0F));
       this.prevPitch += f;
       this.prevYaw += g;
       this.prevPitch = MathHelper.clamp(this.prevPitch, -90.0F, 90.0F);
@@ -1053,7 +1057,7 @@
                }
             } else {
                if (this.fireTicks % 20 == 0 && !this.isInLava()) {
-                  this.m_fuenwjjy(lv2, this.getDamageSources().onFire(), 1.0F);
+                  this.damage(lv2, this.getDamageSources().onFire(), 1.0F);
                }
 
                this.setFireTicks(this.fireTicks - 1);
@@ -1153,7 +1157,7 @@
    public void setOnFireFromLava() {
       if (!this.isFireImmune()) {
          this.setOnFireForSeconds(15.0F);
-         if (this.getWorld() instanceof ServerWorld lv && this.m_fuenwjjy(lv, this.getDamageSources().lava(), 4.0F) && this.m_scrtnsdg() && !this.isSilent()) {
+         if (this.getWorld() instanceof ServerWorld lv && this.damage(lv, this.getDamageSources().lava(), 4.0F) && this.m_scrtnsdg() && !this.isSilent()) {
             lv.playSound(
                null,
                this.getX(),
@@ -1456,11 +1460,11 @@
             lv2.getBlock().onSteppedOn(this.getWorld(), lv, lv2, this);
          }
 
-         this.f_lwsftgrz.add(new Entity.C_aipuagbw(arg, arg2));
-         this.m_wmrqudhe(this.f_lwsftgrz, this.f_ujgsyoqm);
-         boolean bl = Iterables.any(this.f_ujgsyoqm, state -> state.isIn(BlockTags.FIRE) || state.isOf(Blocks.LAVA));
-         this.f_lwsftgrz.clear();
-         this.f_ujgsyoqm.clear();
+         this.queuedCollisionChecks.add(new Entity.Movement(arg, arg2));
+         this.m_wmrqudhe(this.queuedCollisionChecks, this.collidingBlocks);
+         boolean bl = Iterables.any(this.collidingBlocks, state -> state.isIn(BlockTags.FIRE) || state.isOf(Blocks.LAVA));
+         this.queuedCollisionChecks.clear();
+         this.collidingBlocks.clear();
          if (!bl && this.isAlive()) {
             if (this.fireTicks <= 0) {
                this.setFireTicks(-this.getBurningDuration());
@@ -1851,21 +1855,21 @@
 
    /**
     * @mapping {@literal hashed m_xxnsgkmf Lnet/minecraft/unmapped/C_astfners;m_xxnsgkmf(Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)V}
-    * @mapping {@literal named m_xxnsgkmf Lnet/minecraft/entity/Entity;m_xxnsgkmf(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;)V}
+    * @mapping {@literal named queueCollisionCheck Lnet/minecraft/entity/Entity;queueCollisionCheck(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;)V}
     */
-   public void m_xxnsgkmf(Vec3d from, Vec3d to) {
-      this.f_lwsftgrz.add(new Entity.C_aipuagbw(from, to));
+   public void queueCollisionCheck(Vec3d from, Vec3d to) {
+      this.queuedCollisionChecks.add(new Entity.Movement(from, to));
    }
 
    /**
     * Mapping not found
     */
-   private void m_wmrqudhe(List<Entity.C_aipuagbw> list, Set<BlockState> set) {
+   private void m_wmrqudhe(List<Entity.Movement> list, Set<BlockState> set) {
       if (this.m_iybimkec()) {
          Box lv = this.getBounds().contract(1.0E-5F);
-         LongSet longSet = this.f_qckvmvwz;
+         LongSet longSet = this.collidingBlockPositions;
 
-         for (Entity.C_aipuagbw lv2 : list) {
+         for (Entity.Movement lv2 : list) {
             Vec3d lv3 = lv2.from();
             Vec3d lv4 = lv2.to();
 
@@ -1909,7 +1913,7 @@
    private boolean m_ksoidzkr(Vec3d arg, Vec3d vec, BlockPos pos, VoxelShape arg4) {
       Box lv = this.getBounds().offset(this.getBounds().getCenter().multiply(-1.0)).offset(vec);
       Vec3d lv2 = arg.subtract(lv.m_zpsbullj());
-      return this.getBounds().m_qikitayk(lv2, arg4.m_afxwtvim(new Vec3d(pos)).getBoundingBoxes());
+      return this.getBounds().m_qikitayk(lv2, arg4.offset(new Vec3d(pos)).getBoundingBoxes());
    }
 
    /**
@@ -2332,7 +2336,7 @@
     * @mapping {@literal named checkWaterState Lnet/minecraft/entity/Entity;checkWaterState()V}
     */
    void checkWaterState() {
-      if (this.getVehicle() instanceof C_sfpofsgc lv && !lv.isSubmergedInWater()) {
+      if (this.getVehicle() instanceof AbstractBoatEntity lv && !lv.isSubmergedInWater()) {
          this.touchingWater = false;
          return;
       }
@@ -2358,7 +2362,7 @@
       this.submergedInWater = this.isSubmergedIn(FluidTags.WATER);
       this.submergedFluidTag.clear();
       double d = this.getEyeY();
-      if (this.getVehicle() instanceof C_sfpofsgc lv2 && !lv2.isSubmergedInWater() && lv2.getBounds().maxY >= d && lv2.getBounds().minY <= d) {
+      if (this.getVehicle() instanceof AbstractBoatEntity lv2 && !lv2.isSubmergedInWater() && lv2.getBounds().maxY >= d && lv2.getBounds().minY <= d) {
          return;
       }
 
@@ -2473,7 +2477,7 @@
     * @mapping {@literal named updateVelocity Lnet/minecraft/entity/Entity;updateVelocity(FLnet/minecraft/util/math/Vec3d;)V}
     */
    public void updateVelocity(float speed, Vec3d movementInput) {
-      Vec3d lv = movementInputToVelocity(movementInput, speed, this.m_ndosmusf());
+      Vec3d lv = movementInputToVelocity(movementInput, speed, this.getYaw());
       this.setVelocity(this.getVelocity().add(lv));
    }
 
@@ -2520,8 +2524,8 @@
    public void setAngles(float yaw, float pitch) {
       this.setYaw(yaw % 360.0F);
       this.setPitch(MathHelper.clamp(pitch, -90.0F, 90.0F) % 360.0F);
-      this.prevYaw = this.m_ndosmusf();
-      this.prevPitch = this.m_ahrprint();
+      this.prevYaw = this.getYaw();
+      this.prevPitch = this.getPitch();
    }
 
    /**
@@ -2550,7 +2554,7 @@
     * @mapping {@literal named refreshPositionAfterTeleport Lnet/minecraft/entity/Entity;refreshPositionAfterTeleport(DDD)V}
     */
    public void refreshPositionAfterTeleport(double x, double y, double z) {
-      this.refreshPositionAndAngles(x, y, z, this.m_ndosmusf(), this.m_ahrprint());
+      this.refreshPositionAndAngles(x, y, z, this.getYaw(), this.getPitch());
    }
 
    /**
@@ -2608,7 +2612,7 @@
     * Mapping not found
     */
    public void m_kashyvjh() {
-      this.m_zskfvtfy(this.m_ndosmusf(), this.m_ahrprint());
+      this.m_zskfvtfy(this.getYaw(), this.getPitch());
    }
 
    /**
@@ -2750,28 +2754,30 @@
    @Deprecated
    public final void damage(DamageSource source, float amount) {
       if (this.world instanceof ServerWorld lv) {
-         this.m_fuenwjjy(lv, source, amount);
+         this.damage(lv, source, amount);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ioabfmzu Lnet/minecraft/unmapped/C_astfners;m_ioabfmzu(Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
+    * @mapping {@literal named damageSided Lnet/minecraft/entity/Entity;damageSided(Lnet/minecraft/entity/damage/DamageSource;F)Z}
     */
    @Deprecated
-   public final boolean m_ioabfmzu(DamageSource arg, float f) {
-      return this.world instanceof ServerWorld lv ? this.m_fuenwjjy(lv, arg, f) : this.m_jaiycnbg(arg);
+   public final boolean damageSided(DamageSource source, float amount) {
+      return this.world instanceof ServerWorld lv ? this.damage(lv, source, amount) : this.damageClient(source);
    }
 
    /**
     * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_astfners;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/Entity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * @mapping {@literal named damage Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
     */
-   public abstract boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f);
+   public abstract boolean damage(ServerWorld world, DamageSource source, float amount);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jaiycnbg Lnet/minecraft/unmapped/C_astfners;m_jaiycnbg(Lnet/minecraft/unmapped/C_sbxfkpyv;)Z}
+    * @mapping {@literal named damageClient Lnet/minecraft/entity/Entity;damageClient(Lnet/minecraft/entity/damage/DamageSource;)Z}
     */
-   public boolean m_jaiycnbg(DamageSource arg) {
+   public boolean damageClient(DamageSource source) {
       return false;
    }
 
@@ -2788,7 +2794,7 @@
     * @mapping {@literal named getFacing Lnet/minecraft/entity/Entity;getFacing()Lnet/minecraft/util/math/Direction;}
     */
    public Direction getFacing() {
-      return Direction.m_icbobqmt(this.getRotationVec(1.0F));
+      return Direction.getFacing(this.getRotationVec(1.0F));
    }
 
    /**
@@ -2812,7 +2818,7 @@
     * @mapping {@literal named m_beudeczo Lnet/minecraft/entity/Entity;m_beudeczo(F)F}
     */
    public float m_beudeczo(float delta) {
-      return delta == 1.0F ? this.m_ahrprint() : MathHelper.lerp(delta, this.prevPitch, this.m_ahrprint());
+      return delta == 1.0F ? this.getPitch() : MathHelper.lerp(delta, this.prevPitch, this.getPitch());
    }
 
    /**
@@ -2820,7 +2826,7 @@
     * @mapping {@literal named m_stcixbth Lnet/minecraft/entity/Entity;m_stcixbth(F)F}
     */
    public float m_stcixbth(float delta) {
-      return delta == 1.0F ? this.m_ndosmusf() : MathHelper.lerpDegrees(delta, this.prevYaw, this.m_ndosmusf());
+      return delta == 1.0F ? this.getYaw() : MathHelper.lerpDegrees(delta, this.prevYaw, this.getYaw());
    }
 
    /**
@@ -3008,7 +3014,7 @@
 
          Vec3d lv = this.getVelocity();
          nbt.put("Motion", this.toNbtList(lv.x, lv.y, lv.z));
-         nbt.put("Rotation", this.toNbtList(this.m_ndosmusf(), this.m_ahrprint()));
+         nbt.put("Rotation", this.toNbtList(this.getYaw(), this.getPitch()));
          nbt.putFloat("FallDistance", this.fallDistance);
          nbt.putShort("Fire", (short)this.fireTicks);
          nbt.putShort("Air", (short)this.getAir());
@@ -3104,8 +3110,8 @@
          this.setYaw(lv3.getFloat(0));
          this.setPitch(lv3.getFloat(1));
          this.m_hhwtkfxu();
-         this.setHeadYaw(this.m_ndosmusf());
-         this.setBodyYaw(this.m_ndosmusf());
+         this.setHeadYaw(this.getYaw());
+         this.setBodyYaw(this.getYaw());
          this.fallDistance = nbt.getFloat("FallDistance");
          this.fireTicks = nbt.getShort("Fire");
          if (nbt.contains("Air")) {
@@ -3122,9 +3128,9 @@
 
          if (!Double.isFinite(this.getX()) || !Double.isFinite(this.getY()) || !Double.isFinite(this.getZ())) {
             throw new IllegalStateException("Entity has invalid position");
-         } else if (Double.isFinite((double)this.m_ndosmusf()) && Double.isFinite((double)this.m_ahrprint())) {
+         } else if (Double.isFinite((double)this.getYaw()) && Double.isFinite((double)this.getPitch())) {
             this.refreshPosition();
-            this.setRotation(this.m_ndosmusf(), this.m_ahrprint());
+            this.setRotation(this.getYaw(), this.getPitch());
             if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
                String string = nbt.getString("CustomName");
 
@@ -3227,41 +3233,41 @@
 
    /**
     * @mapping {@literal hashed m_xrhuexzc Lnet/minecraft/unmapped/C_astfners;m_xrhuexzc(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_xrhuexzc Lnet/minecraft/entity/Entity;m_xrhuexzc(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_xrhuexzc(ServerWorld world, ItemConvertible item) {
-      return this.m_smqilrfl(world, item, 0);
+   public ItemEntity dropStack(ServerWorld world, ItemConvertible item) {
+      return this.dropStack(world, item, 0);
    }
 
    /**
     * @mapping {@literal hashed m_smqilrfl Lnet/minecraft/unmapped/C_astfners;m_smqilrfl(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_smqilrfl Lnet/minecraft/entity/Entity;m_smqilrfl(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_smqilrfl(ServerWorld world, ItemConvertible item, int i) {
-      return this.m_bxezczwg(world, new ItemStack(item), (float)i);
+   public ItemEntity dropStack(ServerWorld world, ItemConvertible item, int yOffset) {
+      return this.dropStack(world, new ItemStack(item), (float)yOffset);
    }
 
    /**
     * @mapping {@literal hashed m_bujlfnum Lnet/minecraft/unmapped/C_astfners;m_bujlfnum(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_bujlfnum Lnet/minecraft/entity/Entity;m_bujlfnum(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_bujlfnum(ServerWorld world, ItemStack stack) {
-      return this.m_bxezczwg(world, stack, 0.0F);
+   public ItemEntity dropStack(ServerWorld world, ItemStack stack) {
+      return this.dropStack(world, stack, 0.0F);
    }
 
    /**
     * @mapping {@literal hashed m_bxezczwg Lnet/minecraft/unmapped/C_astfners;m_bxezczwg(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_bxezczwg Lnet/minecraft/entity/Entity;m_bxezczwg(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_bxezczwg(ServerWorld world, ItemStack stack, float f) {
+   public ItemEntity dropStack(ServerWorld world, ItemStack stack, float yOffset) {
       if (stack.isEmpty()) {
          return null;
       } else {
-         ItemEntity lv = new ItemEntity(world, this.getX(), this.getY() + (double)f, this.getZ(), stack);
+         ItemEntity lv = new ItemEntity(world, this.getX(), this.getY() + (double)yOffset, this.getZ(), stack);
          lv.setToDefaultPickupDelay();
          world.spawnEntity(lv);
          return lv;
@@ -3293,7 +3299,7 @@
                   return !lvx.isAir()
                      && lvx.shouldSuffocate(this.getWorld(), pos)
                      && VoxelShapes.matchesAnywhere(
-                        lvx.getCollisionShape(this.getWorld(), pos).m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()),
+                        lvx.getCollisionShape(this.getWorld(), pos).offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()),
                         VoxelShapes.cuboid(lv),
                         BooleanBiFunction.AND
                      );
@@ -3622,7 +3628,7 @@
     * @mapping {@literal named getLerpTargetPitch Lnet/minecraft/entity/Entity;getLerpTargetPitch()F}
     */
    public float getLerpTargetPitch() {
-      return this.m_ahrprint();
+      return this.getPitch();
    }
 
    /**
@@ -3630,7 +3636,7 @@
     * @mapping {@literal named getLerpTargetYaw Lnet/minecraft/entity/Entity;getLerpTargetYaw()F}
     */
    public float getLerpTargetYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
@@ -3654,7 +3660,7 @@
     * @mapping {@literal named getRotationVector Lnet/minecraft/entity/Entity;getRotationVector()Lnet/minecraft/util/math/Vec3d;}
     */
    public Vec3d getRotationVector() {
-      return this.getRotationVector(this.m_ahrprint(), this.m_ndosmusf());
+      return this.getRotationVector(this.getPitch(), this.getYaw());
    }
 
    /**
@@ -3667,7 +3673,7 @@
       } else {
          boolean bl = lv.getOffHandStack().isOf(item) && !lv.getMainHandStack().isOf(item);
          Arm lv2 = bl ? lv.getMainArm().getOpposite() : lv.getMainArm();
-         return this.getRotationVector(0.0F, this.m_ndosmusf() + (float)(lv2 == Arm.RIGHT ? 80 : -80)).multiply(0.5);
+         return this.getRotationVector(0.0F, this.getYaw() + (float)(lv2 == Arm.RIGHT ? 80 : -80)).multiply(0.5);
       }
    }
 
@@ -3676,7 +3682,7 @@
     * @mapping {@literal named getRotationClient Lnet/minecraft/entity/Entity;getRotationClient()Lnet/minecraft/util/math/Vec2f;}
     */
    public Vec2f getRotationClient() {
-      return new Vec2f(this.m_ahrprint(), this.m_ndosmusf());
+      return new Vec2f(this.getPitch(), this.getYaw());
    }
 
    /**
@@ -4130,7 +4136,7 @@
          this.setOnFireForSeconds(8.0F);
       }
 
-      this.m_fuenwjjy(world, this.getDamageSources().lightningBolt(), 5.0F);
+      this.damage(world, this.getDamageSources().lightningBolt(), 5.0F);
    }
 
    /**
@@ -4376,7 +4382,7 @@
     * @mapping {@literal named copyPositionAndRotation Lnet/minecraft/entity/Entity;copyPositionAndRotation(Lnet/minecraft/entity/Entity;)V}
     */
    public void copyPositionAndRotation(Entity entity) {
-      this.refreshPositionAndAngles(entity.getX(), entity.getY(), entity.getZ(), entity.m_ndosmusf(), entity.m_ahrprint());
+      this.refreshPositionAndAngles(entity.getX(), entity.getY(), entity.getZ(), entity.getYaw(), entity.getPitch());
    }
 
    /**
@@ -4478,8 +4484,8 @@
     * @mapping {@literal named m_ciiyibaw Lnet/minecraft/entity/Entity;m_ciiyibaw(Lnet/minecraft/unmapped/C_sqhjwpkh;Lnet/minecraft/entity/Entity;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
     */
    private C_sqhjwpkh m_ciiyibaw(C_sqhjwpkh arg, Entity entity) {
-      float f = arg.yRot() + (arg.relatives().contains(C_crougwaz.Y_ROT) ? 0.0F : entity.m_ndosmusf() - this.m_ndosmusf());
-      float g = arg.xRot() + (arg.relatives().contains(C_crougwaz.X_ROT) ? 0.0F : entity.m_ahrprint() - this.m_ahrprint());
+      float f = arg.yRot() + (arg.relatives().contains(C_crougwaz.Y_ROT) ? 0.0F : entity.getYaw() - this.getYaw());
+      float g = arg.xRot() + (arg.relatives().contains(C_crougwaz.X_ROT) ? 0.0F : entity.getPitch() - this.getPitch());
       Vec3d lv = entity.getPos().subtract(this.getPos());
       Vec3d lv2 = arg.position()
          .add(
@@ -4521,7 +4527,7 @@
       this.refreshPosition();
       this.m_hhwtkfxu();
       this.setVelocity(lv2.deltaMovement());
-      this.f_lwsftgrz.clear();
+      this.queuedCollisionChecks.clear();
    }
 
    /**
@@ -4779,7 +4785,7 @@
     */
    public void tryTeleportAndDismount(double destX, double destY, double destZ) {
       if (this.getWorld() instanceof ServerWorld) {
-         this.refreshPositionAndAngles(destX, destY, destZ, this.m_ndosmusf(), this.m_ahrprint());
+         this.refreshPositionAndAngles(destX, destY, destZ, this.getYaw(), this.getPitch());
          this.teleportPassengers();
       }
    }
@@ -4896,7 +4902,7 @@
     * @mapping {@literal named getHorizontalFacing Lnet/minecraft/entity/Entity;getHorizontalFacing()Lnet/minecraft/util/math/Direction;}
     */
    public Direction getHorizontalFacing() {
-      return Direction.fromRotation((double)this.m_ndosmusf());
+      return Direction.fromRotation((double)this.getYaw());
    }
 
    /**
@@ -5038,7 +5044,7 @@
     * @mapping {@literal named applyRotation Lnet/minecraft/entity/Entity;applyRotation(Lnet/minecraft/util/BlockRotation;)F}
     */
    public float applyRotation(BlockRotation rotation) {
-      float f = MathHelper.wrapDegrees(this.m_ndosmusf());
+      float f = MathHelper.wrapDegrees(this.getYaw());
       switch (rotation) {
          case CLOCKWISE_180:
             return f + 180.0F;
@@ -5056,7 +5062,7 @@
     * @mapping {@literal named applyMirror Lnet/minecraft/entity/Entity;applyMirror(Lnet/minecraft/util/BlockMirror;)F}
     */
    public float applyMirror(BlockMirror mirror) {
-      float f = MathHelper.wrapDegrees(this.m_ndosmusf());
+      float f = MathHelper.wrapDegrees(this.getYaw());
       switch (mirror) {
          case FRONT_BACK:
             return -f;
@@ -5343,9 +5349,9 @@
       double g = Math.sqrt(d * d + f * f);
       this.setPitch(MathHelper.wrapDegrees((float)(-(MathHelper.atan2(e, g) * 180.0F / (float)Math.PI))));
       this.setYaw(MathHelper.wrapDegrees((float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F));
-      this.setHeadYaw(this.m_ndosmusf());
-      this.prevPitch = this.m_ahrprint();
-      this.prevYaw = this.m_ndosmusf();
+      this.setHeadYaw(this.getYaw());
+      this.prevPitch = this.getPitch();
+      this.prevYaw = this.getYaw();
    }
 
    /**
@@ -5792,9 +5798,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ndosmusf Lnet/minecraft/unmapped/C_astfners;m_ndosmusf()F}
+    * @mapping {@literal named getYaw Lnet/minecraft/entity/Entity;getYaw()F}
     */
-   public float m_ndosmusf() {
+   public float getYaw() {
       return this.yaw;
    }
 
@@ -5803,7 +5810,7 @@
     * @mapping {@literal named getVisualYaw Lnet/minecraft/entity/Entity;getVisualYaw()F}
     */
    public float getVisualYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
@@ -5819,9 +5826,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ahrprint Lnet/minecraft/unmapped/C_astfners;m_ahrprint()F}
+    * @mapping {@literal named getPitch Lnet/minecraft/entity/Entity;getPitch()F}
     */
-   public float m_ahrprint() {
+   public float getPitch() {
       return this.pitch;
    }
 
@@ -5910,7 +5918,7 @@
 
       this.getPassengerList().forEach(Entity::stopRiding);
       this.entityChangeListener.remove(reason);
-      this.m_gbjymqob(reason);
+      this.onRemoved(reason);
    }
 
    /**
@@ -6004,8 +6012,8 @@
       double k = MathHelper.lerp(j, this.getX(), x);
       double l = MathHelper.lerp(j, this.getY(), y);
       double m = MathHelper.lerp(j, this.getZ(), z);
-      float n = (float)MathHelper.lerpDegrees(j, (double)this.m_ndosmusf(), yaw);
-      float o = (float)MathHelper.lerp(j, (double)this.m_ahrprint(), pitch);
+      float n = (float)MathHelper.lerpDegrees(j, (double)this.getYaw(), yaw);
+      float o = (float)MathHelper.lerp(j, (double)this.getPitch(), pitch);
       this.setPosition(k, l, m);
       this.setRotation(n, o);
    }
@@ -6048,13 +6056,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_astfners$C_aipuagbw}
-    * @mapping {@literal named net/minecraft/entity/Entity$C_aipuagbw}
-    */
-   static record C_aipuagbw(Vec3d from, Vec3d to) {
-   }
-
-   /**
     * The move effect represents possible effects of an entity moving, such as
     * playing sounds, emitting game events, none, or both.
     * 
@@ -6138,6 +6139,13 @@
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_astfners$C_aipuagbw}
+    * @mapping {@literal named net/minecraft/entity/Entity$Movement}
+    */
+   static record Movement(Vec3d from, Vec3d to) {
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_astfners$C_aobkcgmf}
     * @mapping {@literal named net/minecraft/entity/Entity$PositionUpdater}
     */
diff -bur namedTargetSrc/net/minecraft/entity/EntityStatuses.java namedSrc/net/minecraft/entity/EntityStatuses.java
--- namedTargetSrc/net/minecraft/entity/EntityStatuses.java	2024-10-16 01:43:51.083239586 +0000
+++ namedSrc/net/minecraft/entity/EntityStatuses.java	2024-10-16 01:42:40.919347826 +0000
@@ -166,9 +166,10 @@
     */
    public static final byte STOP_LOOKING_AT_VILLAGER = 34;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jahbxxhy Lnet/minecraft/unmapped/C_vuauwont;f_jahbxxhy:B}
+    * @mapping {@literal named PROTECTED_FROM_DEATH Lnet/minecraft/entity/EntityStatuses;PROTECTED_FROM_DEATH:B}
     */
-   public static final byte f_jahbxxhy = 35;
+   public static final byte PROTECTED_FROM_DEATH = 35;
    /**
     * @mapping {@literal hashed f_cznyliqp Lnet/minecraft/unmapped/C_vuauwont;f_cznyliqp:B}
     * @mapping {@literal named ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES Lnet/minecraft/entity/EntityStatuses;ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES:B}
@@ -295,7 +296,8 @@
     */
    public static final byte BREAK_BODY = 65;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_nerpufry Lnet/minecraft/unmapped/C_vuauwont;f_nerpufry:B}
+    * @mapping {@literal named SHAKE Lnet/minecraft/entity/EntityStatuses;SHAKE:B}
     */
-   public static final byte f_nerpufry = 66;
+   public static final byte SHAKE = 66;
 }
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-10-16 01:43:50.827239945 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-10-16 01:42:40.603348307 +0000
@@ -133,6 +133,7 @@
 import net.minecraft.entity.vehicle.FurnaceMinecartEntity;
 import net.minecraft.entity.vehicle.HopperMinecartEntity;
 import net.minecraft.entity.vehicle.MinecartEntity;
+import net.minecraft.entity.vehicle.RaftEntity;
 import net.minecraft.entity.vehicle.SpawnerMinecartEntity;
 import net.minecraft.entity.vehicle.TntMinecartEntity;
 import net.minecraft.feature_flags.FeatureFlag;
@@ -148,6 +149,7 @@
 import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderSet;
+import net.minecraft.registry.KeyedValue;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
@@ -158,8 +160,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_bujylnzi;
 import net.minecraft.unmapped.C_jkignzdi;
-import net.minecraft.unmapped.C_jquyxssk;
-import net.minecraft.unmapped.C_spthrjmn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
@@ -207,7 +207,7 @@
    public static final EntityType<BoatEntity> ACACIA_BOAT = register(
       "acacia_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.ACACIA_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -219,7 +219,7 @@
    public static final EntityType<ChestBoatEntity> ACACIA_CHEST_BOAT = register(
       "acacia_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.ACACIA_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -244,7 +244,7 @@
    public static final EntityType<AreaEffectCloudEntity> AREA_EFFECT_CLOUD = register(
       "area_effect_cloud",
       EntityType.Builder.<AreaEffectCloudEntity>create(AreaEffectCloudEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .makeFireImmune()
          .setDimensions(6.0F, 0.5F)
          .maxTrackingRange(10)
@@ -275,7 +275,7 @@
    public static final EntityType<ArrowEntity> ARROW = register(
       "arrow",
       EntityType.Builder.<ArrowEntity>create(ArrowEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.13F)
          .maxTrackingRange(4)
@@ -295,7 +295,7 @@
    public static final EntityType<C_bujylnzi> BAMBOO_CHEST_RAFT = register(
       "bamboo_chest_raft",
       EntityType.Builder.create(m_navxebru(() -> Items.BAMBOO_CHEST_RAFT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -304,10 +304,10 @@
     * @mapping {@literal hashed f_elxrknty Lnet/minecraft/unmapped/C_ogavsvbr;f_elxrknty:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named BAMBOO_RAFT Lnet/minecraft/entity/EntityType;BAMBOO_RAFT:Lnet/minecraft/entity/EntityType;}
     */
-   public static final EntityType<C_spthrjmn> BAMBOO_RAFT = register(
+   public static final EntityType<RaftEntity> BAMBOO_RAFT = register(
       "bamboo_raft",
       EntityType.Builder.create(m_ytnkhrki(() -> Items.BAMBOO_RAFT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -333,7 +333,7 @@
    public static final EntityType<BoatEntity> BIRCH_BOAT = register(
       "birch_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.BIRCH_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -345,7 +345,7 @@
    public static final EntityType<ChestBoatEntity> BIRCH_CHEST_BOAT = register(
       "birch_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.BIRCH_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -364,7 +364,7 @@
    public static final EntityType<DisplayEntity.BlockDisplayEntity> BLOCK_DISPLAY = register(
       "block_display",
       EntityType.Builder.create(DisplayEntity.BlockDisplayEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(10)
          .trackingTickInterval(1)
@@ -395,7 +395,7 @@
    public static final EntityType<BreezeWindChargeEntity> BREEZE_WIND_CHARGE = register(
       "breeze_wind_charge",
       EntityType.Builder.<BreezeWindChargeEntity>create(BreezeWindChargeEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(4)
@@ -434,7 +434,7 @@
    public static final EntityType<BoatEntity> CHERRY_BOAT = register(
       "cherry_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.CHERRY_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -446,7 +446,7 @@
    public static final EntityType<ChestBoatEntity> CHERRY_CHEST_BOAT = register(
       "cherry_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.CHERRY_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -458,7 +458,7 @@
    public static final EntityType<ChestMinecartEntity> CHEST_MINECART = register(
       "chest_minecart",
       EntityType.Builder.create(ChestMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -489,7 +489,7 @@
    public static final EntityType<CommandBlockMinecartEntity> COMMAND_BLOCK_MINECART = register(
       "command_block_minecart",
       EntityType.Builder.create(CommandBlockMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -548,7 +548,7 @@
    public static final EntityType<BoatEntity> DARK_OAK_BOAT = register(
       "dark_oak_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.DARK_OAK_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -560,7 +560,7 @@
    public static final EntityType<ChestBoatEntity> DARK_OAK_CHEST_BOAT = register(
       "dark_oak_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.DARK_OAK_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -591,7 +591,7 @@
    public static final EntityType<DragonFireballEntity> DRAGON_FIREBALL = register(
       "dragon_fireball",
       EntityType.Builder.<DragonFireballEntity>create(DragonFireballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.0F, 1.0F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -616,7 +616,7 @@
    public static final EntityType<EggEntity> EGG = register(
       "egg",
       EntityType.Builder.<EggEntity>create(EggEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -676,7 +676,7 @@
    public static final EntityType<EnderPearlEntity> ENDER_PEARL = register(
       "ender_pearl",
       EntityType.Builder.<EnderPearlEntity>create(EnderPearlEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -688,7 +688,7 @@
    public static final EntityType<EndCrystalEntity> END_CRYSTAL = register(
       "end_crystal",
       EntityType.Builder.<EndCrystalEntity>create(EndCrystalEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .makeFireImmune()
          .setDimensions(2.0F, 2.0F)
          .maxTrackingRange(16)
@@ -713,7 +713,7 @@
    public static final EntityType<EvokerFangsEntity> EVOKER_FANGS = register(
       "evoker_fangs",
       EntityType.Builder.<EvokerFangsEntity>create(EvokerFangsEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.8F)
          .maxTrackingRange(6)
          .trackingTickInterval(2)
@@ -725,7 +725,7 @@
    public static final EntityType<ExperienceBottleEntity> EXPERIENCE_BOTTLE = register(
       "experience_bottle",
       EntityType.Builder.<ExperienceBottleEntity>create(ExperienceBottleEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -737,7 +737,7 @@
    public static final EntityType<ExperienceOrbEntity> EXPERIENCE_ORB = register(
       "experience_orb",
       EntityType.Builder.<ExperienceOrbEntity>create(ExperienceOrbEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .maxTrackingRange(6)
          .trackingTickInterval(20)
@@ -749,7 +749,7 @@
    public static final EntityType<EyeOfEnderEntity> EYE_OF_ENDER = register(
       "eye_of_ender",
       EntityType.Builder.<EyeOfEnderEntity>create(EyeOfEnderEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(4)
@@ -761,7 +761,7 @@
    public static final EntityType<FallingBlockEntity> FALLING_BLOCK = register(
       "falling_block",
       EntityType.Builder.<FallingBlockEntity>create(FallingBlockEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.98F)
          .maxTrackingRange(10)
          .trackingTickInterval(20)
@@ -773,7 +773,7 @@
    public static final EntityType<FireballEntity> FIREBALL = register(
       "fireball",
       EntityType.Builder.<FireballEntity>create(FireballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.0F, 1.0F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -785,7 +785,7 @@
    public static final EntityType<FireworkRocketEntity> FIREWORK_ROCKET = register(
       "firework_rocket",
       EntityType.Builder.<FireworkRocketEntity>create(FireworkRocketEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -821,7 +821,7 @@
    public static final EntityType<FurnaceMinecartEntity> FURNACE_MINECART = register(
       "furnace_minecart",
       EntityType.Builder.create(FurnaceMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -859,7 +859,7 @@
    public static final EntityType<GlowItemFrameEntity> GLOW_ITEM_FRAME = register(
       "glow_item_frame",
       EntityType.Builder.<GlowItemFrameEntity>create(GlowItemFrameEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(10)
@@ -907,7 +907,7 @@
    public static final EntityType<HopperMinecartEntity> HOPPER_MINECART = register(
       "hopper_minecart",
       EntityType.Builder.create(HopperMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -954,7 +954,7 @@
     * @mapping {@literal named INTERACTION Lnet/minecraft/entity/EntityType;INTERACTION:Lnet/minecraft/entity/EntityType;}
     */
    public static final EntityType<InteractionEntity> INTERACTION = register(
-      "interaction", EntityType.Builder.create(InteractionEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.0F, 0.0F).maxTrackingRange(10)
+      "interaction", EntityType.Builder.create(InteractionEntity::new, SpawnGroup.MISC).emptyLootTable().setDimensions(0.0F, 0.0F).maxTrackingRange(10)
    );
    /**
     * @mapping {@literal hashed f_bhejdipc Lnet/minecraft/unmapped/C_ogavsvbr;f_bhejdipc:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -970,7 +970,7 @@
    public static final EntityType<ItemEntity> ITEM = register(
       "item",
       EntityType.Builder.<ItemEntity>create(ItemEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .setEyeHeight(0.2125F)
          .maxTrackingRange(6)
@@ -983,7 +983,7 @@
    public static final EntityType<DisplayEntity.ItemDisplayEntity> ITEM_DISPLAY = register(
       "item_display",
       EntityType.Builder.create(DisplayEntity.ItemDisplayEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(10)
          .trackingTickInterval(1)
@@ -995,7 +995,7 @@
    public static final EntityType<ItemFrameEntity> ITEM_FRAME = register(
       "item_frame",
       EntityType.Builder.<ItemFrameEntity>create(ItemFrameEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(10)
@@ -1008,7 +1008,7 @@
    public static final EntityType<BoatEntity> JUNGLE_BOAT = register(
       "jungle_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.JUNGLE_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1020,7 +1020,7 @@
    public static final EntityType<ChestBoatEntity> JUNGLE_CHEST_BOAT = register(
       "jungle_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.JUNGLE_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1032,7 +1032,7 @@
    public static final EntityType<LeashKnotEntity> LEASH_KNOT = register(
       "leash_knot",
       EntityType.Builder.<LeashKnotEntity>create(LeashKnotEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .disableSaving()
          .setDimensions(0.375F, 0.5F)
          .setEyeHeight(0.0625F)
@@ -1046,7 +1046,7 @@
    public static final EntityType<LightningEntity> LIGHTNING_BOLT = register(
       "lightning_bolt",
       EntityType.Builder.create(LightningEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .disableSaving()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(16)
@@ -1071,7 +1071,7 @@
    public static final EntityType<LlamaSpitEntity> LLAMA_SPIT = register(
       "llama_spit",
       EntityType.Builder.<LlamaSpitEntity>create(LlamaSpitEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1096,7 +1096,7 @@
    public static final EntityType<BoatEntity> MANGROVE_BOAT = register(
       "mangrove_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.MANGROVE_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1108,7 +1108,7 @@
    public static final EntityType<ChestBoatEntity> MANGROVE_CHEST_BOAT = register(
       "mangrove_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.MANGROVE_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1118,7 +1118,7 @@
     * @mapping {@literal named MARKER Lnet/minecraft/entity/EntityType;MARKER:Lnet/minecraft/entity/EntityType;}
     */
    public static final EntityType<MarkerEntity> MARKER = register(
-      "marker", EntityType.Builder.create(MarkerEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.0F, 0.0F).maxTrackingRange(0)
+      "marker", EntityType.Builder.create(MarkerEntity::new, SpawnGroup.MISC).emptyLootTable().setDimensions(0.0F, 0.0F).maxTrackingRange(0)
    );
    /**
     * @mapping {@literal hashed f_spcxgpev Lnet/minecraft/unmapped/C_ogavsvbr;f_spcxgpev:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -1126,7 +1126,11 @@
     */
    public static final EntityType<MinecartEntity> MINECART = register(
       "minecart",
-      EntityType.Builder.create(MinecartEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.98F, 0.7F).passengerAttachments(0.1875F).maxTrackingRange(8)
+      EntityType.Builder.create(MinecartEntity::new, SpawnGroup.MISC)
+         .emptyLootTable()
+         .setDimensions(0.98F, 0.7F)
+         .passengerAttachments(0.1875F)
+         .maxTrackingRange(8)
    );
    /**
     * @mapping {@literal hashed f_jdxbwnyb Lnet/minecraft/unmapped/C_ogavsvbr;f_jdxbwnyb:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -1159,7 +1163,7 @@
    public static final EntityType<BoatEntity> OAK_BOAT = register(
       "oak_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.OAK_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1171,7 +1175,7 @@
    public static final EntityType<ChestBoatEntity> OAK_CHEST_BOAT = register(
       "oak_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.OAK_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1189,7 +1193,7 @@
     */
    public static final EntityType<OminousItemSpawnerEntity> OMINOUS_ITEM_SPAWNER = register(
       "ominous_item_spawner",
-      EntityType.Builder.create(OminousItemSpawnerEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.25F, 0.25F).maxTrackingRange(8)
+      EntityType.Builder.create(OminousItemSpawnerEntity::new, SpawnGroup.MISC).emptyLootTable().setDimensions(0.25F, 0.25F).maxTrackingRange(8)
    );
    /**
     * @mapping {@literal hashed f_poffjbku Lnet/minecraft/unmapped/C_ogavsvbr;f_poffjbku:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -1198,7 +1202,7 @@
    public static final EntityType<PaintingEntity> PAINTING = register(
       "painting",
       EntityType.Builder.<PaintingEntity>create(PaintingEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .maxTrackingRange(10)
          .trackingTickInterval(Integer.MAX_VALUE)
@@ -1210,7 +1214,7 @@
    public static final EntityType<BoatEntity> PALE_OAK_BOAT = register(
       "pale_oak_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.PALE_OAK_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1223,7 +1227,7 @@
    public static final EntityType<ChestBoatEntity> PALE_OAK_CHEST_BOAT = register(
       "pale_oak_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.PALE_OAK_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1325,7 +1329,7 @@
    public static final EntityType<PotionEntity> POTION = register(
       "potion",
       EntityType.Builder.<PotionEntity>create(PotionEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1395,7 +1399,7 @@
    public static final EntityType<ShulkerBulletEntity> SHULKER_BULLET = register(
       "shulker_bullet",
       EntityType.Builder.<ShulkerBulletEntity>create(ShulkerBulletEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .maxTrackingRange(8)
    );
@@ -1454,7 +1458,7 @@
    public static final EntityType<SmallFireballEntity> SMALL_FIREBALL = register(
       "small_fireball",
       EntityType.Builder.<SmallFireballEntity>create(SmallFireballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1479,7 +1483,7 @@
    public static final EntityType<SnowballEntity> SNOWBALL = register(
       "snowball",
       EntityType.Builder.<SnowballEntity>create(SnowballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1503,7 +1507,7 @@
    public static final EntityType<SpawnerMinecartEntity> SPAWNER_MINECART = register(
       "spawner_minecart",
       EntityType.Builder.create(SpawnerMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -1515,7 +1519,7 @@
    public static final EntityType<SpectralArrowEntity> SPECTRAL_ARROW = register(
       "spectral_arrow",
       EntityType.Builder.<SpectralArrowEntity>create(SpectralArrowEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.13F)
          .maxTrackingRange(4)
@@ -1540,7 +1544,7 @@
    public static final EntityType<BoatEntity> SPRUCE_BOAT = register(
       "spruce_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.SPRUCE_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1552,7 +1556,7 @@
    public static final EntityType<ChestBoatEntity> SPRUCE_CHEST_BOAT = register(
       "spruce_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.SPRUCE_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1598,7 +1602,7 @@
    public static final EntityType<DisplayEntity.TextDisplayEntity> TEXT_DISPLAY = register(
       "text_display",
       EntityType.Builder.create(DisplayEntity.TextDisplayEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(10)
          .trackingTickInterval(1)
@@ -1610,7 +1614,7 @@
    public static final EntityType<TntEntity> TNT = register(
       "tnt",
       EntityType.Builder.<TntEntity>create(TntEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .makeFireImmune()
          .setDimensions(0.98F, 0.98F)
          .setEyeHeight(0.15F)
@@ -1624,7 +1628,7 @@
    public static final EntityType<TntMinecartEntity> TNT_MINECART = register(
       "tnt_minecart",
       EntityType.Builder.create(TntMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -1648,7 +1652,7 @@
    public static final EntityType<TridentEntity> TRIDENT = register(
       "trident",
       EntityType.Builder.<TridentEntity>create(TridentEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.13F)
          .maxTrackingRange(4)
@@ -1735,7 +1739,7 @@
    public static final EntityType<WindChargeEntity> WIND_CHARGE = register(
       "wind_charge",
       EntityType.Builder.<WindChargeEntity>create(WindChargeEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(4)
@@ -1786,7 +1790,7 @@
    public static final EntityType<WitherSkullEntity> WITHER_SKULL = register(
       "wither_skull",
       EntityType.Builder.<WitherSkullEntity>create(WitherSkullEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1889,7 +1893,7 @@
    public static final EntityType<FishingBobberEntity> FISHING_BOBBER = register(
       "fishing_bobber",
       EntityType.Builder.<FishingBobberEntity>create(FishingBobberEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .disableSaving()
          .disableSummon()
          .setDimensions(0.25F, 0.25F)
@@ -2148,8 +2152,8 @@
             (double)pos.getX() + 0.5, (double)pos.getY() + d, (double)pos.getZ() + 0.5, MathHelper.wrapDegrees(world.random.nextFloat() * 360.0F), 0.0F
          );
          if (lv instanceof MobEntity lv2) {
-            lv2.headYaw = lv2.m_ndosmusf();
-            lv2.bodyYaw = lv2.m_ndosmusf();
+            lv2.headYaw = lv2.getYaw();
+            lv2.bodyYaw = lv2.getYaw();
             lv2.initialize(world, world.getLocalDifficulty(lv2.getBlockPos()), reason, null);
             lv2.playAmbientSound();
          }
@@ -2553,8 +2557,8 @@
    /**
     * Mapping not found
     */
-   private static EntityType.EntityFactory<C_spthrjmn> m_ytnkhrki(Supplier<Item> supplier) {
-      return (arg, world) -> new C_spthrjmn(arg, world, supplier);
+   private static EntityType.EntityFactory<RaftEntity> m_ytnkhrki(Supplier<Item> supplier) {
+      return (arg, world) -> new RaftEntity(arg, world, supplier);
    }
 
    /**
@@ -2635,15 +2639,17 @@
        */
       private FeatureFlagBitSet requiredFlags = FeatureFlags.DEFAULT_SET;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_uuowbxbh Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;f_uuowbxbh:Lnet/minecraft/unmapped/C_jquyxssk;}
+       * @mapping {@literal named lootTable Lnet/minecraft/entity/EntityType$Builder;lootTable:Lnet/minecraft/registry/KeyedValue;}
        */
-      private C_jquyxssk<EntityType<?>, Optional<RegistryKey<LootTable>>> f_uuowbxbh = lootTable -> Optional.of(
+      private KeyedValue<EntityType<?>, Optional<RegistryKey<LootTable>>> lootTable = lootTable -> Optional.of(
             RegistryKey.of(RegistryKeys.LOOT_TABLE, lootTable.getValue().withPrefix("entities/"))
          );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qdlfxewu Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;f_qdlfxewu:Lnet/minecraft/unmapped/C_jquyxssk;}
+       * @mapping {@literal named translationKey Lnet/minecraft/entity/EntityType$Builder;translationKey:Lnet/minecraft/registry/KeyedValue;}
        */
-      private C_jquyxssk<EntityType<?>, String> f_qdlfxewu = type -> Util.createTranslationKey("entity", type.getValue());
+      private KeyedValue<EntityType<?>, String> translationKey = type -> Util.createTranslationKey("entity", type.getValue());
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;<init>(Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;Lnet/minecraft/unmapped/C_ormqdxci;)V}
@@ -2846,10 +2852,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_qgatngvl Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;m_qgatngvl()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;}
+       * @mapping {@literal named emptyLootTable Lnet/minecraft/entity/EntityType$Builder;emptyLootTable()Lnet/minecraft/entity/EntityType$Builder;}
        */
-      public EntityType.Builder<T> m_qgatngvl() {
-         this.f_uuowbxbh = C_jquyxssk.fixed(Optional.empty());
+      public EntityType.Builder<T> emptyLootTable() {
+         this.lootTable = KeyedValue.fixed(Optional.empty());
          return this;
       }
 
@@ -2874,8 +2881,8 @@
             this.spawnDimensionsScale,
             this.maxTrackingRange,
             this.trackingTickInterval,
-            this.f_qdlfxewu.get(type),
-            this.f_uuowbxbh.get(type),
+            this.translationKey.get(type),
+            this.lootTable.get(type),
             this.requiredFlags
          );
       }
diff -bur namedTargetSrc/net/minecraft/entity/EquipmentSlot.java namedSrc/net/minecraft/entity/EquipmentSlot.java
--- namedTargetSrc/net/minecraft/entity/EquipmentSlot.java	2024-10-16 01:43:51.127239524 +0000
+++ namedSrc/net/minecraft/entity/EquipmentSlot.java	2024-10-16 01:42:40.971347748 +0000
@@ -162,10 +162,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jjdtlure Lnet/minecraft/unmapped/C_yuycoehb;m_jjdtlure(I)I}
+    * @mapping {@literal named offsetId Lnet/minecraft/entity/EquipmentSlot;offsetId(I)I}
     */
-   public int m_jjdtlure(int i) {
-      return this.id + i;
+   public int offsetId(int offset) {
+      return this.id + offset;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ExperienceOrbEntity.java namedSrc/net/minecraft/entity/ExperienceOrbEntity.java
--- namedTargetSrc/net/minecraft/entity/ExperienceOrbEntity.java	2024-10-16 01:43:51.083239586 +0000
+++ namedSrc/net/minecraft/entity/ExperienceOrbEntity.java	2024-10-16 01:42:40.919347826 +0000
@@ -296,21 +296,20 @@
     * Mapping not found
     */
    @Override
-   public final boolean m_jaiycnbg(DamageSource arg) {
-      return !this.m_rqhapnud(arg);
+   public final boolean damageClient(DamageSource source) {
+      return !this.m_rqhapnud(source);
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_vcliofjo;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/ExperienceOrbEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public final boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
-      if (this.m_rqhapnud(arg2)) {
+   public final boolean damage(ServerWorld world, DamageSource source, float amount) {
+      if (this.m_rqhapnud(source)) {
          return false;
       } else {
          this.scheduleVelocityUpdate();
-         this.health = (int)((float)this.health - f);
+         this.health = (int)((float)this.health - amount);
          if (this.health <= 0) {
             this.discard();
          }
diff -bur namedTargetSrc/net/minecraft/entity/EyeOfEnderEntity.java namedSrc/net/minecraft/entity/EyeOfEnderEntity.java
--- namedTargetSrc/net/minecraft/entity/EyeOfEnderEntity.java	2024-10-16 01:43:50.867239890 +0000
+++ namedSrc/net/minecraft/entity/EyeOfEnderEntity.java	2024-10-16 01:42:40.651348234 +0000
@@ -161,8 +161,8 @@
          double g = Math.sqrt(x * x + z * z);
          this.setYaw((float)(MathHelper.atan2(x, z) * 180.0F / (float)Math.PI));
          this.setPitch((float)(MathHelper.atan2(y, g) * 180.0F / (float)Math.PI));
-         this.prevYaw = this.m_ndosmusf();
-         this.prevPitch = this.m_ahrprint();
+         this.prevYaw = this.getYaw();
+         this.prevPitch = this.getPitch();
       }
    }
 
@@ -276,11 +276,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fuenwjjy Lnet/minecraft/unmapped/C_juzydrbx;m_fuenwjjy(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;F)Z}
-    * @mapping {@literal named m_fuenwjjy Lnet/minecraft/entity/EyeOfEnderEntity;m_fuenwjjy(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;F)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_fuenwjjy(ServerWorld world, DamageSource arg2, float f) {
+   public boolean damage(ServerWorld world, DamageSource source, float amount) {
       return false;
    }
 }


The remaining diff is too long!

Please sign in to comment.