Skip to content

Commit

Permalink
mob entity completion!
Browse files Browse the repository at this point in the history
  • Loading branch information
ix0rai committed Oct 19, 2024
1 parent 8d2b9d6 commit fad9c78
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CLASS net/minecraft/unmapped/C_lygsomtd net/minecraft/entity/ai/brain/task/SetLookTargetOnIntervalTask
METHOD m_aecmvuxy create (Lnet/minecraft/unmapped/C_ogavsvbr;FLnet/minecraft/unmapped/C_hvilmtvi;)Lnet/minecraft/unmapped/C_mdnathub;
ARG 0 validEntityType
METHOD m_ouvkkubu create (FLnet/minecraft/unmapped/C_hvilmtvi;)Lnet/minecraft/unmapped/C_mdnathub;
METHOD m_xpopbuma create (FLnet/minecraft/unmapped/C_hvilmtvi;Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_mdnathub;
ARG 0 maxDistance
ARG 1 interval
ARG 2 targetPredicate
CLASS C_gvxfhlod Interval
FIELD f_efesnins remainingTicks I
FIELD f_rdvkztgg interval Lnet/minecraft/unmapped/C_hvilmtvi;
METHOD m_haxoxxhw shouldRun (Lnet/minecraft/unmapped/C_rlomrsco;)Z
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/mob/BreezeBrain.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_gxdsshkk net/minecraft/entity/mob/BreezeBrain
FIELD f_atwbyltl SLIDING_SPEED_MULTIPLIER F
FIELD f_kequkmrd SENSORS Ljava/util/List;
FIELD f_rkqhdhwy JUMP_CIRCLE_OUTER_RADIUS F
FIELD f_usqhomax TICKS_BEFORE_FORGETTING_TARGET I
FIELD f_wjnamjhu MEMORY_MODULES Ljava/util/List;
FIELD f_ygzaeast JUMP_CIRCLE_MIDDLE_RADIUS F
METHOD m_inljbpxh addIdleTasks (Lnet/minecraft/unmapped/C_rjqjaxef;)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/mob/BreezeEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ CLASS net/minecraft/unmapped/C_nqresjkz net/minecraft/entity/mob/BreezeEntity
ARG 1 pos
METHOD m_qzaybzaa spawnJumpTrailParticles ()V
METHOD m_sinilvic stopAnimations ()V
METHOD m_ywgongii getShootingY ()D
4 changes: 4 additions & 0 deletions mappings/net/minecraft/entity/mob/CreakingBrain.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
CLASS net/minecraft/unmapped/C_nkqatzha net/minecraft/entity/mob/CreakingBrain
FIELD f_spaomsvc MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
FIELD f_uavqxrpw SENSORS Lcom/google/common/collect/ImmutableList;
METHOD m_fdgcwgsd addIdleActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V
METHOD m_hhynauwr addFightActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V
METHOD m_rxjjsjcj create (Lnet/minecraft/unmapped/C_rjqjaxef;)Lnet/minecraft/unmapped/C_rjqjaxef;
METHOD m_suwefzcr addCoreActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V
METHOD m_vpamiunc createProfile ()Lnet/minecraft/unmapped/C_rjqjaxef$C_liifzsnq;
METHOD m_wvhfkjve updateActivities (Lnet/minecraft/unmapped/C_vbugwmii;)V
ARG 0 creaking
15 changes: 15 additions & 0 deletions mappings/net/minecraft/entity/mob/CreakingEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
CLASS net/minecraft/unmapped/C_vbugwmii net/minecraft/entity/mob/CreakingEntity
FIELD f_ckldzaer GRAY I
FIELD f_dyztbejg ATTACK_DAMAGE F
FIELD f_ekddpnal CAN_MOVE Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_ekjurwuq IDLING_SPEED_MULTIPLIER F
FIELD f_gnorwjlj invulnerabilityAnimationState Lnet/minecraft/unmapped/C_kxntavoz;
FIELD f_iflztenn attackCooldown I
FIELD f_jujfnssl ACTIVE Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_mzkqzzle ATTACK_ANIMATION_DURATION I
FIELD f_rcowlgzl FOLLOW_RANGE F
FIELD f_sdmnlrcu MAX_HEALTH I
FIELD f_sjorwcyp ORANGE I
FIELD f_sqbcuhao ATTACK_INTERVAL I
FIELD f_stkvvsxy attackAnimationState Lnet/minecraft/unmapped/C_kxntavoz;
FIELD f_tocwldwq ACTIVATION_RANGE_SQUARED F
FIELD f_yaenaqzq FIGHTING_MOVEMENT_SPEED F
METHOD m_japnsene setActive (Z)V
METHOD m_jkvxeltg createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
METHOD m_ohccomft animate ()V
METHOD m_qnnyojvb checkCanMove ()Z
METHOD m_xchtvnyy canMove ()Z
METHOD m_xkvsljnw isActive ()Z
CLASS C_bhmfzyyn CreakingJumpControl
CLASS C_hkgbvofv CreakingMoveControl
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/mob/Hoglin.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_ovaqczqd net/minecraft/entity/mob/Hoglin
FIELD f_gcksedcw BABY_SPAWN_CHANCE F
FIELD f_xrcjchag ATTACK_ANIMATION_DURATION I
METHOD m_ivnhdoob tryAttack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z
ARG 1 attacker
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/mob/HoglinEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ CLASS net/minecraft/unmapped/C_fnzykddk net/minecraft/entity/mob/HoglinEntity
ARG 0 type
ARG 1 world
ARG 3 pos
METHOD m_resytqhn setTimeInOverworld (I)V
ARG 1 timeInOverworld
METHOD m_sjcwxamc setImmuneToZombification (Z)V
ARG 1 immuneToZombification
METHOD m_tnmkoscv setCannotBeHunted (Z)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/mob/PhantomEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_xghtjqbw net/minecraft/entity/mob/PhantomEntity
FIELD f_vxkfiqyo movementType Lnet/minecraft/unmapped/C_xghtjqbw$C_gzcnjufx;
FIELD f_yomimisq TICKS_PER_FLAP I
METHOD m_blndykop getFlapTickOffset ()I
METHOD m_fvqarcie testTargetPredicate (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_cjtyhinh;)Z
ARG 3 predicate
METHOD m_qsmmbmsk onSizeChanged ()V
METHOD m_vbiamydm getPhantomSize ()I
METHOD m_xynsjfci setPhantomSize (I)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/mob/PiglinBrain.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ CLASS net/minecraft/unmapped/C_mxpeolkc net/minecraft/entity/mob/PiglinBrain
ARG 1 brain
METHOD m_jqalumps shouldRunAwayFromHoglins (Lnet/minecraft/unmapped/C_lkhqndnb;)Z
ARG 0 piglin
METHOD m_klnzftun hasPiglinSafeArmor (Lnet/minecraft/unmapped/C_usxaxydn;)Z
METHOD m_kmcguhbn drop (Lnet/minecraft/unmapped/C_lkhqndnb;Ljava/util/List;Lnet/minecraft/unmapped/C_vgpupfxx;)V
ARG 0 piglin
ARG 1 items
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ CLASS net/minecraft/unmapped/C_mpoupnon net/minecraft/entity/mob/PiglinBruteEnti
FIELD f_pjwygwlb MAX_HEALTH I
FIELD f_wqepporx ATTACK_DAMAGE I
FIELD f_yhdorhkd MOVEMENT_SPEED F
FIELD f_yoldbofa TARGETING_RANGE D
METHOD m_fbacqqtq createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
METHOD m_trsohuax playAngrySound ()V
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/mob/RavagerEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
CLASS net/minecraft/unmapped/C_gijvkrwk net/minecraft/entity/mob/RavagerEntity
FIELD f_bgyajqwo CLIENT_ROAR_TARGET Ljava/util/function/Predicate;
FIELD f_bhqoehky STUNNED_COLOR_GREEN F
FIELD f_ctkcjtee NO_MOB_GRIEFING_ROAR_TARGET Ljava/util/function/Predicate;
FIELD f_hkyuymfz STUNNED_COLOR I
FIELD f_jzawnpsw ATTACK_DURATION I
FIELD f_khsyeshe BASE_MOVEMENT_SPEED D
Expand All @@ -10,6 +12,7 @@ CLASS net/minecraft/unmapped/C_gijvkrwk net/minecraft/entity/mob/RavagerEntity
FIELD f_usreyzam STUN_DURATION I
FIELD f_vfyjxpaq STUNNED_COLOR_RED F
FIELD f_xdxeebxn attackTick I
FIELD f_xxqlbqit ROAR_TARGET Ljava/util/function/Predicate;
METHOD m_byufpzgq knockBack (Lnet/minecraft/unmapped/C_astfners;)V
ARG 1 entity
METHOD m_dmlphbdb (Lnet/minecraft/unmapped/C_astfners;)Z
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_cpqtqaen net/minecraft/entity/mob/WaterCreatureEntity
FIELD f_uznxfkln MIN_AMBIENT_SOUND_INTERVAL I
METHOD m_rjwsrbhx tickWaterBreathingAir (I)V
ARG 1 air
METHOD m_rlvqolvj canSpawn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z
Expand Down
10 changes: 8 additions & 2 deletions mappings/net/minecraft/entity/mob/ZombieEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity
FIELD f_aqispqmf inWaterTime I
FIELD f_aqispqmf timeInWater I
FIELD f_bkkffcav CAN_BREAK_DOORS_PROBABILITY F
FIELD f_cbavnqhn LEADER_ZOMBIE_BONUS_MODIFIER_ID Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_cgelqhxp ZOMBIE_LEADER_CHANCE F
Expand All @@ -23,9 +23,11 @@ CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity
METHOD <init> (Lnet/minecraft/unmapped/C_cdctfzbn;)V
ARG 1 world
METHOD m_byfmkeyh shouldBeBaby (Lnet/minecraft/unmapped/C_rlomrsco;)Z
METHOD m_cfjxvslc infectVillager (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pdtkdbte;)Z
METHOD m_cinojixn (Lnet/minecraft/unmapped/C_mpbjgxic;)Z
ARG 0 difficulty
METHOD m_dcbwxskt setTicksUntilWaterConversion (I)V
METHOD m_ckckhijq canSpawnInFluid ()Z
METHOD m_dcbwxskt setConvertingInWater (I)V
ARG 1 ticksUntilWaterConversion
METHOD m_dolaqwdc setCanBreakDoors (Z)V
ARG 1 canBreakDoors
Expand All @@ -39,10 +41,14 @@ CLASS net/minecraft/unmapped/C_hlzqkibq net/minecraft/entity/mob/ZombieEntity
ARG 1 entityType
METHOD m_pcnwswoc createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;
METHOD m_tgmcedmt initAttributes ()V
METHOD m_ufmnerao setTimeInWater (I)V
ARG 1 time
METHOD m_vpvzzidd applyAttributeModifiers (F)V
ARG 1 chanceMultiplier
METHOD m_vtxgwfro burnsInDaylight ()Z
METHOD m_wiihxgpu isConvertingInWater ()Z
METHOD m_zcxforui setTicksUntilWaterConversion (I)V
ARG 1 ticks
METHOD m_zfhqmnbl canBreakDoors ()Z
CLASS C_abgqtxqj ZombieData
FIELD f_bwrjberv baby Z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CLASS net/minecraft/unmapped/C_yatelzvm net/minecraft/entity/mob/ZombieVillagerE
ARG 1 world
METHOD m_gutnbnvs setXp (I)V
ARG 1 xp
METHOD m_nbnjxdaj setConversionTimer (I)V
ARG 1 time
METHOD m_nhlbvskt setGossipData (Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 element
METHOD m_sbyyymlp getXp ()I
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_fynaplbn net/minecraft/entity/mob/warden/WardenEn
FIELD f_catvnevx VIBRATION_COOLDOWN_TICKS I
FIELD f_ceomecbq ANGER_BOOST_ON_HURT I
FIELD f_ctsqwubn emergingAnimation Lnet/minecraft/unmapped/C_kxntavoz;
FIELD f_drzmpevx FOLLOW_RANGE I
FIELD f_ejgyiohn ATTACK_KNOCKBACK F
FIELD f_fmnxjsjy vibrationCallback Lnet/minecraft/unmapped/C_ddxrijfx$C_vnbbhkol;
FIELD f_fmvpjdup PROJECTILE_ANGER I
Expand Down

3 comments on commit fad9c78

@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 fad9c78, 383 file(s) were updated with 2820 line(s) added and 2670 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-19 01:53:01.580673579 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-10-19 01:51:50.860547672 +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-19 01:53:01.608673629 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-10-19 01:51:50.892547727 +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-19 01:53:01.452673353 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-19 01:51:50.696547389 +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-19 01:53:01.428673311 +0000
+++ namedSrc/net/minecraft/block/AbstractCandleBlock.java	2024-10-19 01:51:50.664547334 +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-19 01:53:01.444673339 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2024-10-19 01:51:50.684547368 +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-19 01:53:01.572673565 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2024-10-19 01:51:50.852547658 +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-19 01:53:01.512673459 +0000
+++ namedSrc/net/minecraft/block/BellBlock.java	2024-10-19 01:51:50.784547541 +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-19 01:53:01.660673720 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-19 01:51:50.956547837 +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-19 01:53:01.496673431 +0000
+++ namedSrc/net/minecraft/block/ButtonBlock.java	2024-10-19 01:51:50.760547499 +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/CarvedPumpkinBlock.java namedSrc/net/minecraft/block/CarvedPumpkinBlock.java
--- namedTargetSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-10-19 01:53:01.504673445 +0000
+++ namedSrc/net/minecraft/block/CarvedPumpkinBlock.java	2024-10-19 01:51:50.768547513 +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-19 01:53:01.620673650 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-19 01:51:50.904547748 +0000
@@ -2,10 +2,10 @@
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -26,13 +26,13 @@
     * @mapping {@literal hashed f_iqvprvdq Lnet/minecraft/unmapped/C_hzrcnxyg;f_iqvprvdq:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named boatType Lnet/minecraft/block/dispenser/BoatDispenserBehavior;boatType:Lnet/minecraft/entity/EntityType;}
     */
-   private final EntityType<? extends C_sfpofsgc> boatType;
+   private final EntityType<? extends AbstractBoatEntity> boatType;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hzrcnxyg;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/dispenser/BoatDispenserBehavior;<init>(Lnet/minecraft/entity/EntityType;)V}
     */
-   public BoatDispenserBehavior(EntityType<? extends C_sfpofsgc> boatType) {
+   public BoatDispenserBehavior(EntityType<? extends AbstractBoatEntity> boatType) {
       this.boatType = boatType;
    }
 
@@ -60,7 +60,7 @@
          h = 0.0;
       }
 
-      C_sfpofsgc lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
+      AbstractBoatEntity lv5 = this.boatType.create(lv2, SpawnReason.DISPENSER);
       if (lv5 != null) {
          lv5.m_busvmoue(e, f + h, g);
          EntityType.createDefaultStackSpawnConfig(lv2, stack, null).accept(lv5);
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2024-10-19 01:53:01.596673607 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2024-10-19 01:51:50.880547706 +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-19 01:53:01.412673283 +0000
+++ namedSrc/net/minecraft/block/EndGatewayBlock.java	2024-10-19 01:51:50.636547285 +0000
@@ -7,18 +7,18 @@
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.EndGatewayBlockEntity;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.entity.projectile.thrown.EnderPearlEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.entity.TeleportTarget;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -130,15 +130,23 @@
     */
    @Nullable
    @Override
-   public C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof EndGatewayBlockEntity lv2) {
          Vec3d lv4 = lv2.createExitPortalIfAbsent(world, pos);
          if (lv4 == null) {
             return null;
          } else {
             return entity instanceof EnderPearlEntity
-               ? new C_sqhjwpkh(world, lv4, Vec3d.ZERO, 0.0F, 0.0F, Set.of(), C_sqhjwpkh.f_jibestwn)
-               : new C_sqhjwpkh(world, lv4, Vec3d.ZERO, 0.0F, 0.0F, C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, C_crougwaz.f_kgzcwlaw), C_sqhjwpkh.f_jibestwn);
+               ? new TeleportTarget(world, lv4, Vec3d.ZERO, 0.0F, 0.0F, Set.of(), TeleportTarget.ADD_PORTAL_CHUNK_TICKET)
+               : new TeleportTarget(
+                  world,
+                  lv4,
+                  Vec3d.ZERO,
+                  0.0F,
+                  0.0F,
+                  PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, PositionFlag.ROTATION),
+                  TeleportTarget.ADD_PORTAL_CHUNK_TICKET
+               );
          }
       } else {
          return null;
diff -bur namedTargetSrc/net/minecraft/block/EndPortalBlock.java namedSrc/net/minecraft/block/EndPortalBlock.java
--- namedTargetSrc/net/minecraft/block/EndPortalBlock.java	2024-10-19 01:53:01.544673516 +0000
+++ namedSrc/net/minecraft/block/EndPortalBlock.java	2024-10-19 01:51:50.824547610 +0000
@@ -5,14 +5,13 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.EndPortalBlockEntity;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
@@ -21,6 +20,7 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.entity.TeleportTarget;
 import net.minecraft.world.gen.feature.EndPlatformFeature;
 
 /**
@@ -72,11 +72,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_fwpxnldx Lnet/minecraft/unmapped/C_iqbzlnao;m_fwpxnldx(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;}
-    * @mapping {@literal named m_fwpxnldx Lnet/minecraft/block/EndPortalBlock;m_fwpxnldx(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/util/shape/VoxelShape;}
+    * Mapping not found
     */
    @Override
-   protected VoxelShape m_fwpxnldx(BlockState state, World world, BlockPos pos) {
+   protected VoxelShape getInsideCollisionShape(BlockState state, World world, BlockPos pos) {
       return state.getOutlineShape(world, pos);
    }
 
@@ -99,7 +98,7 @@
     * Mapping not found
     */
    @Override
-   public C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -109,25 +108,25 @@
          BlockPos lv3 = bl ? ServerWorld.END_SPAWN_POS : lv2.getSpawnPos();
          Vec3d lv4 = lv3.ofBottomCenter();
          float f;
-         Set<C_crougwaz> set;
+         Set<PositionFlag> set;
          if (bl) {
             EndPlatformFeature.place(lv2, BlockPos.fromPosition(lv4).down(), true);
             f = Direction.WEST.asRotation();
-            set = C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, Set.of(C_crougwaz.X_ROT));
+            set = PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, Set.of(PositionFlag.X_ROT));
             if (entity instanceof ServerPlayerEntity) {
                lv4 = lv4.subtract(0.0, 1.0, 0.0);
             }
          } else {
             f = 0.0F;
-            set = C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, C_crougwaz.f_kgzcwlaw);
+            set = PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, PositionFlag.ROTATION);
             if (entity instanceof ServerPlayerEntity lv5) {
-               return lv5.m_jpjsvuqt(false, C_sqhjwpkh.f_ywlkuzgh);
+               return lv5.m_jpjsvuqt(false, TeleportTarget.NO_OP);
             }
 
             lv4 = entity.getAdjustedSpawnLocation(lv2, lv3).ofBottomCenter();
          }
 
-         return new C_sqhjwpkh(lv2, lv4, Vec3d.ZERO, f, 0.0F, set, C_sqhjwpkh.f_uxkbpkwm.then(C_sqhjwpkh.f_jibestwn));
+         return new TeleportTarget(lv2, lv4, Vec3d.ZERO, f, 0.0F, set, TeleportTarget.SEND_PORTAL_TRAVEL_PACKET.then(TeleportTarget.ADD_PORTAL_CHUNK_TICKET));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-19 01:53:01.620673650 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-19 01:51:50.904547748 +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-19 01:53:01.536673502 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-19 01:51:50.816547595 +0000
@@ -330,7 +330,7 @@
                   double e = (double)pos.getX() + 0.5 + d * (double)lv.getOffsetX();
                   double g = (double)pos.getY() + 0.5 - (double)(lv3.getHeight() / 2.0F);
                   double h = (double)pos.getZ() + 0.5 + d * (double)lv.getOffsetZ();
-                  lv3.refreshPositionAndAngles(e, g, h, lv3.m_ndosmusf(), lv3.m_ahrprint());
+                  lv3.refreshPositionAndAngles(e, g, h, lv3.getYaw(), lv3.getPitch());
                }
 
                world.playSound(null, pos, SoundEvents.BLOCK_BEEHIVE_EXIT, SoundCategory.BLOCKS, 1.0F, 1.0F);
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-19 01:53:01.624673657 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-19 01:51:50.912547761 +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-19 01:53:01.640673685 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-10-19 01:51:50.932547795 +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-19 01:53:01.612673636 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-10-19 01:51:50.896547734 +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-19 01:53:01.480673403 +0000
+++ namedSrc/net/minecraft/block/FrogSpawnBlock.java	2024-10-19 01:51:50.744547472 +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-19 01:53:01.596673607 +0000
+++ namedSrc/net/minecraft/block/HoneyBlock.java	2024-10-19 01:51:50.880547706 +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-19 01:53:01.472673388 +0000
+++ namedSrc/net/minecraft/block/InfestedBlock.java	2024-10-19 01:51:50.732547451 +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-19 01:53:01.660673720 +0000
+++ namedSrc/net/minecraft/block/LeverBlock.java	2024-10-19 01:51:50.960547844 +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-19 01:53:01.560673544 +0000
+++ namedSrc/net/minecraft/block/LilyPadBlock.java	2024-10-19 01:51:50.844547644 +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-19 01:53:01.432673317 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-10-19 01:51:50.668547341 +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-19 01:53:01.596673607 +0000
+++ namedSrc/net/minecraft/block/NetherPortalBlock.java	2024-10-19 01:51:50.880547706 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -17,8 +18,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -33,6 +32,7 @@
 import net.minecraft.world.border.WorldBorder;
 import net.minecraft.world.dimension.AreaHelper;
 import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.entity.TeleportTarget;
 import net.minecraft.world.tick.TickSchedulerAccess;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -180,7 +180,7 @@
     */
    @Nullable
    @Override
-   public C_sqhjwpkh createTransition(ServerWorld world, Entity entity, BlockPos pos) {
+   public TeleportTarget createTransition(ServerWorld world, Entity entity, BlockPos pos) {
       RegistryKey<World> lv = world.getRegistryKey() == World.NETHER ? World.OVERWORLD : World.NETHER;
       ServerWorld lv2 = world.getServer().getWorld(lv);
       if (lv2 == null) {
@@ -196,18 +196,18 @@
 
    /**
     * @mapping {@literal hashed m_cuetenod Lnet/minecraft/unmapped/C_zpsdinym;m_cuetenod(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;ZLnet/minecraft/unmapped/C_pneibfez;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named tryCreateTransition Lnet/minecraft/block/NetherPortalBlock;tryCreateTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named tryCreateTransition Lnet/minecraft/block/NetherPortalBlock;tryCreateTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/world/border/WorldBorder;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
    @Nullable
-   private C_sqhjwpkh tryCreateTransition(ServerWorld world, Entity entity, BlockPos pos, BlockPos scaledPos, boolean nether, WorldBorder border) {
+   private TeleportTarget tryCreateTransition(ServerWorld world, Entity entity, BlockPos pos, BlockPos scaledPos, boolean nether, WorldBorder border) {
       Optional<BlockPos> optional = world.getPortalForcer().m_mpevuvcu(scaledPos, nether, border);
       BlockLocating.Rectangle lv3;
-      C_sqhjwpkh.C_saosxlyx lv4;
+      TeleportTarget.PostTeleportTransition lv4;
       if (optional.isPresent()) {
          BlockPos lv = (BlockPos)optional.get();
          BlockState lv2 = world.getBlockState(lv);
          lv3 = BlockLocating.getLargestRectangle(lv, lv2.get(Properties.HORIZONTAL_AXIS), 21, Direction.Axis.Y, 21, pos2 -> world.getBlockState(pos2) == lv2);
-         lv4 = C_sqhjwpkh.f_uxkbpkwm.then(pos2 -> pos2.addPortalTicket(lv));
+         lv4 = TeleportTarget.SEND_PORTAL_TRAVEL_PACKET.then(pos2 -> pos2.addPortalTicket(lv));
       } else {
          Direction.Axis lv5 = (Direction.Axis)entity.getWorld().getBlockState(pos).getOrEmpty(AXIS).orElse(Direction.Axis.X);
          Optional<BlockLocating.Rectangle> optional2 = world.getPortalForcer().createPortal(scaledPos, lv5);
@@ -217,7 +217,7 @@
          }
 
          lv3 = (BlockLocating.Rectangle)optional2.get();
-         lv4 = C_sqhjwpkh.f_uxkbpkwm.then(C_sqhjwpkh.f_jibestwn);
+         lv4 = TeleportTarget.SEND_PORTAL_TRAVEL_PACKET.then(TeleportTarget.ADD_PORTAL_CHUNK_TICKET);
       }
 
       return createTransition(entity, pos, lv3, world, lv4);
@@ -225,10 +225,10 @@
 
    /**
     * @mapping {@literal hashed m_kvaymgqu Lnet/minecraft/unmapped/C_zpsdinym;m_kvaymgqu(Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/entity/TeleportTarget$PostTeleportTransition;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
-   private static C_sqhjwpkh createTransition(
-      Entity entity, BlockPos pos, BlockLocating.Rectangle portalRectangle, ServerWorld world, C_sqhjwpkh.C_saosxlyx arg5
+   private static TeleportTarget createTransition(
+      Entity entity, BlockPos pos, BlockLocating.Rectangle portalRectangle, ServerWorld world, TeleportTarget.PostTeleportTransition arg5
    ) {
       BlockState lv = entity.getWorld().getBlockState(pos);
       Direction.Axis lv2;
@@ -249,10 +249,15 @@
 
    /**
     * @mapping {@literal hashed m_fzuhemna Lnet/minecraft/unmapped/C_zpsdinym;m_fzuhemna(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
-    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/unmapped/C_sqhjwpkh$C_saosxlyx;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
+    * @mapping {@literal named createTransition Lnet/minecraft/block/NetherPortalBlock;createTransition(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/BlockLocating$Rectangle;Lnet/minecraft/util/math/Direction$Axis;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/entity/Entity;Lnet/minecraft/world/entity/TeleportTarget$PostTeleportTransition;)Lnet/minecraft/world/entity/TeleportTarget;}
     */
-   private static C_sqhjwpkh createTransition(
-      ServerWorld world, BlockLocating.Rectangle portalRectangle, Direction.Axis startAxis, Vec3d offset, Entity entity, C_sqhjwpkh.C_saosxlyx arg6
+   private static TeleportTarget createTransition(
+      ServerWorld world,
+      BlockLocating.Rectangle portalRectangle,
+      Direction.Axis startAxis,
+      Vec3d offset,
+      Entity entity,
+      TeleportTarget.PostTeleportTransition arg6
    ) {
       BlockPos lv = portalRectangle.lowerLeft;
       BlockState lv2 = world.getBlockState(lv);
@@ -267,7 +272,7 @@
       boolean bl = lv3 == Direction.Axis.X;
       Vec3d lv5 = new Vec3d((double)lv.getX() + (bl ? f : h), (double)lv.getY() + g, (double)lv.getZ() + (bl ? h : f));
       Vec3d lv6 = AreaHelper.findOpenPosition(lv5, world, entity, lv4);
-      return new C_sqhjwpkh(world, lv6, Vec3d.ZERO, (float)i, 0.0F, C_crougwaz.m_cjwjpqsk(C_crougwaz.f_xyfjsrdy, C_crougwaz.f_kgzcwlaw), arg6);
+      return new TeleportTarget(world, lv6, Vec3d.ZERO, (float)i, 0.0F, PositionFlag.m_cjwjpqsk(PositionFlag.DELTA, PositionFlag.ROTATION), arg6);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-19 01:53:01.472673388 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-19 01:51:50.732547451 +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-19 01:53:01.620673650 +0000
+++ namedSrc/net/minecraft/block/Portal.java	2024-10-19 01:51:50.904547748 +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-19 01:53:01.584673586 +0000
+++ namedSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-19 01:51:50.864547678 +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/SnifferEggBlock.java namedSrc/net/minecraft/block/SnifferEggBlock.java
--- namedTargetSrc/net/minecraft/block/SnifferEggBlock.java	2024-10-19 01:53:01.536673502 +0000
+++ namedSrc/net/minecraft/block/SnifferEggBlock.java	2024-10-19 01:51:50.820547603 +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-19 01:53:01.648673699 +0000
+++ namedSrc/net/minecraft/block/SweetBerryBushBlock.java	2024-10-19 01:51:50.940547810 +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-19 01:53:01.624673657 +0000
+++ namedSrc/net/minecraft/block/TntBlock.java	2024-10-19 01:51:50.908547754 +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-19 01:53:01.604673621 +0000
+++ namedSrc/net/minecraft/block/TrapdoorBlock.java	2024-10-19 01:51:50.888547720 +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-19 01:53:01.572673565 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-10-19 01:51:50.856547665 +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-19 01:53:01.544673516 +0000
+++ namedSrc/net/minecraft/block/TripwireBlock.java	2024-10-19 01:51:50.824547610 +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-19 01:53:01.592673600 +0000
+++ namedSrc/net/minecraft/block/TurtleEggBlock.java	2024-10-19 01:51:50.876547699 +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-19 01:53:01.516673466 +0000
+++ namedSrc/net/minecraft/block/WitherRoseBlock.java	2024-10-19 01:51:50.788547548 +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-19 01:53:01.628673664 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2024-10-19 01:51:50.920547775 +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();
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-19 01:53:01.632673671 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-19 01:51:50.920547775 +0000
@@ -474,7 +474,7 @@
          );
          list.add(
             String.format(
-               Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", lv8, string11, MathHelper.wrapDegrees(lv7.m_ndosmusf()), MathHelper.wrapDegrees(lv7.m_ahrprint())
+               Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", lv8, string11, MathHelper.wrapDegrees(lv7.getYaw()), MathHelper.wrapDegrees(lv7.getPitch())
             )
          );
          WorldChunk lv11 = this.getClientChunk();
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-19 01:53:01.500673438 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-10-19 01:51:50.768547513 +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-19 01:53:01.520673473 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-19 01:51:50.792547554 +0000
@@ -126,8 +126,8 @@
       float j = -1.0F;
       float k = 1.0F;
       float l = -0.5F;
-      float m = -client.player.m_ndosmusf() / 64.0F;
-      float n = client.player.m_ahrprint() / 64.0F;
+      float m = -client.player.getYaw() / 64.0F;
+      float n = client.player.getPitch() / 64.0F;
       Matrix4f matrix4f = matrices.peek().getModel();
       BufferBuilder lv2 = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
       lv2.xyz(matrix4f, -1.0F, -1.0F, -0.5F).uv0(4.0F + m, 4.0F + n);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-19 01:53:01.452673353 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-19 01:51:50.700547395 +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-19 01:53:01.552673529 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-19 01:51:50.836547630 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -15,7 +16,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.SmithingScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
@@ -169,8 +169,8 @@
       this.display.setShowArms(true);
       this.display.bodyYaw = 210.0F;
       this.display.setPitch(25.0F);
-      this.display.headYaw = this.display.m_ndosmusf();
-      this.display.prevHeadYaw = this.display.m_ndosmusf();
+      this.display.headYaw = this.display.getYaw();
+      this.display.prevHeadYaw = this.display.getYaw();
       this.displayStack(this.handler.getSlot(3).getStack());
    }
 
@@ -237,7 +237,7 @@
          }
 
          if (!stack.isEmpty()) {
-            C_duiqsjgf lv2 = stack.get(DataComponentTypes.EQUIPPABLE);
+            EquippableComponent lv2 = stack.get(DataComponentTypes.EQUIPPABLE);
             EquipmentSlot lv3 = lv2 != null ? lv2.slot() : EquipmentSlot.OFFHAND;
             this.display.equipStack(lv3, stack.copy());
          }
diff -bur namedTargetSrc/net/minecraft/client/Keyboard.java namedSrc/net/minecraft/client/Keyboard.java
--- namedTargetSrc/net/minecraft/client/Keyboard.java	2024-10-19 01:53:01.544673516 +0000
+++ namedSrc/net/minecraft/client/Keyboard.java	2024-10-19 01:51:50.824547610 +0000
@@ -245,8 +245,8 @@
                         this.client.player.getX(),
                         this.client.player.getY(),
                         this.client.player.getZ(),
-                        this.client.player.m_ndosmusf(),
-                        this.client.player.m_ahrprint()
+                        this.client.player.getYaw(),
+                        this.client.player.getPitch()
                      )
                   );
                   return true;
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-10-19 01:53:01.460673367 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-19 01:51:50.712547417 +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-19 01:53:01.624673657 +0000
+++ namedSrc/net/minecraft/client/model/Model.java	2024-10-19 01:51:50.912547761 +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));
    }
 
    /**

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3):
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-19 01:53:01.548673523 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-19 01:51:50.832547624 +0000
@@ -53,6 +53,7 @@
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerAbilities;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
@@ -75,7 +76,6 @@
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_bjnewvkq;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_zcisasac;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ClickType;
@@ -391,7 +391,7 @@
     */
    @Override
    public float getPitch(float tickDelta) {
-      return this.m_ahrprint();
+      return this.getPitch();
    }
 
    /**
@@ -399,7 +399,7 @@
     */
    @Override
    public float getYaw(float tickDelta) {
-      return this.hasVehicle() ? super.getYaw(tickDelta) : this.m_ndosmusf();
+      return this.hasVehicle() ? super.getYaw(tickDelta) : this.getYaw();
    }
 
    /**
@@ -416,7 +416,7 @@
       }
 
       if (this.hasVehicle()) {
-         this.networkHandler.send(new PlayerMoveC2SPacket.LookAndOnGround(this.m_ndosmusf(), this.m_ahrprint(), this.isOnGround(), this.horizontalCollision));
+         this.networkHandler.send(new PlayerMoveC2SPacket.LookAndOnGround(this.getYaw(), this.getPitch(), this.isOnGround(), this.horizontalCollision));
          Entity lv = this.getRootVehicle();
          if (lv != this && lv.isLogicalSideForUpdatingMovement()) {
             this.networkHandler.send(new VehicleMoveC2SPacket(lv));
@@ -458,8 +458,8 @@
          double d = this.getX() - this.lastX;
          double e = this.getY() - this.f_scgekrvy;
          double f = this.getZ() - this.lastZ;
-         double g = (double)(this.m_ndosmusf() - this.lastYaw);
-         double h = (double)(this.m_ahrprint() - this.lastPitch);
+         double g = (double)(this.getYaw() - this.lastYaw);
+         double h = (double)(this.getPitch() - this.lastPitch);
          this.ticksSinceLastPositionPacketSent++;
          boolean bl = MathHelper.lengthSquared(d, e, f) > MathHelper.square(2.0E-4) || this.ticksSinceLastPositionPacketSent >= 20;
          boolean bl2 = g != 0.0 || h != 0.0;
@@ -467,15 +467,14 @@
             this.networkHandler
                .send(
                   new PlayerMoveC2SPacket.Full(
-                     this.getX(), this.getY(), this.getZ(), this.m_ndosmusf(), this.m_ahrprint(), this.isOnGround(), this.horizontalCollision
+                     this.getX(), this.getY(), this.getZ(), this.getYaw(), this.getPitch(), this.isOnGround(), this.horizontalCollision
                   )
                );
          } else if (bl) {
             this.networkHandler
                .send(new PlayerMoveC2SPacket.PositionAndOnGround(this.getX(), this.getY(), this.getZ(), this.isOnGround(), this.horizontalCollision));
          } else if (bl2) {
-            this.networkHandler
-               .send(new PlayerMoveC2SPacket.LookAndOnGround(this.m_ndosmusf(), this.m_ahrprint(), this.isOnGround(), this.horizontalCollision));
+            this.networkHandler.send(new PlayerMoveC2SPacket.LookAndOnGround(this.getYaw(), this.getPitch(), this.isOnGround(), this.horizontalCollision));
          } else if (this.lastOnGround != this.isOnGround() || this.f_rcgfrcgp != this.horizontalCollision) {
             this.networkHandler.send(new PlayerMoveC2SPacket.OnGroundOnly(this.isOnGround(), this.horizontalCollision));
          }
@@ -488,8 +487,8 @@
          }
 
          if (bl2) {
-            this.lastYaw = this.m_ndosmusf();
-            this.lastPitch = this.m_ahrprint();
+            this.lastYaw = this.getYaw();
+            this.lastPitch = this.getPitch();
          }
 
          this.lastOnGround = this.isOnGround();
@@ -1011,8 +1010,8 @@
          this.jumping = this.input.f_ywxgimqb.jump();
          this.lastRenderYaw = this.renderYaw;
          this.lastRenderPitch = this.renderPitch;
-         this.renderPitch = this.renderPitch + (this.m_ahrprint() - this.renderPitch) * 0.5F;
-         this.renderYaw = this.renderYaw + (this.m_ndosmusf() - this.renderYaw) * 0.5F;
+         this.renderPitch = this.renderPitch + (this.getPitch() - this.renderPitch) * 0.5F;
+         this.renderYaw = this.renderYaw + (this.getYaw() - this.renderYaw) * 0.5F;
       }
    }
 
@@ -1272,7 +1271,7 @@
    public void tickRiding() {
       super.tickRiding();
       this.riding = false;
-      if (this.getControlledVehicle() instanceof C_sfpofsgc lv) {
+      if (this.getControlledVehicle() instanceof AbstractBoatEntity lv) {
          lv.m_wdzivrij(this.input.f_ywxgimqb.left(), this.input.f_ywxgimqb.right(), this.input.f_ywxgimqb.forward(), this.input.f_ywxgimqb.backward());
          this.riding = this.riding
             | (this.input.f_ywxgimqb.left() || this.input.f_ywxgimqb.right() || this.input.f_ywxgimqb.forward() || this.input.f_ywxgimqb.backward());
@@ -1346,8 +1345,8 @@
             Vec2f lv4 = this.input.m_jpymendx();
             float j = h * lv4.x;
             float k = h * lv4.y;
-            float l = MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0));
-            float m = MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0));
+            float l = MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0));
+            float m = MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0));
             lv3 = new Vec3d((double)(j * m - k * l), lv3.y, (double)(k * m + j * l));
             i = (float)lv3.lengthSquared();
             if (i <= 0.001F) {
@@ -1437,7 +1436,7 @@
     */
    @Override
    protected boolean hasCollidedSoftly(Vec3d adjustedMovement) {
-      float f = this.m_ndosmusf() * (float) (Math.PI / 180.0);
+      float f = this.getYaw() * (float) (Math.PI / 180.0);
       double d = (double)MathHelper.sin(f);
       double e = (double)MathHelper.cos(f);
       double g = (double)this.sidewaysSpeed * e - (double)this.forwardSpeed * d;
@@ -1589,8 +1588,8 @@
    @Override
    public Vec3d getLeashHoldPosition(float delta) {
       if (this.client.options.getPerspective().isFirstPerson()) {
-         float g = MathHelper.lerp(delta * 0.5F, this.m_ndosmusf(), this.prevYaw) * (float) (Math.PI / 180.0);
-         float h = MathHelper.lerp(delta * 0.5F, this.m_ahrprint(), this.prevPitch) * (float) (Math.PI / 180.0);
+         float g = MathHelper.lerp(delta * 0.5F, this.getYaw(), this.prevYaw) * (float) (Math.PI / 180.0);
+         float h = MathHelper.lerp(delta * 0.5F, this.getPitch(), this.prevPitch) * (float) (Math.PI / 180.0);
          double d = this.getMainArm() == Arm.RIGHT ? -1.0 : 1.0;
          Vec3d lv = new Vec3d(0.39 * d, -0.6, 0.3);
          return lv.rotateX(-h).rotateY(-g).add(this.getLerpedEyePos(delta));
@@ -1612,7 +1611,7 @@
     */
    @Override
    public float getVisualYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-19 01:53:01.420673296 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-19 01:51:50.652547313 +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-19 01:53:01.640673685 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-19 01:51:50.932547795 +0000
@@ -66,6 +66,7 @@
 import net.minecraft.command.argument.ArgumentSignatures;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityPosition;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.ExperienceOrbEntity;
@@ -73,6 +74,7 @@
 import net.minecraft.entity.Leashable;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.PacketPositionCodec;
+import net.minecraft.entity.PositionFlag;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.attribute.AttributeContainer;
 import net.minecraft.entity.attribute.EntityAttributeInstance;
@@ -87,6 +89,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.projectile.ExplosiveProjectileEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.inventory.SimpleInventory;
@@ -190,6 +193,7 @@
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityStatusEffectRemovalS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityStatusEffectUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.EntityTeleportS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
@@ -288,8 +292,6 @@
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_btculrky;
-import net.minecraft.unmapped.C_crougwaz;
-import net.minecraft.unmapped.C_dxakxzow;
 import net.minecraft.unmapped.C_fiyoolld;
 import net.minecraft.unmapped.C_hgofpcxx;
 import net.minecraft.unmapped.C_jqraxkur;
@@ -297,13 +299,11 @@
 import net.minecraft.unmapped.C_npripfjn;
 import net.minecraft.unmapped.C_poljqryj;
 import net.minecraft.unmapped.C_rrcmfgnk;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_uepzhiii;
 import net.minecraft.unmapped.C_uqhumrao;
 import net.minecraft.unmapped.C_wkpqgkjo;
 import net.minecraft.unmapped.C_wuqdybfp;
 import net.minecraft.unmapped.C_yjakgqnt;
-import net.minecraft.unmapped.C_yqhgaaca;
 import net.minecraft.unmapped.C_zqywhkdo;
 import net.minecraft.unmapped.C_zzvdiztt;
 import net.minecraft.util.Hand;
@@ -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));
             }
          }
@@ -945,17 +945,17 @@
          m_noarotfs(packet.change(), packet.relatives(), lv, false);
       }
 
-      this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.m_ndosmusf(), lv.m_ahrprint(), false, false));
+      this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.getYaw(), lv.getPitch(), false, false));
       this.connection.send(new TeleportConfirmationC2SPacket(packet.id()));
    }
 
    /**
     * @mapping {@literal hashed m_noarotfs Lnet/minecraft/unmapped/C_nuofrxvi;m_noarotfs(Lnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;Lnet/minecraft/unmapped/C_astfners;Z)Z}
-    * @mapping {@literal named m_noarotfs Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_noarotfs(Lnet/minecraft/unmapped/C_dxakxzow;Ljava/util/Set;Lnet/minecraft/entity/Entity;Z)Z}
+    * @mapping {@literal named m_noarotfs Lnet/minecraft/client/network/ClientPlayNetworkHandler;m_noarotfs(Lnet/minecraft/entity/EntityPosition;Ljava/util/Set;Lnet/minecraft/entity/Entity;Z)Z}
     */
-   private static boolean m_noarotfs(C_dxakxzow arg, Set<C_crougwaz> set, Entity entity, boolean bl) {
-      C_dxakxzow lv = C_dxakxzow.m_scijksjb(entity);
-      C_dxakxzow lv2 = C_dxakxzow.m_axgndomh(lv, arg, set);
+   private static boolean m_noarotfs(EntityPosition newPos, Set<PositionFlag> flags, Entity entity, boolean bl) {
+      EntityPosition lv = EntityPosition.createFromLerpTarget(entity);
+      EntityPosition lv2 = EntityPosition.calculateAbsolute(lv, newPos, flags);
       boolean bl2 = lv.position().squaredDistanceTo(lv2.position()) > 4096.0;
       if (bl && !bl2) {
          entity.updateTrackedPositionAndAngles(lv2.position().getX(), lv2.position().getY(), lv2.position().getZ(), lv2.yRot(), lv2.xRot(), 3);
@@ -966,9 +966,9 @@
          entity.setVelocity(lv2.deltaMovement());
          entity.setYaw(lv2.yRot());
          entity.setPitch(lv2.xRot());
-         C_dxakxzow lv3 = new C_dxakxzow(entity.m_qkqqfrjy(), Vec3d.ZERO, entity.prevYaw, entity.prevPitch);
-         C_dxakxzow lv4 = C_dxakxzow.m_axgndomh(lv3, arg, set);
-         entity.m_rtigrevq(lv4.position(), lv4.yRot(), lv4.xRot());
+         EntityPosition lv3 = new EntityPosition(entity.getLastPos(), Vec3d.ZERO, entity.prevYaw, entity.prevPitch);
+         EntityPosition lv4 = EntityPosition.calculateAbsolute(lv3, newPos, flags);
+         entity.setPrevPosAndAngles(lv4.position(), lv4.yRot(), lv4.xRot());
          return false;
       }
    }
@@ -982,8 +982,8 @@
       PlayerEntity lv = this.client.player;
       lv.setYaw(arg.yRot());
       lv.setPitch(arg.xRot());
-      lv.m_kashyvjh();
-      this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.m_ndosmusf(), lv.m_ahrprint(), false, false));
+      lv.setPrevAngles();
+      this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.getYaw(), lv.getPitch(), false, false));
    }
 
    /**
@@ -1346,10 +1346,10 @@
                if (lv2 == this.client.player) {
                   this.f_mhfzfcqe = OptionalInt.empty();
                   if (!bl) {
-                     if (lv instanceof C_sfpofsgc) {
-                        this.client.player.prevYaw = lv.m_ndosmusf();
-                        this.client.player.setYaw(lv.m_ndosmusf());
-                        this.client.player.setHeadYaw(lv.m_ndosmusf());
+                     if (lv instanceof AbstractBoatEntity) {
+                        this.client.player.prevYaw = lv.getYaw();
+                        this.client.player.setYaw(lv.getYaw());
+                        this.client.player.setHeadYaw(lv.getYaw());
                      }
 
                      Text lv3 = Text.translatable("mount.onboard", this.client.options.sneakKey.getKeyName());
@@ -1501,8 +1501,8 @@
          }
 
          lv8.setVelocity(lv4.getVelocity());
-         lv8.setYaw(lv4.m_ndosmusf());
-         lv8.setPitch(lv4.m_ahrprint());
+         lv8.setYaw(lv4.getYaw());
+         lv8.setPitch(lv4.getPitch());
       } else {
          lv8.init();
          lv8.setYaw(-180.0F);
@@ -2469,7 +2469,7 @@
          Vec3d lv2 = new Vec3d(packet.getX(), packet.getY(), packet.getZ());
          Vec3d lv3 = new Vec3d(lv.getLerpTargetX(), lv.getLerpTargetY(), lv.getLerpTargetZ());
          if (lv2.distanceTo(lv3) > 1.0E-5F) {
-            lv.m_lxlqiklm();
+            lv.cancelLerp();
             lv.updatePositionAndAngles(lv2.getX(), lv2.getY(), lv2.getZ(), packet.getYaw(), packet.getPitch());
          }
 
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-19 01:53:01.656673714 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-10-19 01:51:50.948547824 +0000
@@ -56,7 +56,7 @@
     * Mapping not found
     */
    @Override
-   public boolean m_jaiycnbg(DamageSource arg) {
+   public boolean damageClient(DamageSource source) {
       return true;
    }
 
@@ -133,6 +133,6 @@
    @Override
    public void onSpawnPacket(EntitySpawnS2CPacket packet) {
       super.onSpawnPacket(packet);
-      this.m_hhwtkfxu();
+      this.setPrevPosAndAngles();
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-19 01:53:01.540673508 +0000
+++ namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-19 01:51:50.820547603 +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-19 01:53:01.424673304 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java	2024-10-19 01:51:50.652547313 +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-19 01:53:01.484673409 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java	2024-10-19 01:51:50.744547472 +0000
@@ -84,11 +84,11 @@
    public void m_uigfpsip(ArmorStandEntity arg, C_ykegzsxw arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       BipedEntityRenderer.m_smedlblp(arg, arg2, f);
-      arg2.f_jywehgew = MathHelper.lerpDegrees(f, arg.prevYaw, arg.m_ndosmusf());
+      arg2.f_jywehgew = MathHelper.lerpDegrees(f, arg.prevYaw, arg.getYaw());
       arg2.f_oiqminhv = arg.isMarker();
       arg2.f_qoqillii = arg.isSmall();
-      arg2.f_vffanfrv = arg.m_fjamjtjb();
-      arg2.f_alkggoeq = arg.m_kruazguc();
+      arg2.f_vffanfrv = arg.showsArms();
+      arg2.f_alkggoeq = arg.showsBasePlate();
       arg2.f_jbfyhrpp = arg.getBodyRotation();
       arg2.f_yulwaqpa = arg.getHeadRotation();
       arg2.f_pmwdwspv = arg.getLeftArmRotation();
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-19 01:53:01.612673636 +0000
+++ namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-19 01:51:50.896547734 +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-19 01:53:01.576673572 +0000
+++ namedSrc/net/minecraft/client/render/entity/BipedEntityRenderer.java	2024-10-19 01:51:50.860547672 +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-19 01:53:01.440673332 +0000
+++ namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-19 01:51:50.680547361 +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-19 01:53:01.576673572 +0000
+++ namedSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java	2024-10-19 01:51:50.860547672 +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-19 01:53:01.608673629 +0000
+++ namedSrc/net/minecraft/client/render/entity/DisplayEntityRenderer.java	2024-10-19 01:51:50.892547727 +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-19 01:53:01.468673381 +0000
+++ namedSrc/net/minecraft/client/render/entity/EnderDragonEntityRenderer.java	2024-10-19 01:51:50.728547444 +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-19 01:53:01.520673473 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-10-19 01:51:50.792547554 +0000
@@ -342,7 +342,7 @@
       boolean bl = arg2.f_jurhvidz < 4096.0 && this.hasLabel(entity, arg2.f_jurhvidz);
       if (bl) {
          arg2.f_ylvpvtdl = this.m_otmducia(entity);
-         arg2.f_tubizsxk = entity.getAttachments().getPointNullable(EntityAttachmentType.NAME_TAG, 0, entity.m_stcixbth(f));
+         arg2.f_tubizsxk = entity.getAttachments().getPointNullable(EntityAttachmentType.NAME_TAG, 0, entity.getLerpedYaw(f));
       } else {
          arg2.f_ylvpvtdl = null;
       }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-19 01:53:01.592673600 +0000
+++ namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-19 01:51:50.876547699 +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-19 01:53:01.436673325 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-10-19 01:51:50.672547348 +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-19 01:53:01.664673728 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-10-19 01:51:50.968547858 +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-19 01:53:01.440673332 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-10-19 01:51:50.680547361 +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-19 01:53:01.436673325 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/LlamaDecorFeatureRenderer.java	2024-10-19 01:51:50.676547354 +0000
@@ -8,8 +8,8 @@
 import net.minecraft.client.render.entity.model.LlamaEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_gvxmissl;
 import net.minecraft.unmapped.C_gxghjvma;
 import net.minecraft.unmapped.C_ivvdyrnm;
@@ -52,7 +52,7 @@
     */
    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, C_ivvdyrnm arg3, float f, float g) {
       ItemStack lv = arg3.stack;
-      C_duiqsjgf lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
+      EquippableComponent lv2 = lv.get(DataComponentTypes.EQUIPPABLE);
       if (lv2 != null && lv2.model().isPresent()) {
          this.m_mfgrmedl(matrices, vertexConsumers, arg3, lv, (Identifier)lv2.model().get(), i);
       } else if (arg3.f_xvktkzok) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-10-19 01:53:01.440673332 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-10-19 01:51:50.680547361 +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-19 01:53:01.452673353 +0000
+++ namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-19 01:51:50.696547389 +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-19 01:53:01.476673395 +0000
+++ namedSrc/net/minecraft/client/render/entity/LivingEntityRenderer.java	2024-10-19 01:51:50.736547458 +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-19 01:53:01.464673374 +0000
+++ namedSrc/net/minecraft/client/render/entity/LlamaSpitEntityRenderer.java	2024-10-19 01:51:50.724547437 +0000
@@ -69,7 +69,7 @@
     */
    public void m_tskwgjqs(LlamaSpitEntity arg, C_ilkcfkxb arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_hsyrwref = arg.m_beudeczo(f);
-      arg2.f_ldnbwhsy = arg.m_stcixbth(f);
+      arg2.f_hsyrwref = arg.getLerpedPitch(f);
+      arg2.f_ldnbwhsy = arg.getLerpedYaw(f);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java	2024-10-19 01:53:01.536673502 +0000
+++ namedSrc/net/minecraft/client/render/entity/ProjectileEntityRenderer.java	2024-10-19 01:51:50.816547595 +0000
@@ -60,8 +60,8 @@
     */
    public void m_tskwgjqs(T arg, S arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_zcvfyqdu = arg.m_beudeczo(f);
-      arg2.f_xlaffrsv = arg.m_stcixbth(f);
+      arg2.f_zcvfyqdu = arg.getLerpedPitch(f);
+      arg2.f_xlaffrsv = arg.getLerpedYaw(f);
       arg2.f_qbjfjvks = (float)arg.shake - f;
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java	2024-10-19 01:53:01.576673572 +0000
+++ namedSrc/net/minecraft/client/render/entity/ShulkerBulletEntityRenderer.java	2024-10-19 01:51:50.856547665 +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-19 01:53:01.588673594 +0000
+++ namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-19 01:51:50.872547692 +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-19 01:53:01.484673409 +0000
+++ namedSrc/net/minecraft/client/render/entity/TridentEntityRenderer.java	2024-10-19 01:51:50.748547478 +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-19 01:53:01.532673495 +0000
+++ namedSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-19 01:51:50.812547589 +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-19 01:53:01.664673728 +0000
+++ namedSrc/net/minecraft/client/render/entity/WitherEntityRenderer.java	2024-10-19 01:51:50.964547851 +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-19 01:53:01.660673720 +0000
+++ namedSrc/net/minecraft/client/render/entity/WitherSkullEntityRenderer.java	2024-10-19 01:51:50.960547844 +0000
@@ -104,7 +104,7 @@
    public void m_tskwgjqs(WitherSkullEntity arg, C_vmiycnop arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_nfvecvjo = arg.isCharged();
-      arg2.f_wqkbikhs = arg.m_stcixbth(f);
-      arg2.f_xvmaljfo = arg.m_beudeczo(f);
+      arg2.f_wqkbikhs = arg.getLerpedYaw(f);
+      arg2.f_xvmaljfo = arg.getLerpedPitch(f);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-10-19 01:53:01.456673360 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-10-19 01:51:50.700547395 +0000
@@ -491,7 +491,7 @@
       Vec3d lv = hit.getPos();
       if (!lv.withinRange(pos, range)) {
          Vec3d lv2 = hit.getPos();
-         Direction lv3 = Direction.m_aceixrsp(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
+         Direction lv3 = Direction.getFacing(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
          return BlockHitResult.createMissed(lv2, lv3, BlockPos.fromPosition(lv2));
       } else {
          return hit;
diff -bur namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-10-19 01:53:01.480673403 +0000
+++ namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-10-19 01:51:50.740547465 +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-19 01:53:01.440673332 +0000
+++ namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-19 01:51:50.680547361 +0000
@@ -293,7 +293,7 @@
          float f = 0.0F;
 
          for (Direction lv2 : Direction.values()) {
-            Vec3i lv3 = lv2.m_uinacubi();
+            Vec3i lv3 = lv2.asVec3i();
             Vector3f vector3f7 = new Vector3f((float)lv3.getX(), (float)lv3.getY(), (float)lv3.getZ());
             float g = vector3f6.dot(vector3f7);
             if (g >= 0.0F && g > f) {
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-10-19 01:53:01.584673586 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-19 01:51:50.864547678 +0000
@@ -439,7 +439,7 @@
     * @mapping {@literal named tickEntity Lnet/minecraft/client/world/ClientWorld;tickEntity(Lnet/minecraft/entity/Entity;)V}
     */
    public void tickEntity(Entity entity) {
-      entity.m_hhwtkfxu();
+      entity.setPrevPosAndAngles();
       entity.age++;
       C_xuophqnt.m_yaecfwdp().push((Supplier<String>)(() -> Registries.ENTITY_TYPE.getId(entity.getType()).toString()));
       entity.tick();
@@ -458,7 +458,7 @@
       if (passenger.isRemoved() || passenger.getVehicle() != entity) {
          passenger.stopRiding();
       } else if (passenger instanceof PlayerEntity || this.entityList.has(passenger)) {
-         passenger.m_hhwtkfxu();
+         passenger.setPrevPosAndAngles();
          passenger.age++;
          passenger.tickRiding();
 
@@ -536,7 +536,7 @@
       Entity lv = this.getEntityLookup().get(entityId);
       if (lv != null) {
          lv.setRemoved(removalReason);
-         lv.onRemoved();
+         lv.onRemovedClient();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorReader.java namedSrc/net/minecraft/command/EntitySelectorReader.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-19 01:53:01.612673636 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-19 01:51:50.900547741 +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-19 01:53:01.624673657 +0000
+++ namedSrc/net/minecraft/component/DataComponentTypes.java	2024-10-19 01:51:50.912547761 +0000
@@ -15,6 +15,7 @@
 import net.minecraft.component.type.CustomModelDataComponent;
 import net.minecraft.component.type.DebugStickStateComponent;
 import net.minecraft.component.type.DyedColorComponent;
+import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.component.type.FireworkExplosionComponent;
 import net.minecraft.component.type.FireworksComponent;
 import net.minecraft.component.type.ItemEnchantmentsComponent;
@@ -50,7 +51,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
 import net.minecraft.unmapped.C_dbotabxl;
-import net.minecraft.unmapped.C_duiqsjgf;
 import net.minecraft.unmapped.C_elkynmne;
 import net.minecraft.unmapped.C_evakkied;
 import net.minecraft.unmapped.C_gzmmqgkx;
@@ -267,8 +267,8 @@
     * @mapping {@literal hashed f_jesloesr Lnet/minecraft/unmapped/C_icwdaizi;f_jesloesr:Lnet/minecraft/unmapped/C_pscqxfcs;}
     * @mapping {@literal named EQUIPPABLE Lnet/minecraft/component/DataComponentTypes;EQUIPPABLE:Lnet/minecraft/component/DataComponentType;}
     */
-   public static final DataComponentType<C_duiqsjgf> EQUIPPABLE = register(
-      "equippable", builder -> builder.codec(C_duiqsjgf.CODEC).packetCodec(C_duiqsjgf.PACKET_CODEC).m_hzpkutpy()
+   public static final DataComponentType<EquippableComponent> EQUIPPABLE = register(
+      "equippable", builder -> builder.codec(EquippableComponent.CODEC).packetCodec(EquippableComponent.PACKET_CODEC).m_hzpkutpy()
    );
    /**
     * @mapping {@literal hashed f_dgmnyxls Lnet/minecraft/unmapped/C_icwdaizi;f_dgmnyxls:Lnet/minecraft/unmapped/C_pscqxfcs;}
Only in namedSrc/net/minecraft/component/type: EquippableComponent.java
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-10-19 01:53:01.644673692 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-10-19 01:51:50.940547810 +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-19 01:53:01.616673643 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-19 01:51:50.900547741 +0000
@@ -1010,7 +1010,7 @@
       LootCondition.Builder[] lvs = (LootCondition.Builder[])ComparatorBlock.FACING.getValues().stream().map(direction -> {
          StatePredicate.Builder lv = StatePredicate.Builder.create().exactMatch(ComparatorBlock.FACING, direction);
          BlockPredicate.Builder lv2 = BlockPredicate.Builder.create().m_woxmzfan(arg, Blocks.COMPARATOR).state(lv);
-         return LocationCheckLootCondition.builder(LocationPredicate.Builder.create().block(lv2), new BlockPos(direction.getOpposite().m_uinacubi()));
+         return LocationCheckLootCondition.builder(LocationPredicate.Builder.create().block(lv2), new BlockPos(direction.getOpposite().asVec3i()));
       }).toArray(LootCondition.Builder[]::new);
       return ItemUsedOnLocationCriterionTrigger.Conditions.create(BlockStatePropertyLootCondition.builder(block), AnyOfLootCondition.create(lvs));
    }
@@ -1030,7 +1030,7 @@
                StatePredicate.Builder lv = StatePredicate.Builder.create().exactMatch(ComparatorBlock.FACING, direction);
                BlockStatePropertyLootCondition.Builder lv2 = new BlockStatePropertyLootCondition.Builder(Blocks.COMPARATOR).properties(lv);
                LootCondition.Builder lv3 = LocationCheckLootCondition.builder(
-                  LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().m_woxmzfan(arg, block)), new BlockPos(direction.m_uinacubi())
+                  LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().m_woxmzfan(arg, block)), new BlockPos(direction.asVec3i())
                );
                return AllOfLootCondition.builder(lv2, lv3);
             }
diff -bur namedTargetSrc/net/minecraft/enchantment/effect/DamageEntity.java namedSrc/net/minecraft/enchantment/effect/DamageEntity.java
--- namedTargetSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-10-19 01:53:01.496673431 +0000
+++ namedSrc/net/minecraft/enchantment/effect/DamageEntity.java	2024-10-19 01:51:50.760547499 +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-19 01:53:01.432673317 +0000
+++ namedSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-19 01:51:50.668547341 +0000
@@ -55,7 +55,7 @@
                   world.getScoreboard().addPlayerToTeam(lv2.getProfileName(), entity.getScoreboardTeam());
                }
 
-               lv2.refreshPositionAndAngles(pos.x, pos.y, pos.z, lv2.m_ndosmusf(), lv2.m_ahrprint());
+               lv2.refreshPositionAndAngles(pos.x, pos.y, pos.z, lv2.getYaw(), lv2.getPitch());
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-10-19 01:53:01.592673600 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.java	2024-10-19 01:51:50.876547699 +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-19 01:53:01.580673579 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.java	2024-10-19 01:51:50.864547678 +0000
@@ -35,7 +35,7 @@
       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();
@@ -48,9 +48,9 @@
 
    /**
     * @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);
    }
 }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3):
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java namedSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java	2024-10-19 01:53:01.468673381 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.java	2024-10-19 01:51:50.728547444 +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-19 01:53:01.532673495 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/Sensor.java	2024-10-19 01:51:50.812547589 +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);
@@ -162,10 +163,10 @@
 
    /**
     * @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) -> testAttackableTargetPredicate(world, entity, arg3));
    }
 
    /**
@@ -179,13 +180,14 @@
    }
 
    /**
-    * 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-19 01:53:01.636673678 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-19 01:51:50.928547789 +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-19 01:53:01.512673459 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeLongJumpTask.java	2024-10-19 01:51:50.784547541 +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-19 01:53:01.432673317 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeShootTask.java	2024-10-19 01:51:50.668547341 +0000
@@ -144,7 +144,7 @@
             && !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(
                new BreezeWindChargeEntity(arg2, world), world, ItemStack.EMPTY, d, e, f, 0.7F, (float)(5 - world.getDifficulty().getId() * 4)
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-19 01:53:01.596673607 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-10-19 01:51:50.880547706 +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/FarmerWorkTask.java namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-19 01:53:01.404673268 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-19 01:51:50.620547258 +0000
@@ -110,7 +110,7 @@
             lv.removeItem(Items.WHEAT, m);
             ItemStack lv2 = lv.addStack(new ItemStack(Items.BREAD, l));
             if (!lv2.isEmpty()) {
-               entity.m_bxezczwg(world, lv2, 0.5F);
+               entity.dropStack(world, lv2, 0.5F);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-10-19 01:53:01.520673473 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.java	2024-10-19 01:51:50.792547554 +0000
@@ -18,17 +18,19 @@
    private static final int REMEMBER_TIME = 200;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tjydfjsu Lnet/minecraft/unmapped/C_gaizicad;m_tjydfjsu(Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create(Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$ForgottenCallback;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> m_tjydfjsu(ForgetAttackTargetTask.C_xlpqahis<E> arg) {
-      return m_aektglmo((world, entity) -> false, arg, true);
+   public static <E extends MobEntity> TaskControl<E> create(ForgetAttackTargetTask.ForgottenCallback<E> forgottenCallback) {
+      return create((world, entity) -> false, forgottenCallback, true);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qgliofqg Lnet/minecraft/unmapped/C_gaizicad;m_qgliofqg(Lnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create(Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$AttackEndPredicate;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> m_qgliofqg(ForgetAttackTargetTask.C_wwmivdow arg) {
-      return m_aektglmo(arg, (world, arg2, entity) -> {
+   public static <E extends MobEntity> TaskControl<E> create(ForgetAttackTargetTask.AttackEndPredicate attackEndPredicate) {
+      return create(attackEndPredicate, (world, entity, target) -> {
       }, true);
    }
 
@@ -37,14 +39,17 @@
     * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create()Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
    public static <E extends MobEntity> TaskControl<E> create() {
-      return m_aektglmo((world, entity) -> false, (world, arg2, entity) -> {
+      return create((world, entity) -> false, (world, entity, target) -> {
       }, true);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_aektglmo Lnet/minecraft/unmapped/C_gaizicad;m_aektglmo(Lnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;Z)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask;create(Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$AttackEndPredicate;Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$ForgottenCallback;Z)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> m_aektglmo(ForgetAttackTargetTask.C_wwmivdow arg, ForgetAttackTargetTask.C_xlpqahis<E> arg2, boolean bl) {
+   public static <E extends MobEntity> TaskControl<E> create(
+      ForgetAttackTargetTask.AttackEndPredicate attackEndPredicate, ForgetAttackTargetTask.ForgottenCallback<E> forgottenCallback, boolean forgetIfUnreachable
+   ) {
       return TaskBuilder.task(
          instance -> instance.group(
                   instance.presentMemory(MemoryModuleType.ATTACK_TARGET), instance.registeredMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE)
@@ -53,14 +58,14 @@
                   instance,
                   (attackTarget, cannotReachWalkTargetReason) -> (world, entity, time) -> {
                         LivingEntity lv = instance.getValue(attackTarget);
-                        if (entity.m_lazolqzm(lv)
-                           && (!bl || !cannotReachTarget(entity, instance.getValueOptional(cannotReachWalkTargetReason)))
+                        if (entity.canTarget(lv)
+                           && (!forgetIfUnreachable || !cannotReachTarget(entity, instance.getValueOptional(cannotReachWalkTargetReason)))
                            && lv.isAlive()
                            && lv.getWorld() == entity.getWorld()
-                           && !arg.test(world, lv)) {
+                           && !attackEndPredicate.test(world, lv)) {
                            return true;
                         } else {
-                           arg2.accept(world, (E)entity, lv);
+                           forgottenCallback.accept(world, (E)entity, lv);
                            attackTarget.forget();
                            return true;
                         }
@@ -79,27 +84,27 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_gaizicad$C_wwmivdow}
-    * @mapping {@literal named net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$C_wwmivdow}
+    * @mapping {@literal named net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$AttackEndPredicate}
     */
    @FunctionalInterface
-   public interface C_wwmivdow {
+   public interface AttackEndPredicate {
       /**
        * @mapping {@literal hashed test Lnet/minecraft/unmapped/C_gaizicad$C_wwmivdow;test(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)Z}
-       * @mapping {@literal named test Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$C_wwmivdow;test(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)Z}
+       * @mapping {@literal named test Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$AttackEndPredicate;test(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)Z}
        */
       boolean test(ServerWorld world, LivingEntity entity);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_gaizicad$C_xlpqahis}
-    * @mapping {@literal named net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$C_xlpqahis}
+    * @mapping {@literal named net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$ForgottenCallback}
     */
    @FunctionalInterface
-   public interface C_xlpqahis<E> {
+   public interface ForgottenCallback<E> {
       /**
        * @mapping {@literal hashed accept Lnet/minecraft/unmapped/C_gaizicad$C_xlpqahis;accept(Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/Object;Lnet/minecraft/unmapped/C_usxaxydn;)V}
-       * @mapping {@literal named accept Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$C_xlpqahis;accept(Lnet/minecraft/server/world/ServerWorld;Ljava/lang/Object;Lnet/minecraft/entity/LivingEntity;)V}
+       * @mapping {@literal named accept Lnet/minecraft/entity/ai/brain/task/ForgetAttackTargetTask$ForgottenCallback;accept(Lnet/minecraft/server/world/ServerWorld;Ljava/lang/Object;Lnet/minecraft/entity/LivingEntity;)V}
        */
-      void accept(ServerWorld world, E object, LivingEntity entity);
+      void accept(ServerWorld world, E entity, LivingEntity target);
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java namedSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java	2024-10-19 01:53:01.436673325 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java	2024-10-19 01:51:50.672547348 +0000
@@ -169,17 +169,18 @@
     * @mapping {@literal named giveGifts Lnet/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask;giveGifts(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/VillagerEntity;Lnet/minecraft/entity/LivingEntity;)V}
     */
    private void giveGifts(ServerWorld world, VillagerEntity villager, LivingEntity recipient) {
-      villager.m_fcllvyfo(world, m_udnybjdp(villager), (worldx, stack) -> LookTargetUtil.throwStack(villager, stack, recipient.getPos()));
+      villager.forEachGiftItem(world, getGiftLootTable(villager), (worldx, stack) -> LookTargetUtil.throwStack(villager, stack, recipient.getPos()));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_udnybjdp Lnet/minecraft/unmapped/C_cxomqjew;m_udnybjdp(Lnet/minecraft/unmapped/C_pdtkdbte;)Lnet/minecraft/unmapped/C_xhhleach;}
+    * @mapping {@literal named getGiftLootTable Lnet/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask;getGiftLootTable(Lnet/minecraft/entity/passive/VillagerEntity;)Lnet/minecraft/registry/RegistryKey;}
     */
-   private static RegistryKey<LootTable> m_udnybjdp(VillagerEntity arg) {
-      if (arg.isBaby()) {
+   private static RegistryKey<LootTable> getGiftLootTable(VillagerEntity villager) {
+      if (villager.isBaby()) {
          return LootTables.HERO_OF_THE_VILLAGE_BABY_GIFT_GAMEPLAY;
       } else {
-         VillagerProfession lv = arg.getVillagerData().getProfession();
+         VillagerProfession lv = villager.getVillagerData().getProfession();
          return (RegistryKey<LootTable>)GIFTS.getOrDefault(lv, LootTables.HERO_OF_THE_VILLAGE_UNEMPLOYED_GIFT_GAMEPLAY);
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java	2024-10-19 01:53:01.424673304 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/MeleeAttackTask.java	2024-10-19 01:51:50.656547320 +0000
@@ -17,16 +17,18 @@
  */
 public class MeleeAttackTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_nhfjfnwn Lnet/minecraft/unmapped/C_gpxkysqi;m_nhfjfnwn(I)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/MeleeAttackTask;create(I)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static <T extends MobEntity> ReportingTaskControl<T> m_nhfjfnwn(int i) {
-      return m_yvkymmtj(arg -> true, i);
+   public static <T extends MobEntity> ReportingTaskControl<T> create(int cooldown) {
+      return create(arg -> true, cooldown);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yvkymmtj Lnet/minecraft/unmapped/C_gpxkysqi;m_yvkymmtj(Ljava/util/function/Predicate;I)Lnet/minecraft/unmapped/C_yfpegcpm;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/MeleeAttackTask;create(Ljava/util/function/Predicate;I)Lnet/minecraft/entity/ReportingTaskControl;}
     */
-   public static <T extends MobEntity> ReportingTaskControl<T> m_yvkymmtj(Predicate<T> predicate, int i) {
+   public static <T extends MobEntity> ReportingTaskControl<T> create(Predicate<T> targetPredicate, int cooldown) {
       return TaskBuilder.task(
          arg -> arg.group(
                   arg.registeredMemory(MemoryModuleType.LOOK_TARGET),
@@ -38,14 +40,14 @@
                   arg,
                   (arg2, arg3, arg4, arg5) -> (world, arg7, l) -> {
                         LivingEntity lv = arg.getValue(arg3);
-                        if (predicate.test(arg7)
+                        if (targetPredicate.test(arg7)
                            && !isHoldingUsableRangedWeapon(arg7)
                            && arg7.isIntersecting(lv)
                            && arg.<VisibleLivingEntitiesCache>getValue(arg5).contains(lv)) {
                            arg2.remember(new EntityLookTarget(lv, true));
                            arg7.swingHand(Hand.MAIN_HAND);
                            arg7.tryAttack(world, lv);
-                           arg4.remember(true, (long)i);
+                           arg4.remember(true, (long)cooldown);
                            return true;
                         } else {
                            return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-10-19 01:53:01.596673607 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RamImpactTask.java	2024-10-19 01:51:50.880547706 +0000
@@ -141,7 +141,7 @@
       if (!list.isEmpty()) {
          LivingEntity lv2 = (LivingEntity)list.get(0);
          DamageSource lv3 = world.getDamageSources().mobAttackNoAggro(arg2);
-         if (lv2.m_fuenwjjy(world, lv3, (float)arg2.getAttributeValue(EntityAttributes.ATTACK_DAMAGE))) {
+         if (lv2.damage(world, lv3, (float)arg2.getAttributeValue(EntityAttributes.ATTACK_DAMAGE))) {
             EnchantmentHelper.onEntityDamaged(world, lv2, lv3);
          }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-19 01:53:01.560673544 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-19 01:51:50.840547637 +0000
@@ -60,7 +60,7 @@
    protected void run(ServerWorld world, MobEntity arg2, long l) {
       RandomGenerator lv = arg2.getRandom();
       float f = MathHelper.clamp(lv.nextFloat() * this.pitchRange + this.minPitch, -90.0F, 90.0F);
-      float g = MathHelper.wrapDegrees(arg2.m_ndosmusf() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
+      float g = MathHelper.wrapDegrees(arg2.getYaw() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
       Vec3d lv2 = Vec3d.fromPolar(f, g);
       arg2.getBrain().remember(MemoryModuleType.LOOK_TARGET, new BlockPosLookTarget(arg2.getEyePos().add(lv2)));
       arg2.getBrain().remember(MemoryModuleType.GAZE_COOLDOWN_TICKS, this.interval.get(lv));
Only in namedSrc/net/minecraft/entity/ai/brain/task: SetLookTargetOnIntervalTask.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-10-19 01:53:01.452673353 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-10-19 01:51:50.700547395 +0000
@@ -117,7 +117,7 @@
             .filter(arg2::isEnemy)
             .filter(entity -> arg2.isInRange(entity, 15.0, 20.0))
             .ifPresent(entity -> {
-               Vec3d lv = arg2.getPos().add(arg2.getAttachments().getPoint(EntityAttachmentType.WARDEN_CHEST, 0, arg2.m_ndosmusf()));
+               Vec3d lv = arg2.getPos().add(arg2.getAttachments().getPoint(EntityAttachmentType.WARDEN_CHEST, 0, arg2.getYaw()));
                Vec3d lv2 = entity.getEyePos().subtract(lv);
                Vec3d lv3 = lv2.normalize();
                int i = MathHelper.floor(lv2.length()) + 7;
@@ -128,7 +128,7 @@
                }
 
                arg2.playSound(SoundEvents.ENTITY_WARDEN_SONIC_BOOM, 3.0F, 1.0F);
-               if (entity.m_fuenwjjy(world, world.getDamageSources().sonicBoom(arg2), 10.0F)) {
+               if (entity.damage(world, world.getDamageSources().sonicBoom(arg2), 10.0F)) {
                   double d = 0.5 * (1.0 - entity.getAttributeValue(EntityAttributes.KNOCKBACK_RESISTANCE));
                   double e = 2.5 * (1.0 - entity.getAttributeValue(EntityAttributes.KNOCKBACK_RESISTANCE));
                   entity.addVelocity(lv3.getX() * e, lv3.getY() * d, lv3.getZ() * e);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java	2024-10-19 01:53:01.528673487 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.java	2024-10-19 01:51:50.808547582 +0000
@@ -12,28 +12,32 @@
  */
 public class UpdateAttackTargetTask {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jgrjzbzo Lnet/minecraft/unmapped/C_ulrbltvh;m_jgrjzbzo(Lnet/minecraft/unmapped/C_ulrbltvh$C_fewmraou;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask;create(Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$TargetFinder;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> m_jgrjzbzo(UpdateAttackTargetTask.C_fewmraou<E> arg) {
-      return m_krktxyoq((world, arg2) -> true, arg);
+   public static <E extends MobEntity> TaskControl<E> create(UpdateAttackTargetTask.TargetFinder<E> targetFinder) {
+      return create((world, arg2) -> true, targetFinder);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_krktxyoq Lnet/minecraft/unmapped/C_ulrbltvh;m_krktxyoq(Lnet/minecraft/unmapped/C_ulrbltvh$C_dpbnwfid;Lnet/minecraft/unmapped/C_ulrbltvh$C_fewmraou;)Lnet/minecraft/unmapped/C_mdnathub;}
+    * @mapping {@literal named create Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask;create(Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$AttackStartPredicate;Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$TargetFinder;)Lnet/minecraft/entity/ai/brain/task/TaskControl;}
     */
-   public static <E extends MobEntity> TaskControl<E> m_krktxyoq(UpdateAttackTargetTask.C_dpbnwfid<E> arg, UpdateAttackTargetTask.C_fewmraou<E> arg2) {
+   public static <E extends MobEntity> TaskControl<E> create(
+      UpdateAttackTargetTask.AttackStartPredicate<E> startPredicate, UpdateAttackTargetTask.TargetFinder<E> targetFinder
+   ) {
       return TaskBuilder.task(
          arg3 -> arg3.group(arg3.absentMemory(MemoryModuleType.ATTACK_TARGET), arg3.registeredMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE))
                .apply(arg3, (arg3x, arg4) -> (world, entity, time) -> {
-                     if (!arg.test(world, (E)entity)) {
+                     if (!startPredicate.test(world, (E)entity)) {
                         return false;
                      } else {
-                        Optional<? extends LivingEntity> optional = arg2.get(world, (E)entity);
+                        Optional<? extends LivingEntity> optional = targetFinder.get(world, (E)entity);
                         if (optional.isEmpty()) {
                            return false;
                         } else {
                            LivingEntity lv = (LivingEntity)optional.get();
-                           if (!entity.m_lazolqzm(lv)) {
+                           if (!entity.canTarget(lv)) {
                               return false;
                            } else {
                               arg3x.remember(lv);
@@ -48,27 +52,27 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ulrbltvh$C_dpbnwfid}
-    * @mapping {@literal named net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$C_dpbnwfid}
+    * @mapping {@literal named net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$AttackStartPredicate}
     */
    @FunctionalInterface
-   public interface C_dpbnwfid<E> {
+   public interface AttackStartPredicate<E> {
       /**
        * @mapping {@literal hashed test Lnet/minecraft/unmapped/C_ulrbltvh$C_dpbnwfid;test(Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/Object;)Z}
-       * @mapping {@literal named test Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$C_dpbnwfid;test(Lnet/minecraft/server/world/ServerWorld;Ljava/lang/Object;)Z}
+       * @mapping {@literal named test Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$AttackStartPredicate;test(Lnet/minecraft/server/world/ServerWorld;Ljava/lang/Object;)Z}
        */
-      boolean test(ServerWorld world, E object);
+      boolean test(ServerWorld world, E entity);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ulrbltvh$C_fewmraou}
-    * @mapping {@literal named net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$C_fewmraou}
+    * @mapping {@literal named net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$TargetFinder}
     */
    @FunctionalInterface
-   public interface C_fewmraou<E> {
+   public interface TargetFinder<E> {
       /**
        * @mapping {@literal hashed get Lnet/minecraft/unmapped/C_ulrbltvh$C_fewmraou;get(Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/Object;)Ljava/util/Optional;}
-       * @mapping {@literal named get Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$C_fewmraou;get(Lnet/minecraft/server/world/ServerWorld;Ljava/lang/Object;)Ljava/util/Optional;}
+       * @mapping {@literal named get Lnet/minecraft/entity/ai/brain/task/UpdateAttackTargetTask$TargetFinder;get(Lnet/minecraft/server/world/ServerWorld;Ljava/lang/Object;)Ljava/util/Optional;}
        */
-      Optional<? extends LivingEntity> get(ServerWorld world, E object);
+      Optional<? extends LivingEntity> get(ServerWorld world, E entity);
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java namedSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java	2024-10-19 01:53:01.516673466 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.java	2024-10-19 01:51:50.788547548 +0000
@@ -46,7 +46,7 @@
                            && startPredicate.test(entity)
                            && lvx.isInRange(entity, (double)radius)
                            && entity.getWorld().getWorldBorder().contains(lvx.getBlockPos())
-                           && entity.m_cwcitqpe()) {
+                           && entity.canPickUpLoot()) {
                            WalkTarget lv2 = new WalkTarget(new EntityLookTarget(lvx, false), speed, 0);
                            arg2.remember(new EntityLookTarget(lvx, true));
                            arg3.remember(lv2);
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/AquaticLookControl.java namedSrc/net/minecraft/entity/ai/control/AquaticLookControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/AquaticLookControl.java	2024-10-19 01:53:01.640673685 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticLookControl.java	2024-10-19 01:51:50.932547795 +0000
@@ -41,10 +41,10 @@
       if (this.lookAtCooldown > 0) {
          this.lookAtCooldown--;
          this.getTargetYaw().ifPresent(arg -> this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, arg + 20.0F, this.yawSpeed));
-         this.getTargetPitch().ifPresent(arg -> this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), arg + 10.0F, this.pitchSpeed)));
+         this.getTargetPitch().ifPresent(arg -> this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), arg + 10.0F, this.pitchSpeed)));
       } else {
          if (this.entity.getNavigation().isIdle()) {
-            this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), 0.0F, 5.0F));
+            this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), 0.0F, 5.0F));
          }
 
          this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, this.entity.bodyYaw, this.yawSpeed);
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-10-19 01:53:01.656673714 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-10-19 01:51:50.952547830 +0000
@@ -76,9 +76,9 @@
             this.entity.setForwardSpeed(0.0F);
          } else {
             float h = (float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F;
-            this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), h, (float)this.yawChange));
-            this.entity.bodyYaw = this.entity.m_ndosmusf();
-            this.entity.headYaw = this.entity.m_ndosmusf();
+            this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), h, (float)this.yawChange));
+            this.entity.bodyYaw = this.entity.getYaw();
+            this.entity.headYaw = this.entity.getYaw();
             float i = (float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED));
             if (this.entity.isTouchingWater()) {
                this.entity.setMovementSpeed(i * this.speedInWater);
@@ -86,15 +86,15 @@
                if (Math.abs(e) > 1.0E-5F || Math.abs(j) > 1.0E-5F) {
                   float k = -((float)(MathHelper.atan2(e, j) * 180.0F / (float)Math.PI));
                   k = MathHelper.clamp(MathHelper.wrapDegrees(k), (float)(-this.pitchChange), (float)this.pitchChange);
-                  this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), k, 5.0F));
+                  this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), k, 5.0F));
                }
 
-               float l = MathHelper.cos(this.entity.m_ahrprint() * (float) (Math.PI / 180.0));
-               float m = MathHelper.sin(this.entity.m_ahrprint() * (float) (Math.PI / 180.0));
+               float l = MathHelper.cos(this.entity.getPitch() * (float) (Math.PI / 180.0));
+               float m = MathHelper.sin(this.entity.getPitch() * (float) (Math.PI / 180.0));
                this.entity.forwardSpeed = l * i;
                this.entity.upwardSpeed = -m * i;
             } else {
-               float n = Math.abs(MathHelper.wrapDegrees(this.entity.m_ndosmusf() - h));
+               float n = Math.abs(MathHelper.wrapDegrees(this.entity.getYaw() - h));
                float o = calcAirSpeedMultiplier(n);
                this.entity.setMovementSpeed(i * this.speedInAir * o);
             }
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/BodyControl.java namedSrc/net/minecraft/entity/ai/control/BodyControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-19 01:53:01.536673502 +0000
+++ namedSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-19 01:51:50.816547595 +0000
@@ -54,7 +54,7 @@
     */
    public void tick() {
       if (this.isMoving()) {
-         this.entity.bodyYaw = this.entity.m_ndosmusf();
+         this.entity.bodyYaw = this.entity.getYaw();
          this.rotateHead();
          this.lastHeadYaw = this.entity.headYaw;
          this.activeTicks = 0;
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/FlightMoveControl.java namedSrc/net/minecraft/entity/ai/control/FlightMoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/FlightMoveControl.java	2024-10-19 01:53:01.488673417 +0000
+++ namedSrc/net/minecraft/entity/ai/control/FlightMoveControl.java	2024-10-19 01:51:50.752547485 +0000
@@ -49,7 +49,7 @@
          }
 
          float h = (float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F;
-         this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), h, 90.0F));
+         this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), h, 90.0F));
          float i;
          if (this.entity.isOnGround()) {
             i = (float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED));
@@ -61,7 +61,7 @@
          double k = Math.sqrt(d * d + f * f);
          if (Math.abs(e) > 1.0E-5F || Math.abs(k) > 1.0E-5F) {
             float l = (float)(-(MathHelper.atan2(e, k) * 180.0F / (float)Math.PI));
-            this.entity.setPitch(this.wrapDegrees(this.entity.m_ahrprint(), l, (float)this.maxPitchChange));
+            this.entity.setPitch(this.wrapDegrees(this.entity.getPitch(), l, (float)this.maxPitchChange));
             this.entity.setUpwardSpeed(e > 0.0 ? i : -i);
          }
       } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/LookControl.java namedSrc/net/minecraft/entity/ai/control/LookControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/LookControl.java	2024-10-19 01:53:01.520673473 +0000
+++ namedSrc/net/minecraft/entity/ai/control/LookControl.java	2024-10-19 01:51:50.792547554 +0000
@@ -114,7 +114,7 @@
       if (this.lookAtCooldown > 0) {
          this.lookAtCooldown--;
          this.getTargetYaw().ifPresent(yaw -> this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, yaw, this.yawSpeed));
-         this.getTargetPitch().ifPresent(pitch -> this.entity.setPitch(this.m_mljvwuuu(this.entity.m_ahrprint(), pitch, this.pitchSpeed)));
+         this.getTargetPitch().ifPresent(pitch -> this.entity.setPitch(this.m_mljvwuuu(this.entity.getPitch(), pitch, this.pitchSpeed)));
       } else {
          this.entity.headYaw = this.m_mljvwuuu(this.entity.headYaw, this.entity.bodyYaw, 10.0F);
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java namedSrc/net/minecraft/entity/ai/control/MoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-19 01:53:01.508673452 +0000
+++ namedSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-19 01:51:50.776547527 +0000
@@ -141,8 +141,8 @@
          j = g / j;
          h *= j;
          i *= j;
-         float k = MathHelper.sin(this.entity.m_ndosmusf() * (float) (Math.PI / 180.0));
-         float l = MathHelper.cos(this.entity.m_ndosmusf() * (float) (Math.PI / 180.0));
+         float k = MathHelper.sin(this.entity.getYaw() * (float) (Math.PI / 180.0));
+         float l = MathHelper.cos(this.entity.getYaw() * (float) (Math.PI / 180.0));
          float m = h * l - i * k;
          float n = i * l + h * k;
          if (!this.isWalkable(m, n)) {
@@ -166,7 +166,7 @@
          }
 
          float q = (float)(MathHelper.atan2(e, d) * 180.0F / (float)Math.PI) - 90.0F;
-         this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), q, 90.0F));
+         this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), q, 90.0F));
          this.entity.setMovementSpeed((float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED)));
          BlockPos lv = this.entity.getBlockPos();
          BlockState lv2 = this.entity.getWorld().getBlockState(lv);
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java namedSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java	2024-10-19 01:53:01.560673544 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/AnimalMateGoal.java	2024-10-19 01:51:50.844547644 +0000
@@ -63,7 +63,7 @@
     */
    public AnimalMateGoal(AnimalEntity animal, double chance, Class<? extends AnimalEntity> entityClass) {
       this.animal = animal;
-      this.world = m_stitijqs(animal);
+      this.world = getServerWorld(animal);
       this.entityClass = entityClass;
       this.chance = chance;
       this.setControls(EnumSet.of(Goal.Control.MOVE, Goal.Control.LOOK));
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/AttackGoal.java namedSrc/net/minecraft/entity/ai/goal/AttackGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/AttackGoal.java	2024-10-19 01:53:01.628673664 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/AttackGoal.java	2024-10-19 01:51:50.916547768 +0000
@@ -97,7 +97,7 @@
       if (!(e > d)) {
          if (this.cooldown <= 0) {
             this.cooldown = 20;
-            this.mob.tryAttack(m_stitijqs(this.mob), this.target);
+            this.mob.tryAttack(getServerWorld(this.mob), this.target);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java namedSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java	2024-10-19 01:53:01.632673671 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/BreakDoorGoal.java	2024-10-19 01:51:50.924547782 +0000
@@ -72,7 +72,7 @@
       if (!super.canStart()) {
          return false;
       } else {
-         return !m_stitijqs(this.mob).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)
+         return !getServerWorld(this.mob).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)
             ? false
             : this.isDifficultySufficient(this.mob.getWorld().getDifficulty()) && !this.isDoorOpen();
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-10-19 01:53:01.500673438 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-10-19 01:51:50.764547506 +0000
@@ -5,7 +5,7 @@
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.mob.PathAwareEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.unmapped.C_sfpofsgc;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -52,10 +52,10 @@
     */
    @Override
    public boolean canStart() {
-      List<C_sfpofsgc> list = this.mob.getWorld().getNonSpectatingEntities(C_sfpofsgc.class, this.mob.getBounds().expand(5.0));
+      List<AbstractBoatEntity> list = this.mob.getWorld().getNonSpectatingEntities(AbstractBoatEntity.class, this.mob.getBounds().expand(5.0));
       boolean bl = false;
 
-      for (C_sfpofsgc lv : list) {
+      for (AbstractBoatEntity lv : list) {
          Entity lv2 = lv.getPrimaryPassenger();
          if (lv2 instanceof PlayerEntity
             && (MathHelper.abs(((PlayerEntity)lv2).sidewaysSpeed) > 0.0F || MathHelper.abs(((PlayerEntity)lv2).forwardSpeed) > 0.0F)) {
@@ -90,7 +90,7 @@
     */
    @Override
    public void start() {
-      for (C_sfpofsgc lv : this.mob.getWorld().getNonSpectatingEntities(C_sfpofsgc.class, this.mob.getBounds().expand(5.0))) {
+      for (AbstractBoatEntity lv : this.mob.getWorld().getNonSpectatingEntities(AbstractBoatEntity.class, this.mob.getBounds().expand(5.0))) {
          if (lv.getPrimaryPassenger() instanceof PlayerEntity lv2) {
             this.passenger = lv2;
             break;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-10-19 01:53:01.552673529 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-10-19 01:51:50.832547624 +0000
@@ -91,7 +91,7 @@
    @Override
    public boolean shouldContinue() {
       double d = this.dolphin.getVelocity().y;
-      return (!(d * d < 0.03F) || this.dolphin.m_ahrprint() == 0.0F || !(Math.abs(this.dolphin.m_ahrprint()) < 10.0F) || !this.dolphin.isTouchingWater())
+      return (!(d * d < 0.03F) || this.dolphin.getPitch() == 0.0F || !(Math.abs(this.dolphin.getPitch()) < 10.0F) || !this.dolphin.isTouchingWater())
          && !this.dolphin.isOnGround();
    }
 
@@ -137,8 +137,8 @@
       }
 
       Vec3d lv2 = this.dolphin.getVelocity();
-      if (lv2.y * lv2.y < 0.03F && this.dolphin.m_ahrprint() != 0.0F) {
-         this.dolphin.setPitch(MathHelper.lerpDegrees(0.2F, this.dolphin.m_ahrprint(), 0.0F));
+      if (lv2.y * lv2.y < 0.03F && this.dolphin.getPitch() != 0.0F) {
+         this.dolphin.setPitch(MathHelper.lerpDegrees(0.2F, this.dolphin.getPitch(), 0.0F));
       } else if (lv2.length() > 1.0E-5F) {
          double d = lv2.horizontalLength();
          double e = Math.atan2(-lv2.y, d) * 180.0F / (float)Math.PI;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java namedSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java	2024-10-19 01:53:01.572673565 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/EatGrassGoal.java	2024-10-19 01:51:50.856547665 +0000
@@ -110,7 +110,7 @@
       if (this.timer == this.getTickCount(4)) {
          BlockPos lv = this.mob.getBlockPos();
          if (GRASS_PREDICATE.test(this.world.getBlockState(lv))) {
-            if (m_fvqcmini(this.world).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+            if (getServerWorld(this.world).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
                this.world.breakBlock(lv, false);
             }
 
@@ -118,7 +118,7 @@
          } else {
             BlockPos lv2 = lv.down();
             if (this.world.getBlockState(lv2).isOf(Blocks.GRASS_BLOCK)) {
-               if (m_fvqcmini(this.world).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+               if (getServerWorld(this.world).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
                   this.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, lv2, Block.getRawIdFromState(Blocks.GRASS_BLOCK.getDefaultState()));
                   this.world.setBlockState(lv2, Blocks.DIRT.getDefaultState(), Block.NOTIFY_LISTENERS);
                }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java namedSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java	2024-10-19 01:53:01.604673621 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FleeEntityGoal.java	2024-10-19 01:51:50.888547720 +0000
@@ -130,7 +130,7 @@
     */
    @Override
    public boolean canStart() {
-      this.targetEntity = m_stitijqs(this.mob)
+      this.targetEntity = getServerWorld(this.mob)
          .m_cmohxnbg(
             this.mob
                .getWorld()
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/Goal.java namedSrc/net/minecraft/entity/ai/goal/Goal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/Goal.java	2024-10-19 01:53:01.580673579 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/Goal.java	2024-10-19 01:51:50.864547678 +0000
@@ -111,17 +111,17 @@
 
    /**
     * @mapping {@literal hashed m_stitijqs Lnet/minecraft/unmapped/C_svjebams;m_stitijqs(Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_bdwnwhiu;}
-    * @mapping {@literal named m_stitijqs Lnet/minecraft/entity/ai/goal/Goal;m_stitijqs(Lnet/minecraft/entity/Entity;)Lnet/minecraft/server/world/ServerWorld;}
+    * @mapping {@literal named getServerWorld Lnet/minecraft/entity/ai/goal/Goal;getServerWorld(Lnet/minecraft/entity/Entity;)Lnet/minecraft/server/world/ServerWorld;}
     */
-   protected static ServerWorld m_stitijqs(Entity entity) {
+   protected static ServerWorld getServerWorld(Entity entity) {
       return (ServerWorld)entity.getWorld();
    }
 
    /**
     * @mapping {@literal hashed m_fvqcmini Lnet/minecraft/unmapped/C_svjebams;m_fvqcmini(Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_bdwnwhiu;}
-    * @mapping {@literal named m_fvqcmini Lnet/minecraft/entity/ai/goal/Goal;m_fvqcmini(Lnet/minecraft/world/World;)Lnet/minecraft/server/world/ServerWorld;}
+    * @mapping {@literal named getServerWorld Lnet/minecraft/entity/ai/goal/Goal;getServerWorld(Lnet/minecraft/world/World;)Lnet/minecraft/server/world/ServerWorld;}
     */
-   protected static ServerWorld m_fvqcmini(World world) {
+   protected static ServerWorld getServerWorld(World world) {
       return (ServerWorld)world;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java namedSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java	2024-10-19 01:53:01.616673643 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/IronGolemLookGoal.java	2024-10-19 01:51:50.900547741 +0000
@@ -55,7 +55,7 @@
       } else if (this.golem.getRandom().nextInt(8000) != 0) {
          return false;
       } else {
-         this.targetVillager = m_stitijqs(this.golem)
+         this.targetVillager = getServerWorld(this.golem)
             .m_qakzqhjm(
                VillagerEntity.class,
                CLOSE_VILLAGER_PREDICATE,
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java namedSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java	2024-10-19 01:53:01.592673600 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/LookAtEntityGoal.java	2024-10-19 01:51:50.876547699 +0000
@@ -110,7 +110,7 @@
             this.target = this.mob.getTarget();
          }
 
-         ServerWorld lv = m_stitijqs(this.mob);
+         ServerWorld lv = getServerWorld(this.mob);
          if (this.targetType == PlayerEntity.class) {
             this.target = lv.m_wgkhrjde(this.targetPredicate, this.mob, this.mob.getX(), this.mob.getEyeY(), this.mob.getZ());
          } else {
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java namedSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java	2024-10-19 01:53:01.576673572 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/MeleeAttackGoal.java	2024-10-19 01:51:50.860547672 +0000
@@ -206,7 +206,7 @@
       if (this.canAttack(target)) {
          this.resetCooldown();
          this.mob.swingHand(Hand.MAIN_HAND);
-         this.mob.tryAttack(m_stitijqs(this.mob), target);
+         this.mob.tryAttack(getServerWorld(this.mob), target);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/RaidGoal.java namedSrc/net/minecraft/entity/ai/goal/RaidGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/RaidGoal.java	2024-10-19 01:53:01.644673692 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/RaidGoal.java	2024-10-19 01:51:50.936547803 +0000
@@ -23,10 +23,10 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_eqvbqsuw;<init>(Lnet/minecraft/unmapped/C_iaguvmwh;Ljava/lang/Class;ZLnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/RaidGoal;<init>(Lnet/minecraft/entity/raid/RaiderEntity;Ljava/lang/Class;ZLnet/minecraft/entity/ai/TargetPredicate$C_cqgaarcf;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/RaidGoal;<init>(Lnet/minecraft/entity/raid/RaiderEntity;Ljava/lang/Class;ZLnet/minecraft/entity/ai/TargetPredicate$Selector;)V}
     */
-   public RaidGoal(RaiderEntity mob, Class<T> targetClass, boolean checkVisibility, @Nullable TargetPredicate.C_cqgaarcf arg3) {
-      super(mob, targetClass, 500, checkVisibility, false, arg3);
+   public RaidGoal(RaiderEntity raider, Class<T> targetClass, boolean checkVisibility, @Nullable TargetPredicate.Selector predicate) {
+      super(raider, targetClass, 500, checkVisibility, false, predicate);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/RevengeGoal.java namedSrc/net/minecraft/entity/ai/goal/RevengeGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/RevengeGoal.java	2024-10-19 01:53:01.660673720 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/RevengeGoal.java	2024-10-19 01:51:50.960547844 +0000
@@ -69,7 +69,7 @@
       int i = this.mob.getLastAttackedTime();
       LivingEntity lv = this.mob.getAttacker();
       if (i != this.lastAttackedTime && lv != null) {
-         if (lv.getType() == EntityType.PLAYER && m_stitijqs(this.mob).getGameRules().getBooleanValue(GameRules.UNIVERSAL_ANGER)) {
+         if (lv.getType() == EntityType.PLAYER && getServerWorld(this.mob).getGameRules().getBooleanValue(GameRules.UNIVERSAL_ANGER)) {
             return false;
          } else {
             for (Class<?> lv2 : this.noRevengeTypes) {
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-10-19 01:53:01.628673664 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-10-19 01:51:50.916547768 +0000
@@ -54,7 +54,7 @@
       this.skeletonHorse.setTrapped(false);
       this.skeletonHorse.setTame(true);
       this.skeletonHorse.setBreedingAge(0);
-      LightningEntity lv3 = EntityType.LIGHTNING_BOLT.m_oebfrxli(lv, SpawnReason.TRIGGERED);
+      LightningEntity lv3 = EntityType.LIGHTNING_BOLT.create(lv, SpawnReason.TRIGGERED);
       if (lv3 != null) {
          lv3.refreshPositionAfterTeleport(this.skeletonHorse.getX(), this.skeletonHorse.getY(), this.skeletonHorse.getZ());
          lv3.setCosmetic(true);
@@ -85,7 +85,7 @@
     */
    @Nullable
    private AbstractHorseEntity getHorse(LocalDifficulty localDifficulty) {
-      SkeletonHorseEntity lv = EntityType.SKELETON_HORSE.m_oebfrxli(this.skeletonHorse.getWorld(), SpawnReason.TRIGGERED);
+      SkeletonHorseEntity lv = EntityType.SKELETON_HORSE.create(this.skeletonHorse.getWorld(), SpawnReason.TRIGGERED);
       if (lv != null) {
          lv.initialize((ServerWorld)this.skeletonHorse.getWorld(), localDifficulty, SpawnReason.TRIGGERED, null);
          lv.setPosition(this.skeletonHorse.getX(), this.skeletonHorse.getY(), this.skeletonHorse.getZ());
@@ -104,7 +104,7 @@
     */
    @Nullable
    private SkeletonEntity getSkeleton(LocalDifficulty localDifficulty, AbstractHorseEntity vehicle) {
-      SkeletonEntity lv = EntityType.SKELETON.m_oebfrxli(vehicle.getWorld(), SpawnReason.TRIGGERED);
+      SkeletonEntity lv = EntityType.SKELETON.create(vehicle.getWorld(), SpawnReason.TRIGGERED);
       if (lv != null) {
          lv.initialize((ServerWorld)vehicle.getWorld(), localDifficulty, SpawnReason.TRIGGERED, null);
          lv.setPosition(vehicle.getX(), vehicle.getY(), vehicle.getZ());
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java namedSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java	2024-10-19 01:53:01.500673438 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.java	2024-10-19 01:51:50.768547513 +0000
@@ -62,7 +62,7 @@
     */
    @Override
    public boolean canStart() {
-      if (!m_stitijqs(this.stepAndDestroyMob).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
+      if (!getServerWorld(this.stepAndDestroyMob).getGameRules().getBooleanValue(GameRules.DO_MOB_GRIEFING)) {
          return false;
       } else if (this.cooldown > 0) {
          this.cooldown--;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/TargetGoal.java namedSrc/net/minecraft/entity/ai/goal/TargetGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TargetGoal.java	2024-10-19 01:53:01.620673650 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TargetGoal.java	2024-10-19 01:51:50.904547748 +0000
@@ -52,10 +52,10 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rxeqeznw;<init>(Lnet/minecraft/unmapped/C_dxkfswlz;Ljava/lang/Class;ZLnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/TargetGoal;<init>(Lnet/minecraft/entity/mob/MobEntity;Ljava/lang/Class;ZLnet/minecraft/entity/ai/TargetPredicate$C_cqgaarcf;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/TargetGoal;<init>(Lnet/minecraft/entity/mob/MobEntity;Ljava/lang/Class;ZLnet/minecraft/entity/ai/TargetPredicate$Selector;)V}
     */
-   public TargetGoal(MobEntity mob, Class<T> targetClass, boolean checkVisibility, TargetPredicate.C_cqgaarcf arg3) {
-      this(mob, targetClass, 10, checkVisibility, false, arg3);
+   public TargetGoal(MobEntity mob, Class<T> targetClass, boolean checkVisibility, TargetPredicate.Selector predicate) {
+      this(mob, targetClass, 10, checkVisibility, false, predicate);
    }
 
    /**
@@ -68,14 +68,16 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rxeqeznw;<init>(Lnet/minecraft/unmapped/C_dxkfswlz;Ljava/lang/Class;IZZLnet/minecraft/unmapped/C_cjtyhinh$C_cqgaarcf;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/TargetGoal;<init>(Lnet/minecraft/entity/mob/MobEntity;Ljava/lang/Class;IZZLnet/minecraft/entity/ai/TargetPredicate$C_cqgaarcf;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/TargetGoal;<init>(Lnet/minecraft/entity/mob/MobEntity;Ljava/lang/Class;IZZLnet/minecraft/entity/ai/TargetPredicate$Selector;)V}
     */
-   public TargetGoal(MobEntity mob, Class<T> targetClass, int i, boolean checkVisibility, boolean checkNavigable, @Nullable TargetPredicate.C_cqgaarcf arg3) {
+   public TargetGoal(
+      MobEntity mob, Class<T> targetClass, int reciprocalChance, boolean checkVisibility, boolean checkNavigable, @Nullable TargetPredicate.Selector predicate
+   ) {
       super(mob, checkVisibility, checkNavigable);
       this.targetClass = targetClass;
-      this.reciprocalChance = toGoalTicks(i);
+      this.reciprocalChance = toGoalTicks(reciprocalChance);
       this.setControls(EnumSet.of(Goal.Control.TARGET));
-      this.targetPredicate = TargetPredicate.createAttackable().setBaseMaxDistance(this.getFollowRange()).setPredicate(arg3);
+      this.targetPredicate = TargetPredicate.createAttackable().setBaseMaxDistance(this.getFollowRange()).setPredicate(predicate);
    }
 
    /**
@@ -104,18 +106,18 @@
     * @mapping {@literal named findClosestTarget Lnet/minecraft/entity/ai/goal/TargetGoal;findClosestTarget()V}
     */
    protected void findClosestTarget() {
-      ServerWorld lv = m_stitijqs(this.mob);
+      ServerWorld lv = getServerWorld(this.mob);
       if (this.targetClass != PlayerEntity.class && this.targetClass != ServerPlayerEntity.class) {
          this.targetEntity = lv.m_cmohxnbg(
             this.mob.getWorld().getEntitiesByClass(this.targetClass, this.getSearchBox(this.getFollowRange()), entity -> true),
-            this.m_wvkdctyc(),
+            this.getTargetPredicate(),
             this.mob,
             this.mob.getX(),
             this.mob.getEyeY(),
             this.mob.getZ()
          );
       } else {
-         this.targetEntity = lv.m_wgkhrjde(this.m_wvkdctyc(), this.mob, this.mob.getX(), this.mob.getEyeY(), this.mob.getZ());
+         this.targetEntity = lv.m_wgkhrjde(this.getTargetPredicate(), this.mob, this.mob.getX(), this.mob.getEyeY(), this.mob.getZ());
       }
    }
 
@@ -137,9 +139,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wvkdctyc Lnet/minecraft/unmapped/C_rxeqeznw;m_wvkdctyc()Lnet/minecraft/unmapped/C_cjtyhinh;}
+    * @mapping {@literal named getTargetPredicate Lnet/minecraft/entity/ai/goal/TargetGoal;getTargetPredicate()Lnet/minecraft/entity/ai/TargetPredicate;}
     */
-   private TargetPredicate m_wvkdctyc() {
+   private TargetPredicate getTargetPredicate() {
       return this.targetPredicate.setBaseMaxDistance(this.getFollowRange());
    }
 }


The remaining diff is too long!

Please sign in to comment.