Skip to content

Commit

Permalink
glide -> fallFly
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Oct 18, 2024
1 parent a6b6b64 commit e76b8f1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mappings/net/minecraft/entity/LivingEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
ARG 1 effect
METHOD m_fcllvyfo forEachGiftItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/BiConsumer;)Z
METHOD m_fdrozcta getFallSounds ()Lnet/minecraft/unmapped/C_usxaxydn$C_krioeiaq;
METHOD m_fgegzwmf canGlide ()Z
METHOD m_fgegzwmf canFallFly ()Z
METHOD m_fgldaguj getActiveHand ()Lnet/minecraft/unmapped/C_laxmzoqs;
METHOD m_fmgoaoex takeShieldHit (Lnet/minecraft/unmapped/C_usxaxydn;)V
ARG 1 attacker
Expand Down Expand Up @@ -506,7 +506,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_spwwmdyl getHurtSound (Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_avavozay;
ARG 1 source
METHOD m_stneqkoz getPlayerHitTimer ()I
METHOD m_svekchwa canGlideUsing (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z
METHOD m_svekchwa canFallFlyUsing (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
METHOD m_swoeftqi getRiddenSpeed (Lnet/minecraft/unmapped/C_jzrpycqo;)F
ARG 1 player
Expand Down

3 comments on commit e76b8f1

@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 e76b8f1, 297 file(s) were updated with 2121 line(s) added and 2058 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-18 03:17:28.514529255 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-10-18 03:16:10.978758434 +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-18 03:17:28.554529142 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-10-18 03:16:11.026758283 +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-18 03:17:28.346529731 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-18 03:16:10.754759146 +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;
@@ -293,7 +293,7 @@
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
       if (!state.isAir() && explosion.getDestructionType() != Explosion.DestructionType.TRIGGER_BLOCK) {
          Block lv = state.getBlock();
-         boolean bl = explosion.m_pzwvnxgx() instanceof PlayerEntity;
+         boolean bl = explosion.getCausingEntity() instanceof PlayerEntity;
          if (lv.shouldDropItemsOnExplosion(explosion)) {
             BlockEntity lv2 = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
             LootContextParameterSet.Builder lv3 = new LootContextParameterSet.Builder(world)
@@ -628,9 +628,9 @@
 
    /**
     * @mapping {@literal hashed m_fwpxnldx Lnet/minecraft/unmapped/C_triydqro;m_fwpxnldx(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-    * @mapping {@literal named m_fwpxnldx Lnet/minecraft/block/AbstractBlock;m_fwpxnldx(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+    * @mapping {@literal named getInsideCollisionShape Lnet/minecraft/block/AbstractBlock;getInsideCollisionShape(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
     */
-   protected VoxelShape m_fwpxnldx(BlockState state, World world, BlockPos pos) {
+   protected VoxelShape getInsideCollisionShape(BlockState state, World world, BlockPos pos) {
       return VoxelShapes.fullCube();
    }
 
@@ -1434,10 +1434,10 @@
 
       /**
        * @mapping {@literal hashed m_hhjvgbvf Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_hhjvgbvf(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-       * @mapping {@literal named m_hhjvgbvf Lnet/minecraft/block/AbstractBlock$AbstractBlockState;m_hhjvgbvf(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+       * @mapping {@literal named getInsideCollisionShape Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getInsideCollisionShape(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
        */
-      public VoxelShape m_hhjvgbvf(World world, BlockPos pos) {
-         return this.getBlock().m_fwpxnldx(this.asBlockState(), world, pos);
+      public VoxelShape getInsideCollisionShape(World world, BlockPos pos) {
+         return this.getBlock().getInsideCollisionShape(this.asBlockState(), world, pos);
       }
 
       /**
@@ -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/AbstractCandleBlock.java namedSrc/net/minecraft/block/AbstractCandleBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractCandleBlock.java	2024-10-18 03:17:28.314529821 +0000
+++ namedSrc/net/minecraft/block/AbstractCandleBlock.java	2024-10-18 03:16:10.718759260 +0000
@@ -159,7 +159,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks() && (Boolean)state.get(LIT)) {
+      if (explosion.canTriggerBlocks() && (Boolean)state.get(LIT)) {
          extinguish(null, state, world, pos);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/BambooBlock.java namedSrc/net/minecraft/block/BambooBlock.java
--- namedTargetSrc/net/minecraft/block/BambooBlock.java	2024-10-18 03:17:28.338529754 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2024-10-18 03:16:10.746759171 +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-18 03:17:28.502529289 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2024-10-18 03:16:10.966758473 +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/BellBlock.java namedSrc/net/minecraft/block/BellBlock.java
--- namedTargetSrc/net/minecraft/block/BellBlock.java	2024-10-18 03:17:28.430529493 +0000
+++ namedSrc/net/minecraft/block/BellBlock.java	2024-10-18 03:16:10.878758752 +0000
@@ -344,7 +344,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks()) {
+      if (explosion.canTriggerBlocks()) {
          this.ring(world, pos, null);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-10-18 03:17:28.614528972 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-18 03:16:11.110758015 +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/ButtonBlock.java namedSrc/net/minecraft/block/ButtonBlock.java
--- namedTargetSrc/net/minecraft/block/ButtonBlock.java	2024-10-18 03:17:28.406529561 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-10-18 03:16:10.842758867 +0000
@@ -233,7 +233,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks() && !(Boolean)state.get(POWERED)) {
+      if (explosion.canTriggerBlocks() && !(Boolean)state.get(POWERED)) {
          this.press(state, world, pos, null);
       }
 
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-18 03:17:28.570529096 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-18 03:16:11.046758219 +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/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-10-18 03:17:28.538529187 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-10-18 03:16:11.010758333 +0000
@@ -185,7 +185,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks() && state.get(HALF) == DoubleBlockHalf.LOWER && this.blockSetType.canOpenByWindCharge() && !(Boolean)state.get(POWERED)) {
+      if (explosion.canTriggerBlocks() && state.get(HALF) == DoubleBlockHalf.LOWER && this.blockSetType.canOpenByWindCharge() && !(Boolean)state.get(POWERED)) {
          this.setOpen(null, world, state, pos, !this.isOpen(state));
       }
 
diff -bur namedTargetSrc/net/minecraft/block/EndGatewayBlock.java namedSrc/net/minecraft/block/EndGatewayBlock.java
--- namedTargetSrc/net/minecraft/block/EndGatewayBlock.java	2024-10-18 03:17:28.290529890 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-10-18 03:16:10.682759375 +0000
@@ -7,18 +7,18 @@
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.EndGatewayBlockEntity;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.entity.projectile.thrown.EnderPearlEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.entity.TeleportTarget;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -130,15 +130,23 @@
     */
    @Nullable
    @Override
-   public C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2) {
          Vec3d lv4 = lv2.createExitPortalIfAbsent(world, pos);
          if (lv4 == null) {
             return null;
          } else {
             return entity instanceof EnderPearlEntity
-               ? new C_sqhjwpkh(world, lv4, Vec3d.ZERO, 0.0F, 0.0F, Set.of(), C_sqhjwpkh.f_jibestwn)
-               : new C_sqhjwpkh(world, lv4, Vec3d.ZERO, 0.0F, 0.0F, C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, C_crougwaz.f_kgzcwlaw), C_sqhjwpkh.f_jibestwn);
+               ? new TeleportTarget(world, lv4, Vec3d.ZERO, 0.0F, 0.0F, Set.of(), TeleportTarget.ADD_PORTAL_CHUNK_TICKET)
+               : new TeleportTarget(
+                  world,
+                  lv4,
+                  Vec3d.ZERO,
+                  0.0F,
+                  0.0F,
+                  PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, PositionFlag.ROTATION),
+                  TeleportTarget.ADD_PORTAL_CHUNK_TICKET
+               );
          }
       } else {
          return null;
diff -bur namedTargetSrc/net/minecraft/block/EndPortalBlock.java namedSrc/net/minecraft/block/EndPortalBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalBlock.java	2024-10-18 03:17:28.470529379 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-10-18 03:16:10.926758600 +0000
@@ -5,14 +5,13 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.EndPortalBlockEntity;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
@@ -21,6 +20,7 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.entity.TeleportTarget;
 import net.minecraft.world.gen.feature.EndPlatformFeature;
 
 /**
@@ -72,11 +72,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fwpxnldx Lnet/minecraft/unmapped/C_iqbzlnao;m_fwpxnldx(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-    * @mapping {@literal named m_fwpxnldx Lnet/minecraft/block/EndPortalBlock;m_fwpxnldx(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+    * Mapping not found
     */
    @Override
-   protected VoxelShape m_fwpxnldx(BlockState state, World world, BlockPos pos) {
+   protected VoxelShape getInsideCollisionShape(BlockState state, World world, BlockPos pos) {
       return state.getOutlineShape(world, pos);
    }
 
@@ -99,7 +98,7 @@
     * Mapping not found
     */
    @Override
-   public C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -109,25 +108,25 @@
          BlockPos lv3 = bl ? ServerWorld.END_SPAWN_POS : lv2.getSpawnPos();
          Vec3d lv4 = lv3.ofBottomCenter();
          float f;
-         Set<C_crougwaz> set;
+         Set<PositionFlag> set;
          if (bl) {
             EndPlatformFeature.place(lv2, BlockPos.fromPosition(lv4).down(), true);
             f = Direction.WEST.asRotation();
-            set = C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, Set.of(C_crougwaz.X_ROT));
+            set = PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, Set.of(PositionFlag.X_ROT));
             if (entity instanceof ServerPlayerEntity) {
                lv4 = lv4.subtract(0.0, 1.0, 0.0);
             }
          } else {
             f = 0.0F;
-            set = C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, C_crougwaz.f_kgzcwlaw);
+            set = PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, PositionFlag.ROTATION);
             if (entity instanceof ServerPlayerEntity lv5) {
-               return lv5.m_jpjsvuqt(false, C_sqhjwpkh.f_ywlkuzgh);
+               return lv5.m_jpjsvuqt(false, TeleportTarget.NO_OP);
             }
 
             lv4 = entity.getAdjustedSpawnLocation(lv2, lv3).ofBottomCenter();
          }
 
-         return new C_sqhjwpkh(lv2, lv4, Vec3d.ZERO, f, 0.0F, set, C_sqhjwpkh.f_uxkbpkwm.then(C_sqhjwpkh.f_jibestwn));
+         return new TeleportTarget(lv2, lv4, Vec3d.ZERO, f, 0.0F, set, TeleportTarget.SEND_PORTAL_TRAVEL_PACKET.then(TeleportTarget.ADD_PORTAL_CHUNK_TICKET));
       }
    }
 
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-18 03:17:28.570529096 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-18 03:16:11.046758219 +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-18 03:17:28.462529403 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-18 03:16:10.914758638 +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-18 03:17:28.574529085 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-18 03:16:11.054758193 +0000
@@ -295,7 +295,7 @@
          MovementType.PISTON,
          new Vec3d(amount * (double)direction.getOffsetX(), amount * (double)direction.getOffsetY(), amount * (double)direction.getOffsetZ())
       );
-      entity.m_hwaiduvv();
+      entity.applyBlockCollisionEffects();
       NO_CLIP.set(null);
    }
 
@@ -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/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2024-10-18 03:17:28.594529028 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-10-18 03:16:11.078758117 +0000
@@ -298,7 +298,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks() && !(Boolean)state.get(POWERED)) {
+      if (explosion.canTriggerBlocks() && !(Boolean)state.get(POWERED)) {
          boolean bl = (Boolean)state.get(OPEN);
          world.setBlockState(pos, state.with(OPEN, Boolean.valueOf(!bl)));
          world.playSound(
diff -bur namedTargetSrc/net/minecraft/block/FlowerBlock.java namedSrc/net/minecraft/block/FlowerBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerBlock.java	2024-10-18 03:17:28.558529131 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-10-18 03:16:11.030758269 +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-18 03:17:28.538529187 +0000
+++ namedSrc/net/minecraft/block/HoneyBlock.java	2024-10-18 03:16:11.002758358 +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/LeverBlock.java namedSrc/net/minecraft/block/LeverBlock.java
--- namedTargetSrc/net/minecraft/block/LeverBlock.java	2024-10-18 03:17:28.614528972 +0000
+++ namedSrc/net/minecraft/block/LeverBlock.java	2024-10-18 03:16:11.110758015 +0000
@@ -177,7 +177,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks()) {
+      if (explosion.canTriggerBlocks()) {
          this.toggle(state, world, pos, null);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/LilyPadBlock.java namedSrc/net/minecraft/block/LilyPadBlock.java
--- namedTargetSrc/net/minecraft/block/LilyPadBlock.java	2024-10-18 03:17:28.490529323 +0000
+++ namedSrc/net/minecraft/block/LilyPadBlock.java	2024-10-18 03:16:10.954758511 +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-18 03:17:28.318529810 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-10-18 03:16:10.726759235 +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/NetherPortalBlock.java namedSrc/net/minecraft/block/NetherPortalBlock.java
--- namedTargetSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-18 03:17:28.534529198 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-18 03:16:11.002758358 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -17,8 +18,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -33,6 +32,7 @@
 import net.minecraft.world.border.WorldBorder;
 import net.minecraft.world.dimension.AreaHelper;
 import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.entity.TeleportTarget;
 import net.minecraft.world.tick.TickSchedulerAccess;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -180,7 +180,7 @@
     */
    @Nullable
    @Override
-   public C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.NETHER ? World.OVERWORLD : World.NETHER;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -196,18 +196,18 @@
 
    /**
     * @mapping {@literal hashed m_cuetenod Lnet/minecraft/unmapped/C_zpsdinym;m_cuetenod(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;ZLnet/minecraft/unmapped/C_pneibfez;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named tryCreateTransition Lnet/minecraft/block/NetherPortalBlock;tryCreateTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named tryCreateTransition Lnet/minecraft/block/NetherPortalBlock;tryCreateTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
    @Nullable
-   private C_sqhjwpkh tryCreateTransition(ServerWorld world, Entity entity, BlockPos pos, BlockPos scaledPos, boolean nether, WorldBorder border) {
+   private TeleportTarget tryCreateTransition(ServerWorld world, Entity entity, BlockPos pos, BlockPos scaledPos, boolean nether, WorldBorder border) {
       Optional<BlockPos> optional = world.getPortalForcer().m_mpevuvcu(scaledPos, nether, border);
       BlockLocating.Rectangle lv3;
-      C_sqhjwpkh.C_saosxlyx lv4;
+      TeleportTarget.PostTeleportTransition lv4;
       if (optional.isPresent()) {
          BlockPos lv = (BlockPos)optional.get();
          BlockState lv2 = world.getBlockState(lv);
          lv3 = BlockLocating.getLargestRectangle(lv, lv2.get(Properties.HORIZONTAL_AXIS), 21, Direction.Axis.Y, 21, pos2 -> world.getBlockState(pos2) == lv2);
-         lv4 = C_sqhjwpkh.f_uxkbpkwm.then(pos2 -> pos2.addPortalTicket(lv));
+         lv4 = TeleportTarget.SEND_PORTAL_TRAVEL_PACKET.then(pos2 -> pos2.addPortalTicket(lv));
       } else {
          Direction.Axis lv5 = (Direction.Axis)entity.getWorld().getBlockState(pos).getOrEmpty(AXIS).orElse(Direction.Axis.X);
          Optional<BlockLocating.Rectangle> optional2 = world.getPortalForcer().createPortal(scaledPos, lv5);
@@ -217,7 +217,7 @@
          }
 
          lv3 = (BlockLocating.Rectangle)optional2.get();
-         lv4 = C_sqhjwpkh.f_uxkbpkwm.then(C_sqhjwpkh.f_jibestwn);
+         lv4 = TeleportTarget.SEND_PORTAL_TRAVEL_PACKET.then(TeleportTarget.ADD_PORTAL_CHUNK_TICKET);
       }
 
       return createTransition(entity, pos, lv3, world, lv4);
@@ -225,10 +225,10 @@
 
    /**
     * @mapping {@literal hashed m_kvaymgqu Lnet/minecraft/unmapped/C_zpsdinym;m_kvaymgqu(Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/entity/TeleportTarget$PostTeleportTransition;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
-   private static C_sqhjwpkh createTransition(
-      Entity entity, BlockPos pos, BlockLocating.Rectangle portalRectangle, ServerWorld world, C_sqhjwpkh.C_saosxlyx arg5
+   private static TeleportTarget createTransition(
+      Entity entity, BlockPos pos, BlockLocating.Rectangle portalRectangle, ServerWorld world, TeleportTarget.PostTeleportTransition arg5
    ) {
       BlockState lv = entity.getWorld().getBlockState(pos);
       Direction.Axis lv2;
@@ -249,10 +249,15 @@
 
    /**
     * @mapping {@literal hashed m_fzuhemna Lnet/minecraft/unmapped/C_zpsdinym;m_fzuhemna(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/world/entity/TeleportTarget$PostTeleportTransition;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
-   private static C_sqhjwpkh createTransition(
-      ServerWorld world, BlockLocating.Rectangle portalRectangle, Direction.Axis startAxis, Vec3d offset, Entity entity, C_sqhjwpkh.C_saosxlyx arg6
+   private static TeleportTarget createTransition(
+      ServerWorld world,
+      BlockLocating.Rectangle portalRectangle,
+      Direction.Axis startAxis,
+      Vec3d offset,
+      Entity entity,
+      TeleportTarget.PostTeleportTransition arg6
    ) {
       BlockPos lv = portalRectangle.lowerLeft;
       BlockState lv2 = world.getBlockState(lv);
@@ -267,7 +272,7 @@
       boolean bl = lv3 == Direction.Axis.X;
       Vec3d lv5 = new Vec3d((double)lv.getX() + (bl ? f : h), (double)lv.getY() + g, (double)lv.getZ() + (bl ? h : f));
       Vec3d lv6 = AreaHelper.findOpenPosition(lv5, world, entity, lv4);
-      return new C_sqhjwpkh(world, lv6, Vec3d.ZERO, (float)i, 0.0F, C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, C_crougwaz.f_kgzcwlaw), arg6);
+      return new TeleportTarget(world, lv6, Vec3d.ZERO, (float)i, 0.0F, PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, PositionFlag.ROTATION), arg6);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-18 03:17:28.374529651 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-18 03:16:10.798759006 +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/Portal.java namedSrc/net/minecraft/block/Portal.java
--- namedTargetSrc/net/minecraft/block/Portal.java	2024-10-18 03:17:28.566529107 +0000
+++ namedSrc/net/minecraft/block/Portal.java	2024-10-18 03:16:11.042758232 +0000
@@ -2,8 +2,8 @@
 
 import net.minecraft.entity.Entity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.entity.TeleportTarget;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -21,10 +21,10 @@
 
    /**
     * @mapping {@literal hashed m_ssylpsbj Lnet/minecraft/unmapped/C_teerivzm;m_ssylpsbj(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named createTransition Lnet/minecraft/block/Portal;createTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named createTransition Lnet/minecraft/block/Portal;createTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
    @Nullable
-   C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos);
+   TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos);
 
    /**
     * @mapping {@literal hashed m_kzlfoqae Lnet/minecraft/unmapped/C_teerivzm;m_kzlfoqae()Lnet/minecraft/unmapped/C_teerivzm$C_budwrmur;}
diff -bur namedTargetSrc/net/minecraft/block/ScaffoldingBlock.java namedSrc/net/minecraft/block/ScaffoldingBlock.java
--- namedTargetSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-18 03:17:28.522529233 +0000
+++ namedSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-18 03:16:10.986758409 +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-18 03:17:28.602529005 +0000
+++ namedSrc/net/minecraft/block/SweetBerryBushBlock.java	2024-10-18 03:16:11.090758079 +0000
@@ -127,12 +127,12 @@
       if (entity instanceof LivingEntity && entity.getType() != EntityType.FOX && entity.getType() != EntityType.BEE) {
          entity.setMovementMultiplier(state, new Vec3d(0.8F, 0.75, 0.8F));
          if (world instanceof ServerWorld lv && (Integer)state.get(AGE) != 0) {
-            Vec3d lv3 = entity.m_uwlubbjx() ? entity.getMovement() : entity.m_qkqqfrjy().subtract(entity.getPos());
+            Vec3d lv3 = entity.isControlledByPlayer() ? entity.getMovement() : entity.getLastPos().subtract(entity.getPos());
             if (lv3.horizontalLengthSquared() > 0.0) {
                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/block/TntBlock.java namedSrc/net/minecraft/block/TntBlock.java
--- namedTargetSrc/net/minecraft/block/TntBlock.java	2024-10-18 03:17:28.570529096 +0000
+++ namedSrc/net/minecraft/block/TntBlock.java	2024-10-18 03:16:11.050758207 +0000
@@ -100,7 +100,7 @@
     */
    @Override
    public void onDestroyedByExplosion(ServerWorld world, BlockPos pos, Explosion explosion) {
-      TntEntity lv = new TntEntity(world, (double)pos.getX() + 0.5, (double)pos.getY(), (double)pos.getZ() + 0.5, explosion.m_pzwvnxgx());
+      TntEntity lv = new TntEntity(world, (double)pos.getX() + 0.5, (double)pos.getY(), (double)pos.getZ() + 0.5, explosion.getCausingEntity());
       int i = lv.getFuse();
       lv.setFuse((short)(world.random.nextInt(i / 4) + i / 8));
       world.spawnEntity(lv);
diff -bur namedTargetSrc/net/minecraft/block/TrapdoorBlock.java namedSrc/net/minecraft/block/TrapdoorBlock.java
--- namedTargetSrc/net/minecraft/block/TrapdoorBlock.java	2024-10-18 03:17:28.550529153 +0000
+++ namedSrc/net/minecraft/block/TrapdoorBlock.java	2024-10-18 03:16:11.018758308 +0000
@@ -188,7 +188,7 @@
     */
    @Override
    protected void onExplosion(BlockState state, ServerWorld world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> dropConsumer) {
-      if (explosion.m_ndwdgdks() && this.blockSetType.canOpenByWindCharge() && !(Boolean)state.get(POWERED)) {
+      if (explosion.canTriggerBlocks() && this.blockSetType.canOpenByWindCharge() && !(Boolean)state.get(POWERED)) {
          this.flip(state, world, pos, null);
       }
 
diff -bur namedTargetSrc/net/minecraft/block/TripwireBlock.java namedSrc/net/minecraft/block/TripwireBlock.java
--- namedTargetSrc/net/minecraft/block/TripwireBlock.java	2024-10-18 03:17:28.470529379 +0000
+++ namedSrc/net/minecraft/block/TripwireBlock.java	2024-10-18 03:16:10.926758600 +0000
@@ -226,11 +226,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fwpxnldx Lnet/minecraft/unmapped/C_jioxkxuh;m_fwpxnldx(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-    * @mapping {@literal named m_fwpxnldx Lnet/minecraft/block/TripwireBlock;m_fwpxnldx(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+    * Mapping not found
     */
    @Override
-   protected VoxelShape m_fwpxnldx(BlockState state, World world, BlockPos pos) {
+   protected VoxelShape getInsideCollisionShape(BlockState state, World world, BlockPos pos) {
       return state.getOutlineShape(world, pos);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/WitherRoseBlock.java namedSrc/net/minecraft/block/WitherRoseBlock.java
--- namedTargetSrc/net/minecraft/block/WitherRoseBlock.java	2024-10-18 03:17:28.434529481 +0000
+++ namedSrc/net/minecraft/block/WitherRoseBlock.java	2024-10-18 03:16:10.882758740 +0000
@@ -97,7 +97,7 @@
       if (world instanceof ServerWorld lv
          && world.getDifficulty() != Difficulty.PEACEFUL
          && entity instanceof LivingEntity lv2
-         && !lv2.m_luzswycb(lv, world.getDamageSources().wither())) {
+         && !lv2.isInvulnerableTo(lv, world.getDamageSources().wither())) {
          lv2.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, 40));
       }
    }
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-18 03:17:28.582529062 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-18 03:16:11.062758168 +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/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-18 03:17:28.414529538 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-18 03:16:10.858758816 +0000
@@ -30,6 +30,7 @@
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.texture.StatusEffectSpriteManager;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.JumpingMount;
@@ -55,7 +56,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ArgbHelper;
 import net.minecraft.util.Arm;
@@ -603,7 +603,7 @@
 
             for (EquipmentSlot lv : EquipmentSlot.values()) {
                ItemStack lv2 = this.client.player.getEquippedStack(lv);
-               C_duiqsjgf lv3 = lv2.get(DataComponentTypes.EQUIPPABLE);
+               EquippableComponent lv3 = lv2.get(DataComponentTypes.EQUIPPABLE);
                if (lv3 != null && lv3.slot() == lv && lv3.cameraOverlay().isPresent()) {
                   this.renderOverlay(
                      graphics, ((Identifier)lv3.cameraOverlay().get()).withPath((UnaryOperator<String>)(string -> "textures/" + string + ".png")), 1.0F
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-18 03:17:28.438529470 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-18 03:16:10.886758727 +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-18 03:17:28.350529720 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-18 03:16:10.762759121 +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-18 03:17:28.482529346 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-18 03:16:10.942758549 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -15,7 +16,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.SmithingScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
@@ -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());
    }
 
@@ -237,7 +237,7 @@
          }
 
          if (!stack.isEmpty()) {
-            C_duiqsjgf lv2 = stack.get(DataComponentTypes.EQUIPPABLE);
+            EquippableComponent lv2 = stack.get(DataComponentTypes.EQUIPPABLE);
             EquipmentSlot lv3 = lv2 != null ? lv2.slot() : EquipmentSlot.OFFHAND;
             this.display.equipStack(lv3, stack.copy());
          }
diff -bur namedTargetSrc/net/minecraft/client/Keyboard.java namedSrc/net/minecraft/client/Keyboard.java
--- namedTargetSrc/net/minecraft/client/Keyboard.java	2024-10-18 03:17:28.470529379 +0000
+++ namedSrc/net/minecraft/client/Keyboard.java	2024-10-18 03:16:10.926758600 +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-18 03:17:28.358529697 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-18 03:16:10.778759070 +0000
@@ -3856,8 +3856,8 @@
       int k = this.window.getFramebufferWidth();
       int l = this.window.getFramebufferHeight();
       Framebuffer lv = this.getFramebuffer();
-      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-18 03:17:28.574529085 +0000
+++ namedSrc/net/minecraft/client/model/Model.java	2024-10-18 03:16:11.054758193 +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-18 03:17:28.478529357 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-18 03:16:10.934758574 +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-18 03:17:28.302529856 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-18 03:16:10.706759299 +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);

@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/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-18 03:17:28.594529028 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-18 03:16:11.074758130 +0000
@@ -66,6 +66,7 @@
 import net.minecraft.command.argument.ArgumentSignatures;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityPosition;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.ExperienceOrbEntity;
@@ -73,6 +74,7 @@
 import net.minecraft.entity.Leashable;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.PacketPositionCodec;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.attribute.AttributeContainer;
 import net.minecraft.entity.attribute.EntityAttributeInstance;
@@ -87,6 +89,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;
@@ -190,6 +193,7 @@
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityStatusEffectRemovalS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityStatusEffectUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.EntityTeleportS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
@@ -288,8 +292,6 @@
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_btculrky;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_dxakxzow;
 import net.minecraft.unmapped.C_fiyoolld;
 import net.minecraft.unmapped.C_hgofpcxx;
 import net.minecraft.unmapped.C_jqraxkur;
@@ -297,13 +299,11 @@
 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;
 import net.minecraft.unmapped.C_wuqdybfp;
 import net.minecraft.unmapped.C_yjakgqnt;
-import net.minecraft.unmapped.C_yqhgaaca;
 import net.minecraft.unmapped.C_zqywhkdo;
 import net.minecraft.unmapped.C_zzvdiztt;
 import net.minecraft.util.Hand;
@@ -760,15 +760,15 @@
     * Mapping not found
     */
    @Override
-   public void m_fejagkmw(C_yqhgaaca arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      Entity lv = this.world.getEntityById(arg.id());
+   public void onEntityPositionUpdate(EntityPositionUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      Entity lv = this.world.getEntityById(packet.id());
       if (lv != null) {
-         Vec3d lv2 = arg.values().position();
+         Vec3d lv2 = packet.values().position();
          lv.getPacketPositionCodec().setPos(lv2);
          if (!lv.isLogicalSideForUpdatingMovement()) {
-            float f = arg.values().yRot();
-            float g = arg.values().xRot();
+            float f = packet.values().yRot();
+            float g = packet.values().xRot();
             boolean bl = lv.getPos().squaredDistanceTo(lv2) > 4096.0;
             if (this.world.m_gppbsjis(lv) && !bl) {
                lv.updateTrackedPositionAndAngles(lv2.x, lv2.y, lv2.z, f, g, 3);
@@ -776,11 +776,11 @@
                lv.refreshPositionAndAngles(lv2.x, lv2.y, lv2.z, f, g);
                if (lv.hasPassengerDeep(this.client.player)) {
                   lv.updatePassengerPosition(this.client.player);
-                  this.client.player.m_hhwtkfxu();
+                  this.client.player.setPrevPosAndAngles();
                }
             }
 
-            lv.setOnGround(arg.onGround());
+            lv.setOnGround(packet.onGround());
          }
       }
    }
@@ -789,7 +789,7 @@
     * Mapping not found
     */
    @Override
-   public void onEntityPositionUpdate(EntityPositionUpdateS2CPacket packet) {
+   public void onEntityTeleport(EntityTeleportS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       Entity lv = this.world.getEntityById(packet.id());
       if (lv == null) {
@@ -802,22 +802,22 @@
                      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
                   )
                );
          }
       } else {
-         boolean bl = packet.relatives().contains(C_crougwaz.X) || packet.relatives().contains(C_crougwaz.Y) || packet.relatives().contains(C_crougwaz.Z);
+         boolean bl = packet.relatives().contains(PositionFlag.X) || packet.relatives().contains(PositionFlag.Y) || packet.relatives().contains(PositionFlag.Z);
          boolean bl2 = this.world.m_gppbsjis(lv) || !lv.isLogicalSideForUpdatingMovement() || bl;
          boolean bl3 = m_noarotfs(packet.change(), packet.relatives(), lv, bl2);
          lv.setOnGround(packet.onGround());
          if (!bl3 && lv.hasPassengerDeep(this.client.player)) {
             lv.updatePassengerPosition(this.client.player);
-            this.client.player.m_hhwtkfxu();
-            if (lv.m_zgdobmyk()) {
+            this.client.player.setPrevPosAndAngles();
+            if (lv.isOrControlledByLogicalPlayer()) {
                this.connection.send(new VehicleMoveC2SPacket(lv));
             }
          }
@@ -945,17 +945,17 @@
          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()));
    }
 
    /**
     * @mapping {@literal hashed m_noarotfs Lnet/minecraft/unmapped/C_nuofrxvi;m_noarotfs(Lnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;Lnet/minecraft/unmapped/C_astfners;Z)Z}
-    * @mapping {@literal named m_noarotfs Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_noarotfs(Lnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;Lnet/minecraft/entity/Entity;Z)Z}
+    * @mapping {@literal named m_noarotfs Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_noarotfs(Lnet/minecraft/entity/EntityPosition;Ljava/util/Set;Lnet/minecraft/entity/Entity;Z)Z}
     */
-   private static boolean m_noarotfs(C_dxakxzow arg, Set<C_crougwaz> set, Entity entity, boolean bl) {
-      C_dxakxzow lv = C_dxakxzow.m_scijksjb(entity);
-      C_dxakxzow lv2 = C_dxakxzow.m_axgndomh(lv, arg, set);
+   private static boolean m_noarotfs(EntityPosition newPos, Set<PositionFlag> flags, Entity entity, boolean bl) {
+      EntityPosition lv = EntityPosition.createFromLerpTarget(entity);
+      EntityPosition lv2 = EntityPosition.calculateAbsolute(lv, newPos, flags);
       boolean bl2 = lv.position().squaredDistanceTo(lv2.position()) > 4096.0;
       if (bl && !bl2) {
          entity.updateTrackedPositionAndAngles(lv2.position().getX(), lv2.position().getY(), lv2.position().getZ(), lv2.yRot(), lv2.xRot(), 3);
@@ -966,9 +966,9 @@
          entity.setVelocity(lv2.deltaMovement());
          entity.setYaw(lv2.yRot());
          entity.setPitch(lv2.xRot());
-         C_dxakxzow lv3 = new C_dxakxzow(entity.m_qkqqfrjy(), Vec3d.ZERO, entity.prevYaw, entity.prevPitch);
-         C_dxakxzow lv4 = C_dxakxzow.m_axgndomh(lv3, arg, set);
-         entity.m_rtigrevq(lv4.position(), lv4.yRot(), lv4.xRot());
+         EntityPosition lv3 = new EntityPosition(entity.getLastPos(), Vec3d.ZERO, entity.prevYaw, entity.prevPitch);
+         EntityPosition lv4 = EntityPosition.calculateAbsolute(lv3, newPos, flags);
+         entity.setPrevPosAndAngles(lv4.position(), lv4.yRot(), lv4.xRot());
          return false;
       }
    }
@@ -982,8 +982,8 @@
       PlayerEntity lv = this.client.player;
       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));
+      lv.setPrevAngles();
+      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);
@@ -2469,7 +2469,7 @@
          Vec3d lv2 = new Vec3d(packet.getX(), packet.getY(), packet.getZ());
          Vec3d lv3 = new Vec3d(lv.getLerpTargetX(), lv.getLerpTargetY(), lv.getLerpTargetZ());
          if (lv2.distanceTo(lv3) > 1.0E-5F) {
-            lv.m_lxlqiklm();
+            lv.cancelLerp();
             lv.updatePositionAndAngles(lv2.getX(), lv2.getY(), lv2.getZ(), packet.getYaw(), packet.getPitch());
          }
 
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-18 03:17:28.610528983 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-18 03:16:11.102758041 +0000
@@ -56,7 +56,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_jaiycnbg(DamageSource arg) {
+   public boolean damageClient(DamageSource source) {
       return true;
    }
 
@@ -133,6 +133,6 @@
    @Override
    public void onSpawnPacket(EntitySpawnS2CPacket packet) {
       super.onSpawnPacket(packet);
-      this.m_hhwtkfxu();
+      this.setPrevPosAndAngles();
    }
 }
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-18 03:17:28.466529391 +0000
+++ namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-18 03:16:10.922758612 +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-18 03:17:28.306529845 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java	2024-10-18 03:16:10.706759299 +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-18 03:17:28.390529606 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java	2024-10-18 03:16:10.822758930 +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-18 03:17:28.558529131 +0000
+++ namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-18 03:16:11.030758269 +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-18 03:17:28.510529266 +0000
+++ namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-18 03:16:10.974758448 +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-18 03:17:28.330529777 +0000
+++ namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-18 03:16:10.742759184 +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-18 03:17:28.514529255 +0000
+++ namedSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java	2024-10-18 03:16:10.978758434 +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/DisplayEntityRenderer.java namedSrc/net/minecraft/client/render/entity/DisplayEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/DisplayEntityRenderer.java	2024-10-18 03:17:28.550529153 +0000
+++ namedSrc/net/minecraft/client/render/entity/DisplayEntityRenderer.java	2024-10-18 03:16:11.022758295 +0000
@@ -150,14 +150,14 @@
     * Mapping not found
     */
    private static <T extends DisplayEntity> float m_btlgdwql(T arg, float f) {
-      return arg.m_stcixbth(f);
+      return arg.getLerpedYaw(f);
    }
 
    /**
     * Mapping not found
     */
    private static <T extends DisplayEntity> float m_zegdbvcy(T arg, float f) {
-      return arg.m_beudeczo(f);
+      return arg.getLerpedPitch(f);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java namedSrc/net/minecraft/client/render/entity/EntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-10-18 03:17:28.438529470 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-10-18 03:16:10.886758727 +0000
@@ -342,7 +342,7 @@
       boolean bl = arg2.f_jurhvidz < 4096.0 && this.hasLabel(entity, arg2.f_jurhvidz);
       if (bl) {
          arg2.f_ylvpvtdl = this.m_otmducia(entity);
-         arg2.f_tubizsxk = entity.getAttachments().getPointNullable(EntityAttachmentType.NAME_TAG, 0, entity.m_stcixbth(f));
+         arg2.f_tubizsxk = entity.getAttachments().getPointNullable(EntityAttachmentType.NAME_TAG, 0, entity.getLerpedYaw(f));
       } else {
          arg2.f_ylvpvtdl = null;
       }
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-18 03:17:28.534529198 +0000
+++ namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-18 03:16:11.002758358 +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/feature/ArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-10-18 03:17:28.322529799 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-10-18 03:16:10.730759222 +0000
@@ -6,10 +6,10 @@
 import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.unmapped.C_btosngnd;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_gxghjvma;
 import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
@@ -71,14 +71,14 @@
     * @mapping {@literal named m_utaccwiw Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;m_utaccwiw(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;)Z}
     */
    public static boolean m_utaccwiw(ItemStack stack, EquipmentSlot arg2) {
-      C_duiqsjgf lv = stack.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv = stack.get(DataComponentTypes.EQUIPPABLE);
       return lv != null && m_qycgrmni(lv, arg2);
    }
 
    /**
     * Mapping not found
     */
-   private static boolean m_qycgrmni(C_duiqsjgf arg, EquipmentSlot arg2) {
+   private static boolean m_qycgrmni(EquippableComponent arg, EquipmentSlot arg2) {
       return arg.model().isPresent() && arg.slot() == arg2;
    }
 
@@ -98,7 +98,7 @@
     * @mapping {@literal named renderArmor Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;renderArmor(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;ILnet/minecraft/client/render/entity/model/BipedEntityModel;)V}
     */
    private void renderArmor(MatrixStack matrices, VertexConsumerProvider vertexConsumers, ItemStack stack, EquipmentSlot armorSlot, int light, A model) {
-      C_duiqsjgf lv = stack.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv = stack.get(DataComponentTypes.EQUIPPABLE);
       if (lv != null && m_qycgrmni(lv, armorSlot)) {
          this.getContextModel().m_dffrctaa(model);
          this.setVisible(model, armorSlot);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-10-18 03:17:28.618528960 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-10-18 03:16:11.118757990 +0000
@@ -13,8 +13,8 @@
 import net.minecraft.client.texture.PlayerSkin;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.unmapped.C_miillwpg;
 import net.minecraft.unmapped.C_pkqgufgx;
@@ -51,7 +51,7 @@
     * @mapping {@literal named m_nmlegkzt Lnet/minecraft/client/render/entity/feature/CapeFeatureRenderer;m_nmlegkzt(Lnet/minecraft/item/ItemStack;Lnet/minecraft/unmapped/C_mgbzsqdv$C_otwvbrdf;)Z}
     */
    private boolean m_nmlegkzt(ItemStack stack, C_mgbzsqdv.C_otwvbrdf key) {
-      C_duiqsjgf lv = stack.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv = stack.get(DataComponentTypes.EQUIPPABLE);
       if (lv != null && !lv.model().isEmpty()) {
          C_mgbzsqdv lv2 = this.f_rilqngmm.m_kszmxske((Identifier)lv.model().get());
          return !lv2.m_jyfxgynh(key).isEmpty();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-10-18 03:17:28.330529777 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-10-18 03:16:10.738759197 +0000
@@ -8,8 +8,8 @@
 import net.minecraft.client.render.entity.model.HorseEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_gxghjvma;
 import net.minecraft.unmapped.C_jmqrtfry;
 import net.minecraft.unmapped.C_mgbzsqdv;
@@ -51,7 +51,7 @@
     */
    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, C_jmqrtfry arg3, float f, float g) {
       ItemStack lv = arg3.stack;
-      C_duiqsjgf lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
       if (lv2 != null && !lv2.model().isEmpty()) {
          HorseEntityModel lv3 = arg3.f_vetzpkzw ? this.f_qnxftgno : this.f_chbtqerl;
          Identifier lv4 = (Identifier)lv2.model().get();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-10-18 03:17:28.326529788 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-10-18 03:16:10.734759210 +0000
@@ -8,8 +8,8 @@
 import net.minecraft.client.render.entity.model.LlamaEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.unmapped.C_gxghjvma;
 import net.minecraft.unmapped.C_ivvdyrnm;
@@ -52,7 +52,7 @@
     */
    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, C_ivvdyrnm arg3, float f, float g) {
       ItemStack lv = arg3.stack;
-      C_duiqsjgf lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
       if (lv2 != null && lv2.model().isPresent()) {
          this.m_mfgrmedl(matrices, vertexConsumers, arg3, lv, (Identifier)lv2.model().get(), i);
       } else if (arg3.f_xvktkzok) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-10-18 03:17:28.334529765 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-10-18 03:16:10.742759184 +0000
@@ -13,8 +13,8 @@
 import net.minecraft.client.render.entity.model.WolfEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_fudcfuiw;
 import net.minecraft.unmapped.C_gveqshad;
 import net.minecraft.unmapped.C_gxghjvma;
@@ -69,7 +69,7 @@
     */
    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, C_gveqshad arg3, float f, float g) {
       ItemStack lv = arg3.stack;
-      C_duiqsjgf lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
       if (lv2 != null && !lv2.model().isEmpty()) {
          WolfEntityModel lv3 = arg3.f_vetzpkzw ? this.f_lacitret : this.f_slmmbgwl;
          Identifier lv4 = (Identifier)lv2.model().get();
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-18 03:17:28.346529731 +0000
+++ namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-18 03:16:10.758759134 +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/LivingEntityRenderer.java namedSrc/net/minecraft/client/render/entity/LivingEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/LivingEntityRenderer.java	2024-10-18 03:17:28.378529640 +0000
+++ namedSrc/net/minecraft/client/render/entity/LivingEntityRenderer.java	2024-10-18 03:16:10.806758981 +0000
@@ -359,7 +359,7 @@
       float g = MathHelper.lerpDegrees(f, entity.prevHeadYaw, entity.headYaw);
       arg2.f_svrskpgy = m_fkajsxni(entity, g, f);
       arg2.f_hdaqnjbp = MathHelper.wrapDegrees(g - arg2.f_svrskpgy);
-      arg2.f_ktbmfmcg = entity.m_beudeczo(f);
+      arg2.f_ktbmfmcg = entity.getLerpedPitch(f);
       arg2.f_cyjcipbw = entity.getCustomName();
       arg2.f_uqpnbadv = renderFlipped(entity);
       if (arg2.f_uqpnbadv) {
@@ -398,8 +398,8 @@
       arg2.f_hjosjaer = lv2.copy();
       arg2.f_oyelgcru = this.f_chidqyjb.m_knnobqjj(lv2, entity, ModelTransformationMode.HEAD);
       arg2.f_jfyrocmo = entity.getMainArm();
-      ItemStack lv3 = entity.m_pizuxcky(Arm.RIGHT);
-      ItemStack lv4 = entity.m_pizuxcky(Arm.LEFT);
+      ItemStack lv3 = entity.getHeldStack(Arm.RIGHT);
+      ItemStack lv4 = entity.getHeldStack(Arm.LEFT);
       arg2.f_wotcxvoe = lv3.copy();
       arg2.f_xrxhvhfh = lv4.copy();
       arg2.f_djnszfwk = this.f_chidqyjb.m_knnobqjj(lv3, entity, ModelTransformationMode.THIRD_PERSON_RIGHT_HAND);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/LlamaSpitEntityRenderer.java namedSrc/net/minecraft/client/render/entity/LlamaSpitEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/LlamaSpitEntityRenderer.java	2024-10-18 03:17:28.366529675 +0000
+++ namedSrc/net/minecraft/client/render/entity/LlamaSpitEntityRenderer.java	2024-10-18 03:16:10.786759045 +0000
@@ -69,7 +69,7 @@
     */
    public void m_tskwgjqs(LlamaSpitEntity arg, C_ilkcfkxb arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_hsyrwref = arg.m_beudeczo(f);
-      arg2.f_ldnbwhsy = arg.m_stcixbth(f);
+      arg2.f_hsyrwref = arg.getLerpedPitch(f);
+      arg2.f_ldnbwhsy = arg.getLerpedYaw(f);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java	2024-10-18 03:17:28.462529403 +0000
+++ namedSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java	2024-10-18 03:16:10.914758638 +0000
@@ -60,8 +60,8 @@
     */
    public void m_tskwgjqs(T arg, S arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_zcvfyqdu = arg.m_beudeczo(f);
-      arg2.f_xlaffrsv = arg.m_stcixbth(f);
+      arg2.f_zcvfyqdu = arg.getLerpedPitch(f);
+      arg2.f_xlaffrsv = arg.getLerpedYaw(f);
       arg2.f_qbjfjvks = (float)arg.shake - f;
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java	2024-10-18 03:17:28.510529266 +0000
+++ namedSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java	2024-10-18 03:16:10.974758448 +0000
@@ -91,7 +91,7 @@
     */
    public void m_tskwgjqs(ShulkerBulletEntity arg, C_zckhbxpy arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_dswzioxd = arg.m_stcixbth(f);
-      arg2.f_mplvznxu = arg.m_beudeczo(f);
+      arg2.f_dswzioxd = arg.getLerpedYaw(f);
+      arg2.f_mplvznxu = arg.getLerpedPitch(f);
    }
 }
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-18 03:17:28.530529209 +0000
+++ namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-18 03:16:10.994758384 +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/TridentEntityRenderer.java namedSrc/net/minecraft/client/render/entity/TridentEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/TridentEntityRenderer.java	2024-10-18 03:17:28.390529606 +0000
+++ namedSrc/net/minecraft/client/render/entity/TridentEntityRenderer.java	2024-10-18 03:16:10.822758930 +0000
@@ -68,8 +68,8 @@
     */
    public void m_tskwgjqs(TridentEntity arg, C_fppjadwh arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_eolrfmfy = arg.m_stcixbth(f);
-      arg2.f_ooqdzpok = arg.m_beudeczo(f);
+      arg2.f_eolrfmfy = arg.getLerpedYaw(f);
+      arg2.f_ooqdzpok = arg.getLerpedPitch(f);
       arg2.f_lawpkyrd = arg.isEnchanted();
    }
 }
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-18 03:17:28.454529425 +0000
+++ namedSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-18 03:16:10.906758663 +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/entity/WitherSkullEntityRenderer.java namedSrc/net/minecraft/client/render/entity/WitherSkullEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WitherSkullEntityRenderer.java	2024-10-18 03:17:28.614528972 +0000
+++ namedSrc/net/minecraft/client/render/entity/WitherSkullEntityRenderer.java	2024-10-18 03:16:11.110758015 +0000
@@ -104,7 +104,7 @@
    public void m_tskwgjqs(WitherSkullEntity arg, C_vmiycnop arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_nfvecvjo = arg.isCharged();
-      arg2.f_wqkbikhs = arg.m_stcixbth(f);
-      arg2.f_xvmaljfo = arg.m_beudeczo(f);
+      arg2.f_wqkbikhs = arg.getLerpedYaw(f);
+      arg2.f_xvmaljfo = arg.getLerpedPitch(f);
    }
 }
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-18 03:17:28.350529720 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-10-18 03:16:10.766759108 +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/item/HeldItemRenderer.java namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-10-18 03:17:28.382529629 +0000
+++ namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-10-18 03:16:10.814758956 +0000
@@ -717,7 +717,7 @@
    public void renderItem(float tickDelta, MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers, ClientPlayerEntity player, int light) {
       float g = player.getHandSwingProgress(tickDelta);
       Hand lv = MoreObjects.firstNonNull(player.preferredHand, Hand.MAIN_HAND);
-      float h = player.m_beudeczo(tickDelta);
+      float h = player.getLerpedPitch(tickDelta);
       HeldItemRenderer.HandRenderType lv2 = getHandRenderType(player);
       float j = MathHelper.lerp(tickDelta, player.lastRenderPitch, player.renderPitch);
       float k = MathHelper.lerp(tickDelta, player.lastRenderYaw, player.renderYaw);
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-18 03:17:28.330529777 +0000
+++ namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-18 03:16:10.738759197 +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-18 03:17:28.518529244 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-18 03:16:10.982758422 +0000
@@ -439,7 +439,7 @@
     * @mapping {@literal named tickEntity Lnet/minecraft/client/world/ClientWorld;tickEntity(Lnet/minecraft/entity/Entity;)V}
     */
    public void tickEntity(Entity entity) {
-      entity.m_hhwtkfxu();
+      entity.setPrevPosAndAngles();
       entity.age++;
       C_xuophqnt.m_yaecfwdp().push((Supplier<String>)(() -> Registries.ENTITY_TYPE.getId(entity.getType()).toString()));
       entity.tick();
@@ -458,7 +458,7 @@
       if (passenger.isRemoved() || passenger.getVehicle() != entity) {
          passenger.stopRiding();
       } else if (passenger instanceof PlayerEntity || this.entityList.has(passenger)) {
-         passenger.m_hhwtkfxu();
+         passenger.setPrevPosAndAngles();
          passenger.age++;
          passenger.tickRiding();
 
@@ -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-18 03:17:28.558529131 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-18 03:16:11.034758257 +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/component/DataComponentTypes.java namedSrc/net/minecraft/component/DataComponentTypes.java
--- namedTargetSrc/net/minecraft/component/DataComponentTypes.java	2024-10-18 03:17:28.574529085 +0000
+++ namedSrc/net/minecraft/component/DataComponentTypes.java	2024-10-18 03:16:11.054758193 +0000
@@ -15,6 +15,7 @@
 import net.minecraft.component.type.CustomModelDataComponent;
 import net.minecraft.component.type.DebugStickStateComponent;
 import net.minecraft.component.type.DyedColorComponent;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.component.type.FireworkExplosionComponent;
 import net.minecraft.component.type.FireworksComponent;
 import net.minecraft.component.type.ItemEnchantmentsComponent;
@@ -50,7 +51,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
 import net.minecraft.unmapped.C_dbotabxl;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_elkynmne;
 import net.minecraft.unmapped.C_evakkied;
 import net.minecraft.unmapped.C_gzmmqgkx;
@@ -267,8 +267,8 @@
     * @mapping {@literal hashed f_jesloesr Lnet/minecraft/unmapped/C_icwdaizi;f_jesloesr:Lnet/minecraft/unmapped/C_pscqxfcs;}
     * @mapping {@literal named EQUIPPABLE Lnet/minecraft/component/DataComponentTypes;EQUIPPABLE:Lnet/minecraft/component/DataComponentType;}
     */
-   public static final DataComponentType<C_duiqsjgf> EQUIPPABLE = register(
-      "equippable", builder -> builder.codec(C_duiqsjgf.CODEC).packetCodec(C_duiqsjgf.PACKET_CODEC).m_hzpkutpy()
+   public static final DataComponentType<EquippableComponent> EQUIPPABLE = register(
+      "equippable", builder -> builder.codec(EquippableComponent.CODEC).packetCodec(EquippableComponent.PACKET_CODEC).m_hzpkutpy()
    );
    /**
     * @mapping {@literal hashed f_dgmnyxls Lnet/minecraft/unmapped/C_icwdaizi;f_dgmnyxls:Lnet/minecraft/unmapped/C_pscqxfcs;}
Only in namedSrc/net/minecraft/component/type: EquippableComponent.java
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-10-18 03:17:28.598529017 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-10-18 03:16:11.086758092 +0000
@@ -10,6 +10,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.data.client.model.Model;
 import net.minecraft.data.client.model.ModelIds;
 import net.minecraft.data.client.model.Models;
@@ -19,7 +20,6 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.unmapped.C_mgbzsqdv;
 import net.minecraft.util.Identifier;
@@ -475,7 +475,7 @@
       C_gvxmissl.m_gpvytjtb(map::put);
 
       for (Item lv : Registries.ITEM) {
-         C_duiqsjgf lv2 = lv.getComponents().get(DataComponentTypes.EQUIPPABLE);
+         EquippableComponent lv2 = lv.getComponents().get(DataComponentTypes.EQUIPPABLE);
          if (lv2 != null && lv2.slot().getType() == EquipmentSlot.Type.HUMANOID_ARMOR && lv2.model().isPresent()) {
             Identifier lv3 = (Identifier)lv2.model().get();
             C_mgbzsqdv lv4 = (C_mgbzsqdv)map.get(lv3);
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-18 03:17:28.562529118 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-18 03:16:11.034758257 +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-18 03:17:28.406529561 +0000
+++ namedSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-10-18 03:16:10.846758853 +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-18 03:17:28.318529810 +0000
+++ namedSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-18 03:16:10.726759235 +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/sensor/NearestItemsSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-10-18 03:17:28.534529198 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-10-18 03:16:11.002758358 +0000
@@ -51,7 +51,7 @@
       Optional<ItemEntity> optional = list.stream()
          .filter(arg3 -> arg2.canGather(world, arg3.getStack()))
          .filter(arg2x -> arg2x.isInRange(arg2, 32.0))
-         .filter(arg2::m_ayqytazn)
+         .filter(arg2::hasLineOfSight)
          .findFirst();
       lv.remember(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional);
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java	2024-10-18 03:17:28.370529663 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java	2024-10-18 03:16:10.794759019 +0000
@@ -94,7 +94,7 @@
             }
          } else if (lv3 instanceof PlayerEntity) {
             PlayerEntity lv7 = (PlayerEntity)lv3;
-            if (optional6.isEmpty() && !PiglinBrain.m_klnzftun(lv7) && entity.m_lazolqzm(lv3)) {
+            if (optional6.isEmpty() && !PiglinBrain.m_klnzftun(lv7) && entity.canTarget(lv3)) {
                optional6 = Optional.of(lv7);
             }
 
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-18 03:17:28.590529039 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-18 03:16:11.070758143 +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-18 03:17:28.278529924 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-18 03:16:10.646759489 +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/ForgetAttackTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-10-18 03:17:28.438529470 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-10-18 03:16:10.886758727 +0000
@@ -53,7 +53,7 @@
                   instance,
                   (attackTarget, cannotReachWalkTargetReason) -> (world, entity, time) -> {
                         LivingEntity lv = instance.getValue(attackTarget);
-                        if (entity.m_lazolqzm(lv)
+                        if (entity.canTarget(lv)
                            && (!bl || !cannotReachTarget(entity, instance.getValueOptional(cannotReachWalkTargetReason)))
                            && lv.isAlive()
                            && lv.getWorld() == entity.getWorld()
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java namedSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java	2024-10-18 03:17:28.322529799 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java	2024-10-18 03:16:10.730759222 +0000
@@ -169,7 +169,7 @@
     * @mapping {@literal named giveGifts Lnet/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask;giveGifts(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/VillagerEntity;Lnet/minecraft/entity/LivingEntity;)V}
     */
    private void giveGifts(ServerWorld world, VillagerEntity villager, LivingEntity recipient) {
-      villager.m_fcllvyfo(world, m_udnybjdp(villager), (worldx, stack) -> LookTargetUtil.throwStack(villager, stack, recipient.getPos()));
+      villager.forEachGiftItem(world, m_udnybjdp(villager), (worldx, stack) -> LookTargetUtil.throwStack(villager, stack, recipient.getPos()));
    }
 
    /**
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-18 03:17:28.538529187 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-10-18 03:16:11.006758346 +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-18 03:17:28.490529323 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-18 03:16:10.950758523 +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-18 03:17:28.350529720 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-10-18 03:16:10.762759121 +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/brain/task/UpdateAttackTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java	2024-10-18 03:17:28.450529436 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java	2024-10-18 03:16:10.902758676 +0000
@@ -33,7 +33,7 @@
                            return false;
                         } else {
                            LivingEntity lv = (LivingEntity)optional.get();
-                           if (!entity.m_lazolqzm(lv)) {
+                           if (!entity.canTarget(lv)) {
                               return false;
                            } else {
                               arg3x.remember(lv);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java	2024-10-18 03:17:28.434529481 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java	2024-10-18 03:16:10.882758740 +0000
@@ -46,7 +46,7 @@
                            && startPredicate.test(entity)
                            && lvx.isInRange(entity, (double)radius)
                            && entity.getWorld().getWorldBorder().contains(lvx.getBlockPos())
-                           && entity.m_cwcitqpe()) {
+                           && entity.canPickUpLoot()) {
                            WalkTarget lv2 = new WalkTarget(new EntityLookTarget(lvx, false), speed, 0);
                            arg2.remember(new EntityLookTarget(lvx, true));
                            arg3.remember(lv2);
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-18 03:17:28.594529028 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticLookControl.java	2024-10-18 03:16:11.078758117 +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);
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-18 03:17:28.610528983 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-10-18 03:16:11.102758041 +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);
             }

@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/ai/control/BodyControl.java namedSrc/net/minecraft/entity/ai/control/BodyControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-18 03:17:28.458529414 +0000
+++ namedSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-18 03:16:10.914758638 +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-18 03:17:28.398529584 +0000
+++ namedSrc/net/minecraft/entity/ai/control/FlightMoveControl.java	2024-10-18 03:16:10.834758892 +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-18 03:17:28.438529470 +0000
+++ namedSrc/net/minecraft/entity/ai/control/LookControl.java	2024-10-18 03:16:10.890758714 +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-18 03:17:28.422529516 +0000
+++ namedSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-18 03:16:10.866758791 +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-18 03:17:28.410529549 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-10-18 03:16:10.850758841 +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-18 03:17:28.478529357 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-10-18 03:16:10.938758562 +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-18 03:17:28.462529403 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TemptGoal.java	2024-10-18 03:16:10.914758638 +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/ai/goal/TrackTargetGoal.java namedSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java	2024-10-18 03:17:28.502529289 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TrackTargetGoal.java	2024-10-18 03:16:10.966758473 +0000
@@ -101,7 +101,7 @@
 
       if (lv == null) {
          return false;
-      } else if (!this.mob.m_lazolqzm(lv)) {
+      } else if (!this.mob.canTarget(lv)) {
          return false;
       } else {
          AbstractTeam lv2 = this.mob.getScoreboardTeam();
diff -bur namedTargetSrc/net/minecraft/entity/ai/TargetPredicate.java namedSrc/net/minecraft/entity/ai/TargetPredicate.java
--- namedTargetSrc/net/minecraft/entity/ai/TargetPredicate.java	2024-10-18 03:17:28.602529005 +0000
+++ namedSrc/net/minecraft/entity/ai/TargetPredicate.java	2024-10-18 03:16:11.094758067 +0000
@@ -139,7 +139,7 @@
             }
          } else {
             if (this.attackable
-               && (!baseEntity.m_lazolqzm(targetEntity) || !baseEntity.canTarget(targetEntity.getType()) || baseEntity.isTeammate(targetEntity))) {
+               && (!baseEntity.canTarget(targetEntity) || !baseEntity.canTarget(targetEntity.getType()) || baseEntity.isTeammate(targetEntity))) {
                return false;
             }
 
diff -bur namedTargetSrc/net/minecraft/entity/AnimationState.java namedSrc/net/minecraft/entity/AnimationState.java
--- namedTargetSrc/net/minecraft/entity/AnimationState.java	2024-10-18 03:17:28.350529720 +0000
+++ namedSrc/net/minecraft/entity/AnimationState.java	2024-10-18 03:16:10.766759108 +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-18 03:17:28.402529572 +0000
+++ namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-10-18 03:16:10.834758892 +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-18 03:17:28.314529821 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-10-18 03:16:10.722759247 +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));
@@ -434,10 +434,10 @@
             }
 
             if (!this.getWorld().isClient()) {
-               this.m_hwaiduvv();
+               this.applyBlockCollisionEffects();
             }
 
-            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);
@@ -1165,11 +1164,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_lazolqzm Lnet/minecraft/unmapped/C_bsmypcfq;m_lazolqzm(Lnet/minecraft/unmapped/C_usxaxydn;)Z}
-    * @mapping {@literal named m_lazolqzm Lnet/minecraft/entity/boss/dragon/EnderDragonEntity;m_lazolqzm(Lnet/minecraft/entity/LivingEntity;)Z}
+    * Mapping not found
     */
    @Override
-   public boolean m_lazolqzm(LivingEntity entity) {
+   public boolean canTarget(LivingEntity entity) {
       return entity.canTakeDamage();
    }
 
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-18 03:17:28.318529810 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonPart.java	2024-10-18 03:16:10.726759235 +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.isAlwaysInvulnerableTo(source) ? false : this.owner.m_pmbrehqc(world, this, source, amount);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java	2024-10-18 03:17:28.338529754 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.java	2024-10-18 03:16:10.746759171 +0000
@@ -182,7 +182,7 @@
     */
    @Override
    public void crystalDestroyed(EndCrystalEntity crystal, BlockPos pos, DamageSource source, @Nullable PlayerEntity player) {
-      if (player != null && this.dragon.m_lazolqzm(player)) {
+      if (player != null && this.dragon.canTarget(player)) {
          this.strafePlayer(player);
       }
    }
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-18 03:17:28.458529414 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java	2024-10-18 03:16:10.910758651 +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-18 03:17:28.470529379 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-10-18 03:16:10.930758587 +0000
@@ -92,13 +92,13 @@
 
          double k = 64.0;
          if (this.target.squaredDistanceTo(this.dragon) < 4096.0) {
-            if (this.dragon.m_ayqytazn(this.target)) {
+            if (this.dragon.hasLineOfSight(this.target)) {
                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-18 03:17:28.338529754 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-18 03:16:10.746759171 +0000
@@ -392,7 +392,7 @@
                int k = this.getTrackedEntityId(j);
                if (k > 0) {
                   LivingEntity lv = (LivingEntity)world.getEntityById(k);
-                  if (lv != null && this.m_lazolqzm(lv) && !(this.squaredDistanceTo(lv) > 900.0) && this.m_ayqytazn(lv)) {
+                  if (lv != null && this.canTarget(lv) && !(this.squaredDistanceTo(lv) > 900.0) && this.hasLineOfSight(lv)) {
                      this.shootSkullAt(j + 1, lv);
                      this.skullCooldowns[j - 1] = this.age + 40 + this.random.nextInt(20);
                      this.chargedSkullCooldowns[j - 1] = 0;
@@ -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.isInvulnerableTo(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/damage/DamageSources.java namedSrc/net/minecraft/entity/damage/DamageSources.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageSources.java	2024-10-18 03:17:28.438529470 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageSources.java	2024-10-18 03:16:10.890758714 +0000
@@ -541,7 +541,7 @@
     * @mapping {@literal named explosion Lnet/minecraft/entity/damage/DamageSources;explosion(Lnet/minecraft/world/explosion/Explosion;)Lnet/minecraft/entity/damage/DamageSource;}
     */
    public DamageSource explosion(@Nullable Explosion explosion) {
-      return explosion != null ? this.explosion(explosion.getEntity(), explosion.m_pzwvnxgx()) : this.explosion(null, null);
+      return explosion != null ? this.explosion(explosion.getEntity(), explosion.getCausingEntity()) : this.explosion(null, null);
    }
 
    /**
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-18 03:17:28.602529005 +0000
+++ namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-10-18 03:16:11.090758079 +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-18 03:17:28.478529357 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-18 03:16:10.938758562 +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.isInvulnerableTo(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;
    }
 
@@ -909,7 +908,7 @@
     */
    @Override
    public boolean isImmuneToExplosion(Explosion explosion) {
-      return explosion.m_rbzkxlud() ? this.isInvisible() : true;
+      return explosion.shouldAffectDecorativeEntities() ? this.isInvisible() : true;
    }
 
    /**
@@ -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-18 03:17:28.370529663 +0000
+++ namedSrc/net/minecraft/entity/decoration/BlockAttachedEntity.java	2024-10-18 03:16:10.794759019 +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.isAlwaysInvulnerableTo(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.isAlwaysInvulnerableTo(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;
@@ -139,7 +138,7 @@
     */
    @Override
    public boolean isImmuneToExplosion(Explosion explosion) {
-      return explosion.m_rbzkxlud() ? super.isImmuneToExplosion(explosion) : true;
+      return explosion.shouldAffectDecorativeEntities() ? super.isImmuneToExplosion(explosion) : 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-18 03:17:28.318529810 +0000
+++ namedSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-10-18 03:16:10.722759247 +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;
    }
 
@@ -363,7 +362,7 @@
          if (this.interpolationTarget != null) {
             if (this.interpolationTarget.steps == 0) {
                this.interpolationTarget.apply(this);
-               this.m_hhwtkfxu();
+               this.setPrevPosAndAngles();
                this.interpolationTarget = null;
             } else {
                this.interpolationTarget.applyLerpStep(this);
@@ -512,7 +511,7 @@
     * Mapping not found
     */
    @Override
-   public void m_lxlqiklm() {
+   public void cancelLerp() {
       this.interpolationTarget = null;
    }
 
@@ -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();
    }
 
    /**
@@ -1715,7 +1714,7 @@
             try {
                Text lv = Text.SerializationUtil.fromJson(string, this.getRegistryManager());
                if (lv != null && this.getWorld() instanceof ServerWorld lv2) {
-                  ServerCommandSource lv3 = this.m_cgrdsanb(lv2).withLevel(2);
+                  ServerCommandSource lv3 = this.createCommandSource(lv2).withLevel(2);
                   Text lv4 = Texts.parse(lv3, lv, this, 0);
                   this.setText(lv4);
                } else {
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-18 03:17:28.418529527 +0000
+++ namedSrc/net/minecraft/entity/decoration/EndCrystalEntity.java	2024-10-18 03:16:10.862758803 +0000
@@ -86,7 +86,7 @@
    @Override
    public void tick() {
       this.endCrystalAge++;
-      this.m_hwaiduvv();
+      this.applyBlockCollisionEffects();
       this.tickPortalTeleportation();
       if (this.getWorld() instanceof ServerWorld) {
          BlockPos lv = this.getBlockPos();
@@ -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.isAlwaysInvulnerableTo(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.isAlwaysInvulnerableTo(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-18 03:17:28.370529663 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-10-18 03:16:10.794759019 +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.isAlwaysInvulnerableTo(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.isAlwaysInvulnerableTo(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-18 03:17:28.298529867 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-10-18 03:16:10.694759336 +0000
@@ -224,7 +224,7 @@
             return;
          }
 
-         this.m_xrhuexzc(world, Items.PAINTING);
+         this.dropStack(world, Items.PAINTING);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java namedSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java	2024-10-18 03:17:28.302529856 +0000
+++ namedSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java	2024-10-18 03:16:10.702759311 +0000
@@ -39,7 +39,7 @@
          Raid lv2 = world.getRaidAt(lv.getBlockPos());
          if (lv2 == null || lv2.getBadOmenLevel() < lv2.getMaxBadOmenLevel()) {
             lv.addStatusEffect(new StatusEffectInstance(StatusEffects.RAID_OMEN, 600, amplifier));
-            lv.m_ehhcdgvv(lv.getBlockPos());
+            lv.setRaidOmenPos(lv.getBlockPos());
             return false;
          }
       }
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-18 03:17:28.422529516 +0000
+++ namedSrc/net/minecraft/entity/effect/InstantHealthOrDamageStatusEffect.java	2024-10-18 03:16:10.866758791 +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-18 03:17:28.378529640 +0000
+++ namedSrc/net/minecraft/entity/effect/PoisonStatusEffect.java	2024-10-18 03:16:10.806758981 +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/RaidOmenStatusEffect.java namedSrc/net/minecraft/entity/effect/RaidOmenStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/RaidOmenStatusEffect.java	2024-10-18 03:17:28.298529867 +0000
+++ namedSrc/net/minecraft/entity/effect/RaidOmenStatusEffect.java	2024-10-18 03:16:10.698759324 +0000
@@ -33,10 +33,10 @@
    @Override
    public boolean applyUpdateEffect(ServerWorld world, LivingEntity entity, int amplifier) {
       if (entity instanceof ServerPlayerEntity lv && !entity.isSpectator()) {
-         BlockPos lv2 = lv.m_uxjbfcwl();
+         BlockPos lv2 = lv.getRaidOmenPos();
          if (lv2 != null) {
             world.getRaidManager().startRaid(lv, lv2);
-            lv.m_wgyjvvco();
+            lv.resetRaidOmenPos();
             return false;
          }
       }
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-18 03:17:28.542529175 +0000
+++ namedSrc/net/minecraft/entity/effect/WitherStatusEffect.java	2024-10-18 03:16:11.010758333 +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


The remaining diff is too long!

Please sign in to comment.