Skip to content

Commit

Permalink
fix remainingHappyTicks field
Browse files Browse the repository at this point in the history
  • Loading branch information
ix0rai committed Oct 28, 2024
1 parent a9a0925 commit 6e526b6
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CLASS net/minecraft/unmapped/C_jvojbnla net/minecraft/entity/passive/PassiveEntity
FIELD f_epxqtcwc FORCED_AGE_PARTICLE_TICKS I
FIELD f_hnoazvab happyTicksRemaining I
FIELD f_hnoazvab remainingHappyTicks I
FIELD f_lsykwgjd CHILD Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_rnhbullz breedingAge I
FIELD f_xpxrrqcm BABY_AGE I
Expand Down

3 comments on commit 6e526b6

@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 6e526b6, 476 file(s) were updated with 3995 line(s) added and 3703 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-28 22:06:15.612306006 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-10-28 22:05:04.760281544 +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-28 22:06:15.644306013 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-10-28 22:05:04.808281586 +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-28 22:06:15.480305975 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-28 22:05:04.516281335 +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-28 22:06:15.460305970 +0000
+++ namedSrc/net/minecraft/block/AbstractCandleBlock.java	2024-10-28 22:05:04.480281305 +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-28 22:06:15.476305973 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2024-10-28 22:05:04.504281325 +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-28 22:06:15.604306003 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2024-10-28 22:05:04.744281531 +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-28 22:06:15.544305990 +0000
+++ namedSrc/net/minecraft/block/BellBlock.java	2024-10-28 22:05:04.640281441 +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-28 22:06:15.692306025 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-28 22:05:04.884281651 +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-28 22:06:15.524305985 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-10-28 22:05:04.600281408 +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/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-10-28 22:06:15.612306006 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-10-28 22:05:04.760281544 +0000
@@ -150,7 +150,7 @@
    protected ActionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
       if (world.getBlockEntity(pos) instanceof CampfireBlockEntity lv2) {
          ItemStack lv3 = player.getStackInHand(hand);
-         if (world.m_mlvimbbc().getPropertySet(RecipePropertySet.CAMPFIRE_INPUT).test(lv3)) {
+         if (world.getRecipeManager().getPropertySet(RecipePropertySet.CAMPFIRE_INPUT).test(lv3)) {
             if (world instanceof ServerWorld lv4 && lv2.addItem(lv4, player, lv3)) {
                player.incrementStat(Stats.INTERACT_WITH_CAMPFIRE);
                return ActionResult.SUCCESS_SERVER;
diff -bur namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java namedSrc/net/minecraft/block/CarvedPumpkinBlock.java
--- namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-10-28 22:06:15.532305987 +0000
+++ namedSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-10-28 22:05:04.616281421 +0000
@@ -111,14 +111,14 @@
    private void trySpawnEntity(World world, BlockPos pos) {
       BlockPattern.Result lv = this.getSnowGolemPattern().searchAround(world, pos);
       if (lv != null) {
-         SnowGolemEntity lv2 = EntityType.SNOW_GOLEM.m_oebfrxli(world, SpawnReason.TRIGGERED);
+         SnowGolemEntity lv2 = EntityType.SNOW_GOLEM.create(world, SpawnReason.TRIGGERED);
          if (lv2 != null) {
             spawnGolem(world, lv, lv2, lv.translate(0, 2, 0).getBlockPos());
          }
       } else {
          BlockPattern.Result lv3 = this.getIronGolemPattern().searchAround(world, pos);
          if (lv3 != null) {
-            IronGolemEntity lv4 = EntityType.IRON_GOLEM.m_oebfrxli(world, SpawnReason.TRIGGERED);
+            IronGolemEntity lv4 = EntityType.IRON_GOLEM.create(world, SpawnReason.TRIGGERED);
             if (lv4 != null) {
                lv4.setPlayerCreated(true);
                spawnGolem(world, lv3, lv4, lv3.translate(1, 2, 0).getBlockPos());
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-28 22:06:15.652306015 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-28 22:05:04.824281599 +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,9 +60,9 @@
          h = 0.0;
       }
 
-      C_sfpofsgc lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
+      AbstractBoatEntity lv5 = this.boatType.create(lv2, SpawnReason.DISPENSER);
       if (lv5 != null) {
-         lv5.m_busvmoue(e, f + h, g);
+         lv5.initPosition(e, f + h, g);
          EntityType.createDefaultStackSpawnConfig(lv2, stack, null).accept(lv5);
          lv5.setYaw(lv.asRotation());
          lv2.spawnEntity(lv5);
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-10-28 22:06:15.576305997 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-10-28 22:05:04.692281486 +0000
@@ -110,7 +110,7 @@
             EntityType<?> lv2 = ((SpawnEggItem)stack.getItem()).getEntityType(stack);
 
             try {
-               lv2.m_gmedtjoz(pointer.world(), stack, null, pointer.pos().offset(lv), SpawnReason.DISPENSER, lv != Direction.UP, false);
+               lv2.spawn(pointer.world(), stack, null, pointer.pos().offset(lv), SpawnReason.DISPENSER, lv != Direction.UP, false);
             } catch (Exception var6) {
                LOGGER.error("Error while dispensing spawn egg from dispenser at {}", pointer.pos(), var6);
                return ItemStack.EMPTY;
@@ -136,7 +136,7 @@
             BlockPos lv2 = pointer.pos().offset(lv);
             ServerWorld lv3 = pointer.world();
             Consumer<ArmorStandEntity> consumer = EntityType.appendDefaultStackSpawnConfig(arg2 -> arg2.setYaw(lv.asRotation()), lv3, stack, null);
-            ArmorStandEntity lv4 = EntityType.ARMOR_STAND.m_nmoiyemp(lv3, consumer, lv2, SpawnReason.DISPENSER, false, false);
+            ArmorStandEntity lv4 = EntityType.ARMOR_STAND.spawn(lv3, consumer, lv2, SpawnReason.DISPENSER, false, false);
             if (lv4 != null) {
                stack.decrement(1);
             }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2024-10-28 22:06:15.468305971 +0000
+++ namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2024-10-28 22:05:04.492281314 +0000
@@ -62,9 +62,9 @@
       ItemEntity lv = new ItemEntity(world, d, e, f, stack);
       double g = world.random.nextDouble() * 0.1 + 0.2;
       lv.setVelocity(
-         world.random.m_aokkzmee((double)side.getOffsetX() * g, 0.0172275 * (double)velocityDeviation),
-         world.random.m_aokkzmee(0.2, 0.0172275 * (double)velocityDeviation),
-         world.random.m_aokkzmee((double)side.getOffsetZ() * g, 0.0172275 * (double)velocityDeviation)
+         world.random.nextTriangular((double)side.getOffsetX() * g, 0.0172275 * (double)velocityDeviation),
+         world.random.nextTriangular(0.2, 0.0172275 * (double)velocityDeviation),
+         world.random.nextTriangular((double)side.getOffsetZ() * g, 0.0172275 * (double)velocityDeviation)
       );
       world.spawnEntity(lv);
    }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-10-28 22:06:15.592306001 +0000
+++ namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2024-10-28 22:05:04.720281510 +0000
@@ -46,7 +46,7 @@
       ServerWorld lv = pointer.world();
       Direction lv2 = pointer.state().get(DispenserBlock.FACING);
       Position lv3 = this.config.positionFunction().getDispensePosition(pointer, lv2);
-      ProjectileEntity.m_aomcogmb(
+      ProjectileEntity.spawn(
          this.projectile.createEntity(lv, lv3, stack, lv2),
          lv,
          stack,
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-10-28 22:06:15.632306011 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-10-28 22:05:04.788281569 +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-28 22:06:15.444305966 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-10-28 22:05:04.448281277 +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,17 @@
     */
    @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.combine(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-28 22:06:15.580305998 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-10-28 22:05:04.700281493 +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.combine(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.combine(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/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-10-28 22:06:15.496305978 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-10-28 22:05:04.544281360 +0000
@@ -543,7 +543,7 @@
       List<RecipeHolder<?>> list = Lists.<RecipeHolder<?>>newArrayList();
 
       for (Entry<RegistryKey<Recipe<?>>> entry : this.recipesUsed.reference2IntEntrySet()) {
-         world.m_mlvimbbc().get((RegistryKey<Recipe<?>>)entry.getKey()).ifPresent(recipe -> {
+         world.getRecipeManager().get((RegistryKey<Recipe<?>>)entry.getKey()).ifPresent(recipe -> {
             list.add(recipe);
             dropExperience(world, pos, entry.getIntValue(), ((AbstractCookingRecipe)recipe.value()).getExperience());
          });
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-28 22:06:15.652306015 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-28 22:05:04.824281599 +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-28 22:06:15.572305996 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-28 22:05:04.684281479 +0000
@@ -290,7 +290,7 @@
       BeehiveBlockEntity.BeeState beeState,
       @Nullable BlockPos flowerPos
    ) {
-      if (BeeEntity.m_inydwqhr(world) && beeState != BeehiveBlockEntity.BeeState.EMERGENCY) {
+      if (BeeEntity.isNightOrRaining(world) && beeState != BeehiveBlockEntity.BeeState.EMERGENCY) {
          return false;
       } else {
          Direction lv = state.get(BeehiveBlock.FACING);
@@ -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/CampfireBlockEntity.java namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-10-28 22:06:15.432305963 +0000
+++ namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-10-28 22:05:04.428281260 +0000
@@ -217,7 +217,7 @@
       for (int i = 0; i < this.itemsBeingCooked.size(); i++) {
          ItemStack lv = this.itemsBeingCooked.get(i);
          if (lv.isEmpty()) {
-            Optional<RecipeHolder<CampfireCookingRecipe>> optional = world.m_mlvimbbc()
+            Optional<RecipeHolder<CampfireCookingRecipe>> optional = world.getRecipeManager()
                .getFirstMatch(RecipeType.CAMPFIRE_COOKING, new SingleRecipeInput(item), world);
             if (optional.isEmpty()) {
                return false;
diff -bur namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-10-28 22:06:15.492305978 +0000
+++ namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-10-28 22:05:04.532281349 +0000
@@ -289,9 +289,10 @@
       ALIGNED("aligned");
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qfyvhqpn Lnet/minecraft/unmapped/C_epwegwuj$C_exgsbpfq;f_qfyvhqpn:Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc;}
+       * @mapping {@literal named CODEC Lnet/minecraft/block/entity/JigsawBlockEntity$Joint;CODEC:Lnet/minecraft/util/StringIdentifiable$EnumCodec;}
        */
-      public static final StringIdentifiable.EnumCodec<JigsawBlockEntity.Joint> f_qfyvhqpn = StringIdentifiable.createEnumCodec(JigsawBlockEntity.Joint::values);
+      public static final StringIdentifiable.EnumCodec<JigsawBlockEntity.Joint> CODEC = StringIdentifiable.createEnumCodec(JigsawBlockEntity.Joint::values);
       /**
        * @mapping {@literal hashed f_fbhdtnni Lnet/minecraft/unmapped/C_epwegwuj$C_exgsbpfq;f_fbhdtnni:Ljava/lang/String;}
        * @mapping {@literal named name Lnet/minecraft/block/entity/JigsawBlockEntity$Joint;name:Ljava/lang/String;}
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-28 22:06:15.656306016 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-28 22:05:04.832281607 +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-28 22:06:15.672306020 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-10-28 22:05:04.856281626 +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-28 22:06:15.644306013 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-10-28 22:05:04.812281589 +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/FrogSpawnBlock.java namedSrc/net/minecraft/block/FrogSpawnBlock.java
--- namedTargetSrc/net/minecraft/block/FrogSpawnBlock.java	2024-10-28 22:06:15.512305982 +0000
+++ namedSrc/net/minecraft/block/FrogSpawnBlock.java	2024-10-28 22:05:04.576281387 +0000
@@ -192,7 +192,7 @@
       int i = random.range(2, 6);
 
       for (int j = 1; j <= i; j++) {
-         TadpoleEntity lv = EntityType.TADPOLE.m_oebfrxli(world, SpawnReason.BREEDING);
+         TadpoleEntity lv = EntityType.TADPOLE.create(world, SpawnReason.BREEDING);
          if (lv != null) {
             double d = (double)pos.getX() + this.getSpawnPosition(random);
             double e = (double)pos.getZ() + this.getSpawnPosition(random);
diff -bur namedTargetSrc/net/minecraft/block/HoneyBlock.java namedSrc/net/minecraft/block/HoneyBlock.java
--- namedTargetSrc/net/minecraft/block/HoneyBlock.java	2024-10-28 22:06:15.628306010 +0000
+++ namedSrc/net/minecraft/block/HoneyBlock.java	2024-10-28 22:05:04.784281565 +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/InfestedBlock.java namedSrc/net/minecraft/block/InfestedBlock.java
--- namedTargetSrc/net/minecraft/block/InfestedBlock.java	2024-10-28 22:06:15.504305980 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-10-28 22:05:04.556281370 +0000
@@ -95,7 +95,7 @@
     * @mapping {@literal named spawnSilverfish Lnet/minecraft/block/InfestedBlock;spawnSilverfish(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)V}
     */
    private void spawnSilverfish(ServerWorld world, BlockPos pos) {
-      SilverfishEntity lv = EntityType.SILVERFISH.m_oebfrxli(world, SpawnReason.TRIGGERED);
+      SilverfishEntity lv = EntityType.SILVERFISH.create(world, SpawnReason.TRIGGERED);
       if (lv != null) {
          lv.refreshPositionAndAngles((double)pos.getX() + 0.5, (double)pos.getY(), (double)pos.getZ() + 0.5, 0.0F, 0.0F);
          world.spawnEntity(lv);
diff -bur namedTargetSrc/net/minecraft/block/LeverBlock.java namedSrc/net/minecraft/block/LeverBlock.java
--- namedTargetSrc/net/minecraft/block/LeverBlock.java	2024-10-28 22:06:15.688306023 +0000
+++ namedSrc/net/minecraft/block/LeverBlock.java	2024-10-28 22:05:04.888281654 +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-28 22:06:15.596306002 +0000
+++ namedSrc/net/minecraft/block/LilyPadBlock.java	2024-10-28 22:05:04.728281517 +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-28 22:06:15.464305971 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-10-28 22:05:04.488281312 +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-28 22:06:15.628306010 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-28 22:05:04.784281565 +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;
@@ -117,7 +117,7 @@
          }
 
          if (world.getBlockState(pos).allowsSpawning(world, pos, EntityType.ZOMBIFIED_PIGLIN)) {
-            Entity lv = EntityType.ZOMBIFIED_PIGLIN.m_tqxwdyaw(world, pos.up(), SpawnReason.STRUCTURE);
+            Entity lv = EntityType.ZOMBIFIED_PIGLIN.spawn(world, pos.up(), SpawnReason.STRUCTURE);
             if (lv != null) {
                lv.resetNetherPortalCooldown();
                Entity lv2 = lv.getVehicle();
@@ -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.combine(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-28 22:06:15.500305979 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-28 22:05:04.556281370 +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-28 22:06:15.652306015 +0000
+++ namedSrc/net/minecraft/block/Portal.java	2024-10-28 22:05:04.824281599 +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-28 22:06:15.616306006 +0000
+++ namedSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-28 22:05:04.764281548 +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/sculk/SculkBehavior.java namedSrc/net/minecraft/block/sculk/SculkBehavior.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkBehavior.java	2024-10-28 22:06:15.572305996 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkBehavior.java	2024-10-28 22:05:04.684281479 +0000
@@ -416,7 +416,7 @@
        * @mapping {@literal named m_yedswcio Lnet/minecraft/block/sculk/SculkBehavior$ChargeCursor;m_yedswcio(Lnet/minecraft/util/math/BlockPos;)Z}
        */
       boolean m_yedswcio(BlockPos pos) {
-         return this.pos.m_yosafuze(pos) > 1024;
+         return this.pos.getChebyshevDistance(pos) > 1024;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/block/ShapeContext.java namedSrc/net/minecraft/block/ShapeContext.java
--- namedTargetSrc/net/minecraft/block/ShapeContext.java	2024-10-28 22:06:15.684306023 +0000
+++ namedSrc/net/minecraft/block/ShapeContext.java	2024-10-28 22:05:04.876281644 +0000
@@ -31,7 +31,9 @@
       Objects.requireNonNull(entity);
 
       return (ShapeContext)(switch (entity) {
-         case AbstractMinecartEntity lv -> AbstractMinecartEntity.m_raaevxrz(lv.getWorld()) ? new C_izlsforw(lv, false) : new EntityShapeContext(entity, false);
+         case AbstractMinecartEntity lv -> AbstractMinecartEntity.isNewBehaviorActive(lv.getWorld())
+         ? new C_izlsforw(lv, false)
+         : new EntityShapeContext(entity, false);
          default -> new EntityShapeContext(entity, false);
       });
    }
diff -bur namedTargetSrc/net/minecraft/block/SnifferEggBlock.java namedSrc/net/minecraft/block/SnifferEggBlock.java
--- namedTargetSrc/net/minecraft/block/SnifferEggBlock.java	2024-10-28 22:06:15.572305996 +0000
+++ namedSrc/net/minecraft/block/SnifferEggBlock.java	2024-10-28 22:05:04.688281483 +0000
@@ -123,7 +123,7 @@
       } else {
          world.playSound(null, pos, SoundEvents.BLOCK_SNIFFER_EGG_HATCH, SoundCategory.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
          world.breakBlock(pos, false);
-         SnifferEntity lv = EntityType.SNIFFER.m_oebfrxli(world, SpawnReason.BREEDING);
+         SnifferEntity lv = EntityType.SNIFFER.create(world, SpawnReason.BREEDING);
          if (lv != null) {
             Vec3d lv2 = pos.ofCenter();
             lv.setBaby(true);
diff -bur namedTargetSrc/net/minecraft/block/SweetBerryBushBlock.java namedSrc/net/minecraft/block/SweetBerryBushBlock.java
--- namedTargetSrc/net/minecraft/block/SweetBerryBushBlock.java	2024-10-28 22:06:15.680306022 +0000
+++ namedSrc/net/minecraft/block/SweetBerryBushBlock.java	2024-10-28 22:05:04.868281637 +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-28 22:06:15.656306016 +0000
+++ namedSrc/net/minecraft/block/TntBlock.java	2024-10-28 22:05:04.828281603 +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-28 22:06:15.636306011 +0000
+++ namedSrc/net/minecraft/block/TrapdoorBlock.java	2024-10-28 22:05:04.800281578 +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/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-10-28 22:06:15.608306005 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-10-28 22:05:04.748281534 +0000
@@ -318,7 +318,7 @@
          if (entity != null) {
             world.syncWorldEvent(WorldEvents.TRIAL_SPAWNER_SPAWNS_MOB_AT_POS, entity.getBlockPos(), TrialSpawnerLogic.C_vhsnwpwm.NORMAL.m_cyctivcj());
             if (entity instanceof MobEntity lv) {
-               lv.m_kbemoobx(world);
+               lv.dropEquipment(world);
             }
 
             entity.remove(Entity.RemovalReason.DISCARDED);
diff -bur namedTargetSrc/net/minecraft/block/TripwireBlock.java namedSrc/net/minecraft/block/TripwireBlock.java
--- namedTargetSrc/net/minecraft/block/TripwireBlock.java	2024-10-28 22:06:15.580305998 +0000
+++ namedSrc/net/minecraft/block/TripwireBlock.java	2024-10-28 22:05:04.700281493 +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/TurtleEggBlock.java namedSrc/net/minecraft/block/TurtleEggBlock.java
--- namedTargetSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-28 22:06:15.624306008 +0000
+++ namedSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-28 22:05:04.776281559 +0000
@@ -160,7 +160,7 @@
 
             for (int j = 0; j < state.get(EGGS); j++) {
                world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, pos, Block.getRawIdFromState(state));
-               TurtleEntity lv = EntityType.TURTLE.m_oebfrxli(world, SpawnReason.BREEDING);
+               TurtleEntity lv = EntityType.TURTLE.create(world, SpawnReason.BREEDING);
                if (lv != null) {
                   lv.setBreedingAge(-24000);
                   lv.setHomePos(pos);
diff -bur namedTargetSrc/net/minecraft/block/WitherRoseBlock.java namedSrc/net/minecraft/block/WitherRoseBlock.java
--- namedTargetSrc/net/minecraft/block/WitherRoseBlock.java	2024-10-28 22:06:15.548305991 +0000
+++ namedSrc/net/minecraft/block/WitherRoseBlock.java	2024-10-28 22:05:04.648281448 +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/block/WitherSkullBlock.java namedSrc/net/minecraft/block/WitherSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WitherSkullBlock.java	2024-10-28 22:06:15.664306018 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2024-10-28 22:05:04.840281613 +0000
@@ -89,7 +89,7 @@
          if (bl && pos.getY() >= world.getBottomY() && world.getDifficulty() != Difficulty.PEACEFUL) {
             BlockPattern.Result lv2 = getWitherBossPattern().searchAround(world, pos);
             if (lv2 != null) {
-               WitherEntity lv3 = EntityType.WITHER.m_oebfrxli(world, SpawnReason.TRIGGERED);
+               WitherEntity lv3 = EntityType.WITHER.create(world, SpawnReason.TRIGGERED);
                if (lv3 != null) {
                   CarvedPumpkinBlock.replaceBlocks(world, lv2);
                   BlockPos lv4 = lv2.translate(1, 2, 0).getBlockPos();

@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/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-28 22:06:15.664306018 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-28 22:05:04.840281613 +0000
@@ -374,14 +374,14 @@
 
       String string5;
       if (lv != null) {
-         ServerTickManager lv5 = lv.m_zpabhbdy();
+         ServerTickManager lv5 = lv.getTickManager();
          boolean bl = lv5.isSprinting();
          if (bl) {
             string = " (sprinting)";
          }
 
          String string4 = bl ? "-" : String.format(Locale.ROOT, "%.1f", lv4.getMillisPerTick());
-         string5 = String.format(Locale.ROOT, "Integrated server @ %.1f/%s ms%s, %.0f tx, %.0f rx", lv.m_cvfglksi(), string4, string, f, g);
+         string5 = String.format(Locale.ROOT, "Integrated server @ %.1f/%s ms%s, %.0f tx, %.0f rx", lv.getAverageTickTimeMillis(), string4, string, f, g);
       } else {
          string5 = String.format(Locale.ROOT, "\"%s\" server%s, %.0f tx, %.0f rx", lv2.getServerBrand(), string, f, g);
       }
@@ -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-28 22:06:15.532305987 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-28 22:05:04.616281421 +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-28 22:06:15.552305991 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-28 22:05:04.652281452 +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/GameModeSelectionScreen.java namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2024-10-28 22:06:15.536305988 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2024-10-28 22:05:04.624281427 +0000
@@ -208,7 +208,7 @@
    private static void sendGameModeSelection(MinecraftClient client, GameModeSelectionScreen.GameMode gameMode) {
       if (client.interactionManager != null && client.player != null) {
          GameModeSelectionScreen.GameMode lv = GameModeSelectionScreen.GameMode.of(client.interactionManager.getCurrentGameMode());
-         if (client.player.m_snjwnoyj(2) && gameMode != lv) {
+         if (client.player.hasPermissions(2) && gameMode != lv) {
             client.player.networkHandler.sendCommand(gameMode.getCommand());
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-10-28 22:06:15.476305973 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-10-28 22:05:04.508281328 +0000
@@ -339,11 +339,11 @@
 
       boolean bl = actionType == SlotActionType.QUICK_MOVE;
       actionType = slotId == -999 && actionType == SlotActionType.PICKUP ? SlotActionType.THROW : actionType;
-      if (actionType != SlotActionType.THROW || this.client.player.m_hmruvmge()) {
+      if (actionType != SlotActionType.THROW || this.client.player.canDropItems()) {
          this.m_elolvigb(slot, actionType);
          if (slot == null && selectedTab.getType() != ItemGroup.Type.INVENTORY && actionType != SlotActionType.QUICK_CRAFT) {
             if (!this.handler.getCursorStack().isEmpty() && this.lastClickOutsideBounds) {
-               if (!this.client.player.m_hmruvmge()) {
+               if (!this.client.player.canDropItems()) {
                   return;
                }
 
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-28 22:06:15.484305976 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-28 22:05:04.520281339 +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-28 22:06:15.588306000 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-28 22:05:04.716281506 +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/input/Input.java namedSrc/net/minecraft/client/input/Input.java
--- namedTargetSrc/net/minecraft/client/input/Input.java	2024-10-28 22:06:15.584305999 +0000
+++ namedSrc/net/minecraft/client/input/Input.java	2024-10-28 22:05:04.708281500 +0000
@@ -74,9 +74,10 @@
       }
    };
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bltkqzwh Lnet/minecraft/unmapped/C_graemaps;f_bltkqzwh:Lnet/minecraft/unmapped/C_graemaps;}
+    * @mapping {@literal named empty Lnet/minecraft/client/input/Input;empty:Lnet/minecraft/client/input/Input;}
     */
-   public static Input f_bltkqzwh = new Input(false, false, false, false, false, false, false);
+   public static Input empty = new Input(false, false, false, false, false, false, false);
 
    /**
     * @mapping {@literal hashed m_xlgtqksd Lnet/minecraft/unmapped/C_graemaps;m_xlgtqksd()Z}
diff -bur namedTargetSrc/net/minecraft/client/Keyboard.java namedSrc/net/minecraft/client/Keyboard.java
--- namedTargetSrc/net/minecraft/client/Keyboard.java	2024-10-28 22:06:15.580305998 +0000
+++ namedSrc/net/minecraft/client/Keyboard.java	2024-10-28 22:05:04.700281493 +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;
@@ -268,7 +268,7 @@
                return true;
             case 73:
                if (!this.client.player.hasReducedDebugInfo()) {
-                  this.copyLocationFromTarget(this.client.player.m_snjwnoyj(2), !Screen.hasShiftDown());
+                  this.copyLocationFromTarget(this.client.player.hasPermissions(2), !Screen.hasShiftDown());
                }
 
                return true;
@@ -279,7 +279,7 @@
 
                return true;
             case 78:
-               if (!this.client.player.m_snjwnoyj(2)) {
+               if (!this.client.player.hasPermissions(2)) {
                   this.debugLog("debug.creative_spectator.error");
                } else if (!this.client.player.isSpectator()) {
                   this.client.player.networkHandler.sendCommand("gamemode spectator");
@@ -329,7 +329,7 @@
                this.client.reloadResources();
                return true;
             case 293:
-               if (!this.client.player.m_snjwnoyj(2)) {
+               if (!this.client.player.hasPermissions(2)) {
                   this.debugLog("debug.gamemodes.error");
                } else {
                   this.client.setScreen(new GameModeSelectionScreen());
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-10-28 22:06:15.492305978 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-28 22:05:04.536281352 +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-28 22:06:15.660306017 +0000
+++ namedSrc/net/minecraft/client/model/Model.java	2024-10-28 22:05:04.832281607 +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/Mouse.java namedSrc/net/minecraft/client/Mouse.java
--- namedTargetSrc/net/minecraft/client/Mouse.java	2024-10-28 22:06:15.576305997 +0000
+++ namedSrc/net/minecraft/client/Mouse.java	2024-10-28 22:05:04.692281486 +0000
@@ -272,7 +272,7 @@
                   }
                } else {
                   PlayerInventory lv = this.client.player.getInventory();
-                  lv.m_grrjbqkb(C_ywmpcrjq.m_tnxrmebq((double)k, lv.selectedSlot, PlayerInventory.getHotbarSize()));
+                  lv.setSelectedSlot(C_ywmpcrjq.m_tnxrmebq((double)k, lv.selectedSlot, PlayerInventory.getHotbarSize()));
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java namedSrc/net/minecraft/client/network/ClientCommandSource.java
--- namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java	2024-10-28 22:06:15.640306013 +0000
+++ namedSrc/net/minecraft/client/network/ClientCommandSource.java	2024-10-28 22:05:04.800281578 +0000
@@ -133,7 +133,7 @@
    @Override
    public boolean hasPermission(int level) {
       ClientPlayerEntity lv = this.client.player;
-      return lv != null ? lv.m_snjwnoyj(level) : level == 0;
+      return lv != null ? lv.hasPermissions(level) : level == 0;
    }
 
    /**
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-28 22:06:15.584305999 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-28 22:05:04.712281503 +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;
@@ -230,7 +230,7 @@
    /**
     * Mapping not found
     */
-   private Input f_zjxujerh = Input.f_bltkqzwh;
+   private Input f_zjxujerh = Input.empty;
    /**
     * @mapping {@literal hashed f_aufxggqt Lnet/minecraft/unmapped/C_jlopmfei;f_aufxggqt:Lnet/minecraft/unmapped/C_ayfeobid;}
     * @mapping {@literal named client Lnet/minecraft/client/network/ClientPlayerEntity;client:Lnet/minecraft/client/MinecraftClient;}
@@ -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();
@@ -675,7 +674,7 @@
     * Mapping not found
     */
    @Override
-   protected int m_arcbriga() {
+   protected int getPermissionLevel() {
       return this.clientPermissionLevel;
    }
 
@@ -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,8 +1271,8 @@
    public void tickRiding() {
       super.tickRiding();
       this.riding = false;
-      if (this.getControlledVehicle() instanceof C_sfpofsgc lv) {
-         lv.m_wdzivrij(this.input.f_ywxgimqb.left(), this.input.f_ywxgimqb.right(), this.input.f_ywxgimqb.forward(), this.input.f_ywxgimqb.backward());
+      if (this.getControlledVehicle() instanceof AbstractBoatEntity lv) {
+         lv.setInputs(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());
       }
@@ -1327,7 +1326,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_mgdicokk() {
+   public boolean shouldRotateWithMinecart() {
       return this.client.options.m_nimvuuwd().get();
    }
 
@@ -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,15 +1611,14 @@
     */
    @Override
    public float getVisualYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
-    * @mapping {@literal hashed m_irikssnm Lnet/minecraft/unmapped/C_jlopmfei;m_irikssnm(Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named m_irikssnm Lnet/minecraft/client/network/ClientPlayerEntity;m_irikssnm(Lnet/minecraft/item/ItemStack;)V}
+    * Mapping not found
     */
    @Override
-   public void m_irikssnm(ItemStack stack) {
+   public void dropCreativeStack(ItemStack stack) {
       this.client.interactionManager.dropCreativeStack(stack);
    }
 
@@ -1628,7 +1626,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_hmruvmge() {
+   public boolean canDropItems() {
       return this.f_qopkbzvg.m_spctdrez();
    }
 
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-28 22:06:15.452305968 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-28 22:05:04.468281295 +0000
@@ -454,7 +454,7 @@
          this.syncSelectedSlot();
          MutableObject<ActionResult> mutableObject = new MutableObject<>();
          this.sendActionPacket(this.client.world, i -> {
-            PlayerInteractionWithItemC2SPacket lv = new PlayerInteractionWithItemC2SPacket(hand, i, player.m_ndosmusf(), player.m_ahrprint());
+            PlayerInteractionWithItemC2SPacket lv = new PlayerInteractionWithItemC2SPacket(hand, i, player.getYaw(), player.getPitch());
             ItemStack lv2 = player.getStackInHand(hand);
             if (player.getItemCooldownManager().isCoolingDown(lv2)) {
                mutableObject.setValue(ActionResult.PASS);
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-28 22:06:15.672306020 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-28 22:05:04.856281626 +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,7 +89,9 @@
 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.entity.vehicle.ExperimentalMinecartController;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.ItemGroups;
@@ -190,6 +194,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;
@@ -210,6 +215,7 @@
 import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlaySoundFromEntityS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlayerAbilitiesUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.PlayerInventoryUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlayerListHeaderUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlayerPoseUpdateS2CPacket;
@@ -287,9 +293,6 @@
 import net.minecraft.stat.Stat;
 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 +300,10 @@
 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;
@@ -691,7 +691,7 @@
             return new OtherClientPlayerEntity(this.world, lv2.getProfile());
          }
       } else {
-         return lv.m_oebfrxli(this.world, SpawnReason.LOAD);
+         return lv.create(this.world, SpawnReason.LOAD);
       }
    }
 
@@ -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));
             }
          }
@@ -897,8 +897,8 @@
       NetworkThreadUtils.forceMainThread(arg, this, this.client);
       Entity lv = arg.m_jflrgbhx(this.world);
       if (lv instanceof AbstractMinecartEntity lv2) {
-         if (!lv.isLogicalSideForUpdatingMovement() && lv2.m_pzrmwujl() instanceof C_btculrky lv4) {
-            lv4.f_mnqowxmz.addAll(arg.lerpSteps());
+         if (!lv.isLogicalSideForUpdatingMovement() && lv2.getController() instanceof ExperimentalMinecartController lv4) {
+            lv4.lerpSteps.addAll(arg.lerpSteps());
          }
       }
    }
@@ -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);
@@ -1646,10 +1646,10 @@
     * Mapping not found
     */
    @Override
-   public void m_nbdaebbl(C_yjakgqnt arg) {
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.getTutorialManager().onSlotUpdate(arg.contents());
-      this.client.player.getInventory().setStack(arg.slot(), arg.contents());
+   public void onPlayerInventoryUpdate(PlayerInventoryUpdateS2CPacket packet) {
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.getTutorialManager().onSlotUpdate(packet.contents());
+      this.client.player.getInventory().setStack(packet.slot(), packet.contents());
    }
 
    /**
@@ -2454,7 +2454,7 @@
       if (packet.duration() == 0) {
          this.client.player.getItemCooldownManager().remove(packet.cooldownGroup());
       } else {
-         this.client.player.getItemCooldownManager().m_rizxqeam(packet.cooldownGroup(), packet.duration());
+         this.client.player.getItemCooldownManager().set(packet.cooldownGroup(), packet.duration());
       }
    }
 
@@ -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-28 22:06:15.684306023 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-28 22:05:04.880281647 +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/Camera.java namedSrc/net/minecraft/client/render/Camera.java
--- namedTargetSrc/net/minecraft/client/render/Camera.java	2024-10-28 22:06:15.504305980 +0000
+++ namedSrc/net/minecraft/client/render/Camera.java	2024-10-28 22:05:04.560281373 +0000
@@ -8,10 +8,10 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.vehicle.ExperimentalMinecartController;
 import net.minecraft.entity.vehicle.MinecartEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.registry.tag.FluidTags;
-import net.minecraft.unmapped.C_btculrky;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -141,14 +141,14 @@
       this.lastTickDelta = tickDelta;
       if (focusedEntity.hasVehicle()
          && focusedEntity.getVehicle() instanceof MinecartEntity lv
-         && lv.m_pzrmwujl() instanceof C_btculrky lv2
-         && lv2.m_udvfwekl()) {
+         && lv.getController() instanceof ExperimentalMinecartController lv2
+         && lv2.hasCurrentLerpSteps()) {
          Vec3d lv3 = lv.getPassengerRidingPos(focusedEntity)
             .subtract(lv.getPos())
             .subtract(focusedEntity.getVehicleAttachmentPos(lv))
             .add(new Vec3d(0.0, (double)MathHelper.lerp(tickDelta, this.lastCameraY, this.cameraY), 0.0));
          this.setRotation(focusedEntity.getYaw(tickDelta), focusedEntity.getPitch(tickDelta));
-         this.setPos(lv2.m_lysdpqwh(tickDelta).add(lv3));
+         this.setPos(lv2.getLerpedPos(tickDelta).add(lv3));
       } else {
          this.setRotation(focusedEntity.getYaw(tickDelta), focusedEntity.getPitch(tickDelta));
          this.setPos(
diff -bur namedTargetSrc/net/minecraft/client/render/debug/DebugRenderer.java namedSrc/net/minecraft/client/render/debug/DebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/DebugRenderer.java	2024-10-28 22:06:15.508305981 +0000
+++ namedSrc/net/minecraft/client/render/debug/DebugRenderer.java	2024-10-28 22:05:04.568281380 +0000
@@ -274,7 +274,7 @@
          Vec3d lv3 = lv.add(lv2);
          Box lv4 = entity.getBounds().stretch(lv2).expand(1.0);
          int j = maxDistance * maxDistance;
-         EntityHitResult lv5 = ProjectileUtil.raycast(entity, lv, lv3, lv4, EntityPredicates.f_uslwafbb, (double)j);
+         EntityHitResult lv5 = ProjectileUtil.raycast(entity, lv, lv3, lv4, EntityPredicates.CAN_HIT, (double)j);
          if (lv5 == null) {
             return Optional.empty();
          } else {
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-28 22:06:15.576305997 +0000
+++ namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-28 22:05:04.692281486 +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-28 22:06:15.452305968 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java	2024-10-28 22:05:04.472281297 +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-28 22:06:15.516305983 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java	2024-10-28 22:05:04.580281390 +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/AxolotlEntityRenderer.java namedSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java	2024-10-28 22:06:15.548305991 +0000
+++ namedSrc/net/minecraft/client/render/entity/AxolotlEntityRenderer.java	2024-10-28 22:05:04.644281445 +0000
@@ -60,9 +60,9 @@
    public void m_uigfpsip(AxolotlEntity arg, C_dlhftoak arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_cqvniwgh = arg.getVariant();
-      arg2.f_qaaxmicp = arg.f_wuymczru.m_pdudjfdm(f);
-      arg2.f_rjvxgzev = arg.f_klmqpjnz.m_pdudjfdm(f);
-      arg2.f_zsmjprse = arg.f_hquzwutg.m_pdudjfdm(f);
-      arg2.f_ducmcjpd = arg.f_ymqhfbbi.m_pdudjfdm(f);
+      arg2.f_qaaxmicp = arg.playingDeadAnimator.getValue(f);
+      arg2.f_rjvxgzev = arg.inWaterAnimator.getValue(f);
+      arg2.f_zsmjprse = arg.onGroundAnimator.getValue(f);
+      arg2.f_ducmcjpd = arg.movingAnimator.getValue(f);
    }
 }
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-28 22:06:15.644306013 +0000
+++ namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-28 22:05:04.812281589 +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-28 22:06:15.608306005 +0000
+++ namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-28 22:05:04.752281538 +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-28 22:06:15.472305973 +0000
+++ namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-28 22:05:04.500281322 +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-28 22:06:15.612306006 +0000
+++ namedSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java	2024-10-28 22:05:04.756281541 +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-28 22:06:15.640306013 +0000
+++ namedSrc/net/minecraft/client/render/entity/DisplayEntityRenderer.java	2024-10-28 22:05:04.804281582 +0000
@@ -56,7 +56,7 @@
     * @mapping {@literal named m_iayyauuk Lnet/minecraft/client/render/entity/DisplayEntityRenderer;m_iayyauuk(Lnet/minecraft/entity/decoration/DisplayEntity;)Lnet/minecraft/util/math/Box;}
     */
    protected Box m_iayyauuk(T arg) {
-      return arg.m_jlmdjsuq();
+      return arg.getVisibleBoundingBox();
    }
 
    /**
@@ -64,7 +64,7 @@
     * @mapping {@literal named m_lpszeivo Lnet/minecraft/client/render/entity/DisplayEntityRenderer;m_lpszeivo(Lnet/minecraft/entity/decoration/DisplayEntity;)Z}
     */
    protected boolean m_lpszeivo(T arg) {
-      return arg.m_mmfwqwqi();
+      return arg.isAffectedByCulling();
    }
 
    /**
@@ -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/EnderDragonEntityRenderer.java namedSrc/net/minecraft/client/render/entity/EnderDragonEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EnderDragonEntityRenderer.java	2024-10-28 22:06:15.500305979 +0000
+++ namedSrc/net/minecraft/client/render/entity/EnderDragonEntityRenderer.java	2024-10-28 22:05:04.552281366 +0000
@@ -250,7 +250,7 @@
       BlockPos lv4 = arg.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.offsetFightOrigin(arg.getFightOrigin()));
       arg2.f_zxktkwtq = lv4.getSquaredDistanceToCenter(arg.getPos());
       arg2.f_aruiappt = arg.isDead() ? 0.0F : f;
-      arg2.f_zdqjbxgc.m_ioxcflfy(arg.f_vhinbehd);
+      arg2.f_zdqjbxgc.copyFrom(arg.flightTracker);
    }
 
    /**
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-28 22:06:15.552305991 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-10-28 22:05:04.652281452 +0000
@@ -14,8 +14,8 @@
 import net.minecraft.entity.EntityAttachmentType;
 import net.minecraft.entity.Leashable;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
+import net.minecraft.entity.vehicle.ExperimentalMinecartController;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_btculrky;
 import net.minecraft.unmapped.C_vptppxob;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
@@ -329,11 +329,14 @@
       arg2.f_ayfrpthj = entity.getWidth();
       arg2.f_mxnqnzku = entity.getHeight();
       arg2.f_bvdstwqc = entity.getStandingEyeHeight();
-      if (entity.hasVehicle() && entity.getVehicle() instanceof AbstractMinecartEntity lv && lv.m_pzrmwujl() instanceof C_btculrky lv2 && lv2.m_udvfwekl()) {
+      if (entity.hasVehicle()
+         && entity.getVehicle() instanceof AbstractMinecartEntity lv
+         && lv.getController() instanceof ExperimentalMinecartController lv2
+         && lv2.hasCurrentLerpSteps()) {
          double d = MathHelper.lerp((double)f, lv.lastRenderX, lv.getX());
          double e = MathHelper.lerp((double)f, lv.lastRenderY, lv.getY());
          double g = MathHelper.lerp((double)f, lv.lastRenderZ, lv.getZ());
-         arg2.f_lkcyuybz = lv2.m_lysdpqwh(f).subtract(new Vec3d(d, e, g));
+         arg2.f_lkcyuybz = lv2.getLerpedPos(f).subtract(new Vec3d(d, e, g));
       } else {
          arg2.f_lkcyuybz = null;
       }
@@ -342,7 +345,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-28 22:06:15.628306010 +0000
+++ namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-28 22:05:04.784281565 +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-28 22:06:15.464305971 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-10-28 22:05:04.492281314 +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-28 22:06:15.696306026 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-10-28 22:05:04.896281661 +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-28 22:06:15.472305973 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-10-28 22:05:04.500281322 +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-28 22:06:15.468305971 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-10-28 22:05:04.496281318 +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/MooshroomMushroomFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.java	2024-10-28 22:06:15.488305976 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer.java	2024-10-28 22:05:04.532281349 +0000
@@ -43,7 +43,7 @@
       if (!arg3.f_vetzpkzw) {
          boolean bl = arg3.f_pntznnfy && arg3.f_qcpkjxfw;
          if (!arg3.f_qcpkjxfw || bl) {
-            BlockState lv = arg3.f_mluwvfco.m_frvuonjc();
+            BlockState lv = arg3.f_mluwvfco.getBlockState();
             int j = LivingEntityRenderer.getOverlay(arg3, 0.0F);
             BakedModel lv2 = this.blockRenderManager.getModel(lv);
             matrices.push();

@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/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-28 22:06:15.472305973 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-10-28 22:05:04.500281322 +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-28 22:06:15.484305976 +0000
+++ namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-28 22:05:04.516281335 +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-28 22:06:15.504305980 +0000
+++ namedSrc/net/minecraft/client/render/entity/LivingEntityRenderer.java	2024-10-28 22:05:04.560281373 +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-28 22:06:15.496305978 +0000
+++ namedSrc/net/minecraft/client/render/entity/LlamaSpitEntityRenderer.java	2024-10-28 22:05:04.544281360 +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/MooshroomEntityRenderer.java namedSrc/net/minecraft/client/render/entity/MooshroomEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/MooshroomEntityRenderer.java	2024-10-28 22:06:15.520305983 +0000
+++ namedSrc/net/minecraft/client/render/entity/MooshroomEntityRenderer.java	2024-10-28 22:05:04.588281397 +0000
@@ -23,12 +23,10 @@
     * @mapping {@literal hashed f_nxxhfkfi Lnet/minecraft/unmapped/C_tizdabia;f_nxxhfkfi:Ljava/util/Map;}
     * @mapping {@literal named TEXTURES Lnet/minecraft/client/render/entity/MooshroomEntityRenderer;TEXTURES:Ljava/util/Map;}
     */
-   private static final Map<MooshroomEntity.C_vwbykyrx, Identifier> TEXTURES = Util.make(
-      Maps.<MooshroomEntity.C_vwbykyrx, Identifier>newHashMap(), textures -> {
-         textures.put(MooshroomEntity.C_vwbykyrx.BROWN, Identifier.ofDefault("textures/entity/cow/brown_mooshroom.png"));
-         textures.put(MooshroomEntity.C_vwbykyrx.RED, Identifier.ofDefault("textures/entity/cow/red_mooshroom.png"));
-      }
-   );
+   private static final Map<MooshroomEntity.Variant, Identifier> TEXTURES = Util.make(Maps.<MooshroomEntity.Variant, Identifier>newHashMap(), textures -> {
+      textures.put(MooshroomEntity.Variant.BROWN, Identifier.ofDefault("textures/entity/cow/brown_mooshroom.png"));
+      textures.put(MooshroomEntity.Variant.RED, Identifier.ofDefault("textures/entity/cow/red_mooshroom.png"));
+   });
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_tizdabia;<init>(Lnet/minecraft/unmapped/C_ycdfjsnw$C_bnclqjzp;)V}
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-28 22:06:15.572305996 +0000
+++ namedSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java	2024-10-28 22:05:04.688281483 +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/SalmonEntityRenderer.java namedSrc/net/minecraft/client/render/entity/SalmonEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/SalmonEntityRenderer.java	2024-10-28 22:06:15.568305995 +0000
+++ namedSrc/net/minecraft/client/render/entity/SalmonEntityRenderer.java	2024-10-28 22:05:04.680281475 +0000
@@ -98,9 +98,9 @@
     * @mapping {@literal named render Lnet/minecraft/client/render/entity/SalmonEntityRenderer;render(Lnet/minecraft/unmapped/C_mobsuydo;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
     */
    public void render(C_mobsuydo arg, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i) {
-      if (arg.f_xabuinqr == SalmonEntity.C_oepggenf.SMALL) {
+      if (arg.f_xabuinqr == SalmonEntity.Variant.SMALL) {
          this.model = this.f_xsihajli;
-      } else if (arg.f_xabuinqr == SalmonEntity.C_oepggenf.LARGE) {
+      } else if (arg.f_xabuinqr == SalmonEntity.Variant.LARGE) {
          this.model = this.f_bsrfqwai;
       } else {
          this.model = this.f_mngefezo;
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-28 22:06:15.608306005 +0000
+++ namedSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java	2024-10-28 22:05:04.752281538 +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-28 22:06:15.624306008 +0000
+++ namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-28 22:05:04.772281555 +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-28 22:06:15.516305983 +0000
+++ namedSrc/net/minecraft/client/render/entity/TridentEntityRenderer.java	2024-10-28 22:05:04.580281390 +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-28 22:06:15.564305995 +0000
+++ namedSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-28 22:05:04.676281473 +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/WitherEntityRenderer.java namedSrc/net/minecraft/client/render/entity/WitherEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WitherEntityRenderer.java	2024-10-28 22:06:15.696306026 +0000
+++ namedSrc/net/minecraft/client/render/entity/WitherEntityRenderer.java	2024-10-28 22:05:04.896281661 +0000
@@ -84,8 +84,8 @@
       super.m_tskwgjqs(arg, arg2, f);
       int i = arg.getInvulnerableTimer();
       arg2.f_knxdcnwe = i > 0 ? (float)i - f : 0.0F;
-      System.arraycopy(arg.m_lqbzdcae(), 0, arg2.f_iubafrhx, 0, arg2.f_iubafrhx.length);
-      System.arraycopy(arg.m_qmyjaubp(), 0, arg2.f_aubhltyl, 0, arg2.f_aubhltyl.length);
-      arg2.f_qqakpabc = arg.m_ozoswikq();
+      System.arraycopy(arg.getSideHeadPitches(), 0, arg2.f_iubafrhx, 0, arg2.f_iubafrhx.length);
+      System.arraycopy(arg.getSideHeadYaws(), 0, arg2.f_aubhltyl, 0, arg2.f_aubhltyl.length);
+      arg2.f_qqakpabc = arg.shouldRenderOverlay();
    }
 }
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-28 22:06:15.692306025 +0000
+++ namedSrc/net/minecraft/client/render/entity/WitherSkullEntityRenderer.java	2024-10-28 22:05:04.888281654 +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/entity/WolfEntityRenderer.java namedSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java	2024-10-28 22:06:15.588306000 +0000
+++ namedSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java	2024-10-28 22:05:04.716281506 +0000
@@ -63,7 +63,7 @@
       arg2.f_jusovzrm = arg.isInSittingPose();
       arg2.f_deilkqon = arg.getTailAngle();
       arg2.f_sxwtfwvk = arg.getBegAnimationProgress(f);
-      arg2.f_rhkxwgns = arg.m_jdczbagy(f);
+      arg2.f_rhkxwgns = arg.lerpShakeProgress(f);
       arg2.f_kfojblfw = arg.getTexture();
       arg2.f_pypkayfj = arg.getFurWetBrightnessMultiplier(f);
       arg2.f_uycgyszu = arg.isTamed() ? arg.getCollarColor() : null;
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-28 22:06:15.484305976 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-10-28 22:05:04.520281339 +0000
@@ -479,7 +479,7 @@
       Vec3d lv4 = lv.add(lv3.x * g, lv3.y * g, lv3.z * g);
       float j = 1.0F;
       Box lv5 = entity.getBounds().stretch(lv3.multiply(g)).expand(1.0, 1.0, 1.0);
-      EntityHitResult lv6 = ProjectileUtil.raycast(entity, lv, lv4, lv5, EntityPredicates.f_uslwafbb, h);
+      EntityHitResult lv6 = ProjectileUtil.raycast(entity, lv, lv4, lv5, EntityPredicates.CAN_HIT, h);
       return lv6 != null && lv6.getPos().squaredDistanceTo(lv) < i ? ensureHitInRange(lv6, lv, entityRange) : ensureHitInRange(lv2, lv, blockRange);
    }
 
@@ -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-28 22:06:15.508305981 +0000
+++ namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-10-28 22:05:04.568281380 +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-28 22:06:15.472305973 +0000
+++ namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-28 22:05:04.500281322 +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/sound/MinecartInsideSoundInstance.java namedSrc/net/minecraft/client/sound/MinecartInsideSoundInstance.java
--- namedTargetSrc/net/minecraft/client/sound/MinecartInsideSoundInstance.java	2024-10-28 22:06:15.460305970 +0000
+++ namedSrc/net/minecraft/client/sound/MinecartInsideSoundInstance.java	2024-10-28 22:05:04.484281308 +0000
@@ -4,9 +4,9 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
+import net.minecraft.entity.vehicle.ExperimentalMinecartController;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_btculrky;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -87,7 +87,7 @@
          this.volume = 0.0F;
       } else {
          float f = (float)this.minecart.getVelocity().horizontalLength();
-         boolean bl = !this.minecart.isOnRailTracks() && this.minecart.m_pzrmwujl() instanceof C_btculrky;
+         boolean bl = !this.minecart.isOnRailTracks() && this.minecart.getController() instanceof ExperimentalMinecartController;
          if (f >= 0.01F && !bl) {
             this.volume = MathHelper.clampedLerp(0.0F, 0.75F, f);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/sound/MovingMinecartSoundInstance.java namedSrc/net/minecraft/client/sound/MovingMinecartSoundInstance.java
--- namedTargetSrc/net/minecraft/client/sound/MovingMinecartSoundInstance.java	2024-10-28 22:06:15.636306011 +0000
+++ namedSrc/net/minecraft/client/sound/MovingMinecartSoundInstance.java	2024-10-28 22:05:04.796281576 +0000
@@ -3,9 +3,9 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
+import net.minecraft.entity.vehicle.ExperimentalMinecartController;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_btculrky;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -95,7 +95,7 @@
          this.y = (double)((float)this.minecart.getY());
          this.z = (double)((float)this.minecart.getZ());
          float f = (float)this.minecart.getVelocity().horizontalLength();
-         boolean bl = !this.minecart.isOnRailTracks() && this.minecart.m_pzrmwujl() instanceof C_btculrky;
+         boolean bl = !this.minecart.isOnRailTracks() && this.minecart.getController() instanceof ExperimentalMinecartController;
          if (f >= 0.01F && this.minecart.getWorld().getTickManager().shouldTick() && !bl) {
             this.distance = MathHelper.clamp(this.distance + 0.0025F, 0.0F, 1.0F);
             this.volume = MathHelper.lerp(MathHelper.clamp(f, 0.0F, 0.5F), 0.0F, 0.7F);
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-28 22:06:15.612306006 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-28 22:05:04.756281541 +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();
       }
    }
 
@@ -791,7 +791,7 @@
     * Mapping not found
     */
    @Override
-   public RecipeAccess m_mlvimbbc() {
+   public RecipeAccess getRecipeManager() {
       return this.netHandler.m_zydgbtyw();
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorReader.java namedSrc/net/minecraft/command/EntitySelectorReader.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-28 22:06:15.648306015 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-28 22:05:04.812281589 +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-28 22:06:15.656306016 +0000
+++ namedSrc/net/minecraft/component/DataComponentTypes.java	2024-10-28 22:05:04.832281607 +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;
@@ -30,6 +31,8 @@
 import net.minecraft.component.type.SuspiciousStewEffectsComponent;
 import net.minecraft.component.type.ToolComponent;
 import net.minecraft.component.type.UnbreakableComponent;
+import net.minecraft.component.type.UseCooldownComponent;
+import net.minecraft.component.type.UseRemainderComponent;
 import net.minecraft.component.type.WritableBookContentComponent;
 import net.minecraft.component.type.WrittenBookContentComponent;
 import net.minecraft.inventory.ContainerLock;
@@ -50,12 +53,9 @@
 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;
 import net.minecraft.unmapped.C_iktlenyy;
-import net.minecraft.unmapped.C_jugjlqvm;
 import net.minecraft.unmapped.C_npqbextr;
 import net.minecraft.unmapped.C_zuuptmip;
 import net.minecraft.util.DyeColor;
@@ -232,15 +232,15 @@
     * @mapping {@literal hashed f_qzveaqms Lnet/minecraft/unmapped/C_icwdaizi;f_qzveaqms:Lnet/minecraft/unmapped/C_pscqxfcs;}
     * @mapping {@literal named USE_REMAINDER Lnet/minecraft/component/DataComponentTypes;USE_REMAINDER:Lnet/minecraft/component/DataComponentType;}
     */
-   public static final DataComponentType<C_jugjlqvm> USE_REMAINDER = register(
-      "use_remainder", builder -> builder.codec(C_jugjlqvm.CODEC).packetCodec(C_jugjlqvm.PACKET_CODEC).m_hzpkutpy()
+   public static final DataComponentType<UseRemainderComponent> USE_REMAINDER = register(
+      "use_remainder", builder -> builder.codec(UseRemainderComponent.CODEC).packetCodec(UseRemainderComponent.PACKET_CODEC).m_hzpkutpy()
    );
    /**
     * @mapping {@literal hashed f_usnlxggi Lnet/minecraft/unmapped/C_icwdaizi;f_usnlxggi:Lnet/minecraft/unmapped/C_pscqxfcs;}
     * @mapping {@literal named USE_COOLDOWN Lnet/minecraft/component/DataComponentTypes;USE_COOLDOWN:Lnet/minecraft/component/DataComponentType;}
     */
-   public static final DataComponentType<C_elkynmne> USE_COOLDOWN = register(
-      "use_cooldown", builder -> builder.codec(C_elkynmne.CODEC).packetCodec(C_elkynmne.PACKET_CODEC).m_hzpkutpy()
+   public static final DataComponentType<UseCooldownComponent> USE_COOLDOWN = register(
+      "use_cooldown", builder -> builder.codec(UseCooldownComponent.CODEC).packetCodec(UseCooldownComponent.PACKET_CODEC).m_hzpkutpy()
    );
    /**
     * @mapping {@literal hashed f_tkvqayym Lnet/minecraft/unmapped/C_icwdaizi;f_tkvqayym:Lnet/minecraft/unmapped/C_pscqxfcs;}
@@ -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
Only in namedSrc/net/minecraft/component/type: UseCooldownComponent.java
Only in namedSrc/net/minecraft/component/type: UseRemainderComponent.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-28 22:06:15.676306020 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-10-28 22:05:04.864281634 +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-28 22:06:15.648306015 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-28 22:05:04.816281592 +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/data/server/loot_table/ShearingLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/ShearingLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/ShearingLootTableGenerator.java	2024-10-28 22:06:15.572305996 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/ShearingLootTableGenerator.java	2024-10-28 22:05:04.692281486 +0000
@@ -60,14 +60,14 @@
                            .conditionally(
                               EntityPropertiesLootCondition.builder(
                                  LootContext.EntityTarget.THIS,
-                                 EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.MOOSHROOM.m_afpcwxvr(MooshroomEntity.C_vwbykyrx.RED))
+                                 EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.MOOSHROOM.m_afpcwxvr(MooshroomEntity.Variant.RED))
                               )
                            ),
                         LootTableEntry.builder(LootTables.MOOSHROOM_BROWN_SHEARING)
                            .conditionally(
                               EntityPropertiesLootCondition.builder(
                                  LootContext.EntityTarget.THIS,
-                                 EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.MOOSHROOM.m_afpcwxvr(MooshroomEntity.C_vwbykyrx.BROWN))
+                                 EntityPredicate.Builder.create().typeSpecific(EntitySubPredicateTypes.MOOSHROOM.m_afpcwxvr(MooshroomEntity.Variant.BROWN))
                               )
                            )
                      )
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-28 22:06:15.524305985 +0000
+++ namedSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-10-28 22:05:04.604281410 +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-28 22:06:15.464305971 +0000
+++ namedSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-28 22:05:04.488281312 +0000
@@ -45,7 +45,7 @@
       if (World.isValid(lv)) {
          Optional<Holder<EntityType<?>>> optional = this.entityTypes().getRandomElement(world.getRandom());
          if (!optional.isEmpty()) {
-            Entity lv2 = ((EntityType)((Holder)optional.get()).getValue()).m_tqxwdyaw(world, lv, SpawnReason.TRIGGERED);
+            Entity lv2 = ((EntityType)((Holder)optional.get()).getValue()).spawn(world, lv, SpawnReason.TRIGGERED);
             if (lv2 != null) {
                if (lv2 instanceof LightningEntity lv3 && context.owner() instanceof ServerPlayerEntity lv4) {
                   lv3.setChanneler(lv4);
@@ -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/AxolotlAttackablesSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.java	2024-10-28 22:06:15.696306026 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.java	2024-10-28 22:05:04.896281661 +0000
@@ -24,7 +24,7 @@
       return this.isInRange(entity, target)
          && target.isInsideWaterOrBubbleColumn()
          && (this.isAlwaysHostileTo(target) || this.canHunt(entity, target))
-         && Sensor.testAttackableTargetPredicate(world, entity, target);
+         && Sensor.canAttack(world, entity, target);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/BreezeAttackEntitySensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/BreezeAttackEntitySensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/BreezeAttackEntitySensor.java	2024-10-28 22:06:15.696306026 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/BreezeAttackEntitySensor.java	2024-10-28 22:05:04.896281661 +0000
@@ -34,7 +34,7 @@
          .stream()
          .flatMap(Collection::stream)
          .filter(EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)
-         .filter(entity -> Sensor.testAttackableTargetPredicate(world, arg2, entity))
+         .filter(entity -> Sensor.canAttack(world, arg2, entity))
          .findFirst()
          .ifPresentOrElse(
             entity -> arg2.getBrain().remember(MemoryModuleType.NEAREST_ATTACKABLE, entity), () -> arg2.getBrain().forget(MemoryModuleType.NEAREST_ATTACKABLE)
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/FrogAttackablesSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/FrogAttackablesSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/FrogAttackablesSensor.java	2024-10-28 22:06:15.584305999 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/FrogAttackablesSensor.java	2024-10-28 22:05:04.704281496 +0000
@@ -25,7 +25,7 @@
    @Override
    protected boolean matches(ServerWorld world, LivingEntity entity, LivingEntity target) {
       return !entity.getBrain().hasMemoryModule(MemoryModuleType.HAS_HUNTING_COOLDOWN)
-            && Sensor.testAttackableTargetPredicate(world, entity, target)
+            && Sensor.canAttack(world, entity, target)
             && FrogEntity.canEat(target)
             && !this.isTargetUnreachable(entity, target)
          ? target.isInRange(entity, 10.0)
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-28 22:06:15.628306010 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-10-28 22:05:04.784281565 +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/NearestPlayersSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.java	2024-10-28 22:06:15.612306006 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.java	2024-10-28 22:05:04.760281544 +0000
@@ -35,22 +35,22 @@
       List<PlayerEntity> list = (List<PlayerEntity>)world.getPlayers()
          .stream()
          .filter(EntityPredicates.EXCEPT_SPECTATOR)
-         .filter(player -> entity.isInRange(player, this.m_bmzrlldc(entity)))
+         .filter(player -> entity.isInRange(player, this.getFollowRange(entity)))
          .sorted(Comparator.comparingDouble(entity::squaredDistanceTo))
          .collect(Collectors.toList());
       Brain<?> lv = entity.getBrain();
       lv.remember(MemoryModuleType.NEAREST_PLAYERS, list);
-      List<PlayerEntity> list2 = (List<PlayerEntity>)list.stream().filter(player -> testTargetPredicate(world, entity, player)).collect(Collectors.toList());
+      List<PlayerEntity> list2 = (List<PlayerEntity>)list.stream().filter(player -> canTarget(world, entity, player)).collect(Collectors.toList());
       lv.remember(MemoryModuleType.NEAREST_VISIBLE_PLAYER, list2.isEmpty() ? null : (PlayerEntity)list2.get(0));
-      Optional<PlayerEntity> optional = list2.stream().filter(player -> testAttackableTargetPredicate(world, entity, player)).findFirst();
+      Optional<PlayerEntity> optional = list2.stream().filter(player -> canAttack(world, entity, player)).findFirst();
       lv.remember(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, optional);
    }
 
    /**
     * @mapping {@literal hashed m_bmzrlldc Lnet/minecraft/unmapped/C_uipsphan;m_bmzrlldc(Lnet/minecraft/unmapped/C_usxaxydn;)D}
-    * @mapping {@literal named m_bmzrlldc Lnet/minecraft/entity/ai/brain/sensor/NearestPlayersSensor;m_bmzrlldc(Lnet/minecraft/entity/LivingEntity;)D}
+    * @mapping {@literal named getFollowRange Lnet/minecraft/entity/ai/brain/sensor/NearestPlayersSensor;getFollowRange(Lnet/minecraft/entity/LivingEntity;)D}
     */
-   protected double m_bmzrlldc(LivingEntity entity) {
+   protected double getFollowRange(LivingEntity entity) {
       return entity.getAttributeValue(EntityAttributes.FOLLOW_RANGE);
    }
 }
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-28 22:06:15.500305979 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java	2024-10-28 22:05:04.552281366 +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.hasPiglinSafeArmor(lv7) && entity.canTarget(lv3)) {
                optional6 = Optional.of(lv7);
             }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/Sensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/Sensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/Sensor.java	2024-10-28 22:06:15.568305995 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/Sensor.java	2024-10-28 22:05:04.680281475 +0000
@@ -32,9 +32,10 @@
     */
    private static final int DEFAULT_RUN_TIME = 20;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tqpujoog Lnet/minecraft/unmapped/C_brvrbzqh;f_tqpujoog:I}
+    * @mapping {@literal named DEFAULT_TARGETING_RANGE Lnet/minecraft/entity/ai/brain/sensor/Sensor;DEFAULT_TARGETING_RANGE:I}
     */
-   private static final int f_tqpujoog = 16;
+   private static final int DEFAULT_TARGETING_RANGE = 16;
    /**
     * @mapping {@literal hashed f_cntwatpt Lnet/minecraft/unmapped/C_brvrbzqh;f_cntwatpt:Lnet/minecraft/unmapped/C_cjtyhinh;}
     * @mapping {@literal named TARGET_PREDICATE Lnet/minecraft/entity/ai/brain/sensor/Sensor;TARGET_PREDICATE:Lnet/minecraft/entity/ai/TargetPredicate;}
@@ -109,16 +110,16 @@
    public final void tick(ServerWorld world, E entity) {
       if (--this.lastSenseTime <= 0L) {
          this.lastSenseTime = (long)this.senseInterval;
-         this.m_oaooofgj(entity);
+         this.updateTargetingRanges(entity);
          this.sense(world, entity);
       }
    }
 
    /**
     * @mapping {@literal hashed m_oaooofgj Lnet/minecraft/unmapped/C_brvrbzqh;m_oaooofgj(Lnet/minecraft/unmapped/C_usxaxydn;)V}
-    * @mapping {@literal named m_oaooofgj Lnet/minecraft/entity/ai/brain/sensor/Sensor;m_oaooofgj(Lnet/minecraft/entity/LivingEntity;)V}
+    * @mapping {@literal named updateTargetingRanges Lnet/minecraft/entity/ai/brain/sensor/Sensor;updateTargetingRanges(Lnet/minecraft/entity/LivingEntity;)V}
     */
-   private void m_oaooofgj(E entity) {
+   private void updateTargetingRanges(E entity) {
       double d = entity.getAttributeValue(EntityAttributes.FOLLOW_RANGE);
       TARGET_PREDICATE.setBaseMaxDistance(d);
       TARGET_PREDICATE_IGNORE_DISTANCE_SCALING.setBaseMaxDistance(d);
@@ -142,9 +143,9 @@
 
    /**
     * @mapping {@literal hashed m_pjqiwcnh Lnet/minecraft/unmapped/C_brvrbzqh;m_pjqiwcnh(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z}
-    * @mapping {@literal named testTargetPredicate Lnet/minecraft/entity/ai/brain/sensor/Sensor;testTargetPredicate(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
+    * @mapping {@literal named canTarget Lnet/minecraft/entity/ai/brain/sensor/Sensor;canTarget(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
     */
-   public static boolean testTargetPredicate(ServerWorld world, LivingEntity entity, LivingEntity target) {
+   public static boolean canTarget(ServerWorld world, LivingEntity entity, LivingEntity target) {
       return entity.getBrain().hasMemoryModuleWithValue(MemoryModuleType.ATTACK_TARGET, target)
          ? TARGET_PREDICATE_IGNORE_DISTANCE_SCALING.test(world, entity, target)
          : TARGET_PREDICATE.test(world, entity, target);
@@ -152,9 +153,9 @@
 
    /**
     * @mapping {@literal hashed m_rtpssfaw Lnet/minecraft/unmapped/C_brvrbzqh;m_rtpssfaw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z}
-    * @mapping {@literal named testAttackableTargetPredicate Lnet/minecraft/entity/ai/brain/sensor/Sensor;testAttackableTargetPredicate(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
+    * @mapping {@literal named canAttack Lnet/minecraft/entity/ai/brain/sensor/Sensor;canAttack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
     */
-   public static boolean testAttackableTargetPredicate(ServerWorld world, LivingEntity entity, LivingEntity target) {
+   public static boolean canAttack(ServerWorld world, LivingEntity entity, LivingEntity target) {
       return entity.getBrain().hasMemoryModuleWithValue(MemoryModuleType.ATTACK_TARGET, target)
          ? ATTACKABLE_TARGET_PREDICATE_IGNORE_DISTANCE_SCALING.test(world, entity, target)
          : ATTACKABLE_TARGET_PREDICATE.test(world, entity, target);
@@ -162,30 +163,31 @@
 
    /**
     * @mapping {@literal hashed m_cqcoyxpn Lnet/minecraft/unmapped/C_brvrbzqh;m_cqcoyxpn(Lnet/minecraft/unmapped/C_usxaxydn;I)Ljava/util/function/BiPredicate;}
-    * @mapping {@literal named m_cqcoyxpn Lnet/minecraft/entity/ai/brain/sensor/Sensor;m_cqcoyxpn(Lnet/minecraft/entity/LivingEntity;I)Ljava/util/function/BiPredicate;}
+    * @mapping {@literal named hasRecentlyBeenAttackable Lnet/minecraft/entity/ai/brain/sensor/Sensor;hasRecentlyBeenAttackable(Lnet/minecraft/entity/LivingEntity;I)Ljava/util/function/BiPredicate;}
     */
-   public static BiPredicate<ServerWorld, LivingEntity> m_cqcoyxpn(LivingEntity entity, int i) {
-      return m_aputesvt(i, (world, arg3) -> testAttackableTargetPredicate(world, entity, arg3));
+   public static BiPredicate<ServerWorld, LivingEntity> hasRecentlyBeenAttackable(LivingEntity entity, int testedTicks) {
+      return hasRecentlyPassed(testedTicks, (world, arg3) -> canAttack(world, entity, arg3));
    }
 
    /**
     * @mapping {@literal hashed m_namfjgwr Lnet/minecraft/unmapped/C_brvrbzqh;m_namfjgwr(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z}
-    * @mapping {@literal named testAttackableTargetPredicateIgnoreVisibility Lnet/minecraft/entity/ai/brain/sensor/Sensor;testAttackableTargetPredicateIgnoreVisibility(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
+    * @mapping {@literal named canAttackIgnoreVisibility Lnet/minecraft/entity/ai/brain/sensor/Sensor;canAttackIgnoreVisibility(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/LivingEntity;)Z}
     */
-   public static boolean testAttackableTargetPredicateIgnoreVisibility(ServerWorld world, LivingEntity entity, LivingEntity target) {
+   public static boolean canAttackIgnoreVisibility(ServerWorld world, LivingEntity entity, LivingEntity target) {
       return entity.getBrain().hasMemoryModuleWithValue(MemoryModuleType.ATTACK_TARGET, target)
          ? ATTACKABLE_TARGET_PREDICATE_IGNORE_VISIBILITY_OR_DISTANCE_SCALING.test(world, entity, target)
          : ATTACKABLE_TARGET_PREDICATE_IGNORE_VISIBILITY.test(world, entity, target);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_aputesvt Lnet/minecraft/unmapped/C_brvrbzqh;m_aputesvt(ILjava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;}
+    * @mapping {@literal named hasRecentlyPassed Lnet/minecraft/entity/ai/brain/sensor/Sensor;hasRecentlyPassed(ILjava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;}
     */
-   static <T, U> BiPredicate<T, U> m_aputesvt(int i, BiPredicate<T, U> biPredicate) {
+   static <T, U> BiPredicate<T, U> hasRecentlyPassed(int testedTicks, BiPredicate<T, U> predicate) {
       AtomicInteger atomicInteger = new AtomicInteger(0);
       return (object, object2) -> {
-         if (biPredicate.test(object, object2)) {
-            atomicInteger.set(i);
+         if (predicate.test(object, object2)) {
+            atomicInteger.set(testedTicks);
             return true;
          } else {
             return atomicInteger.decrementAndGet() >= 0;
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-28 22:06:15.668306018 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-28 22:05:04.852281624 +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/BreezeLongJumpTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java	2024-10-28 22:06:15.548305991 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java	2024-10-28 22:05:04.644281445 +0000
@@ -19,7 +19,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_cspceykn;
 import net.minecraft.util.Unit;
 import net.minecraft.util.Util;
 import net.minecraft.util.hit.HitResult;
@@ -56,17 +55,20 @@
     */
    private static final int INHALING_DURATION = Math.round(10.0F);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_oknthhqd Lnet/minecraft/unmapped/C_eadqehug;f_oknthhqd:F}
+    * @mapping {@literal named DEFAULT_FOLLOW_RANGE Lnet/minecraft/entity/ai/brain/task/BreezeLongJumpTask;DEFAULT_FOLLOW_RANGE:F}
     */
-   private static final float f_oknthhqd = 24.0F;
+   private static final float DEFAULT_FOLLOW_RANGE = 24.0F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xloabgtw Lnet/minecraft/unmapped/C_eadqehug;f_xloabgtw:F}
+    * @mapping {@literal named DEFAULT_MAX_JUMP_VELOCITY Lnet/minecraft/entity/ai/brain/task/BreezeLongJumpTask;DEFAULT_MAX_JUMP_VELOCITY:F}
     */
-   private static final float f_xloabgtw = 1.4F;
+   private static final float DEFAULT_MAX_JUMP_VELOCITY = 1.4F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gqwfesec Lnet/minecraft/unmapped/C_eadqehug;f_gqwfesec:F}
+    * @mapping {@literal named MAX_JUMP_VELOCITY_MULTIPLIER Lnet/minecraft/entity/ai/brain/task/BreezeLongJumpTask;MAX_JUMP_VELOCITY_MULTIPLIER:F}
     */
-   private static final float f_gqwfesec = 0.058333334F;
+   private static final float MAX_JUMP_VELOCITY_MULTIPLIER = 0.058333334F;
    /**
     * @mapping {@literal hashed f_uiikvybd Lnet/minecraft/unmapped/C_eadqehug;f_uiikvybd:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;}
     * @mapping {@literal named ALLOWED_JUMP_ANGLES Lnet/minecraft/entity/ai/brain/task/BreezeLongJumpTask;ALLOWED_JUMP_ANGLES:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;}
@@ -123,14 +125,14 @@
          } else if (!canJumpFromPos(world, breeze)) {
             return false;
          } else {
-            BlockPos lv2 = getJumpTargetPos(breeze, C_cspceykn.m_jpogoaaz(lv, breeze.getRandom()));
+            BlockPos lv2 = getJumpTargetPos(breeze, BreezeUtil.getRandomPosBehindTarget(lv, breeze.getRandom()));
             if (lv2 == null) {
                return false;
             } else {
                BlockState lv3 = world.getBlockState(lv2.down());
                if (breeze.getType().isInvalidSpawn(lv3)) {
                   return false;
-               } else if (!C_cspceykn.m_lujgadpm(breeze, lv2.ofCenter()) && !C_cspceykn.m_lujgadpm(breeze, lv2.up(4).ofCenter())) {
+               } else if (!BreezeUtil.hasLineOfSight(breeze, lv2.ofCenter()) && !BreezeUtil.hasLineOfSight(breeze, lv2.up(4).ofCenter())) {
                   return false;
                } else {
                   breeze.getBrain().remember(MemoryModuleType.BREEZE_JUMP_TARGET, lv2);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeShootTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreezeShootTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeShootTask.java	2024-10-28 22:06:15.464305971 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeShootTask.java	2024-10-28 22:05:04.484281308 +0000
@@ -144,9 +144,9 @@
             && !lv.getOptionalMemory(MemoryModuleType.BREEZE_SHOOT_RECOVER).isPresent()) {
             lv.remember(MemoryModuleType.BREEZE_SHOOT_RECOVER, Unit.INSTANCE, (long)RECOVERY_TICKS);
             double d = lv2.getX() - arg2.getX();
-            double e = lv2.getBodyY(lv2.hasVehicle() ? 0.8 : 0.3) - arg2.m_ywgongii();
+            double e = lv2.getBodyY(lv2.hasVehicle() ? 0.8 : 0.3) - arg2.getShootingY();
             double f = lv2.getZ() - arg2.getZ();
-            ProjectileEntity.m_aomcogmb(
+            ProjectileEntity.spawn(
                new BreezeWindChargeEntity(arg2, world), world, ItemStack.EMPTY, d, e, f, 0.7F, (float)(5 - world.getDifficulty().getId() * 4)
             );
             arg2.playSound(SoundEvents.ENTITY_BREEZE_SHOOT, 1.5F, 1.0F);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-10-28 22:06:15.628306010 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-10-28 22:05:04.784281565 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.entity.ai.brain.WalkTarget;
 import net.minecraft.entity.mob.BreezeEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_cspceykn;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -57,13 +56,13 @@
          Vec3d lv2 = null;
          if (bl) {
             Vec3d lv3 = NoPenaltyTargeting.find(arg2, 5, 5, lv.getPos());
-            if (lv3 != null && C_cspceykn.m_lujgadpm(arg2, lv3) && lv.squaredDistanceTo(lv3.x, lv3.y, lv3.z) > lv.squaredDistanceTo(arg2)) {
+            if (lv3 != null && BreezeUtil.hasLineOfSight(arg2, lv3) && lv.squaredDistanceTo(lv3.x, lv3.y, lv3.z) > lv.squaredDistanceTo(arg2)) {
                lv2 = lv3;
             }
          }
 
          if (lv2 == null) {
-            lv2 = arg2.getRandom().nextBoolean() ? C_cspceykn.m_jpogoaaz(lv, arg2.getRandom()) : getRandomPointInMediumRange(arg2, lv);
+            lv2 = arg2.getRandom().nextBoolean() ? BreezeUtil.getRandomPosBehindTarget(lv, arg2.getRandom()) : getRandomPointInMediumRange(arg2, lv);
          }
 
          arg2.getBrain().remember(MemoryModuleType.WALK_TARGET, new WalkTarget(BlockPos.fromPosition(lv2), 0.6F, 1));
Only in namedSrc/net/minecraft/entity/ai/brain/task: BreezeUtil.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java namedSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java	2024-10-28 22:06:15.468305971 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java	2024-10-28 22:05:04.496281318 +0000
@@ -80,7 +80,7 @@
          DyeColor lv2 = Util.getRandom(DyeColor.values(), lv);
          int i = lv.nextInt(3);
          ItemStack lv3 = this.createFirework(lv2, i);
-         ProjectileEntity.m_rfjmckqt(new FireworkRocketEntity(arg2.getWorld(), arg2, arg2.getX(), arg2.getEyeY(), arg2.getZ(), lv3), world, lv3);
+         ProjectileEntity.spawn(new FireworkRocketEntity(arg2.getWorld(), arg2, arg2.getX(), arg2.getEyeY(), arg2.getZ(), lv3), world, lv3);
       }
    }
 
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-28 22:06:15.436305964 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-28 22:05:04.432281263 +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);
             }
          }
       }


The remaining diff is too long!

Please sign in to comment.