Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21.1 fix final #675

Merged
merged 8 commits into from
Jan 5, 2025
Prev Previous commit
Next Next commit
Improved some BoatEntity mappings. (#586)
* Improved some `BoatEntity` mappings.
- `checkBoatInWater` -> `isInWater`; conventional and consistent with `Location.IN_WATER`
- `checkLocation` -> `updateLocation`; a bit of an odd one, `updateLandFractionAndGetLocation` would be a verbose literal name, I think `updateLocation` communicates that reasonably well

* Improved some `BoatEntity` mappings.
- `checkBoatInWater` -> `isInWater`; conventional and consistent with `Location.IN_WATER`
- `checkLocation` -> `updateLocation`; a bit of an odd one, `updateLandFractionAndGetLocation` would be a verbose literal name, I think `updateLocation` communicates that reasonably well
- `landFriction` -> `groundFriction`; to match `getGroundFriction`
I considered renaming all `ground` -> `land` in `BoatEntity` to be consistent with `Location.ON_LAND`, but `Entity.fall`'s `onGround` param traces back to a string, so they can't be completely reconciled, and `ground` is used more in other classes and I think is slightly better in most cases.

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
commit 2e4b3ab40bd1faeaecb947417686a89547778fba
6 changes: 3 additions & 3 deletions mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ CLASS net/minecraft/unmapped/C_mpfuowct net/minecraft/entity/vehicle/BoatEntity
FIELD f_jgunhycm ticksUnderwater F
FIELD f_jpsxxmki y D
FIELD f_mavldovk z D
FIELD f_nshqodnw landFriction F
FIELD f_nshqodnw groundFriction F
FIELD f_odtguolr boatYaw D
FIELD f_rspsbzff fallVelocity D
FIELD f_sbrsivqn TIME_TO_EJECT_TICKS I
@@ -57,7 +57,7 @@ CLASS net/minecraft/unmapped/C_mpfuowct net/minecraft/entity/vehicle/BoatEntity
METHOD m_qktgsogx getBubbleWobbleTicks ()I
METHOD m_teavnubq isPaddleMoving (I)Z
ARG 1 paddle
METHOD m_tikylhyj checkBoatInWater ()Z
METHOD m_tikylhyj isInWater ()Z
METHOD m_ttullqty canCollide (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;)Z
ARG 0 entity
ARG 1 other
@@ -76,7 +76,7 @@ CLASS net/minecraft/unmapped/C_mpfuowct net/minecraft/entity/vehicle/BoatEntity
METHOD m_wimbgplz getSinglePassengerXOffset ()F
METHOD m_wovjkrir (Lnet/minecraft/unmapped/C_astfners;)Z
ARG 0 entity
METHOD m_xwvweinm checkLocation ()Lnet/minecraft/unmapped/C_mpfuowct$C_tdpqooxn;
METHOD m_xwvweinm updateLocation ()Lnet/minecraft/unmapped/C_mpfuowct$C_tdpqooxn;
CLASS C_jyahrrif Variant
FIELD f_haecscok CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc;
FIELD f_vbzpbykb key Ljava/lang/String;