Skip to content

Commit

Permalink
start working on entity mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
ix0rai committed Oct 15, 2024
1 parent 3055d25 commit 3ea998f
Show file tree
Hide file tree
Showing 13 changed files with 78 additions and 3 deletions.
7 changes: 6 additions & 1 deletion mappings/net/minecraft/entity/AnimationState.mapping
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
CLASS net/minecraft/unmapped/C_kxntavoz net/minecraft/entity/AnimationState
FIELD f_mynxnfft INVALID_TIME I
FIELD f_mynxnfft STOPPED I
FIELD f_slrycntl startTick I
METHOD m_cpvhojvm fastForward (IF)V
ARG 1 seconds
ARG 2 speedMultiplier
METHOD m_drcnbqst isAnimating ()Z
METHOD m_eyncnhvh animateIf (ZI)V
ARG 1 condition
ARG 2 start
METHOD m_fjeaaddd copyFrom (Lnet/minecraft/unmapped/C_kxntavoz;)V
ARG 1 state
METHOD m_hbqomwtk getTimeMillis (F)J
ARG 1 ticks
METHOD m_ipvmrdzh stop ()V
METHOD m_nbtuouwc restart (I)V
ARG 1 start
Expand Down
16 changes: 15 additions & 1 deletion mappings/net/minecraft/entity/Entity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
FIELD f_llpiaiql fireTicks I
FIELD f_lnfbdcex firstUpdate Z
FIELD f_ltxgrrxv noClip Z
FIELD f_lwsftgrz queuedCollisionChecks Ljava/util/List;
FIELD f_metfcppr velocityDirty Z
FIELD f_mhlwwcep POSE Lnet/minecraft/unmapped/C_rinmcaxy;
FIELD f_mnnqnavj glowing Z
Expand All @@ -72,6 +73,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
FIELD f_pfezymmj prevYaw F
FIELD f_pfgaedzm MIN_TICKS_TO_FREEZE I
FIELD f_qazqhmfv SNEAKING_FLAG_INDEX I
FIELD f_qckvmvwz collidingBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD f_qriixkyh SWIMMING_FLAG_INDEX I
FIELD f_qtxalbwz SAFE_FALL_DISTANCE I
FIELD f_qxfvmjxc lastRenderX D
Expand All @@ -91,6 +93,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
FIELD f_ssljujsr LOGGER Lorg/slf4j/Logger;
FIELD f_tigrjjuw DEFAULT_BOUNDING_BOX_WIDTH F
FIELD f_tklhtpht entityChangeListener Lnet/minecraft/unmapped/C_ylpvpknw;
FIELD f_ujgsyoqm collidingBlocks Ljava/util/Set;
FIELD f_ujsjgylb fallDistance F
FIELD f_vdsiqqmt prevPitch F
FIELD f_vettyvgp hasVisualFire Z
Expand Down Expand Up @@ -132,6 +135,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 1 pose
METHOD m_ahglzvvg getBodyY (D)D
ARG 1 heightScale
METHOD m_ahrprint getPitch ()F
METHOD m_ajnomikh getEffectiveExplosionResistance (Lnet/minecraft/unmapped/C_aahhrzpf;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xqketiuf;F)F
ARG 1 explosion
ARG 2 world
Expand Down Expand Up @@ -159,7 +163,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 2 type
METHOD m_bikcqssn setInsidePortal (Lnet/minecraft/unmapped/C_teerivzm;Lnet/minecraft/unmapped/C_hynzadkk;)V
ARG 1 portal
METHOD m_bjibgujk onRemoved ()V
METHOD m_bjibgujk onRemovedClient ()V
METHOD m_bmjmwuig setBoundingBox (Lnet/minecraft/unmapped/C_hbcjzgoe;)V
ARG 1 boundingBox
METHOD m_bqujtsnz isSubmergedInWater ()Z
Expand All @@ -169,6 +173,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 0 entity
ARG 2 expectedCollisions
ARG 3 entityBoundingBox
METHOD m_bujlfnum dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_uqpzijng;
METHOD m_bxezczwg dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng;
ARG 3 yOffset
METHOD m_bzrtaquy getVehicle ()Lnet/minecraft/unmapped/C_astfners;
METHOD m_bzveerey collides ()Z
METHOD m_cckfyxyf fall (DZLnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V
Expand Down Expand Up @@ -337,6 +344,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
METHOD m_fzshfvfl isSprinting ()Z
METHOD m_gakqenyv getLerpTargetPitch ()F
METHOD m_gavkvalj hasWings ()Z
METHOD m_gbjymqob onRemoved (Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V
ARG 1 reason
METHOD m_ggpcigyk addVelocityInternal (Lnet/minecraft/unmapped/C_vgpupfxx;)V
ARG 1 velocity
METHOD m_ghqcprlw onPlayerCollision (Lnet/minecraft/unmapped/C_jzrpycqo;)V
Expand Down Expand Up @@ -540,6 +549,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 1 widthScale
METHOD m_ncryhhth copyPositionAndRotation (Lnet/minecraft/unmapped/C_astfners;)V
ARG 1 entity
METHOD m_ndosmusf getYaw ()F
METHOD m_ngysbrcu getSwimSound ()Lnet/minecraft/unmapped/C_avavozay;
METHOD m_nhuepqoa getOppositeRotationVector (FF)Lnet/minecraft/unmapped/C_vgpupfxx;
ARG 1 pitch
Expand Down Expand Up @@ -702,6 +712,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
METHOD m_shlbgxdt saveSelfNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
ARG 1 nbt
METHOD m_smbujbsa discard ()V
METHOD m_smqilrfl dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_uqpzijng;
METHOD m_spboarji isTouchingWater ()Z
COMMENT {@return whether this entity's hitbox is touching water}
METHOD m_spnjhgke resetFallDistance ()V
Expand Down Expand Up @@ -880,6 +891,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 1 tickDelta
METHOD m_xpuekaoa setUuid (Ljava/util/UUID;)V
ARG 1 uuid
METHOD m_xrhuexzc dropStack (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_uqpzijng;
METHOD m_xrvghdnl getLandingBlockStateLegacy ()Lnet/minecraft/unmapped/C_txtbiemp;
METHOD m_xthhawdp onStartedTrackingBy (Lnet/minecraft/unmapped/C_mxrobsgg;)V
ARG 1 player
Expand All @@ -894,6 +906,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 1 entity
ARG 2 dimensions
ARG 3 scaleFactor
METHOD m_xxnsgkmf queueCollisionCheck (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)V
METHOD m_xyjymteg getVehicleAttachmentPos (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx;
ARG 1 entity
METHOD m_xyqhaexi playCombinationStepSounds (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)V
Expand Down Expand Up @@ -955,6 +968,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
ARG 2 interpolationSteps
METHOD m_zoivpnyj getAttachments ()Lnet/minecraft/unmapped/C_pubtmkke;
METHOD m_zrismnrd checkWaterState ()V
CLASS C_aipuagbw Movement
CLASS C_aobkcgmf PositionUpdater
METHOD accept (Lnet/minecraft/unmapped/C_astfners;DDD)V
ARG 1 entity
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/EntityStatuses.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ CLASS net/minecraft/unmapped/C_vuauwont net/minecraft/entity/EntityStatuses
FIELD f_hgeveagl SET_OP_LEVEL_4 B
FIELD f_hlhbecen ADD_PORTAL_PARTICLES B
FIELD f_iujagjoa BREAK_OFFHAND B
FIELD f_jahbxxhy PROTECTED_FROM_DEATH B
FIELD f_jfcmyval ADD_WITCH_PARTICLES B
FIELD f_jkvfmfoj TAME_OCELOT_SUCCESS B
FIELD f_jogsmdtm ADD_POSITIVE_PLAYER_REACTION_PARTICLES B
Expand All @@ -32,6 +33,7 @@ CLASS net/minecraft/unmapped/C_vuauwont net/minecraft/entity/EntityStatuses
FIELD f_lbkmphzf PLAY_ATTACK_SOUND B
FIELD f_lzgaeuhp PREPARE_RAM B
FIELD f_mfslguzv USE_REDUCED_DEBUG_INFO B
FIELD f_nerpufry SHAKE B
FIELD f_nfcguorg BREAK_CHEST B
FIELD f_olioudok ADD_DEATH_PARTICLES B
FIELD f_oorwyirf BREAK_BODY B
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/EntityType.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
FIELD f_lwhqlwvm factory Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;
FIELD f_nmmzrtfm saveable Z
FIELD f_qcebxifq spawnDimensionsScale F
FIELD f_qdlfxewu translationKey Lnet/minecraft/unmapped/C_jquyxssk;
FIELD f_rpsdjoxa trackingTickInterval I
FIELD f_rzcfynrt attachmentType Lnet/minecraft/unmapped/C_pubtmkke$C_qexjibym;
FIELD f_tntzkbun spawnableFarFromPlayer Z
FIELD f_uuowbxbh lootTable Lnet/minecraft/unmapped/C_jquyxssk;
FIELD f_xtndxyps spawnGroup Lnet/minecraft/unmapped/C_ormqdxci;
METHOD <init> (Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;Lnet/minecraft/unmapped/C_ormqdxci;)V
ARG 1 factory
Expand Down Expand Up @@ -162,6 +164,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
METHOD m_onnfrfmf spawnableFarFromPlayer ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
METHOD m_phyefhwa setEyeHeight (F)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
ARG 1 eyeHeight
METHOD m_qgatngvl emptyLootTable ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
METHOD m_qzcjtflv disableSaving ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
METHOD m_tfrskfvg create (Lnet/minecraft/unmapped/C_ormqdxci;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;
ARG 0 spawnGroup
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/EquipmentSlot.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ CLASS net/minecraft/unmapped/C_yuycoehb net/minecraft/entity/EquipmentSlot
METHOD m_egyjjxnq getType ()Lnet/minecraft/unmapped/C_yuycoehb$C_vkdieima;
METHOD m_fyvngtoz (Lnet/minecraft/unmapped/C_yuycoehb;)I
ARG 0 slot
METHOD m_jjdtlure offsetId (I)I
ARG 1 offset
METHOD m_omjerill isArmorSlot ()Z
METHOD m_ovklkqiy getName ()Ljava/lang/String;
METHOD m_sybtfyce getEntitySlotId ()I
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta
ARG 1 value
ARG 2 bitField
ARG 3 set
METHOD m_fjamjtjb showsArms ()Z
METHOD m_foqjlatj setLeftLegRotation (Lnet/minecraft/unmapped/C_eocijcdh;)V
ARG 1 angle
METHOD m_fqivefvy isMarker ()Z
Expand All @@ -68,6 +69,7 @@ CLASS net/minecraft/unmapped/C_nknvrhfn net/minecraft/entity/decoration/ArmorSta
ARG 3 amount
METHOD m_kkoccwlu setMarker (Z)V
ARG 1 marker
METHOD m_kruazguc showsBasePlate ()Z
METHOD m_ldbykolm poseToNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
METHOD m_lvksyjqf isSlotDisabled (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS net/minecraft/unmapped/C_sfpofsgc net/minecraft/entity/vehicle/AbstractBoatEntity
METHOD <init> (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;Ljava/util/function/Supplier;)V
ARG 1 type
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/unmapped/C_cyjxgxrb net/minecraft/entity/vehicle/AbstractChestBoatEntity
FIELD f_dehvsldw lootTable Lnet/minecraft/unmapped/C_xhhleach;
FIELD f_lfxympdn inventory Lnet/minecraft/unmapped/C_rnrfftze;
FIELD f_nxvmtoei lootTableSeed J
FIELD f_vfvcqxxr INVENTORY_SIZE I
METHOD m_jhidwmsn generateLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/vehicle/RaftEntity.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_spthrjmn net/minecraft/entity/vehicle/RaftEntity
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_srvkmyvp net/minecraft/entity/vehicle/StorageVehi
METHOD m_ctcqgnek openScreen (Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_ozuepbyj;
ARG 1 player
METHOD m_elbjzlaw isRemoved ()Z
METHOD m_ggolaweo generateLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
METHOD m_ggolaweo generateContainerLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
ARG 1 player
METHOD m_huzqbykz clearInventory ()V
METHOD m_iemddgjw writeStorage (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/registry/KeyedValue.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/unmapped/C_jquyxssk net/minecraft/registry/KeyedValue
METHOD fixed (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jquyxssk;
ARG 0 value
METHOD get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object;
ARG 1 key
24 changes: 24 additions & 0 deletions mappings/net/minecraft/util/math/Direction.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
FIELD f_xnopevsr id I
FIELD f_yxdvzmgt vec3i Lnet/minecraft/unmapped/C_ceivtqhh;
FIELD f_zbhygcbw CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc;
METHOD m_aceixrsp getFacing (DDD)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 x
ARG 2 y
ARG 4 z
METHOD m_arokrhof validateVertical (Lnet/minecraft/unmapped/C_xpuuihxf;)Lcom/mojang/serialization/DataResult;
ARG 0 direction
METHOD m_atdyqmtg getId ()I
METHOD m_buxxiflp getOpposite ()Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_ckfxacqi getFacing (FFF)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 x
ARG 1 y
ARG 2 z
METHOD m_cmaqxlom byId (I)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 id
METHOD m_dfjhoqwe fromHorizontal (I)Lnet/minecraft/unmapped/C_xpuuihxf;
Expand All @@ -30,12 +38,20 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
METHOD m_hntyvpnl get (Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 direction
ARG 1 axis
METHOD m_icbobqmt getFacing (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 vec
METHOD m_iuvhambs getAxis ()Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;
METHOD m_iztsoygw getUnitVector ()Lorg/joml/Vector3f;
METHOD m_lxrgvhbm getOffsetY ()I
METHOD m_nmryvhog asVec3d ()Lnet/minecraft/unmapped/C_vgpupfxx;
METHOD m_nyqvqnqv transform (Lorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 position
ARG 1 direction
METHOD m_obcinsgd fromVec (IIILnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 x
ARG 1 y
ARG 2 z
ARG 3 fallback
METHOD m_oqyobyjy getOffsetX ()I
METHOD m_osvadcjw rotateYClockwise ()Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_pbuextkm rotateCounterclockwise (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf;
Expand All @@ -51,6 +67,8 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
METHOD m_qnbvkhac getLookDirectionForAxis (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 entity
ARG 1 axis
METHOD m_rgctwylt fromVec (Lnet/minecraft/unmapped/C_ceivtqhh;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 vec
METHOD m_rybsiiha getName ()Ljava/lang/String;
METHOD m_rzedosik from (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;)Lnet/minecraft/unmapped/C_xpuuihxf;
ARG 0 axis
Expand All @@ -59,6 +77,7 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
ARG 0 entity
METHOD m_ucwgyusq getShuffledDirections (Lnet/minecraft/unmapped/C_rlomrsco;)Ljava/util/Collection;
ARG 0 random
METHOD m_uinacubi asVec3i ()Lnet/minecraft/unmapped/C_ceivtqhh;
METHOD m_veocfmwg pointsTo (F)Z
COMMENT {@return whether the given yaw points to the direction}
COMMENT
Expand All @@ -67,6 +86,8 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
COMMENT <p>This always returns {@code false} for vertical directions.
ARG 1 yaw
METHOD m_vyhskrab getOffsetZ ()I
METHOD m_vzfadujr getHorizontalDegrees (Lnet/minecraft/unmapped/C_xpuuihxf;)F
COMMENT Gets the degrees of the {@code direction}, relative to {@link Direction#SOUTH}
METHOD m_wstyzrap (Lnet/minecraft/unmapped/C_xpuuihxf;)I
ARG 0 direction
METHOD m_xwgdebbi getRotationQuaternion ()Lorg/joml/Quaternionf;
Expand Down Expand Up @@ -103,10 +124,13 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction
ARG 0 name
METHOD m_jwnubmio isVertical ()Z
METHOD m_qewftacv getName ()Ljava/lang/String;
METHOD m_symjvdwr getDirections ()[Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_uhgjjbza getPositive ()Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_vfobospg choose (III)I
ARG 1 x
ARG 2 y
ARG 3 z
METHOD m_wxwlsnud getNegative ()Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_xfsvouev isHorizontal ()Z
METHOD m_xipigoyp pickRandomAxis (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;
ARG 0 random
Expand Down
8 changes: 8 additions & 0 deletions mappings/net/minecraft/util/shape/VoxelShape.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape
FIELD f_uodkcxwt voxels Lnet/minecraft/unmapped/C_bipoyzjn;
METHOD <init> (Lnet/minecraft/unmapped/C_bipoyzjn;)V
ARG 1 voxels
METHOD m_afxwtvim offset (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_zscvhwbd;
ARG 1 vec
METHOD m_ebbqnisg raycast (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;
ARG 1 start
ARG 2 end
Expand All @@ -11,6 +13,7 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape
ARG 1 axis
METHOD m_evzrivct forEachBox (Lnet/minecraft/unmapped/C_dodusopt$C_spddrqcv;)V
ARG 1 consumer
METHOD m_eziwunlj isSquareOn (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Z
METHOD m_fbshlppi getFace (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_zscvhwbd;
ARG 1 facing
METHOD m_glpbrbos (Lnet/minecraft/unmapped/C_dodusopt$C_spddrqcv;IIIIII)V
Expand All @@ -28,8 +31,13 @@ CLASS net/minecraft/unmapped/C_zscvhwbd net/minecraft/util/shape/VoxelShape
ARG 1 axis
ARG 2 from
ARG 4 to
METHOD m_ktlmojoe isCube ()Z
METHOD m_mltevqes getPointPositions (Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;)Lit/unimi/dsi/fastutil/doubles/DoubleList;
ARG 1 axis
METHOD m_nxfuxmhj offset (DDD)Lnet/minecraft/unmapped/C_zscvhwbd;
ARG 1 x
ARG 3 y
ARG 5 z
METHOD m_nzndbnrv calculateMaxDistance (Lnet/minecraft/unmapped/C_ryiuicpl;Lnet/minecraft/unmapped/C_hbcjzgoe;D)D
ARG 1 axisCycle
ARG 2 box
Expand Down

3 comments on commit 3ea998f

@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 3ea998f, 177 file(s) were updated with 807 line(s) added and 781 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-15 01:24:16.428924687 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/OverlayVertexConsumer.java	2024-10-15 01:23:06.384045414 +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-15 01:24:16.460925088 +0000
+++ namedSrc/com/mojang/blaze3d/vertex/VertexConsumer.java	2024-10-15 01:23:06.412045766 +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-15 01:24:16.284922878 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-15 01:23:06.192042999 +0000
@@ -42,6 +42,7 @@
 import net.minecraft.loot.context.LootContextTypes;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderSet;
+import net.minecraft.registry.KeyedValue;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -53,7 +54,6 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.State;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_jquyxssk;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -1971,15 +1971,15 @@
       private RegistryKey<Block> key;
       /**
        * @mapping {@literal hashed f_pxqjcqnw Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_pxqjcqnw:Lnet/minecraft/unmapped/C_jquyxssk;}
-       * @mapping {@literal named lootTableId Lnet/minecraft/block/AbstractBlock$Settings;lootTableId:Lnet/minecraft/unmapped/C_jquyxssk;}
+       * @mapping {@literal named lootTableId Lnet/minecraft/block/AbstractBlock$Settings;lootTableId:Lnet/minecraft/registry/KeyedValue;}
        */
-      private C_jquyxssk<Block, Optional<RegistryKey<LootTable>>> lootTableId = key -> Optional.of(
+      private KeyedValue<Block, Optional<RegistryKey<LootTable>>> lootTableId = key -> Optional.of(
             RegistryKey.of(RegistryKeys.LOOT_TABLE, key.getValue().withPrefix("blocks/"))
          );
       /**
        * Mapping not found
        */
-      private C_jquyxssk<Block, String> f_gxswpnob = arg -> Util.createTranslationKey("block", arg.getValue());
+      private KeyedValue<Block, String> f_gxswpnob = arg -> Util.createTranslationKey("block", arg.getValue());
       /**
        * @mapping {@literal hashed f_obppjqdx Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_obppjqdx:Z}
        * @mapping {@literal named opaque Lnet/minecraft/block/AbstractBlock$Settings;opaque:Z}
@@ -2309,15 +2309,16 @@
        * @mapping {@literal named dropsNothing Lnet/minecraft/block/AbstractBlock$Settings;dropsNothing()Lnet/minecraft/block/AbstractBlock$Settings;}
        */
       public AbstractBlock.Settings dropsNothing() {
-         this.lootTableId = C_jquyxssk.fixed(Optional.empty());
+         this.lootTableId = KeyedValue.fixed(Optional.empty());
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_nbpsnvhc Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_nbpsnvhc(Ljava/util/Optional;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
+       * @mapping {@literal named m_nbpsnvhc Lnet/minecraft/block/AbstractBlock$Settings;m_nbpsnvhc(Ljava/util/Optional;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings m_nbpsnvhc(Optional<RegistryKey<LootTable>> optional) {
-         this.lootTableId = C_jquyxssk.fixed(optional);
+      public AbstractBlock.Settings m_nbpsnvhc(Optional<RegistryKey<LootTable>> value) {
+         this.lootTableId = KeyedValue.fixed(value);
          return this;
       }
 
@@ -2548,10 +2549,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_oileiccy Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_oileiccy(Ljava/lang/String;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
+       * @mapping {@literal named m_oileiccy Lnet/minecraft/block/AbstractBlock$Settings;m_oileiccy(Ljava/lang/String;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings m_oileiccy(String string) {
-         this.f_gxswpnob = C_jquyxssk.fixed(string);
+      public AbstractBlock.Settings m_oileiccy(String value) {
+         this.f_gxswpnob = KeyedValue.fixed(value);
          return this;
       }
 
diff -bur namedTargetSrc/net/minecraft/block/BambooBlock.java namedSrc/net/minecraft/block/BambooBlock.java
--- namedTargetSrc/net/minecraft/block/BambooBlock.java	2024-10-15 01:24:16.276922778 +0000
+++ namedSrc/net/minecraft/block/BambooBlock.java	2024-10-15 01:23:06.184042899 +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-15 01:24:16.420924586 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2024-10-15 01:23:06.372045263 +0000
@@ -61,7 +61,7 @@
    @Override
    protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       Vec3d lv = state.getModelOffset(pos);
-      return SHAPE.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return SHAPE.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2024-10-15 01:24:16.516925792 +0000
+++ namedSrc/net/minecraft/block/Block.java	2024-10-15 01:23:06.468046470 +0000
@@ -291,7 +291,7 @@
     */
    public static BlockState pushEntitiesUpBeforeBlockChange(BlockState from, BlockState to, WorldAccess world, BlockPos pos) {
       VoxelShape lv = VoxelShapes.combine(from.getCollisionShape(world, pos), to.getCollisionShape(world, pos), BooleanBiFunction.ONLY_SECOND)
-         .m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
+         .offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
       if (lv.isEmpty()) {
          return to;
       } else {
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-15 01:24:16.472925239 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2024-10-15 01:23:06.424045917 +0000
@@ -2,10 +2,10 @@
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -26,13 +26,13 @@
     * @mapping {@literal hashed f_iqvprvdq Lnet/minecraft/unmapped/C_hzrcnxyg;f_iqvprvdq:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named boatType Lnet/minecraft/block/dispenser/BoatDispenserBehavior;boatType:Lnet/minecraft/entity/EntityType;}
     */
-   private final EntityType<? extends C_sfpofsgc> boatType;
+   private final EntityType<? extends AbstractBoatEntity> boatType;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hzrcnxyg;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;)V}
     * @mapping {@literal named <init> Lnet/minecraft/block/dispenser/BoatDispenserBehavior;<init>(Lnet/minecraft/entity/EntityType;)V}
     */
-   public BoatDispenserBehavior(EntityType<? extends C_sfpofsgc> boatType) {
+   public BoatDispenserBehavior(EntityType<? extends AbstractBoatEntity> boatType) {
       this.boatType = boatType;
    }
 
@@ -60,7 +60,7 @@
          h = 0.0;
       }
 
-      C_sfpofsgc lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
+      AbstractBoatEntity lv5 = this.boatType.m_oebfrxli(lv2, SpawnReason.DISPENSER);
       if (lv5 != null) {
          lv5.m_busvmoue(e, f + h, g);
          EntityType.createDefaultStackSpawnConfig(lv2, stack, null).accept(lv5);
diff -bur namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-15 01:24:16.472925239 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-10-15 01:23:06.424045917 +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-15 01:24:16.388924184 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-10-15 01:23:06.332044760 +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-15 01:24:16.476925289 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-10-15 01:23:06.428045967 +0000
@@ -534,7 +534,7 @@
          double d = (double)((float)this.facing.getOffsetX() * f);
          double e = (double)((float)this.facing.getOffsetY() * f);
          double g = (double)((float)this.facing.getOffsetZ() * f);
-         return VoxelShapes.union(lv, lv4.getCollisionShape(world, pos).m_nxfuxmhj(d, e, g));
+         return VoxelShapes.union(lv, lv4.getCollisionShape(world, pos).offset(d, e, g));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/FlowerBlock.java namedSrc/net/minecraft/block/FlowerBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerBlock.java	2024-10-15 01:24:16.464925138 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-10-15 01:23:06.416045816 +0000
@@ -86,7 +86,7 @@
    @Override
    protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
       Vec3d lv = state.getModelOffset(pos);
-      return SHAPE.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return SHAPE.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/HoneyBlock.java namedSrc/net/minecraft/block/HoneyBlock.java
--- namedTargetSrc/net/minecraft/block/HoneyBlock.java	2024-10-15 01:24:16.444924887 +0000
+++ namedSrc/net/minecraft/block/HoneyBlock.java	2024-10-15 01:23:06.400045615 +0000
@@ -6,12 +6,12 @@
 import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.TntEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
@@ -75,7 +75,7 @@
     * @mapping {@literal named hasHoneyBlockEffects Lnet/minecraft/block/HoneyBlock;hasHoneyBlockEffects(Lnet/minecraft/entity/Entity;)Z}
     */
    private static boolean hasHoneyBlockEffects(Entity entity) {
-      return entity instanceof LivingEntity || entity instanceof AbstractMinecartEntity || entity instanceof TntEntity || entity instanceof C_sfpofsgc;
+      return entity instanceof LivingEntity || entity instanceof AbstractMinecartEntity || entity instanceof TntEntity || entity instanceof AbstractBoatEntity;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/LilyPadBlock.java namedSrc/net/minecraft/block/LilyPadBlock.java
--- namedTargetSrc/net/minecraft/block/LilyPadBlock.java	2024-10-15 01:24:16.412924486 +0000
+++ namedSrc/net/minecraft/block/LilyPadBlock.java	2024-10-15 01:23:06.364045163 +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-15 01:24:16.260922577 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-10-15 01:23:06.168042698 +0000
@@ -132,7 +132,7 @@
          lv2 = SHAPES[state.get(AGE_4)];
       }
 
-      return lv2.m_nxfuxmhj(lv.x, lv.y, lv.z);
+      return lv2.offset(lv.x, lv.y, lv.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-15 01:24:16.308923180 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-10-15 01:23:06.228043452 +0000
@@ -454,7 +454,7 @@
       }
 
       Vec3d lv8 = state.getModelOffset(pos);
-      return lv2.m_nxfuxmhj(lv8.x, 0.0, lv8.z);
+      return lv2.offset(lv8.x, 0.0, lv8.z);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ScaffoldingBlock.java namedSrc/net/minecraft/block/ScaffoldingBlock.java
--- namedTargetSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-15 01:24:16.432924737 +0000
+++ namedSrc/net/minecraft/block/ScaffoldingBlock.java	2024-10-15 01:23:06.388045464 +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/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-15 01:24:16.484925389 +0000
+++ namedSrc/net/minecraft/client/gui/hud/debug/DebugHud.java	2024-10-15 01:23:06.436046068 +0000
@@ -474,7 +474,7 @@
          );
          list.add(
             String.format(
-               Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", lv8, string11, MathHelper.wrapDegrees(lv7.m_ndosmusf()), MathHelper.wrapDegrees(lv7.m_ahrprint())
+               Locale.ROOT, "Facing: %s (%s) (%.1f / %.1f)", lv8, string11, MathHelper.wrapDegrees(lv7.getYaw()), MathHelper.wrapDegrees(lv7.getPitch())
             )
          );
          WorldChunk lv11 = this.getClientChunk();
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-15 01:24:16.368923933 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-10-15 01:23:06.308044459 +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-15 01:24:16.288922929 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/InventoryScreen.java	2024-10-15 01:23:06.200043100 +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-15 01:24:16.404924385 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-10-15 01:23:06.352045011 +0000
@@ -169,8 +169,8 @@
       this.display.setShowArms(true);
       this.display.bodyYaw = 210.0F;
       this.display.setPitch(25.0F);
-      this.display.headYaw = this.display.m_ndosmusf();
-      this.display.prevHeadYaw = this.display.m_ndosmusf();
+      this.display.headYaw = this.display.getYaw();
+      this.display.prevHeadYaw = this.display.getYaw();
       this.displayStack(this.handler.getSlot(3).getStack());
    }
 
diff -bur namedTargetSrc/net/minecraft/client/Keyboard.java namedSrc/net/minecraft/client/Keyboard.java
--- namedTargetSrc/net/minecraft/client/Keyboard.java	2024-10-15 01:24:16.396924285 +0000
+++ namedSrc/net/minecraft/client/Keyboard.java	2024-10-15 01:23:06.344044911 +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-15 01:24:16.296923029 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-10-15 01:23:06.208043201 +0000
@@ -3857,8 +3857,8 @@
       int k = this.window.getFramebufferWidth();
       int l = this.window.getFramebufferHeight();
       Framebuffer lv = new SimpleFramebuffer(width, height, true);
-      float f = this.player.m_ahrprint();
-      float g = this.player.m_ndosmusf();
+      float f = this.player.getPitch();
+      float g = this.player.getYaw();
       float h = this.player.prevPitch;
       float m = this.player.prevYaw;
       this.gameRenderer.setBlockOutlineEnabled(false);
@@ -3897,8 +3897,8 @@
                   this.player.setPitch(90.0F);
             }
 
-            this.player.prevYaw = this.player.m_ndosmusf();
-            this.player.prevPitch = this.player.m_ahrprint();
+            this.player.prevYaw = this.player.getYaw();
+            this.player.prevPitch = this.player.getPitch();
             lv.beginWrite(true);
             this.gameRenderer.renderWorld(DeltaTracker.ONE);
 
diff -bur namedTargetSrc/net/minecraft/client/model/Model.java namedSrc/net/minecraft/client/model/Model.java
--- namedTargetSrc/net/minecraft/client/model/Model.java	2024-10-15 01:24:16.480925339 +0000
+++ namedSrc/net/minecraft/client/model/Model.java	2024-10-15 01:23:06.428045967 +0000
@@ -133,7 +133,7 @@
     * Mapping not found
     */
    protected void m_emzlezbo(AnimationState arg, Animation arg2, float f, float g) {
-      arg.animateIfValid(arg2x -> Animator.animate(this, arg2, (long)((float)arg2x.m_hbqomwtk(f) * g), 1.0F, f_qfztkxfk));
+      arg.animateIfValid(arg2x -> Animator.animate(this, arg2, (long)((float)arg2x.getTimeMillis(f) * g), 1.0F, f_qfztkxfk));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-15 01:24:16.400924335 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-10-15 01:23:06.352045011 +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-15 01:24:16.248922426 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2024-10-15 01:23:06.152042496 +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-15 01:24:16.496925540 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-10-15 01:23:06.444046169 +0000
@@ -87,6 +87,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.projectile.ExplosiveProjectileEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.inventory.SimpleInventory;
@@ -297,7 +298,6 @@
 import net.minecraft.unmapped.C_npripfjn;
 import net.minecraft.unmapped.C_poljqryj;
 import net.minecraft.unmapped.C_rrcmfgnk;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_uepzhiii;
 import net.minecraft.unmapped.C_uqhumrao;
 import net.minecraft.unmapped.C_wkpqgkjo;
@@ -802,8 +802,8 @@
                      this.client.player.getX(),
                      this.client.player.getY(),
                      this.client.player.getZ(),
-                     this.client.player.m_ndosmusf(),
-                     this.client.player.m_ahrprint(),
+                     this.client.player.getYaw(),
+                     this.client.player.getPitch(),
                      false,
                      false
                   )
@@ -945,7 +945,7 @@
          m_noarotfs(packet.change(), packet.relatives(), lv, false);
       }
 
-      this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.m_ndosmusf(), lv.m_ahrprint(), false, false));
+      this.connection.send(new PlayerMoveC2SPacket.Full(lv.getX(), lv.getY(), lv.getZ(), lv.getYaw(), lv.getPitch(), false, false));
       this.connection.send(new TeleportConfirmationC2SPacket(packet.id()));
    }
 
@@ -983,7 +983,7 @@
       lv.setYaw(arg.yRot());
       lv.setPitch(arg.xRot());
       lv.m_kashyvjh();
-      this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.m_ndosmusf(), lv.m_ahrprint(), false, false));
+      this.connection.send(new PlayerMoveC2SPacket.LookAndOnGround(lv.getYaw(), lv.getPitch(), false, false));
    }
 
    /**
@@ -1346,10 +1346,10 @@
                if (lv2 == this.client.player) {
                   this.f_mhfzfcqe = OptionalInt.empty();
                   if (!bl) {
-                     if (lv instanceof C_sfpofsgc) {
-                        this.client.player.prevYaw = lv.m_ndosmusf();
-                        this.client.player.setYaw(lv.m_ndosmusf());
-                        this.client.player.setHeadYaw(lv.m_ndosmusf());
+                     if (lv instanceof AbstractBoatEntity) {
+                        this.client.player.prevYaw = lv.getYaw();
+                        this.client.player.setYaw(lv.getYaw());
+                        this.client.player.setHeadYaw(lv.getYaw());
                      }
 
                      Text lv3 = Text.translatable("mount.onboard", this.client.options.sneakKey.getKeyName());
@@ -1501,8 +1501,8 @@
          }
 
          lv8.setVelocity(lv4.getVelocity());
-         lv8.setYaw(lv4.m_ndosmusf());
-         lv8.setPitch(lv4.m_ahrprint());
+         lv8.setYaw(lv4.getYaw());
+         lv8.setPitch(lv4.getPitch());
       } else {
          lv8.init();
          lv8.setYaw(-180.0F);
diff -bur namedTargetSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-15 01:24:16.392924234 +0000
+++ namedSrc/net/minecraft/client/render/debug/SupportBlockDebugRenderer.java	2024-10-15 01:23:06.336044811 +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-15 01:24:16.252922477 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmadilloEntityRenderer.java	2024-10-15 01:23:06.152042496 +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-15 01:24:16.324923381 +0000
+++ namedSrc/net/minecraft/client/render/entity/ArmorStandEntityRenderer.java	2024-10-15 01:23:06.248043704 +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-15 01:24:16.464925138 +0000
+++ namedSrc/net/minecraft/client/render/entity/BatEntityRenderer.java	2024-10-15 01:23:06.416045816 +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/BreezeEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-15 01:24:16.268922677 +0000
+++ namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-10-15 01:23:06.180042848 +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-15 01:24:16.428924687 +0000
+++ namedSrc/net/minecraft/client/render/entity/CamelEntityRenderer.java	2024-10-15 01:23:06.380045363 +0000
@@ -54,10 +54,10 @@
       arg2.f_jakaoofo = arg.isSaddled();
       arg2.f_kdpdiedc = arg.hasPassengers();
       arg2.f_iqqzwnsn = Math.max((float)arg.getJumpCooldown() - f, 0.0F);
-      arg2.f_mdvlisqf.m_fjeaaddd(arg.sitState);
-      arg2.f_hnjtngys.m_fjeaaddd(arg.sittingState);
-      arg2.f_tkktkquu.m_fjeaaddd(arg.standUpState);
-      arg2.f_qgiqqlrv.m_fjeaaddd(arg.idleState);
-      arg2.f_waluzkih.m_fjeaaddd(arg.dashState);
+      arg2.f_mdvlisqf.copyFrom(arg.sitState);
+      arg2.f_hnjtngys.copyFrom(arg.sittingState);
+      arg2.f_tkktkquu.copyFrom(arg.standUpState);
+      arg2.f_qgiqqlrv.copyFrom(arg.idleState);
+      arg2.f_waluzkih.copyFrom(arg.dashState);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-15 01:24:16.444924887 +0000
+++ namedSrc/net/minecraft/client/render/entity/EvokerFangsEntityRenderer.java	2024-10-15 01:23:06.396045565 +0000
@@ -72,7 +72,7 @@
     */
    public void m_tskwgjqs(EvokerFangsEntity arg, C_slughlgb arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
-      arg2.f_bbxrwgra = arg.m_ndosmusf();
+      arg2.f_bbxrwgra = arg.getYaw();
       arg2.f_ipsdfzci = arg.getAnimationProgress(f);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-15 01:24:16.284922878 +0000
+++ namedSrc/net/minecraft/client/render/entity/FrogEntityRenderer.java	2024-10-15 01:23:06.196043050 +0000
@@ -45,10 +45,10 @@
    public void m_tskwgjqs(FrogEntity arg, C_jvfahcsc arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_ohjecduc = arg.isInsideWaterOrBubbleColumn();
-      arg2.f_yokqubjx.m_fjeaaddd(arg.longJumpAnimationState);
-      arg2.f_kbepgwtm.m_fjeaaddd(arg.croakAnimationState);
-      arg2.f_oxuvptfa.m_fjeaaddd(arg.tongueAnimationState);
-      arg2.f_yesvirgh.m_fjeaaddd(arg.floatAnimationState);
+      arg2.f_yokqubjx.copyFrom(arg.longJumpAnimationState);
+      arg2.f_kbepgwtm.copyFrom(arg.croakAnimationState);
+      arg2.f_oxuvptfa.copyFrom(arg.tongueAnimationState);
+      arg2.f_yesvirgh.copyFrom(arg.floatAnimationState);
       arg2.f_qioxjbek = arg.getVariant().getValue().textureId();
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-15 01:24:16.440924837 +0000
+++ namedSrc/net/minecraft/client/render/entity/SnifferEntityRenderer.java	2024-10-15 01:23:06.392045514 +0000
@@ -53,11 +53,11 @@
    public void m_tskwgjqs(SnifferEntity arg, C_aqiuqico arg2, float f) {
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_ztfjaurp = arg.isSearching();
-      arg2.f_xidorafg.m_fjeaaddd(arg.diggingAnimationState);
-      arg2.f_jfcgrhob.m_fjeaaddd(arg.sniffingAnimationState);
-      arg2.f_utldhivl.m_fjeaaddd(arg.risingAnimationState);
-      arg2.f_twimsecs.m_fjeaaddd(arg.happyAnimationState);
-      arg2.f_zvcpcfxp.m_fjeaaddd(arg.scentingAnimationState);
+      arg2.f_xidorafg.copyFrom(arg.diggingAnimationState);
+      arg2.f_jfcgrhob.copyFrom(arg.sniffingAnimationState);
+      arg2.f_utldhivl.copyFrom(arg.risingAnimationState);
+      arg2.f_twimsecs.copyFrom(arg.happyAnimationState);
+      arg2.f_zvcpcfxp.copyFrom(arg.scentingAnimationState);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/WardenRenderer.java namedSrc/net/minecraft/client/render/entity/WardenRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-15 01:24:16.384924134 +0000
+++ namedSrc/net/minecraft/client/render/entity/WardenRenderer.java	2024-10-15 01:23:06.328044710 +0000
@@ -102,11 +102,11 @@
       super.m_tskwgjqs(arg, arg2, f);
       arg2.f_qzhodwgz = arg.getTendrilAnimation(f);
       arg2.f_xvqlqmho = arg.getHeartAnimation(f);
-      arg2.f_tyvlitng.m_fjeaaddd(arg.roaringAnimation);
-      arg2.f_cgkhsdqx.m_fjeaaddd(arg.sniffingAnimation);
-      arg2.f_itqcqpad.m_fjeaaddd(arg.emergingAnimation);
-      arg2.f_suovhsuq.m_fjeaaddd(arg.diggingAnimation);
-      arg2.f_osqqucmn.m_fjeaaddd(arg.attackingAnimation);
-      arg2.f_qmcfvwub.m_fjeaaddd(arg.sonicBoomAnimation);
+      arg2.f_tyvlitng.copyFrom(arg.roaringAnimation);
+      arg2.f_cgkhsdqx.copyFrom(arg.sniffingAnimation);
+      arg2.f_itqcqpad.copyFrom(arg.emergingAnimation);
+      arg2.f_suovhsuq.copyFrom(arg.diggingAnimation);
+      arg2.f_osqqucmn.copyFrom(arg.attackingAnimation);
+      arg2.f_qmcfvwub.copyFrom(arg.sonicBoomAnimation);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-10-15 01:24:16.288922929 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-10-15 01:23:06.200043100 +0000
@@ -491,7 +491,7 @@
       Vec3d lv = hit.getPos();
       if (!lv.withinRange(pos, range)) {
          Vec3d lv2 = hit.getPos();
-         Direction lv3 = Direction.m_aceixrsp(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
+         Direction lv3 = Direction.getFacing(lv2.x - pos.x, lv2.y - pos.y, lv2.z - pos.z);
          return BlockHitResult.createMissed(lv2, lv3, BlockPos.fromPosition(lv2));
       } else {
          return hit;
diff -bur namedTargetSrc/net/minecraft/client/render/model/BakedQuadFactory.java namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java
--- namedTargetSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-15 01:24:16.268922677 +0000
+++ namedSrc/net/minecraft/client/render/model/BakedQuadFactory.java	2024-10-15 01:23:06.180042848 +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-15 01:24:16.432924737 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-10-15 01:23:06.384045414 +0000
@@ -536,7 +536,7 @@
       Entity lv = this.getEntityLookup().get(entityId);
       if (lv != null) {
          lv.setRemoved(removalReason);
-         lv.onRemoved();
+         lv.onRemovedClient();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorReader.java namedSrc/net/minecraft/command/EntitySelectorReader.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-15 01:24:16.464925138 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorReader.java	2024-10-15 01:23:06.416045816 +0000
@@ -430,11 +430,11 @@
     */
    private void buildPredicate() {
       if (this.pitchRange != FloatRangeArgument.ANY) {
-         this.predicates.add(this.rotationPredicate(this.pitchRange, Entity::m_ahrprint));
+         this.predicates.add(this.rotationPredicate(this.pitchRange, Entity::getPitch));
       }
 
       if (this.yawRange != FloatRangeArgument.ANY) {
-         this.predicates.add(this.rotationPredicate(this.yawRange, Entity::m_ndosmusf));
+         this.predicates.add(this.rotationPredicate(this.yawRange, Entity::getYaw));
       }
 
       if (!this.levelRange.isDummy()) {
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-15 01:24:16.468925189 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-10-15 01:23:06.420045867 +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/SummonEntity.java namedSrc/net/minecraft/enchantment/effect/SummonEntity.java
--- namedTargetSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-15 01:24:16.260922577 +0000
+++ namedSrc/net/minecraft/enchantment/effect/SummonEntity.java	2024-10-15 01:23:06.168042698 +0000
@@ -55,7 +55,7 @@
                   world.getScoreboard().addPlayerToTeam(lv2.getProfileName(), entity.getScoreboardTeam());
                }
 
-               lv2.refreshPositionAndAngles(pos.x, pos.y, pos.z, lv2.m_ndosmusf(), lv2.m_ahrprint());
+               lv2.refreshPositionAndAngles(pos.x, pos.y, pos.z, lv2.getYaw(), lv2.getPitch());
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/AttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-15 01:24:16.492925490 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/AttackTask.java	2024-10-15 01:23:06.440046118 +0000
@@ -30,7 +30,7 @@
                      if (lv.isInRange(arg6, (double)distance) && instance.<VisibleLivingEntitiesCache>getValue(arg5).contains(lv)) {
                         arg3.remember(new EntityLookTarget(lv, true));
                         arg6.getMoveControl().strafeTo(-forwardMovement, 0.0F);
-                        arg6.setYaw(MathHelper.stepAngleTowards(arg6.m_ndosmusf(), arg6.headYaw, 0.0F));
+                        arg6.setYaw(MathHelper.stepAngleTowards(arg6.getYaw(), arg6.headYaw, 0.0F));
                         return true;
                      } else {
                         return false;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-15 01:24:16.228922175 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/FarmerWorkTask.java	2024-10-15 01:23:06.120042094 +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/RandomLookAroundTask.java namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-15 01:24:16.412924486 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/RandomLookAroundTask.java	2024-10-15 01:23:06.364045163 +0000
@@ -60,7 +60,7 @@
    protected void run(ServerWorld world, MobEntity arg2, long l) {
       RandomGenerator lv = arg2.getRandom();
       float f = MathHelper.clamp(lv.nextFloat() * this.pitchRange + this.minPitch, -90.0F, 90.0F);
-      float g = MathHelper.wrapDegrees(arg2.m_ndosmusf() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
+      float g = MathHelper.wrapDegrees(arg2.getYaw() + 2.0F * lv.nextFloat() * this.maxYaw - this.maxYaw);
       Vec3d lv2 = Vec3d.fromPolar(f, g);
       arg2.getBrain().remember(MemoryModuleType.LOOK_TARGET, new BlockPosLookTarget(arg2.getEyePos().add(lv2)));
       arg2.getBrain().remember(MemoryModuleType.GAZE_COOLDOWN_TICKS, this.interval.get(lv));
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-10-15 01:24:16.288922929 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-10-15 01:23:06.196043050 +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;
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-15 01:24:16.496925540 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticLookControl.java	2024-10-15 01:23:06.444046169 +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-15 01:24:16.512925741 +0000
+++ namedSrc/net/minecraft/entity/ai/control/AquaticMoveControl.java	2024-10-15 01:23:06.464046420 +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-15 01:24:16.388924184 +0000
+++ namedSrc/net/minecraft/entity/ai/control/BodyControl.java	2024-10-15 01:23:06.332044760 +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-15 01:24:16.332923481 +0000
+++ namedSrc/net/minecraft/entity/ai/control/FlightMoveControl.java	2024-10-15 01:23:06.256043805 +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-15 01:24:16.368923933 +0000
+++ namedSrc/net/minecraft/entity/ai/control/LookControl.java	2024-10-15 01:23:06.308044459 +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);
       }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3):
diff -bur namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java namedSrc/net/minecraft/entity/ai/control/MoveControl.java
--- namedTargetSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-15 01:24:16.356923782 +0000
+++ namedSrc/net/minecraft/entity/ai/control/MoveControl.java	2024-10-15 01:23:06.288044207 +0000
@@ -141,8 +141,8 @@
          j = g / j;
          h *= j;
          i *= j;
-         float k = MathHelper.sin(this.entity.m_ndosmusf() * (float) (Math.PI / 180.0));
-         float l = MathHelper.cos(this.entity.m_ndosmusf() * (float) (Math.PI / 180.0));
+         float k = MathHelper.sin(this.entity.getYaw() * (float) (Math.PI / 180.0));
+         float l = MathHelper.cos(this.entity.getYaw() * (float) (Math.PI / 180.0));
          float m = h * l - i * k;
          float n = i * l + h * k;
          if (!this.isWalkable(m, n)) {
@@ -166,7 +166,7 @@
          }
 
          float q = (float)(MathHelper.atan2(e, d) * 180.0F / (float)Math.PI) - 90.0F;
-         this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), q, 90.0F));
+         this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), q, 90.0F));
          this.entity.setMovementSpeed((float)(this.speed * this.entity.getAttributeValue(EntityAttributes.MOVEMENT_SPEED)));
          BlockPos lv = this.entity.getBlockPos();
          BlockState lv2 = this.entity.getWorld().getBlockState(lv);
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-10-15 01:24:16.348923682 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/ChaseBoatGoal.java	2024-10-15 01:23:06.272044006 +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-15 01:24:16.404924385 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/DolphinJumpGoal.java	2024-10-15 01:23:06.352045011 +0000
@@ -91,7 +91,7 @@
    @Override
    public boolean shouldContinue() {
       double d = this.dolphin.getVelocity().y;
-      return (!(d * d < 0.03F) || this.dolphin.m_ahrprint() == 0.0F || !(Math.abs(this.dolphin.m_ahrprint()) < 10.0F) || !this.dolphin.isTouchingWater())
+      return (!(d * d < 0.03F) || this.dolphin.getPitch() == 0.0F || !(Math.abs(this.dolphin.getPitch()) < 10.0F) || !this.dolphin.isTouchingWater())
          && !this.dolphin.isOnGround();
    }
 
@@ -137,8 +137,8 @@
       }
 
       Vec3d lv2 = this.dolphin.getVelocity();
-      if (lv2.y * lv2.y < 0.03F && this.dolphin.m_ahrprint() != 0.0F) {
-         this.dolphin.setPitch(MathHelper.lerpDegrees(0.2F, this.dolphin.m_ahrprint(), 0.0F));
+      if (lv2.y * lv2.y < 0.03F && this.dolphin.getPitch() != 0.0F) {
+         this.dolphin.setPitch(MathHelper.lerpDegrees(0.2F, this.dolphin.getPitch(), 0.0F));
       } else if (lv2.length() > 1.0E-5F) {
          double d = lv2.horizontalLength();
          double e = Math.atan2(-lv2.y, d) * 180.0F / (float)Math.PI;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/TemptGoal.java namedSrc/net/minecraft/entity/ai/goal/TemptGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/TemptGoal.java	2024-10-15 01:24:16.388924184 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/TemptGoal.java	2024-10-15 01:23:06.332044760 +0000
@@ -133,8 +133,8 @@
                return false;
             }
 
-            if (Math.abs((double)this.closestPlayer.m_ahrprint() - this.lastPlayerPitch) > 5.0
-               || Math.abs((double)this.closestPlayer.m_ndosmusf() - this.lastPlayerYaw) > 5.0) {
+            if (Math.abs((double)this.closestPlayer.getPitch() - this.lastPlayerPitch) > 5.0
+               || Math.abs((double)this.closestPlayer.getYaw() - this.lastPlayerYaw) > 5.0) {
                return false;
             }
          } else {
@@ -143,8 +143,8 @@
             this.lastPlayerZ = this.closestPlayer.getZ();
          }
 
-         this.lastPlayerPitch = (double)this.closestPlayer.m_ahrprint();
-         this.lastPlayerYaw = (double)this.closestPlayer.m_ndosmusf();
+         this.lastPlayerPitch = (double)this.closestPlayer.getPitch();
+         this.lastPlayerYaw = (double)this.closestPlayer.getYaw();
       }
 
       return this.canStart();
diff -bur namedTargetSrc/net/minecraft/entity/AnimationState.java namedSrc/net/minecraft/entity/AnimationState.java
--- namedTargetSrc/net/minecraft/entity/AnimationState.java	2024-10-15 01:24:16.288922929 +0000
+++ namedSrc/net/minecraft/entity/AnimationState.java	2024-10-15 01:23:06.200043100 +0000
@@ -9,20 +9,21 @@
 public class AnimationState {
    /**
     * @mapping {@literal hashed f_mynxnfft Lnet/minecraft/unmapped/C_kxntavoz;f_mynxnfft:I}
-    * @mapping {@literal named INVALID_TIME Lnet/minecraft/entity/AnimationState;INVALID_TIME:I}
+    * @mapping {@literal named STOPPED Lnet/minecraft/entity/AnimationState;STOPPED:I}
     */
-   private static final int INVALID_TIME = Integer.MIN_VALUE;
+   private static final int STOPPED = Integer.MIN_VALUE;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_slrycntl Lnet/minecraft/unmapped/C_kxntavoz;f_slrycntl:I}
+    * @mapping {@literal named startTick Lnet/minecraft/entity/AnimationState;startTick:I}
     */
-   private int f_slrycntl = Integer.MIN_VALUE;
+   private int startTick = Integer.MIN_VALUE;
 
    /**
     * @mapping {@literal hashed m_nbtuouwc Lnet/minecraft/unmapped/C_kxntavoz;m_nbtuouwc(I)V}
     * @mapping {@literal named restart Lnet/minecraft/entity/AnimationState;restart(I)V}
     */
    public void restart(int start) {
-      this.f_slrycntl = start;
+      this.startTick = start;
    }
 
    /**
@@ -52,7 +53,7 @@
     * @mapping {@literal named stop Lnet/minecraft/entity/AnimationState;stop()V}
     */
    public void stop() {
-      this.f_slrycntl = Integer.MIN_VALUE;
+      this.startTick = Integer.MIN_VALUE;
    }
 
    /**
@@ -71,15 +72,16 @@
     */
    public void fastForward(int seconds, float speedMultiplier) {
       if (this.isAnimating()) {
-         this.f_slrycntl -= (int)((float)seconds * speedMultiplier);
+         this.startTick -= (int)((float)seconds * speedMultiplier);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hbqomwtk Lnet/minecraft/unmapped/C_kxntavoz;m_hbqomwtk(F)J}
+    * @mapping {@literal named getTimeMillis Lnet/minecraft/entity/AnimationState;getTimeMillis(F)J}
     */
-   public long m_hbqomwtk(float f) {
-      float g = f - (float)this.f_slrycntl;
+   public long getTimeMillis(float ticks) {
+      float g = ticks - (float)this.startTick;
       return (long)(g * 50.0F);
    }
 
@@ -88,13 +90,14 @@
     * @mapping {@literal named isAnimating Lnet/minecraft/entity/AnimationState;isAnimating()Z}
     */
    public boolean isAnimating() {
-      return this.f_slrycntl != Integer.MIN_VALUE;
+      return this.startTick != Integer.MIN_VALUE;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fjeaaddd Lnet/minecraft/unmapped/C_kxntavoz;m_fjeaaddd(Lnet/minecraft/unmapped/C_kxntavoz;)V}
+    * @mapping {@literal named copyFrom Lnet/minecraft/entity/AnimationState;copyFrom(Lnet/minecraft/entity/AnimationState;)V}
     */
-   public void m_fjeaaddd(AnimationState arg) {
-      this.f_slrycntl = arg.f_slrycntl;
+   public void copyFrom(AnimationState state) {
+      this.startTick = state.startTick;
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-10-15 01:24:16.256922527 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/EnderDragonEntity.java	2024-10-15 01:23:06.164042647 +0000
@@ -367,11 +367,11 @@
             this.wingPosition += i;
          }
 
-         this.setYaw(MathHelper.wrapDegrees(this.m_ndosmusf()));
+         this.setYaw(MathHelper.wrapDegrees(this.getYaw()));
          if (this.isAiDisabled()) {
             this.wingPosition = 0.5F;
          } else {
-            this.f_vhinbehd.m_yqwgsyyn(this.getY(), this.m_ndosmusf());
+            this.f_vhinbehd.m_yqwgsyyn(this.getY(), this.getYaw());
             if (this.getWorld() instanceof ServerWorld lv4) {
                Phase lv6 = this.phaseManager.getCurrent();
                lv6.serverTick(lv4);
@@ -393,22 +393,22 @@
                   }
 
                   this.setVelocity(this.getVelocity().add(0.0, e * 0.01, 0.0));
-                  this.setYaw(MathHelper.wrapDegrees(this.m_ndosmusf()));
+                  this.setYaw(MathHelper.wrapDegrees(this.getYaw()));
                   Vec3d lv8 = lv7.subtract(this.getX(), this.getY(), this.getZ()).normalize();
                   Vec3d lv9 = new Vec3d(
-                        (double)MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0)),
+                        (double)MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0)),
                         this.getVelocity().y,
-                        (double)(-MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0)))
+                        (double)(-MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0)))
                      )
                      .normalize();
                   float n = Math.max(((float)lv9.dotProduct(lv8) + 0.5F) / 1.5F, 0.0F);
                   if (Math.abs(d) > 1.0E-5F || Math.abs(j) > 1.0E-5F) {
                      float o = MathHelper.clamp(
-                        MathHelper.wrapDegrees(180.0F - (float)MathHelper.atan2(d, j) * (180.0F / (float)Math.PI) - this.m_ndosmusf()), -50.0F, 50.0F
+                        MathHelper.wrapDegrees(180.0F - (float)MathHelper.atan2(d, j) * (180.0F / (float)Math.PI) - this.getYaw()), -50.0F, 50.0F
                      );
                      this.yawAcceleration *= 0.8F;
                      this.yawAcceleration = this.yawAcceleration + o * lv6.getYawAcceleration();
-                     this.setYaw(this.m_ndosmusf() + this.yawAcceleration * 0.1F);
+                     this.setYaw(this.getYaw() + this.yawAcceleration * 0.1F);
                   }
 
                   float p = (float)(2.0 / (k + 1.0));
@@ -437,7 +437,7 @@
                this.m_hwaiduvv();
             }
 
-            this.bodyYaw = this.m_ndosmusf();
+            this.bodyYaw = this.getYaw();
             Vec3d[] lvs = new Vec3d[this.parts.length];
 
             for (int s = 0; s < this.parts.length; s++) {
@@ -447,7 +447,7 @@
             float t = (float)(this.f_vhinbehd.m_ksknxywx(5).y() - this.f_vhinbehd.m_ksknxywx(10).y()) * 10.0F * (float) (Math.PI / 180.0);
             float u = MathHelper.cos(t);
             float v = MathHelper.sin(t);
-            float w = this.m_ndosmusf() * (float) (Math.PI / 180.0);
+            float w = this.getYaw() * (float) (Math.PI / 180.0);
             float x = MathHelper.sin(w);
             float y = MathHelper.cos(w);
             this.movePart(this.body, (double)(x * 0.5F), 0.0, (double)(-y * 0.5F));
@@ -470,8 +470,8 @@
                this.m_hubnvizl(lv11, lv11.getOtherEntities(this, this.neck.getBounds().expand(1.0), EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR));
             }
 
-            float z = MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
-            float aa = MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
+            float z = MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
+            float aa = MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0) - this.yawAcceleration * 0.01F);
             float ab = this.getHeadVerticalMovement();
             this.movePart(this.head, (double)(z * 6.5F * u), (double)(ab + v * 6.5F), (double)(-aa * 6.5F * u));
             this.movePart(this.neck, (double)(z * 5.5F * u), (double)(ab + v * 5.5F), (double)(-aa * 5.5F * u));
@@ -492,7 +492,7 @@
                }
 
                C_iozihrig.C_oggeyhcs lv14 = this.f_vhinbehd.m_ksknxywx(12 + ac * 2);
-               float ad = this.m_ndosmusf() * (float) (Math.PI / 180.0) + this.wrapYawChange((double)(lv14.yRot() - lv12.yRot())) * (float) (Math.PI / 180.0);
+               float ad = this.getYaw() * (float) (Math.PI / 180.0) + this.wrapYawChange((double)(lv14.yRot() - lv12.yRot())) * (float) (Math.PI / 180.0);
                float ae = MathHelper.sin(ad);
                float af = MathHelper.cos(ad);
                float ag = 1.5F;
@@ -1061,13 +1061,13 @@
          BlockPos lv3 = this.getWorld().getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, EndPortalFeature.offsetFightOrigin(this.fightOrigin));
          float g = Math.max((float)Math.sqrt(lv3.getSquaredDistanceToCenter(this.getPos())) / 4.0F, 1.0F);
          float h = 6.0F / g;
-         float i = this.m_ahrprint();
+         float i = this.getPitch();
          float j = 1.5F;
          this.setPitch(-h * 1.5F * 5.0F);
          lv4 = this.getRotationVec(tickDelta);
          this.setPitch(i);
       } else if (lv.isSittingOrHovering()) {
-         float k = this.m_ahrprint();
+         float k = this.getPitch();
          float l = 1.5F;
          this.setPitch(-45.0F);
          lv4 = this.getRotationVec(tickDelta);
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java	2024-10-15 01:24:16.388924184 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.java	2024-10-15 01:23:06.332044760 +0000
@@ -72,9 +72,9 @@
          } else {
             Vec3d lv2 = new Vec3d(lv.getX() - this.dragon.getX(), 0.0, lv.getZ() - this.dragon.getZ()).normalize();
             Vec3d lv3 = new Vec3d(
-                  (double)MathHelper.sin(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)),
+                  (double)MathHelper.sin(this.dragon.getYaw() * (float) (Math.PI / 180.0)),
                   0.0,
-                  (double)(-MathHelper.cos(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)))
+                  (double)(-MathHelper.cos(this.dragon.getYaw() * (float) (Math.PI / 180.0)))
                )
                .normalize();
             float f = (float)lv3.dotProduct(lv2);
@@ -83,7 +83,7 @@
                double d = lv.getX() - this.dragon.head.getX();
                double e = lv.getZ() - this.dragon.head.getZ();
                double h = MathHelper.clamp(
-                  MathHelper.wrapDegrees(180.0 - MathHelper.atan2(d, e) * 180.0F / (float)Math.PI - (double)this.dragon.m_ndosmusf()), -100.0, 100.0
+                  MathHelper.wrapDegrees(180.0 - MathHelper.atan2(d, e) * 180.0F / (float)Math.PI - (double)this.dragon.getYaw()), -100.0, 100.0
                );
                this.dragon.yawAcceleration *= 0.8F;
                float i = (float)Math.sqrt(d * d + e * e) + 1.0F;
@@ -93,7 +93,7 @@
                }
 
                this.dragon.yawAcceleration += (float)h * (0.7F / i / j);
-               this.dragon.setYaw(this.dragon.m_ndosmusf() + this.dragon.yawAcceleration);
+               this.dragon.setYaw(this.dragon.getYaw() + this.dragon.yawAcceleration);
             }
          }
       } else if (this.ticks >= 100) {
diff -bur namedTargetSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java
--- namedTargetSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-10-15 01:24:16.396924285 +0000
+++ namedSrc/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.java	2024-10-15 01:23:06.344044911 +0000
@@ -96,9 +96,9 @@
                this.seenTargetTimes++;
                Vec3d lv = new Vec3d(this.target.getX() - this.dragon.getX(), 0.0, this.target.getZ() - this.dragon.getZ()).normalize();
                Vec3d lv2 = new Vec3d(
-                     (double)MathHelper.sin(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)),
+                     (double)MathHelper.sin(this.dragon.getYaw() * (float) (Math.PI / 180.0)),
                      0.0,
-                     (double)(-MathHelper.cos(this.dragon.m_ndosmusf() * (float) (Math.PI / 180.0)))
+                     (double)(-MathHelper.cos(this.dragon.getYaw() * (float) (Math.PI / 180.0)))
                   )
                   .normalize();
                float l = (float)lv2.dotProduct(lv);
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-15 01:24:16.276922778 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-10-15 01:23:06.184042899 +0000
@@ -633,7 +633,7 @@
    @Override
    protected void dropCustomLoot(ServerWorld world, DamageSource source, boolean playerKill) {
       super.dropCustomLoot(world, source, playerKill);
-      ItemEntity lv = this.m_xrhuexzc(world, Items.NETHER_STAR);
+      ItemEntity lv = this.dropStack(world, Items.NETHER_STAR);
       if (lv != null) {
          lv.setCovetedItem();
       }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-10-15 01:24:16.504925641 +0000
+++ namedSrc/net/minecraft/entity/decoration/AbstractDecorationEntity.java	2024-10-15 01:23:06.456046319 +0000
@@ -61,7 +61,7 @@
       Validate.isTrue(facing.getAxis().isHorizontal());
       this.facing = facing;
       this.setYaw((float)(this.facing.getHorizontal() * 90));
-      this.prevYaw = this.m_ndosmusf();
+      this.prevYaw = this.getYaw();
       this.updateBoundingBox();
    }
 
@@ -123,15 +123,14 @@
    public abstract void onPlace();
 
    /**
-    * @mapping {@literal hashed m_bxezczwg Lnet/minecraft/unmapped/C_jkvbjfnw;m_bxezczwg(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_bxezczwg Lnet/minecraft/entity/decoration/AbstractDecorationEntity;m_bxezczwg(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;}
+    * Mapping not found
     */
    @Override
-   public ItemEntity m_bxezczwg(ServerWorld world, ItemStack stack, float f) {
+   public ItemEntity dropStack(ServerWorld world, ItemStack stack, float yOffset) {
       ItemEntity lv = new ItemEntity(
          this.getWorld(),
          this.getX() + (double)((float)this.facing.getOffsetX() * 0.15F),
-         this.getY() + (double)f,
+         this.getY() + (double)yOffset,
          this.getZ() + (double)((float)this.facing.getOffsetZ() * 0.15F),
          stack
       );
@@ -158,7 +157,7 @@
          }
       }
 
-      float f = MathHelper.wrapDegrees(this.m_ndosmusf());
+      float f = MathHelper.wrapDegrees(this.getYaw());
 
       return switch (rotation) {
          case CLOCKWISE_180 -> f + 180.0F;
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-15 01:24:16.404924385 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-10-15 01:23:06.348044961 +0000
@@ -403,9 +403,9 @@
       nbt.put("HandItems", lv3);
       nbt.putBoolean("Invisible", this.isInvisible());
       nbt.putBoolean("Small", this.isSmall());
-      nbt.putBoolean("ShowArms", this.m_fjamjtjb());
+      nbt.putBoolean("ShowArms", this.showsArms());
       nbt.putInt("DisabledSlots", this.disabledSlots);
-      nbt.putBoolean("NoBasePlate", !this.m_kruazguc());
+      nbt.putBoolean("NoBasePlate", !this.showsBasePlate());
       if (this.isMarker()) {
          nbt.putBoolean("Marker", this.isMarker());
       }
@@ -552,7 +552,7 @@
                return ActionResult.FAIL;
             }
 
-            if (lv2.getType() == EquipmentSlot.Type.HAND && !this.m_fjamjtjb()) {
+            if (lv2.getType() == EquipmentSlot.Type.HAND && !this.showsArms()) {
                return ActionResult.FAIL;
             }
 
@@ -594,7 +594,7 @@
     * @mapping {@literal named isSlotDisabled Lnet/minecraft/entity/decoration/ArmorStandEntity;isSlotDisabled(Lnet/minecraft/entity/EquipmentSlot;)Z}
     */
    private boolean isSlotDisabled(EquipmentSlot slot) {
-      return (this.disabledSlots & 1 << slot.m_jjdtlure(0)) != 0 || slot.getType() == EquipmentSlot.Type.HAND && !this.m_fjamjtjb();
+      return (this.disabledSlots & 1 << slot.offsetId(0)) != 0 || slot.getType() == EquipmentSlot.Type.HAND && !this.showsArms();
    }
 
    /**
@@ -603,9 +603,9 @@
     */
    private boolean equip(PlayerEntity player, EquipmentSlot slot, ItemStack stack, Hand hand) {
       ItemStack lv = this.getEquippedStack(slot);
-      if (!lv.isEmpty() && (this.disabledSlots & 1 << slot.m_jjdtlure(8)) != 0) {
+      if (!lv.isEmpty() && (this.disabledSlots & 1 << slot.offsetId(8)) != 0) {
          return false;
-      } else if (lv.isEmpty() && (this.disabledSlots & 1 << slot.m_jjdtlure(16)) != 0) {
+      } else if (lv.isEmpty() && (this.disabledSlots & 1 << slot.offsetId(16)) != 0) {
          return false;
       } else if (player.isInCreativeMode() && lv.isEmpty() && !stack.isEmpty()) {
          this.equipStack(slot, stack.copyWithCount(1));
@@ -801,7 +801,7 @@
    @Override
    protected float turnHead(float bodyRotation, float headRotation) {
       this.prevBodyYaw = this.prevYaw;
-      this.bodyYaw = this.m_ndosmusf();
+      this.bodyYaw = this.getYaw();
       return 0.0F;
    }
 
@@ -953,9 +953,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fjamjtjb Lnet/minecraft/unmapped/C_nknvrhfn;m_fjamjtjb()Z}
+    * @mapping {@literal named showsArms Lnet/minecraft/entity/decoration/ArmorStandEntity;showsArms()Z}
     */
-   public boolean m_fjamjtjb() {
+   public boolean showsArms() {
       return (this.dataTracker.get(ARMOR_STAND_FLAGS) & 4) != 0;
    }
 
@@ -968,9 +969,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kruazguc Lnet/minecraft/unmapped/C_nknvrhfn;m_kruazguc()Z}
+    * @mapping {@literal named showsBasePlate Lnet/minecraft/entity/decoration/ArmorStandEntity;showsBasePlate()Z}
     */
-   public boolean m_kruazguc() {
+   public boolean showsBasePlate() {
       return (this.dataTracker.get(ARMOR_STAND_FLAGS) & 8) == 0;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java namedSrc/net/minecraft/entity/decoration/DisplayEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-10-15 01:24:16.260922577 +0000
+++ namedSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-10-15 01:23:06.164042647 +0000
@@ -554,7 +554,7 @@
     */
    @Override
    public float getLerpTargetPitch() {
-      return this.interpolationTarget != null ? (float)this.interpolationTarget.pitch : this.m_ahrprint();
+      return this.interpolationTarget != null ? (float)this.interpolationTarget.pitch : this.getPitch();
    }
 
    /**
@@ -562,7 +562,7 @@
     */
    @Override
    public float getLerpTargetYaw() {
-      return this.interpolationTarget != null ? (float)this.interpolationTarget.yaw : this.m_ndosmusf();
+      return this.interpolationTarget != null ? (float)this.interpolationTarget.yaw : this.getYaw();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-10-15 01:24:16.304923130 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-10-15 01:23:06.224043402 +0000
@@ -136,8 +136,8 @@
          this.setYaw(0.0F);
       }
 
-      this.prevPitch = this.m_ahrprint();
-      this.prevYaw = this.m_ndosmusf();
+      this.prevPitch = this.getPitch();
+      this.prevYaw = this.getYaw();
       this.updateBoundingBox();
    }
 
@@ -316,14 +316,14 @@
             }
 
             if (bl) {
-               this.m_bujlfnum(world, this.getAsItemStack());
+               this.dropStack(world, this.getAsItemStack());
             }
 
             if (!lv.isEmpty()) {
                lv = lv.copy();
                this.removeFromFrame(lv);
                if (this.random.nextFloat() < this.itemDropChance) {
-                  this.m_bujlfnum(world, lv);
+                  this.dropStack(world, lv);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-10-15 01:24:16.244922376 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-10-15 01:23:06.140042345 +0000
@@ -224,7 +224,7 @@
             return;
          }
 
-         this.m_xrhuexzc(world, Items.PAINTING);
+         this.dropStack(world, Items.PAINTING);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-10-15 01:24:16.440924837 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-10-15 01:23:06.392045514 +0000
@@ -46,6 +46,7 @@
 import net.minecraft.entity.data.TrackedDataHolder;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.inventory.StackReference;
@@ -93,7 +94,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_crougwaz;
 import net.minecraft.unmapped.C_dxakxzow;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_sqhjwpkh;
 import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
@@ -686,17 +686,20 @@
    @Nullable
    private BlockState state = null;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lwsftgrz Lnet/minecraft/unmapped/C_astfners;f_lwsftgrz:Ljava/util/List;}
+    * @mapping {@literal named queuedCollisionChecks Lnet/minecraft/entity/Entity;queuedCollisionChecks:Ljava/util/List;}
     */
-   private final List<Entity.C_aipuagbw> f_lwsftgrz = new ArrayList();
+   private final List<Entity.Movement> queuedCollisionChecks = new ArrayList();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ujgsyoqm Lnet/minecraft/unmapped/C_astfners;f_ujgsyoqm:Ljava/util/Set;}
+    * @mapping {@literal named collidingBlocks Lnet/minecraft/entity/Entity;collidingBlocks:Ljava/util/Set;}
     */
-   private final Set<BlockState> f_ujgsyoqm = new ReferenceArraySet<>();
+   private final Set<BlockState> collidingBlocks = new ReferenceArraySet<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qckvmvwz Lnet/minecraft/unmapped/C_astfners;f_qckvmvwz:Lit/unimi/dsi/fastutil/longs/LongSet;}
+    * @mapping {@literal named collidingBlockPositions Lnet/minecraft/entity/Entity;collidingBlockPositions:Lit/unimi/dsi/fastutil/longs/LongSet;}
     */
-   private final LongSet f_qckvmvwz = new LongOpenHashSet();
+   private final LongSet collidingBlockPositions = new LongOpenHashSet();
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_astfners;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
@@ -730,7 +733,7 @@
     */
    public boolean collidesWithStateAtPos(BlockPos pos, BlockState state) {
       VoxelShape lv = state.getCollisionShape(this.getWorld(), pos, ShapeContext.of(this));
-      VoxelShape lv2 = lv.m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
+      VoxelShape lv2 = lv.offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
       return VoxelShapes.matchesAnywhere(lv2, VoxelShapes.cuboid(this.getBounds()), BooleanBiFunction.AND);
    }
 
@@ -896,15 +899,16 @@
 
    /**
     * @mapping {@literal hashed m_bjibgujk Lnet/minecraft/unmapped/C_astfners;m_bjibgujk()V}
-    * @mapping {@literal named onRemoved Lnet/minecraft/entity/Entity;onRemoved()V}
+    * @mapping {@literal named onRemovedClient Lnet/minecraft/entity/Entity;onRemovedClient()V}
     */
-   public void onRemoved() {
+   public void onRemovedClient() {
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gbjymqob Lnet/minecraft/unmapped/C_astfners;m_gbjymqob(Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V}
+    * @mapping {@literal named onRemoved Lnet/minecraft/entity/Entity;onRemoved(Lnet/minecraft/entity/Entity$RemovalReason;)V}
     */
-   public void m_gbjymqob(Entity.RemovalReason arg) {
+   public void onRemoved(Entity.RemovalReason reason) {
    }
 
    /**
@@ -999,9 +1003,9 @@
    public void changeLookDirection(double cursorDeltaX, double cursorDeltaY) {
       float f = (float)cursorDeltaY * 0.15F;
       float g = (float)cursorDeltaX * 0.15F;
-      this.setPitch(this.m_ahrprint() + f);
-      this.setYaw(this.m_ndosmusf() + g);
-      this.setPitch(MathHelper.clamp(this.m_ahrprint(), -90.0F, 90.0F));
+      this.setPitch(this.getPitch() + f);
+      this.setYaw(this.getYaw() + g);
+      this.setPitch(MathHelper.clamp(this.getPitch(), -90.0F, 90.0F));
       this.prevPitch += f;
       this.prevYaw += g;
       this.prevPitch = MathHelper.clamp(this.prevPitch, -90.0F, 90.0F);
@@ -1456,11 +1460,11 @@
             lv2.getBlock().onSteppedOn(this.getWorld(), lv, lv2, this);
          }
 
-         this.f_lwsftgrz.add(new Entity.C_aipuagbw(arg, arg2));
-         this.m_wmrqudhe(this.f_lwsftgrz, this.f_ujgsyoqm);
-         boolean bl = Iterables.any(this.f_ujgsyoqm, state -> state.isIn(BlockTags.FIRE) || state.isOf(Blocks.LAVA));
-         this.f_lwsftgrz.clear();
-         this.f_ujgsyoqm.clear();
+         this.queuedCollisionChecks.add(new Entity.Movement(arg, arg2));
+         this.m_wmrqudhe(this.queuedCollisionChecks, this.collidingBlocks);
+         boolean bl = Iterables.any(this.collidingBlocks, state -> state.isIn(BlockTags.FIRE) || state.isOf(Blocks.LAVA));
+         this.queuedCollisionChecks.clear();
+         this.collidingBlocks.clear();
          if (!bl && this.isAlive()) {
             if (this.fireTicks <= 0) {
                this.setFireTicks(-this.getBurningDuration());
@@ -1851,21 +1855,21 @@
 
    /**
     * @mapping {@literal hashed m_xxnsgkmf Lnet/minecraft/unmapped/C_astfners;m_xxnsgkmf(Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)V}
-    * @mapping {@literal named m_xxnsgkmf Lnet/minecraft/entity/Entity;m_xxnsgkmf(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;)V}
+    * @mapping {@literal named queueCollisionCheck Lnet/minecraft/entity/Entity;queueCollisionCheck(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;)V}
     */
-   public void m_xxnsgkmf(Vec3d from, Vec3d to) {
-      this.f_lwsftgrz.add(new Entity.C_aipuagbw(from, to));
+   public void queueCollisionCheck(Vec3d from, Vec3d to) {
+      this.queuedCollisionChecks.add(new Entity.Movement(from, to));
    }
 
    /**
     * Mapping not found
     */
-   private void m_wmrqudhe(List<Entity.C_aipuagbw> list, Set<BlockState> set) {
+   private void m_wmrqudhe(List<Entity.Movement> list, Set<BlockState> set) {
       if (this.m_iybimkec()) {
          Box lv = this.getBounds().contract(1.0E-5F);
-         LongSet longSet = this.f_qckvmvwz;
+         LongSet longSet = this.collidingBlockPositions;
 
-         for (Entity.C_aipuagbw lv2 : list) {
+         for (Entity.Movement lv2 : list) {
             Vec3d lv3 = lv2.from();
             Vec3d lv4 = lv2.to();
 
@@ -1909,7 +1913,7 @@
    private boolean m_ksoidzkr(Vec3d arg, Vec3d vec, BlockPos pos, VoxelShape arg4) {
       Box lv = this.getBounds().offset(this.getBounds().getCenter().multiply(-1.0)).offset(vec);
       Vec3d lv2 = arg.subtract(lv.m_zpsbullj());
-      return this.getBounds().m_qikitayk(lv2, arg4.m_afxwtvim(new Vec3d(pos)).getBoundingBoxes());
+      return this.getBounds().m_qikitayk(lv2, arg4.offset(new Vec3d(pos)).getBoundingBoxes());
    }
 
    /**
@@ -2332,7 +2336,7 @@
     * @mapping {@literal named checkWaterState Lnet/minecraft/entity/Entity;checkWaterState()V}
     */
    void checkWaterState() {
-      if (this.getVehicle() instanceof C_sfpofsgc lv && !lv.isSubmergedInWater()) {
+      if (this.getVehicle() instanceof AbstractBoatEntity lv && !lv.isSubmergedInWater()) {
          this.touchingWater = false;
          return;
       }
@@ -2358,7 +2362,7 @@
       this.submergedInWater = this.isSubmergedIn(FluidTags.WATER);
       this.submergedFluidTag.clear();
       double d = this.getEyeY();
-      if (this.getVehicle() instanceof C_sfpofsgc lv2 && !lv2.isSubmergedInWater() && lv2.getBounds().maxY >= d && lv2.getBounds().minY <= d) {
+      if (this.getVehicle() instanceof AbstractBoatEntity lv2 && !lv2.isSubmergedInWater() && lv2.getBounds().maxY >= d && lv2.getBounds().minY <= d) {
          return;
       }
 
@@ -2473,7 +2477,7 @@
     * @mapping {@literal named updateVelocity Lnet/minecraft/entity/Entity;updateVelocity(FLnet/minecraft/util/math/Vec3d;)V}
     */
    public void updateVelocity(float speed, Vec3d movementInput) {
-      Vec3d lv = movementInputToVelocity(movementInput, speed, this.m_ndosmusf());
+      Vec3d lv = movementInputToVelocity(movementInput, speed, this.getYaw());
       this.setVelocity(this.getVelocity().add(lv));
    }
 
@@ -2520,8 +2524,8 @@
    public void setAngles(float yaw, float pitch) {
       this.setYaw(yaw % 360.0F);
       this.setPitch(MathHelper.clamp(pitch, -90.0F, 90.0F) % 360.0F);
-      this.prevYaw = this.m_ndosmusf();
-      this.prevPitch = this.m_ahrprint();
+      this.prevYaw = this.getYaw();
+      this.prevPitch = this.getPitch();
    }
 
    /**
@@ -2550,7 +2554,7 @@
     * @mapping {@literal named refreshPositionAfterTeleport Lnet/minecraft/entity/Entity;refreshPositionAfterTeleport(DDD)V}
     */
    public void refreshPositionAfterTeleport(double x, double y, double z) {
-      this.refreshPositionAndAngles(x, y, z, this.m_ndosmusf(), this.m_ahrprint());
+      this.refreshPositionAndAngles(x, y, z, this.getYaw(), this.getPitch());
    }
 
    /**
@@ -2608,7 +2612,7 @@
     * Mapping not found
     */
    public void m_kashyvjh() {
-      this.m_zskfvtfy(this.m_ndosmusf(), this.m_ahrprint());
+      this.m_zskfvtfy(this.getYaw(), this.getPitch());
    }
 
    /**
@@ -2788,7 +2792,7 @@
     * @mapping {@literal named getFacing Lnet/minecraft/entity/Entity;getFacing()Lnet/minecraft/util/math/Direction;}
     */
    public Direction getFacing() {
-      return Direction.m_icbobqmt(this.getRotationVec(1.0F));
+      return Direction.getFacing(this.getRotationVec(1.0F));
    }
 
    /**
@@ -2812,7 +2816,7 @@
     * @mapping {@literal named m_beudeczo Lnet/minecraft/entity/Entity;m_beudeczo(F)F}
     */
    public float m_beudeczo(float delta) {
-      return delta == 1.0F ? this.m_ahrprint() : MathHelper.lerp(delta, this.prevPitch, this.m_ahrprint());
+      return delta == 1.0F ? this.getPitch() : MathHelper.lerp(delta, this.prevPitch, this.getPitch());
    }
 
    /**
@@ -2820,7 +2824,7 @@
     * @mapping {@literal named m_stcixbth Lnet/minecraft/entity/Entity;m_stcixbth(F)F}
     */
    public float m_stcixbth(float delta) {
-      return delta == 1.0F ? this.m_ndosmusf() : MathHelper.lerpDegrees(delta, this.prevYaw, this.m_ndosmusf());
+      return delta == 1.0F ? this.getYaw() : MathHelper.lerpDegrees(delta, this.prevYaw, this.getYaw());
    }
 
    /**
@@ -3008,7 +3012,7 @@
 
          Vec3d lv = this.getVelocity();
          nbt.put("Motion", this.toNbtList(lv.x, lv.y, lv.z));
-         nbt.put("Rotation", this.toNbtList(this.m_ndosmusf(), this.m_ahrprint()));
+         nbt.put("Rotation", this.toNbtList(this.getYaw(), this.getPitch()));
          nbt.putFloat("FallDistance", this.fallDistance);
          nbt.putShort("Fire", (short)this.fireTicks);
          nbt.putShort("Air", (short)this.getAir());
@@ -3104,8 +3108,8 @@
          this.setYaw(lv3.getFloat(0));
          this.setPitch(lv3.getFloat(1));
          this.m_hhwtkfxu();
-         this.setHeadYaw(this.m_ndosmusf());
-         this.setBodyYaw(this.m_ndosmusf());
+         this.setHeadYaw(this.getYaw());
+         this.setBodyYaw(this.getYaw());
          this.fallDistance = nbt.getFloat("FallDistance");
          this.fireTicks = nbt.getShort("Fire");
          if (nbt.contains("Air")) {
@@ -3122,9 +3126,9 @@
 
          if (!Double.isFinite(this.getX()) || !Double.isFinite(this.getY()) || !Double.isFinite(this.getZ())) {
             throw new IllegalStateException("Entity has invalid position");
-         } else if (Double.isFinite((double)this.m_ndosmusf()) && Double.isFinite((double)this.m_ahrprint())) {
+         } else if (Double.isFinite((double)this.getYaw()) && Double.isFinite((double)this.getPitch())) {
             this.refreshPosition();
-            this.setRotation(this.m_ndosmusf(), this.m_ahrprint());
+            this.setRotation(this.getYaw(), this.getPitch());
             if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
                String string = nbt.getString("CustomName");
 
@@ -3227,41 +3231,41 @@
 
    /**
     * @mapping {@literal hashed m_xrhuexzc Lnet/minecraft/unmapped/C_astfners;m_xrhuexzc(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_xrhuexzc Lnet/minecraft/entity/Entity;m_xrhuexzc(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_xrhuexzc(ServerWorld world, ItemConvertible item) {
-      return this.m_smqilrfl(world, item, 0);
+   public ItemEntity dropStack(ServerWorld world, ItemConvertible item) {
+      return this.dropStack(world, item, 0);
    }
 
    /**
     * @mapping {@literal hashed m_smqilrfl Lnet/minecraft/unmapped/C_astfners;m_smqilrfl(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_gmbqjnle;I)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_smqilrfl Lnet/minecraft/entity/Entity;m_smqilrfl(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_smqilrfl(ServerWorld world, ItemConvertible item, int i) {
-      return this.m_bxezczwg(world, new ItemStack(item), (float)i);
+   public ItemEntity dropStack(ServerWorld world, ItemConvertible item, int yOffset) {
+      return this.dropStack(world, new ItemStack(item), (float)yOffset);
    }
 
    /**
     * @mapping {@literal hashed m_bujlfnum Lnet/minecraft/unmapped/C_astfners;m_bujlfnum(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_bujlfnum Lnet/minecraft/entity/Entity;m_bujlfnum(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_bujlfnum(ServerWorld world, ItemStack stack) {
-      return this.m_bxezczwg(world, stack, 0.0F);
+   public ItemEntity dropStack(ServerWorld world, ItemStack stack) {
+      return this.dropStack(world, stack, 0.0F);
    }
 
    /**
     * @mapping {@literal hashed m_bxezczwg Lnet/minecraft/unmapped/C_astfners;m_bxezczwg(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;F)Lnet/minecraft/unmapped/C_uqpzijng;}
-    * @mapping {@literal named m_bxezczwg Lnet/minecraft/entity/Entity;m_bxezczwg(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;}
+    * @mapping {@literal named dropStack Lnet/minecraft/entity/Entity;dropStack(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;F)Lnet/minecraft/entity/ItemEntity;}
     */
    @Nullable
-   public ItemEntity m_bxezczwg(ServerWorld world, ItemStack stack, float f) {
+   public ItemEntity dropStack(ServerWorld world, ItemStack stack, float yOffset) {
       if (stack.isEmpty()) {
          return null;
       } else {
-         ItemEntity lv = new ItemEntity(world, this.getX(), this.getY() + (double)f, this.getZ(), stack);
+         ItemEntity lv = new ItemEntity(world, this.getX(), this.getY() + (double)yOffset, this.getZ(), stack);
          lv.setToDefaultPickupDelay();
          world.spawnEntity(lv);
          return lv;
@@ -3293,7 +3297,7 @@
                   return !lvx.isAir()
                      && lvx.shouldSuffocate(this.getWorld(), pos)
                      && VoxelShapes.matchesAnywhere(
-                        lvx.getCollisionShape(this.getWorld(), pos).m_nxfuxmhj((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()),
+                        lvx.getCollisionShape(this.getWorld(), pos).offset((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()),
                         VoxelShapes.cuboid(lv),
                         BooleanBiFunction.AND
                      );
@@ -3622,7 +3626,7 @@
     * @mapping {@literal named getLerpTargetPitch Lnet/minecraft/entity/Entity;getLerpTargetPitch()F}
     */
    public float getLerpTargetPitch() {
-      return this.m_ahrprint();
+      return this.getPitch();
    }
 
    /**
@@ -3630,7 +3634,7 @@
     * @mapping {@literal named getLerpTargetYaw Lnet/minecraft/entity/Entity;getLerpTargetYaw()F}
     */
    public float getLerpTargetYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
@@ -3654,7 +3658,7 @@
     * @mapping {@literal named getRotationVector Lnet/minecraft/entity/Entity;getRotationVector()Lnet/minecraft/util/math/Vec3d;}
     */
    public Vec3d getRotationVector() {
-      return this.getRotationVector(this.m_ahrprint(), this.m_ndosmusf());
+      return this.getRotationVector(this.getPitch(), this.getYaw());
    }
 
    /**
@@ -3667,7 +3671,7 @@
       } else {
          boolean bl = lv.getOffHandStack().isOf(item) && !lv.getMainHandStack().isOf(item);
          Arm lv2 = bl ? lv.getMainArm().getOpposite() : lv.getMainArm();
-         return this.getRotationVector(0.0F, this.m_ndosmusf() + (float)(lv2 == Arm.RIGHT ? 80 : -80)).multiply(0.5);
+         return this.getRotationVector(0.0F, this.getYaw() + (float)(lv2 == Arm.RIGHT ? 80 : -80)).multiply(0.5);
       }
    }
 
@@ -3676,7 +3680,7 @@
     * @mapping {@literal named getRotationClient Lnet/minecraft/entity/Entity;getRotationClient()Lnet/minecraft/util/math/Vec2f;}
     */
    public Vec2f getRotationClient() {
-      return new Vec2f(this.m_ahrprint(), this.m_ndosmusf());
+      return new Vec2f(this.getPitch(), this.getYaw());
    }
 
    /**
@@ -4376,7 +4380,7 @@
     * @mapping {@literal named copyPositionAndRotation Lnet/minecraft/entity/Entity;copyPositionAndRotation(Lnet/minecraft/entity/Entity;)V}
     */
    public void copyPositionAndRotation(Entity entity) {
-      this.refreshPositionAndAngles(entity.getX(), entity.getY(), entity.getZ(), entity.m_ndosmusf(), entity.m_ahrprint());
+      this.refreshPositionAndAngles(entity.getX(), entity.getY(), entity.getZ(), entity.getYaw(), entity.getPitch());
    }
 
    /**
@@ -4478,8 +4482,8 @@
     * @mapping {@literal named m_ciiyibaw Lnet/minecraft/entity/Entity;m_ciiyibaw(Lnet/minecraft/unmapped/C_sqhjwpkh;Lnet/minecraft/entity/Entity;)Lnet/minecraft/unmapped/C_sqhjwpkh;}
     */
    private C_sqhjwpkh m_ciiyibaw(C_sqhjwpkh arg, Entity entity) {
-      float f = arg.yRot() + (arg.relatives().contains(C_crougwaz.Y_ROT) ? 0.0F : entity.m_ndosmusf() - this.m_ndosmusf());
-      float g = arg.xRot() + (arg.relatives().contains(C_crougwaz.X_ROT) ? 0.0F : entity.m_ahrprint() - this.m_ahrprint());
+      float f = arg.yRot() + (arg.relatives().contains(C_crougwaz.Y_ROT) ? 0.0F : entity.getYaw() - this.getYaw());
+      float g = arg.xRot() + (arg.relatives().contains(C_crougwaz.X_ROT) ? 0.0F : entity.getPitch() - this.getPitch());
       Vec3d lv = entity.getPos().subtract(this.getPos());
       Vec3d lv2 = arg.position()
          .add(
@@ -4521,7 +4525,7 @@
       this.refreshPosition();
       this.m_hhwtkfxu();
       this.setVelocity(lv2.deltaMovement());
-      this.f_lwsftgrz.clear();
+      this.queuedCollisionChecks.clear();
    }
 
    /**
@@ -4779,7 +4783,7 @@
     */
    public void tryTeleportAndDismount(double destX, double destY, double destZ) {
       if (this.getWorld() instanceof ServerWorld) {
-         this.refreshPositionAndAngles(destX, destY, destZ, this.m_ndosmusf(), this.m_ahrprint());
+         this.refreshPositionAndAngles(destX, destY, destZ, this.getYaw(), this.getPitch());
          this.teleportPassengers();
       }
    }
@@ -4896,7 +4900,7 @@
     * @mapping {@literal named getHorizontalFacing Lnet/minecraft/entity/Entity;getHorizontalFacing()Lnet/minecraft/util/math/Direction;}
     */
    public Direction getHorizontalFacing() {
-      return Direction.fromRotation((double)this.m_ndosmusf());
+      return Direction.fromRotation((double)this.getYaw());
    }
 
    /**
@@ -5038,7 +5042,7 @@
     * @mapping {@literal named applyRotation Lnet/minecraft/entity/Entity;applyRotation(Lnet/minecraft/util/BlockRotation;)F}
     */
    public float applyRotation(BlockRotation rotation) {
-      float f = MathHelper.wrapDegrees(this.m_ndosmusf());
+      float f = MathHelper.wrapDegrees(this.getYaw());
       switch (rotation) {
          case CLOCKWISE_180:
             return f + 180.0F;
@@ -5056,7 +5060,7 @@
     * @mapping {@literal named applyMirror Lnet/minecraft/entity/Entity;applyMirror(Lnet/minecraft/util/BlockMirror;)F}
     */
    public float applyMirror(BlockMirror mirror) {
-      float f = MathHelper.wrapDegrees(this.m_ndosmusf());
+      float f = MathHelper.wrapDegrees(this.getYaw());
       switch (mirror) {
          case FRONT_BACK:
             return -f;
@@ -5343,9 +5347,9 @@
       double g = Math.sqrt(d * d + f * f);
       this.setPitch(MathHelper.wrapDegrees((float)(-(MathHelper.atan2(e, g) * 180.0F / (float)Math.PI))));
       this.setYaw(MathHelper.wrapDegrees((float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F));
-      this.setHeadYaw(this.m_ndosmusf());
-      this.prevPitch = this.m_ahrprint();
-      this.prevYaw = this.m_ndosmusf();
+      this.setHeadYaw(this.getYaw());
+      this.prevPitch = this.getPitch();
+      this.prevYaw = this.getYaw();
    }
 
    /**
@@ -5792,9 +5796,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ndosmusf Lnet/minecraft/unmapped/C_astfners;m_ndosmusf()F}
+    * @mapping {@literal named getYaw Lnet/minecraft/entity/Entity;getYaw()F}
     */
-   public float m_ndosmusf() {
+   public float getYaw() {
       return this.yaw;
    }
 
@@ -5803,7 +5808,7 @@
     * @mapping {@literal named getVisualYaw Lnet/minecraft/entity/Entity;getVisualYaw()F}
     */
    public float getVisualYaw() {
-      return this.m_ndosmusf();
+      return this.getYaw();
    }
 
    /**
@@ -5819,9 +5824,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ahrprint Lnet/minecraft/unmapped/C_astfners;m_ahrprint()F}
+    * @mapping {@literal named getPitch Lnet/minecraft/entity/Entity;getPitch()F}
     */
-   public float m_ahrprint() {
+   public float getPitch() {
       return this.pitch;
    }
 
@@ -5910,7 +5916,7 @@
 
       this.getPassengerList().forEach(Entity::stopRiding);
       this.entityChangeListener.remove(reason);
-      this.m_gbjymqob(reason);
+      this.onRemoved(reason);
    }
 
    /**
@@ -6004,8 +6010,8 @@
       double k = MathHelper.lerp(j, this.getX(), x);
       double l = MathHelper.lerp(j, this.getY(), y);
       double m = MathHelper.lerp(j, this.getZ(), z);
-      float n = (float)MathHelper.lerpDegrees(j, (double)this.m_ndosmusf(), yaw);
-      float o = (float)MathHelper.lerp(j, (double)this.m_ahrprint(), pitch);
+      float n = (float)MathHelper.lerpDegrees(j, (double)this.getYaw(), yaw);
+      float o = (float)MathHelper.lerp(j, (double)this.getPitch(), pitch);
       this.setPosition(k, l, m);
       this.setRotation(n, o);
    }
@@ -6048,13 +6054,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_astfners$C_aipuagbw}
-    * @mapping {@literal named net/minecraft/entity/Entity$C_aipuagbw}
-    */
-   static record C_aipuagbw(Vec3d from, Vec3d to) {
-   }
-
-   /**
     * The move effect represents possible effects of an entity moving, such as
     * playing sounds, emitting game events, none, or both.
     * 
@@ -6138,6 +6137,13 @@
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_astfners$C_aipuagbw}
+    * @mapping {@literal named net/minecraft/entity/Entity$Movement}
+    */
+   static record Movement(Vec3d from, Vec3d to) {
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_astfners$C_aobkcgmf}
     * @mapping {@literal named net/minecraft/entity/Entity$PositionUpdater}
     */
diff -bur namedTargetSrc/net/minecraft/entity/EntityStatuses.java namedSrc/net/minecraft/entity/EntityStatuses.java
--- namedTargetSrc/net/minecraft/entity/EntityStatuses.java	2024-10-15 01:24:16.468925189 +0000
+++ namedSrc/net/minecraft/entity/EntityStatuses.java	2024-10-15 01:23:06.420045867 +0000
@@ -166,9 +166,10 @@
     */
    public static final byte STOP_LOOKING_AT_VILLAGER = 34;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jahbxxhy Lnet/minecraft/unmapped/C_vuauwont;f_jahbxxhy:B}
+    * @mapping {@literal named PROTECTED_FROM_DEATH Lnet/minecraft/entity/EntityStatuses;PROTECTED_FROM_DEATH:B}
     */
-   public static final byte f_jahbxxhy = 35;
+   public static final byte PROTECTED_FROM_DEATH = 35;
    /**
     * @mapping {@literal hashed f_cznyliqp Lnet/minecraft/unmapped/C_vuauwont;f_cznyliqp:B}
     * @mapping {@literal named ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES Lnet/minecraft/entity/EntityStatuses;ADD_DOLPHIN_HAPPY_VILLAGER_PARTICLES:B}
@@ -295,7 +296,8 @@
     */
    public static final byte BREAK_BODY = 65;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_nerpufry Lnet/minecraft/unmapped/C_vuauwont;f_nerpufry:B}
+    * @mapping {@literal named SHAKE Lnet/minecraft/entity/EntityStatuses;SHAKE:B}
     */
-   public static final byte f_nerpufry = 66;
+   public static final byte SHAKE = 66;
 }

@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/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-10-15 01:24:16.264922627 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-10-15 01:23:06.168042698 +0000
@@ -133,6 +133,7 @@
 import net.minecraft.entity.vehicle.FurnaceMinecartEntity;
 import net.minecraft.entity.vehicle.HopperMinecartEntity;
 import net.minecraft.entity.vehicle.MinecartEntity;
+import net.minecraft.entity.vehicle.RaftEntity;
 import net.minecraft.entity.vehicle.SpawnerMinecartEntity;
 import net.minecraft.entity.vehicle.TntMinecartEntity;
 import net.minecraft.feature_flags.FeatureFlag;
@@ -148,6 +149,7 @@
 import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderSet;
+import net.minecraft.registry.KeyedValue;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
@@ -158,8 +160,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_bujylnzi;
 import net.minecraft.unmapped.C_jkignzdi;
-import net.minecraft.unmapped.C_jquyxssk;
-import net.minecraft.unmapped.C_spthrjmn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
@@ -207,7 +207,7 @@
    public static final EntityType<BoatEntity> ACACIA_BOAT = register(
       "acacia_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.ACACIA_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -219,7 +219,7 @@
    public static final EntityType<ChestBoatEntity> ACACIA_CHEST_BOAT = register(
       "acacia_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.ACACIA_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -244,7 +244,7 @@
    public static final EntityType<AreaEffectCloudEntity> AREA_EFFECT_CLOUD = register(
       "area_effect_cloud",
       EntityType.Builder.<AreaEffectCloudEntity>create(AreaEffectCloudEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .makeFireImmune()
          .setDimensions(6.0F, 0.5F)
          .maxTrackingRange(10)
@@ -275,7 +275,7 @@
    public static final EntityType<ArrowEntity> ARROW = register(
       "arrow",
       EntityType.Builder.<ArrowEntity>create(ArrowEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.13F)
          .maxTrackingRange(4)
@@ -295,7 +295,7 @@
    public static final EntityType<C_bujylnzi> BAMBOO_CHEST_RAFT = register(
       "bamboo_chest_raft",
       EntityType.Builder.create(m_navxebru(() -> Items.BAMBOO_CHEST_RAFT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -304,10 +304,10 @@
     * @mapping {@literal hashed f_elxrknty Lnet/minecraft/unmapped/C_ogavsvbr;f_elxrknty:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named BAMBOO_RAFT Lnet/minecraft/entity/EntityType;BAMBOO_RAFT:Lnet/minecraft/entity/EntityType;}
     */
-   public static final EntityType<C_spthrjmn> BAMBOO_RAFT = register(
+   public static final EntityType<RaftEntity> BAMBOO_RAFT = register(
       "bamboo_raft",
       EntityType.Builder.create(m_ytnkhrki(() -> Items.BAMBOO_RAFT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -333,7 +333,7 @@
    public static final EntityType<BoatEntity> BIRCH_BOAT = register(
       "birch_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.BIRCH_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -345,7 +345,7 @@
    public static final EntityType<ChestBoatEntity> BIRCH_CHEST_BOAT = register(
       "birch_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.BIRCH_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -364,7 +364,7 @@
    public static final EntityType<DisplayEntity.BlockDisplayEntity> BLOCK_DISPLAY = register(
       "block_display",
       EntityType.Builder.create(DisplayEntity.BlockDisplayEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(10)
          .trackingTickInterval(1)
@@ -395,7 +395,7 @@
    public static final EntityType<BreezeWindChargeEntity> BREEZE_WIND_CHARGE = register(
       "breeze_wind_charge",
       EntityType.Builder.<BreezeWindChargeEntity>create(BreezeWindChargeEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(4)
@@ -434,7 +434,7 @@
    public static final EntityType<BoatEntity> CHERRY_BOAT = register(
       "cherry_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.CHERRY_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -446,7 +446,7 @@
    public static final EntityType<ChestBoatEntity> CHERRY_CHEST_BOAT = register(
       "cherry_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.CHERRY_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -458,7 +458,7 @@
    public static final EntityType<ChestMinecartEntity> CHEST_MINECART = register(
       "chest_minecart",
       EntityType.Builder.create(ChestMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -489,7 +489,7 @@
    public static final EntityType<CommandBlockMinecartEntity> COMMAND_BLOCK_MINECART = register(
       "command_block_minecart",
       EntityType.Builder.create(CommandBlockMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -548,7 +548,7 @@
    public static final EntityType<BoatEntity> DARK_OAK_BOAT = register(
       "dark_oak_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.DARK_OAK_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -560,7 +560,7 @@
    public static final EntityType<ChestBoatEntity> DARK_OAK_CHEST_BOAT = register(
       "dark_oak_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.DARK_OAK_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -591,7 +591,7 @@
    public static final EntityType<DragonFireballEntity> DRAGON_FIREBALL = register(
       "dragon_fireball",
       EntityType.Builder.<DragonFireballEntity>create(DragonFireballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.0F, 1.0F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -616,7 +616,7 @@
    public static final EntityType<EggEntity> EGG = register(
       "egg",
       EntityType.Builder.<EggEntity>create(EggEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -676,7 +676,7 @@
    public static final EntityType<EnderPearlEntity> ENDER_PEARL = register(
       "ender_pearl",
       EntityType.Builder.<EnderPearlEntity>create(EnderPearlEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -688,7 +688,7 @@
    public static final EntityType<EndCrystalEntity> END_CRYSTAL = register(
       "end_crystal",
       EntityType.Builder.<EndCrystalEntity>create(EndCrystalEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .makeFireImmune()
          .setDimensions(2.0F, 2.0F)
          .maxTrackingRange(16)
@@ -713,7 +713,7 @@
    public static final EntityType<EvokerFangsEntity> EVOKER_FANGS = register(
       "evoker_fangs",
       EntityType.Builder.<EvokerFangsEntity>create(EvokerFangsEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.8F)
          .maxTrackingRange(6)
          .trackingTickInterval(2)
@@ -725,7 +725,7 @@
    public static final EntityType<ExperienceBottleEntity> EXPERIENCE_BOTTLE = register(
       "experience_bottle",
       EntityType.Builder.<ExperienceBottleEntity>create(ExperienceBottleEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -737,7 +737,7 @@
    public static final EntityType<ExperienceOrbEntity> EXPERIENCE_ORB = register(
       "experience_orb",
       EntityType.Builder.<ExperienceOrbEntity>create(ExperienceOrbEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .maxTrackingRange(6)
          .trackingTickInterval(20)
@@ -749,7 +749,7 @@
    public static final EntityType<EyeOfEnderEntity> EYE_OF_ENDER = register(
       "eye_of_ender",
       EntityType.Builder.<EyeOfEnderEntity>create(EyeOfEnderEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(4)
@@ -761,7 +761,7 @@
    public static final EntityType<FallingBlockEntity> FALLING_BLOCK = register(
       "falling_block",
       EntityType.Builder.<FallingBlockEntity>create(FallingBlockEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.98F)
          .maxTrackingRange(10)
          .trackingTickInterval(20)
@@ -773,7 +773,7 @@
    public static final EntityType<FireballEntity> FIREBALL = register(
       "fireball",
       EntityType.Builder.<FireballEntity>create(FireballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.0F, 1.0F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -785,7 +785,7 @@
    public static final EntityType<FireworkRocketEntity> FIREWORK_ROCKET = register(
       "firework_rocket",
       EntityType.Builder.<FireworkRocketEntity>create(FireworkRocketEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -821,7 +821,7 @@
    public static final EntityType<FurnaceMinecartEntity> FURNACE_MINECART = register(
       "furnace_minecart",
       EntityType.Builder.create(FurnaceMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -859,7 +859,7 @@
    public static final EntityType<GlowItemFrameEntity> GLOW_ITEM_FRAME = register(
       "glow_item_frame",
       EntityType.Builder.<GlowItemFrameEntity>create(GlowItemFrameEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(10)
@@ -907,7 +907,7 @@
    public static final EntityType<HopperMinecartEntity> HOPPER_MINECART = register(
       "hopper_minecart",
       EntityType.Builder.create(HopperMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -954,7 +954,7 @@
     * @mapping {@literal named INTERACTION Lnet/minecraft/entity/EntityType;INTERACTION:Lnet/minecraft/entity/EntityType;}
     */
    public static final EntityType<InteractionEntity> INTERACTION = register(
-      "interaction", EntityType.Builder.create(InteractionEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.0F, 0.0F).maxTrackingRange(10)
+      "interaction", EntityType.Builder.create(InteractionEntity::new, SpawnGroup.MISC).emptyLootTable().setDimensions(0.0F, 0.0F).maxTrackingRange(10)
    );
    /**
     * @mapping {@literal hashed f_bhejdipc Lnet/minecraft/unmapped/C_ogavsvbr;f_bhejdipc:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -970,7 +970,7 @@
    public static final EntityType<ItemEntity> ITEM = register(
       "item",
       EntityType.Builder.<ItemEntity>create(ItemEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .setEyeHeight(0.2125F)
          .maxTrackingRange(6)
@@ -983,7 +983,7 @@
    public static final EntityType<DisplayEntity.ItemDisplayEntity> ITEM_DISPLAY = register(
       "item_display",
       EntityType.Builder.create(DisplayEntity.ItemDisplayEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(10)
          .trackingTickInterval(1)
@@ -995,7 +995,7 @@
    public static final EntityType<ItemFrameEntity> ITEM_FRAME = register(
       "item_frame",
       EntityType.Builder.<ItemFrameEntity>create(ItemFrameEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(10)
@@ -1008,7 +1008,7 @@
    public static final EntityType<BoatEntity> JUNGLE_BOAT = register(
       "jungle_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.JUNGLE_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1020,7 +1020,7 @@
    public static final EntityType<ChestBoatEntity> JUNGLE_CHEST_BOAT = register(
       "jungle_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.JUNGLE_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1032,7 +1032,7 @@
    public static final EntityType<LeashKnotEntity> LEASH_KNOT = register(
       "leash_knot",
       EntityType.Builder.<LeashKnotEntity>create(LeashKnotEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .disableSaving()
          .setDimensions(0.375F, 0.5F)
          .setEyeHeight(0.0625F)
@@ -1046,7 +1046,7 @@
    public static final EntityType<LightningEntity> LIGHTNING_BOLT = register(
       "lightning_bolt",
       EntityType.Builder.create(LightningEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .disableSaving()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(16)
@@ -1071,7 +1071,7 @@
    public static final EntityType<LlamaSpitEntity> LLAMA_SPIT = register(
       "llama_spit",
       EntityType.Builder.<LlamaSpitEntity>create(LlamaSpitEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1096,7 +1096,7 @@
    public static final EntityType<BoatEntity> MANGROVE_BOAT = register(
       "mangrove_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.MANGROVE_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1108,7 +1108,7 @@
    public static final EntityType<ChestBoatEntity> MANGROVE_CHEST_BOAT = register(
       "mangrove_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.MANGROVE_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1118,7 +1118,7 @@
     * @mapping {@literal named MARKER Lnet/minecraft/entity/EntityType;MARKER:Lnet/minecraft/entity/EntityType;}
     */
    public static final EntityType<MarkerEntity> MARKER = register(
-      "marker", EntityType.Builder.create(MarkerEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.0F, 0.0F).maxTrackingRange(0)
+      "marker", EntityType.Builder.create(MarkerEntity::new, SpawnGroup.MISC).emptyLootTable().setDimensions(0.0F, 0.0F).maxTrackingRange(0)
    );
    /**
     * @mapping {@literal hashed f_spcxgpev Lnet/minecraft/unmapped/C_ogavsvbr;f_spcxgpev:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -1126,7 +1126,11 @@
     */
    public static final EntityType<MinecartEntity> MINECART = register(
       "minecart",
-      EntityType.Builder.create(MinecartEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.98F, 0.7F).passengerAttachments(0.1875F).maxTrackingRange(8)
+      EntityType.Builder.create(MinecartEntity::new, SpawnGroup.MISC)
+         .emptyLootTable()
+         .setDimensions(0.98F, 0.7F)
+         .passengerAttachments(0.1875F)
+         .maxTrackingRange(8)
    );
    /**
     * @mapping {@literal hashed f_jdxbwnyb Lnet/minecraft/unmapped/C_ogavsvbr;f_jdxbwnyb:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -1159,7 +1163,7 @@
    public static final EntityType<BoatEntity> OAK_BOAT = register(
       "oak_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.OAK_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1171,7 +1175,7 @@
    public static final EntityType<ChestBoatEntity> OAK_CHEST_BOAT = register(
       "oak_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.OAK_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1189,7 +1193,7 @@
     */
    public static final EntityType<OminousItemSpawnerEntity> OMINOUS_ITEM_SPAWNER = register(
       "ominous_item_spawner",
-      EntityType.Builder.create(OminousItemSpawnerEntity::new, SpawnGroup.MISC).m_qgatngvl().setDimensions(0.25F, 0.25F).maxTrackingRange(8)
+      EntityType.Builder.create(OminousItemSpawnerEntity::new, SpawnGroup.MISC).emptyLootTable().setDimensions(0.25F, 0.25F).maxTrackingRange(8)
    );
    /**
     * @mapping {@literal hashed f_poffjbku Lnet/minecraft/unmapped/C_ogavsvbr;f_poffjbku:Lnet/minecraft/unmapped/C_ogavsvbr;}
@@ -1198,7 +1202,7 @@
    public static final EntityType<PaintingEntity> PAINTING = register(
       "painting",
       EntityType.Builder.<PaintingEntity>create(PaintingEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .maxTrackingRange(10)
          .trackingTickInterval(Integer.MAX_VALUE)
@@ -1210,7 +1214,7 @@
    public static final EntityType<BoatEntity> PALE_OAK_BOAT = register(
       "pale_oak_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.PALE_OAK_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1223,7 +1227,7 @@
    public static final EntityType<ChestBoatEntity> PALE_OAK_CHEST_BOAT = register(
       "pale_oak_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.PALE_OAK_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1325,7 +1329,7 @@
    public static final EntityType<PotionEntity> POTION = register(
       "potion",
       EntityType.Builder.<PotionEntity>create(PotionEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1395,7 +1399,7 @@
    public static final EntityType<ShulkerBulletEntity> SHULKER_BULLET = register(
       "shulker_bullet",
       EntityType.Builder.<ShulkerBulletEntity>create(ShulkerBulletEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .maxTrackingRange(8)
    );
@@ -1454,7 +1458,7 @@
    public static final EntityType<SmallFireballEntity> SMALL_FIREBALL = register(
       "small_fireball",
       EntityType.Builder.<SmallFireballEntity>create(SmallFireballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1479,7 +1483,7 @@
    public static final EntityType<SnowballEntity> SNOWBALL = register(
       "snowball",
       EntityType.Builder.<SnowballEntity>create(SnowballEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.25F, 0.25F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1503,7 +1507,7 @@
    public static final EntityType<SpawnerMinecartEntity> SPAWNER_MINECART = register(
       "spawner_minecart",
       EntityType.Builder.create(SpawnerMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -1515,7 +1519,7 @@
    public static final EntityType<SpectralArrowEntity> SPECTRAL_ARROW = register(
       "spectral_arrow",
       EntityType.Builder.<SpectralArrowEntity>create(SpectralArrowEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.13F)
          .maxTrackingRange(4)
@@ -1540,7 +1544,7 @@
    public static final EntityType<BoatEntity> SPRUCE_BOAT = register(
       "spruce_boat",
       EntityType.Builder.create(m_doxdnahd(() -> Items.SPRUCE_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1552,7 +1556,7 @@
    public static final EntityType<ChestBoatEntity> SPRUCE_CHEST_BOAT = register(
       "spruce_chest_boat",
       EntityType.Builder.create(m_hyyvvjps(() -> Items.SPRUCE_CHEST_BOAT), SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(1.375F, 0.5625F)
          .setEyeHeight(0.5625F)
          .maxTrackingRange(10)
@@ -1598,7 +1602,7 @@
    public static final EntityType<DisplayEntity.TextDisplayEntity> TEXT_DISPLAY = register(
       "text_display",
       EntityType.Builder.create(DisplayEntity.TextDisplayEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.0F, 0.0F)
          .maxTrackingRange(10)
          .trackingTickInterval(1)
@@ -1610,7 +1614,7 @@
    public static final EntityType<TntEntity> TNT = register(
       "tnt",
       EntityType.Builder.<TntEntity>create(TntEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .makeFireImmune()
          .setDimensions(0.98F, 0.98F)
          .setEyeHeight(0.15F)
@@ -1624,7 +1628,7 @@
    public static final EntityType<TntMinecartEntity> TNT_MINECART = register(
       "tnt_minecart",
       EntityType.Builder.create(TntMinecartEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.98F, 0.7F)
          .passengerAttachments(0.1875F)
          .maxTrackingRange(8)
@@ -1648,7 +1652,7 @@
    public static final EntityType<TridentEntity> TRIDENT = register(
       "trident",
       EntityType.Builder.<TridentEntity>create(TridentEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.5F, 0.5F)
          .setEyeHeight(0.13F)
          .maxTrackingRange(4)
@@ -1735,7 +1739,7 @@
    public static final EntityType<WindChargeEntity> WIND_CHARGE = register(
       "wind_charge",
       EntityType.Builder.<WindChargeEntity>create(WindChargeEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .setEyeHeight(0.0F)
          .maxTrackingRange(4)
@@ -1786,7 +1790,7 @@
    public static final EntityType<WitherSkullEntity> WITHER_SKULL = register(
       "wither_skull",
       EntityType.Builder.<WitherSkullEntity>create(WitherSkullEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .setDimensions(0.3125F, 0.3125F)
          .maxTrackingRange(4)
          .trackingTickInterval(10)
@@ -1889,7 +1893,7 @@
    public static final EntityType<FishingBobberEntity> FISHING_BOBBER = register(
       "fishing_bobber",
       EntityType.Builder.<FishingBobberEntity>create(FishingBobberEntity::new, SpawnGroup.MISC)
-         .m_qgatngvl()
+         .emptyLootTable()
          .disableSaving()
          .disableSummon()
          .setDimensions(0.25F, 0.25F)
@@ -2148,8 +2152,8 @@
             (double)pos.getX() + 0.5, (double)pos.getY() + d, (double)pos.getZ() + 0.5, MathHelper.wrapDegrees(world.random.nextFloat() * 360.0F), 0.0F
          );
          if (lv instanceof MobEntity lv2) {
-            lv2.headYaw = lv2.m_ndosmusf();
-            lv2.bodyYaw = lv2.m_ndosmusf();
+            lv2.headYaw = lv2.getYaw();
+            lv2.bodyYaw = lv2.getYaw();
             lv2.initialize(world, world.getLocalDifficulty(lv2.getBlockPos()), reason, null);
             lv2.playAmbientSound();
          }
@@ -2553,8 +2557,8 @@
    /**
     * Mapping not found
     */
-   private static EntityType.EntityFactory<C_spthrjmn> m_ytnkhrki(Supplier<Item> supplier) {
-      return (arg, world) -> new C_spthrjmn(arg, world, supplier);
+   private static EntityType.EntityFactory<RaftEntity> m_ytnkhrki(Supplier<Item> supplier) {
+      return (arg, world) -> new RaftEntity(arg, world, supplier);
    }
 
    /**
@@ -2635,15 +2639,17 @@
        */
       private FeatureFlagBitSet requiredFlags = FeatureFlags.DEFAULT_SET;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_uuowbxbh Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;f_uuowbxbh:Lnet/minecraft/unmapped/C_jquyxssk;}
+       * @mapping {@literal named lootTable Lnet/minecraft/entity/EntityType$Builder;lootTable:Lnet/minecraft/registry/KeyedValue;}
        */
-      private C_jquyxssk<EntityType<?>, Optional<RegistryKey<LootTable>>> f_uuowbxbh = lootTable -> Optional.of(
+      private KeyedValue<EntityType<?>, Optional<RegistryKey<LootTable>>> lootTable = lootTable -> Optional.of(
             RegistryKey.of(RegistryKeys.LOOT_TABLE, lootTable.getValue().withPrefix("entities/"))
          );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qdlfxewu Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;f_qdlfxewu:Lnet/minecraft/unmapped/C_jquyxssk;}
+       * @mapping {@literal named translationKey Lnet/minecraft/entity/EntityType$Builder;translationKey:Lnet/minecraft/registry/KeyedValue;}
        */
-      private C_jquyxssk<EntityType<?>, String> f_qdlfxewu = type -> Util.createTranslationKey("entity", type.getValue());
+      private KeyedValue<EntityType<?>, String> translationKey = type -> Util.createTranslationKey("entity", type.getValue());
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;<init>(Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;Lnet/minecraft/unmapped/C_ormqdxci;)V}
@@ -2846,10 +2852,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_qgatngvl Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;m_qgatngvl()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;}
+       * @mapping {@literal named emptyLootTable Lnet/minecraft/entity/EntityType$Builder;emptyLootTable()Lnet/minecraft/entity/EntityType$Builder;}
        */
-      public EntityType.Builder<T> m_qgatngvl() {
-         this.f_uuowbxbh = C_jquyxssk.fixed(Optional.empty());
+      public EntityType.Builder<T> emptyLootTable() {
+         this.lootTable = KeyedValue.fixed(Optional.empty());
          return this;
       }
 
@@ -2874,8 +2881,8 @@
             this.spawnDimensionsScale,
             this.maxTrackingRange,
             this.trackingTickInterval,
-            this.f_qdlfxewu.get(type),
-            this.f_uuowbxbh.get(type),
+            this.translationKey.get(type),
+            this.lootTable.get(type),
             this.requiredFlags
          );
       }
diff -bur namedTargetSrc/net/minecraft/entity/EquipmentSlot.java namedSrc/net/minecraft/entity/EquipmentSlot.java
--- namedTargetSrc/net/minecraft/entity/EquipmentSlot.java	2024-10-15 01:24:16.508925691 +0000
+++ namedSrc/net/minecraft/entity/EquipmentSlot.java	2024-10-15 01:23:06.460046370 +0000
@@ -162,10 +162,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jjdtlure Lnet/minecraft/unmapped/C_yuycoehb;m_jjdtlure(I)I}
+    * @mapping {@literal named offsetId Lnet/minecraft/entity/EquipmentSlot;offsetId(I)I}
     */
-   public int m_jjdtlure(int i) {
-      return this.id + i;
+   public int offsetId(int offset) {
+      return this.id + offset;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/EyeOfEnderEntity.java namedSrc/net/minecraft/entity/EyeOfEnderEntity.java
--- namedTargetSrc/net/minecraft/entity/EyeOfEnderEntity.java	2024-10-15 01:24:16.296923029 +0000
+++ namedSrc/net/minecraft/entity/EyeOfEnderEntity.java	2024-10-15 01:23:06.212043251 +0000
@@ -161,8 +161,8 @@
          double g = Math.sqrt(x * x + z * z);
          this.setYaw((float)(MathHelper.atan2(x, z) * 180.0F / (float)Math.PI));
          this.setPitch((float)(MathHelper.atan2(y, g) * 180.0F / (float)Math.PI));
-         this.prevYaw = this.m_ndosmusf();
-         this.prevPitch = this.m_ahrprint();
+         this.prevYaw = this.getYaw();
+         this.prevPitch = this.getPitch();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java namedSrc/net/minecraft/entity/FallingBlockEntity.java
--- namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java	2024-10-15 01:24:16.484925389 +0000
+++ namedSrc/net/minecraft/entity/FallingBlockEntity.java	2024-10-15 01:23:06.436046068 +0000
@@ -258,7 +258,7 @@
             if (!this.isOnGround() && !bl2) {
                if (this.timeFalling > 100 && (lv3.getY() <= this.getWorld().getBottomY() || lv3.getY() > this.getWorld().getTopY()) || this.timeFalling > 600) {
                   if (this.dropItem && lv2.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
-                     this.m_xrhuexzc(lv2, lv);
+                     this.dropStack(lv2, lv);
                   }
 
                   this.discard();
@@ -307,13 +307,13 @@
                         } else if (this.dropItem && lv2.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
                            this.discard();
                            this.onDestroyedOnLanding(lv, lv3);
-                           this.m_xrhuexzc(lv2, lv);
+                           this.dropStack(lv2, lv);
                         }
                      } else {
                         this.discard();
                         if (this.dropItem && lv2.getGameRules().getBooleanValue(GameRules.DO_ENTITY_DROPS)) {
                            this.onDestroyedOnLanding(lv, lv3);
-                           this.m_xrhuexzc(lv2, lv);
+                           this.dropStack(lv2, lv);
                         }
                      }
                   } else {
diff -bur namedTargetSrc/net/minecraft/entity/Leashable.java namedSrc/net/minecraft/entity/Leashable.java
--- namedTargetSrc/net/minecraft/entity/Leashable.java	2024-10-15 01:24:16.412924486 +0000
+++ namedSrc/net/minecraft/entity/Leashable.java	2024-10-15 01:23:06.368045212 +0000
@@ -152,7 +152,7 @@
          }
 
          if (entity.age > 100) {
-            entity.m_xrhuexzc(lv, Items.LEAD);
+            entity.dropStack(lv, Items.LEAD);
             entity.setLeashData(null);
          }
       }
@@ -176,7 +176,7 @@
          entity.setLeashData(null);
          if (entity.getWorld() instanceof ServerWorld lv2) {
             if (dropItem) {
-               entity.m_xrhuexzc(lv2, Items.LEAD);
+               entity.dropStack(lv2, Items.LEAD);
             }
 
             if (sendPacket) {
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2024-10-15 01:24:16.412924486 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-10-15 01:23:06.364045163 +0000
@@ -730,7 +730,7 @@
       this.refreshPosition();
       this.randomLargeSeed = (float)Math.random() * 12398.0F;
       this.setYaw((float)(Math.random() * (float) (Math.PI * 2)));
-      this.headYaw = this.m_ndosmusf();
+      this.headYaw = this.getYaw();
       NbtOps lv = NbtOps.INSTANCE;
       this.brain = this.deserializeBrain(new Dynamic<>(lv, lv.createMap(ImmutableMap.of(lv.createString("memories"), lv.emptyMap()))));
    }
@@ -988,8 +988,8 @@
       this.prevLookDirection = this.lookDirection;
       this.prevBodyYaw = this.bodyYaw;
       this.prevHeadYaw = this.headYaw;
-      this.prevYaw = this.m_ndosmusf();
-      this.prevPitch = this.m_ahrprint();
+      this.prevYaw = this.getYaw();
+      this.prevPitch = this.getPitch();
       lv2.pop();
    }
 
@@ -2369,7 +2369,7 @@
          }
 
          LootContextParameterSet lv3 = lv2.build(LootContextTypes.ENTITY);
-         lv.generateRawLoot(lv3, this.getLootTableSeed(), stack -> this.m_bujlfnum(world, stack));
+         lv.generateRawLoot(lv3, this.getLootTableSeed(), stack -> this.dropStack(world, stack));
       }
    }
 
@@ -3397,7 +3397,7 @@
          Vec3d lv = this.getVelocity();
          this.setVelocity(lv.x, Math.max((double)f, lv.y), lv.z);
          if (this.isSprinting()) {
-            float g = this.m_ndosmusf() * (float) (Math.PI / 180.0);
+            float g = this.getYaw() * (float) (Math.PI / 180.0);
             this.addVelocityInternal(new Vec3d((double)(-MathHelper.sin(g)) * 0.2, 0.0, (double)MathHelper.cos(g) * 0.2));
          }
 
@@ -3580,7 +3580,7 @@
     */
    private Vec3d m_bxzefqod(Vec3d arg) {
       Vec3d lv = this.getRotationVector();
-      float f = this.m_ahrprint() * (float) (Math.PI / 180.0);
+      float f = this.getPitch() * (float) (Math.PI / 180.0);
       double d = Math.sqrt(lv.x * lv.x + lv.z * lv.z);
       double e = arg.horizontalLength();
       double g = this.m_tihbzsvh();
@@ -3840,7 +3840,7 @@
          k = 1.0F;
          h = (float)Math.sqrt((double)f) * 3.0F;
          float l = (float)MathHelper.atan2(e, d) * (180.0F / (float)Math.PI) - 90.0F;
-         float m = MathHelper.abs(MathHelper.wrapDegrees(this.m_ndosmusf()) - l);
+         float m = MathHelper.abs(MathHelper.wrapDegrees(this.getYaw()) - l);
          if (95.0F < m && m < 265.0F) {
             g = l - 180.0F;
          } else {
@@ -3849,7 +3849,7 @@
       }
 
       if (this.handSwingProgress > 0.0F) {
-         g = this.m_ndosmusf();
+         g = this.getYaw();
       }
 
       if (!this.isOnGround()) {
@@ -3863,11 +3863,11 @@
       lv.pop();
       lv.push("rangeChecks");
 
-      while (this.m_ndosmusf() - this.prevYaw < -180.0F) {
+      while (this.getYaw() - this.prevYaw < -180.0F) {
          this.prevYaw -= 360.0F;
       }
 
-      while (this.m_ndosmusf() - this.prevYaw >= 180.0F) {
+      while (this.getYaw() - this.prevYaw >= 180.0F) {
          this.prevYaw += 360.0F;
       }
 
@@ -3879,11 +3879,11 @@
          this.prevBodyYaw += 360.0F;
       }
 
-      while (this.m_ahrprint() - this.prevPitch < -180.0F) {
+      while (this.getPitch() - this.prevPitch < -180.0F) {
          this.prevPitch -= 360.0F;
       }
 
-      while (this.m_ahrprint() - this.prevPitch >= 180.0F) {
+      while (this.getPitch() - this.prevPitch >= 180.0F) {
          this.prevPitch += 360.0F;
       }
 
@@ -4077,7 +4077,7 @@
    protected float turnHead(float bodyRotation, float headRotation) {
       float h = MathHelper.wrapDegrees(bodyRotation - this.bodyYaw);
       this.bodyYaw += h * 0.3F;
-      float i = MathHelper.wrapDegrees(this.m_ndosmusf() - this.bodyYaw);
+      float i = MathHelper.wrapDegrees(this.getYaw() - this.bodyYaw);
       float j = this.getMaxRelativeHeadRotation();
       if (Math.abs(i) > j) {
          this.bodyYaw = this.bodyYaw + (i - (float)MathHelper.sign((double)i) * j);
@@ -4451,7 +4451,7 @@
     */
    @Override
    public float getLerpTargetPitch() {
-      return this.bodyTrackingIncrements > 0 ? (float)this.serverPitch : this.m_ahrprint();
+      return this.bodyTrackingIncrements > 0 ? (float)this.serverPitch : this.getPitch();
    }
 
    /**
@@ -4459,7 +4459,7 @@
     */
    @Override
    public float getLerpTargetYaw() {
-      return this.bodyTrackingIncrements > 0 ? (float)this.serverYaw : this.m_ndosmusf();
+      return this.bodyTrackingIncrements > 0 ? (float)this.serverYaw : this.getYaw();
    }
 
    /**
@@ -4794,12 +4794,12 @@
    public void spawnItemParticles(ItemStack stack, int count) {
       for (int j = 0; j < count; j++) {
          Vec3d lv = new Vec3d(((double)this.random.nextFloat() - 0.5) * 0.1, Math.random() * 0.1 + 0.1, 0.0);
-         lv = lv.rotateX(-this.m_ahrprint() * (float) (Math.PI / 180.0));
-         lv = lv.rotateY(-this.m_ndosmusf() * (float) (Math.PI / 180.0));
+         lv = lv.rotateX(-this.getPitch() * (float) (Math.PI / 180.0));
+         lv = lv.rotateY(-this.getYaw() * (float) (Math.PI / 180.0));
          double d = (double)(-this.random.nextFloat()) * 0.6 - 0.3;
          Vec3d lv2 = new Vec3d(((double)this.random.nextFloat() - 0.5) * 0.3, d, 0.6);
-         lv2 = lv2.rotateX(-this.m_ahrprint() * (float) (Math.PI / 180.0));
-         lv2 = lv2.rotateY(-this.m_ndosmusf() * (float) (Math.PI / 180.0));
+         lv2 = lv2.rotateX(-this.getPitch() * (float) (Math.PI / 180.0));
+         lv2 = lv2.rotateY(-this.getYaw() * (float) (Math.PI / 180.0));
          lv2 = lv2.add(this.getX(), this.getEyeY(), this.getZ());
          this.getWorld().addParticle(new ItemStackParticleEffect(ParticleTypes.ITEM, stack), lv2.x, lv2.y, lv2.z, lv.x, lv.y + 0.05, lv.z);
       }
@@ -5161,7 +5161,7 @@
          if (lvx.getBlock() instanceof BedBlock) {
             Direction lv2 = lvx.get(BedBlock.FACING);
             this.getWorld().setBlockState(pos, lvx.with(BedBlock.OCCUPIED, Boolean.valueOf(false)), Block.NOTIFY_ALL);
-            Vec3d lv3 = (Vec3d)BedBlock.findWakeUpPosition(this.getType(), this.getWorld(), pos, lv2, this.m_ndosmusf()).orElseGet(() -> {
+            Vec3d lv3 = (Vec3d)BedBlock.findWakeUpPosition(this.getType(), this.getWorld(), pos, lv2, this.getYaw()).orElseGet(() -> {
                BlockPos lvxx = pos.up();
                return new Vec3d((double)lvxx.getX() + 0.5, (double)lvxx.getY() + 0.1, (double)lvxx.getZ() + 0.5);
             });
diff -bur namedTargetSrc/net/minecraft/entity/mob/BoggedEntity.java namedSrc/net/minecraft/entity/mob/BoggedEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/BoggedEntity.java	2024-10-15 01:24:16.336923531 +0000
+++ namedSrc/net/minecraft/entity/mob/BoggedEntity.java	2024-10-15 01:23:06.264043905 +0000
@@ -207,7 +207,7 @@
     * @mapping {@literal named dropShearedItems Lnet/minecraft/entity/mob/BoggedEntity;dropShearedItems(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;)V}
     */
    private void dropShearedItems(ServerWorld world, ItemStack stack) {
-      this.m_pljlrlsh(world, LootTables.BOGGED_SHEARING, stack, (worldx, stackx) -> this.m_bxezczwg(worldx, stackx, this.getHeight()));
+      this.m_pljlrlsh(world, LootTables.BOGGED_SHEARING, stack, (worldx, stackx) -> this.dropStack(worldx, stackx, this.getHeight()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/CreeperEntity.java namedSrc/net/minecraft/entity/mob/CreeperEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/CreeperEntity.java	2024-10-15 01:24:16.316923280 +0000
+++ namedSrc/net/minecraft/entity/mob/CreeperEntity.java	2024-10-15 01:23:06.244043654 +0000
@@ -254,7 +254,7 @@
       Entity lv = source.getAttacker();
       if (lv != this && lv instanceof CreeperEntity lv2 && lv2.shouldDropHead()) {
          lv2.onHeadDropped();
-         this.m_xrhuexzc(world, Items.CREEPER_HEAD);
+         this.dropStack(world, Items.CREEPER_HEAD);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/DrownedEntity.java namedSrc/net/minecraft/entity/mob/DrownedEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/DrownedEntity.java	2024-10-15 01:24:16.264922627 +0000
+++ namedSrc/net/minecraft/entity/mob/DrownedEntity.java	2024-10-15 01:23:06.176042798 +0000
@@ -456,8 +456,8 @@
             double g = Math.sqrt(d * d + e * e + f * f);
             e /= g;
             float h = (float)(MathHelper.atan2(f, d) * 180.0F / (float)Math.PI) - 90.0F;
-            this.drowned.setYaw(this.wrapDegrees(this.drowned.m_ndosmusf(), h, 90.0F));
-            this.drowned.bodyYaw = this.drowned.m_ndosmusf();
+            this.drowned.setYaw(this.wrapDegrees(this.drowned.getYaw(), h, 90.0F));
+            this.drowned.bodyYaw = this.drowned.getYaw();
             float i = (float)(this.speed * this.drowned.getAttributeValue(EntityAttributes.MOVEMENT_SPEED));
             float j = MathHelper.lerp(0.125F, this.drowned.getMovementSpeed(), i);
             this.drowned.setMovementSpeed(j);
diff -bur namedTargetSrc/net/minecraft/entity/mob/EndermanEntity.java namedSrc/net/minecraft/entity/mob/EndermanEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EndermanEntity.java	2024-10-15 01:24:16.248922426 +0000
+++ namedSrc/net/minecraft/entity/mob/EndermanEntity.java	2024-10-15 01:23:06.152042496 +0000
@@ -471,7 +471,7 @@
             .addOptional(LootContextParameters.f_rcnckitm, this);
 
          for (ItemStack lv4 : lv.getDroppedStacks(lv3)) {
-            this.m_bujlfnum(world, lv4);
+            this.dropStack(world, lv4);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/mob/EndermiteEntity.java namedSrc/net/minecraft/entity/mob/EndermiteEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EndermiteEntity.java	2024-10-15 01:24:16.296923029 +0000
+++ namedSrc/net/minecraft/entity/mob/EndermiteEntity.java	2024-10-15 01:23:06.212043251 +0000
@@ -139,7 +139,7 @@
     */
    @Override
    public void tick() {
-      this.bodyYaw = this.m_ndosmusf();
+      this.bodyYaw = this.getYaw();
       super.tick();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/GhastEntity.java namedSrc/net/minecraft/entity/mob/GhastEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/GhastEntity.java	2024-10-15 01:24:16.396924285 +0000
+++ namedSrc/net/minecraft/entity/mob/GhastEntity.java	2024-10-15 01:23:06.344044911 +0000
@@ -393,7 +393,7 @@
          if (this.ghast.getTarget() == null) {
             Vec3d lv = this.ghast.getVelocity();
             this.ghast.setYaw(-((float)MathHelper.atan2(lv.x, lv.z)) * (180.0F / (float)Math.PI));
-            this.ghast.bodyYaw = this.ghast.m_ndosmusf();
+            this.ghast.bodyYaw = this.ghast.getYaw();
          } else {
             LivingEntity lv2 = this.ghast.getTarget();
             double d = 64.0;
@@ -401,7 +401,7 @@
                double e = lv2.getX() - this.ghast.getX();
                double f = lv2.getZ() - this.ghast.getZ();
                this.ghast.setYaw(-((float)MathHelper.atan2(e, f)) * (180.0F / (float)Math.PI));
-               this.ghast.bodyYaw = this.ghast.m_ndosmusf();
+               this.ghast.bodyYaw = this.ghast.getYaw();
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/mob/GuardianEntity.java namedSrc/net/minecraft/entity/mob/GuardianEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/GuardianEntity.java	2024-10-15 01:24:16.452924988 +0000
+++ namedSrc/net/minecraft/entity/mob/GuardianEntity.java	2024-10-15 01:23:06.404045665 +0000
@@ -654,14 +654,14 @@
             double f = lv.y / d;
             double g = lv.z / d;
             float h = (float)(MathHelper.atan2(lv.z, lv.x) * 180.0F / (float)Math.PI) - 90.0F;
-            this.guardian.setYaw(this.wrapDegrees(this.guardian.m_ndosmusf(), h, 90.0F));
-            this.guardian.bodyYaw = this.guardian.m_ndosmusf();
+            this.guardian.setYaw(this.wrapDegrees(this.guardian.getYaw(), h, 90.0F));
+            this.guardian.bodyYaw = this.guardian.getYaw();
             float i = (float)(this.speed * this.guardian.getAttributeValue(EntityAttributes.MOVEMENT_SPEED));
             float j = MathHelper.lerp(0.125F, this.guardian.getMovementSpeed(), i);
             this.guardian.setMovementSpeed(j);
             double k = Math.sin((double)(this.guardian.age + this.guardian.getId()) * 0.5) * 0.05;
-            double l = Math.cos((double)(this.guardian.m_ndosmusf() * (float) (Math.PI / 180.0)));
-            double m = Math.sin((double)(this.guardian.m_ndosmusf() * (float) (Math.PI / 180.0)));
+            double l = Math.cos((double)(this.guardian.getYaw() * (float) (Math.PI / 180.0)));
+            double m = Math.sin((double)(this.guardian.getYaw() * (float) (Math.PI / 180.0)));
             double n = Math.sin((double)(this.guardian.age + this.guardian.getId()) * 0.75) * 0.05;
             this.guardian.setVelocity(this.guardian.getVelocity().add(k * l, n * (m + l) * 0.25 + (double)j * f * 0.1, k * m));
             LookControl lv2 = this.guardian.getLookControl();
diff -bur namedTargetSrc/net/minecraft/entity/mob/MobEntity.java namedSrc/net/minecraft/entity/mob/MobEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/MobEntity.java	2024-10-15 01:24:16.380924083 +0000
+++ namedSrc/net/minecraft/entity/mob/MobEntity.java	2024-10-15 01:23:06.324044660 +0000
@@ -49,6 +49,7 @@
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.BlockItem;
@@ -77,7 +78,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.unmapped.C_pkxijcfk;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.unmapped.C_xuophqnt;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
@@ -654,7 +654,7 @@
     */
    protected void updateGoalControls() {
       boolean bl = !(this.getPrimaryPassenger() instanceof MobEntity);
-      boolean bl2 = !(this.getVehicle() instanceof C_sfpofsgc);
+      boolean bl2 = !(this.getVehicle() instanceof AbstractBoatEntity);
       this.goalSelector.setControlEnabled(Goal.Control.MOVE, bl);
       this.goalSelector.setControlEnabled(Goal.Control.JUMP, bl && bl2);
       this.goalSelector.setControlEnabled(Goal.Control.LOOK, bl);
@@ -941,7 +941,7 @@
       if (bl && this.canPickupItem(equipment)) {
          double d = (double)this.getDropChance(lv);
          if (!lv2.isEmpty() && (double)Math.max(this.random.nextFloat() - 0.1F, 0.0F) < d) {
-            this.m_bujlfnum(world, lv2);
+            this.dropStack(world, lv2);
          }
 
          ItemStack lv3 = lv.split(equipment);
@@ -1247,8 +1247,8 @@
       double j = Math.sqrt(d * d + e * e);
       float k = (float)(MathHelper.atan2(e, d) * 180.0F / (float)Math.PI) - 90.0F;
       float l = (float)(-(MathHelper.atan2(h, j) * 180.0F / (float)Math.PI));
-      this.setPitch(this.changeAngle(this.m_ahrprint(), l, maxPitchChange));
-      this.setYaw(this.changeAngle(this.m_ndosmusf(), k, maxYawChange));
+      this.setPitch(this.changeAngle(this.getPitch(), l, maxPitchChange));
+      this.setYaw(this.changeAngle(this.getYaw(), k, maxYawChange));
    }
 
    /**
@@ -1443,7 +1443,7 @@
                   lv2.setDamage(lv2.getMaxDamage() - this.random.nextInt(1 + this.random.nextInt(Math.max(lv2.getMaxDamage() - 3, 1))));
                }
 
-               this.m_bujlfnum(world, lv2);
+               this.dropStack(world, lv2);
                this.equipStack(lv, ItemStack.EMPTY);
             }
          }
@@ -1486,7 +1486,7 @@
                double d = (double)this.getDropChance(lv);
                if (d > 1.0) {
                   this.equipStack(lv, ItemStack.EMPTY);
-                  this.m_bujlfnum(world, lv2);
+                  this.dropStack(world, lv2);
                }
             }
          }
@@ -2088,8 +2088,8 @@
          if (g > 0.0F && entity instanceof LivingEntity lv3) {
             lv3.takeKnockback(
                (double)(g * 0.5F),
-               (double)MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0)),
-               (double)(-MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0)))
+               (double)MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0)),
+               (double)(-MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0)))
             );
             this.setVelocity(this.getVelocity().multiply(0.6, 1.0, 0.6));
          }
diff -bur namedTargetSrc/net/minecraft/entity/mob/PhantomEntity.java namedSrc/net/minecraft/entity/mob/PhantomEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/PhantomEntity.java	2024-10-15 01:24:16.436924787 +0000
+++ namedSrc/net/minecraft/entity/mob/PhantomEntity.java	2024-10-15 01:23:06.388045464 +0000
@@ -199,8 +199,8 @@
          }
 
          float h = this.getWidth() * 1.48F;
-         float i = MathHelper.cos(this.m_ndosmusf() * (float) (Math.PI / 180.0)) * h;
-         float j = MathHelper.sin(this.m_ndosmusf() * (float) (Math.PI / 180.0)) * h;
+         float i = MathHelper.cos(this.getYaw() * (float) (Math.PI / 180.0)) * h;
+         float j = MathHelper.sin(this.getYaw() * (float) (Math.PI / 180.0)) * h;
          float k = (0.3F + f * 0.45F) * this.getHeight() * 2.5F;
          this.getWorld().addParticle(ParticleTypes.MYCELIUM, this.getX() + (double)i, this.getY() + (double)k, this.getZ() + (double)j, 0.0, 0.0, 0.0);
          this.getWorld().addParticle(ParticleTypes.MYCELIUM, this.getX() - (double)i, this.getY() + (double)k, this.getZ() - (double)j, 0.0, 0.0, 0.0);
@@ -519,7 +519,7 @@
       @Override
       public void tick() {
          PhantomEntity.this.headYaw = PhantomEntity.this.bodyYaw;
-         PhantomEntity.this.bodyYaw = PhantomEntity.this.m_ndosmusf();
+         PhantomEntity.this.bodyYaw = PhantomEntity.this.getYaw();
       }
    }
 
@@ -571,7 +571,7 @@
       @Override
       public void tick() {
          if (PhantomEntity.this.horizontalCollision) {
-            PhantomEntity.this.setYaw(PhantomEntity.this.m_ndosmusf() + 180.0F);
+            PhantomEntity.this.setYaw(PhantomEntity.this.getYaw() + 180.0F);
             this.targetSpeed = 0.1F;
          }
 
@@ -585,13 +585,13 @@
             f *= h;
             g = Math.sqrt(d * d + f * f);
             double i = Math.sqrt(d * d + f * f + e * e);
-            float j = PhantomEntity.this.m_ndosmusf();
+            float j = PhantomEntity.this.getYaw();
             float k = (float)MathHelper.atan2(f, d);
-            float l = MathHelper.wrapDegrees(PhantomEntity.this.m_ndosmusf() + 90.0F);
+            float l = MathHelper.wrapDegrees(PhantomEntity.this.getYaw() + 90.0F);
             float m = MathHelper.wrapDegrees(k * (180.0F / (float)Math.PI));
             PhantomEntity.this.setYaw(MathHelper.stepUnwrappedAngleTowards(l, m, 4.0F) - 90.0F);
-            PhantomEntity.this.bodyYaw = PhantomEntity.this.m_ndosmusf();
-            if (MathHelper.angleBetween(j, PhantomEntity.this.m_ndosmusf()) < 3.0F) {
+            PhantomEntity.this.bodyYaw = PhantomEntity.this.getYaw();
+            if (MathHelper.angleBetween(j, PhantomEntity.this.getYaw()) < 3.0F) {
                this.targetSpeed = MathHelper.stepTowards(this.targetSpeed, 1.8F, 0.005F * (1.8F / this.targetSpeed));
             } else {
                this.targetSpeed = MathHelper.stepTowards(this.targetSpeed, 0.2F, 0.025F);
@@ -599,7 +599,7 @@
 
             float n = (float)(-(MathHelper.atan2(-e, g) * 180.0F / (float)Math.PI));
             PhantomEntity.this.setPitch(n);
-            float o = PhantomEntity.this.m_ndosmusf() + 90.0F;
+            float o = PhantomEntity.this.getYaw() + 90.0F;
             double p = (double)(this.targetSpeed * MathHelper.cos(o * (float) (Math.PI / 180.0))) * Math.abs(d / i);
             double q = (double)(this.targetSpeed * MathHelper.sin(o * (float) (Math.PI / 180.0))) * Math.abs(f / i);
             double r = (double)(this.targetSpeed * MathHelper.sin(n * (float) (Math.PI / 180.0))) * Math.abs(e / i);
diff -bur namedTargetSrc/net/minecraft/entity/mob/PiglinBrain.java namedSrc/net/minecraft/entity/mob/PiglinBrain.java
--- namedTargetSrc/net/minecraft/entity/mob/PiglinBrain.java	2024-10-15 01:24:16.496925540 +0000
+++ namedSrc/net/minecraft/entity/mob/PiglinBrain.java	2024-10-15 01:23:06.448046219 +0000
@@ -581,7 +581,7 @@
     */
    private static void swapItemWithOffHand(ServerWorld world, PiglinEntity piglin, ItemStack stack) {
       if (hasItemInOffHand(piglin)) {
-         piglin.m_bujlfnum(world, piglin.getStackInHand(Hand.OFF_HAND));
+         piglin.dropStack(world, piglin.getStackInHand(Hand.OFF_HAND));
       }
 
       piglin.equipToOffHand(stack);
@@ -641,7 +641,7 @@
     */
    protected static void pickupItemWithOffHand(ServerWorld world, PiglinEntity piglin) {
       if (isAdmiringItem(piglin) && !piglin.getOffHandStack().isEmpty()) {
-         piglin.m_bujlfnum(world, piglin.getOffHandStack());
+         piglin.dropStack(world, piglin.getOffHandStack());
          piglin.setStackInHand(Hand.OFF_HAND, ItemStack.EMPTY);
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/mob/PiglinEntity.java namedSrc/net/minecraft/entity/mob/PiglinEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/PiglinEntity.java	2024-10-15 01:24:16.428924687 +0000
+++ namedSrc/net/minecraft/entity/mob/PiglinEntity.java	2024-10-15 01:23:06.380045363 +0000
@@ -245,10 +245,10 @@
       if (source.getAttacker() instanceof CreeperEntity lv2 && lv2.shouldDropHead()) {
          ItemStack lv3 = new ItemStack(Items.PIGLIN_HEAD);
          lv2.onHeadDropped();
-         this.m_bujlfnum(world, lv3);
+         this.dropStack(world, lv3);
       }
 
-      this.inventory.clearToList().forEach(stack -> this.m_bujlfnum(world, stack));
+      this.inventory.clearToList().forEach(stack -> this.dropStack(world, stack));
    }
 
    /**
@@ -482,7 +482,7 @@
    @Override
    protected void zombify(ServerWorld world) {
       PiglinBrain.pickupItemWithOffHand(world, this);
-      this.inventory.clearToList().forEach(stack -> this.m_bujlfnum(world, stack));
+      this.inventory.clearToList().forEach(stack -> this.dropStack(world, stack));
       super.zombify(world);
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/RavagerEntity.java namedSrc/net/minecraft/entity/mob/RavagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/RavagerEntity.java	2024-10-15 01:24:16.328923431 +0000
+++ namedSrc/net/minecraft/entity/mob/RavagerEntity.java	2024-10-15 01:23:06.256043805 +0000
@@ -24,6 +24,7 @@
 import net.minecraft.entity.passive.MerchantEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.raid.RaiderEntity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.particle.ColoredParticleEffect;
 import net.minecraft.particle.ParticleTypes;
@@ -31,7 +32,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_sfpofsgc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
@@ -151,7 +151,7 @@
    @Override
    protected void updateGoalControls() {
       boolean bl = !(this.getPrimaryPassenger() instanceof MobEntity) || this.getPrimaryPassenger().getType().isIn(EntityTypeTags.RAIDERS);
-      boolean bl2 = !(this.getVehicle() instanceof C_sfpofsgc);
+      boolean bl2 = !(this.getVehicle() instanceof AbstractBoatEntity);
       this.goalSelector.setControlEnabled(Goal.Control.MOVE, bl);
       this.goalSelector.setControlEnabled(Goal.Control.JUMP, bl && bl2);
       this.goalSelector.setControlEnabled(Goal.Control.LOOK, bl);
diff -bur namedTargetSrc/net/minecraft/entity/mob/ShulkerEntity.java namedSrc/net/minecraft/entity/mob/ShulkerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/ShulkerEntity.java	2024-10-15 01:24:16.500925591 +0000
+++ namedSrc/net/minecraft/entity/mob/ShulkerEntity.java	2024-10-15 01:23:06.448046219 +0000
@@ -127,7 +127,7 @@
     * @mapping {@literal named FORWARD Lnet/minecraft/entity/mob/ShulkerEntity;FORWARD:Lorg/joml/Vector3f;}
     */
    static final Vector3f FORWARD = Util.make(() -> {
-      Vec3i lv = Direction.SOUTH.m_uinacubi();
+      Vec3i lv = Direction.SOUTH.asVec3i();
       return new Vector3f((float)lv.getX(), (float)lv.getY(), (float)lv.getZ());
    });
    /**
@@ -452,7 +452,7 @@
    @Override
    public EntityData initialize(ServerWorldAccess world, LocalDifficulty difficulty, SpawnReason reason, @Nullable EntityData entityData) {
       this.setYaw(0.0F);
-      this.headYaw = this.m_ndosmusf();
+      this.headYaw = this.getYaw();
       this.m_hhwtkfxu();
       return super.initialize(world, difficulty, reason, entityData);
    }
@@ -1086,7 +1086,7 @@
       protected Optional<Float> getTargetYaw() {
          Direction lv = ShulkerEntity.this.getAttachedFace().getOpposite();
          Vector3f vector3f = lv.getRotationQuaternion().transform(new Vector3f(ShulkerEntity.FORWARD));
-         Vec3i lv2 = lv.m_uinacubi();
+         Vec3i lv2 = lv.asVec3i();
          Vector3f vector3f2 = new Vector3f((float)lv2.getX(), (float)lv2.getY(), (float)lv2.getZ());
          vector3f2.cross(vector3f);
          double d = this.lookX - this.entity.getX();
diff -bur namedTargetSrc/net/minecraft/entity/mob/SilverfishEntity.java namedSrc/net/minecraft/entity/mob/SilverfishEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/SilverfishEntity.java	2024-10-15 01:24:16.480925339 +0000
+++ namedSrc/net/minecraft/entity/mob/SilverfishEntity.java	2024-10-15 01:23:06.428045967 +0000
@@ -139,7 +139,7 @@
     */
    @Override
    public void tick() {
-      this.bodyYaw = this.m_ndosmusf();
+      this.bodyYaw = this.getYaw();
       super.tick();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/SkeletonEntity.java namedSrc/net/minecraft/entity/mob/SkeletonEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/SkeletonEntity.java	2024-10-15 01:24:16.300923079 +0000
+++ namedSrc/net/minecraft/entity/mob/SkeletonEntity.java	2024-10-15 01:23:06.212043251 +0000
@@ -209,7 +209,7 @@
       super.dropCustomLoot(world, source, playerKill);
       if (source.getAttacker() instanceof CreeperEntity lv2 && lv2.shouldDropHead()) {
          lv2.onHeadDropped();
-         this.m_xrhuexzc(world, Items.SKELETON_SKULL);
+         this.dropStack(world, Items.SKELETON_SKULL);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/mob/SlimeEntity.java namedSrc/net/minecraft/entity/mob/SlimeEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/SlimeEntity.java	2024-10-15 01:24:16.244922376 +0000
+++ namedSrc/net/minecraft/entity/mob/SlimeEntity.java	2024-10-15 01:23:06.144042396 +0000
@@ -584,7 +584,7 @@
          }
 
          if (this.slime.getMoveControl() instanceof SlimeEntity.SlimeMoveControl lv2) {
-            lv2.look(this.slime.m_ndosmusf(), this.slime.canAttack());
+            lv2.look(this.slime.getYaw(), this.slime.canAttack());
          }
       }
    }
@@ -717,7 +717,7 @@
       public SlimeMoveControl(SlimeEntity slime) {
          super(slime);
          this.slime = slime;
-         this.targetYaw = 180.0F * slime.m_ndosmusf() / (float) Math.PI;
+         this.targetYaw = 180.0F * slime.getYaw() / (float) Math.PI;
       }
 
       /**
@@ -743,9 +743,9 @@
        */
       @Override
       public void tick() {
-         this.entity.setYaw(this.wrapDegrees(this.entity.m_ndosmusf(), this.targetYaw, 90.0F));
-         this.entity.headYaw = this.entity.m_ndosmusf();
-         this.entity.bodyYaw = this.entity.m_ndosmusf();
+         this.entity.setYaw(this.wrapDegrees(this.entity.getYaw(), this.targetYaw, 90.0F));
+         this.entity.headYaw = this.entity.getYaw();
+         this.entity.bodyYaw = this.entity.getYaw();
          if (this.state != MoveControl.State.MOVE_TO) {
             this.entity.setForwardSpeed(0.0F);
          } else {
diff -bur namedTargetSrc/net/minecraft/entity/mob/SpiderEntity.java namedSrc/net/minecraft/entity/mob/SpiderEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/SpiderEntity.java	2024-10-15 01:24:16.424924636 +0000
+++ namedSrc/net/minecraft/entity/mob/SpiderEntity.java	2024-10-15 01:23:06.376045313 +0000
@@ -213,7 +213,7 @@
       if (lv.nextInt(100) == 0) {
          SkeletonEntity lv2 = EntityType.SKELETON.m_oebfrxli(this.getWorld(), SpawnReason.JOCKEY);
          if (lv2 != null) {
-            lv2.refreshPositionAndAngles(this.getX(), this.getY(), this.getZ(), this.m_ndosmusf(), 0.0F);
+            lv2.refreshPositionAndAngles(this.getX(), this.getY(), this.getZ(), this.getYaw(), 0.0F);
             lv2.initialize(world, difficulty, reason, null);
             lv2.startRiding(this);
          }


The remaining diff is too long!

Please sign in to comment.