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 fix final #674

Merged
merged 7 commits into from
Jan 5, 2025
Merged

1.21 fix final #674

merged 7 commits into from
Jan 5, 2025

Conversation

supersaiyansubtlety
Copy link
Member

backports #672 to 1.21

supersaiyansubtlety and others added 7 commits May 6, 2024 12:15
* complete components, text, and village

* shown in tooltip

* tooltip config

* Completed several enchantment-related classes and ToolComponent

* fixed typos and javadoc references

* refined/reworked some names, added javadoc formatting, fixed hasSpace -> hasSpaceBelow and params

* Update mappings/net/minecraft/entity/player/PlayerEntity.mapping

Fix typo

* requiresTool/doesRequireTool -> toolRequired/isToolRequired

---------

Co-authored-by: ix0rai <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* 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>
* fixed BookEditScreen #writeNbtData -> #updateBookComponent

* Improved some `BookEditScreen` and related names.
Notably:
- **fixed**  `#writeNbtData` -> `#updateBookComponent`
- `PageContent` -> `Display`; it's not just content, it's only used for the current page, and having fields of `String`s, `int`s, and this all called "pages" was confusing. Mojmap is `DisplayCache`, but the field that holds the current instance is the cache of this, the display.

* LecterScreenHandler #getBookItem -> #getBook

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@supersaiyansubtlety supersaiyansubtlety added bug something isn't working correctly v: release targets a release version of minecraft reviews needed please review this PR critical a critical PR; bypasses final comment period s: tiny PRs with less than 50 lines labels Dec 31, 2024
Copy link
Member

@ix0rai ix0rai left a comment

Choose a reason for hiding this comment

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

looks good, i'll get all these merged!

@ix0rai ix0rai merged commit 7247b72 into QuiltMC:1.21 Jan 5, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug something isn't working correctly critical a critical PR; bypasses final comment period reviews needed please review this PR s: tiny PRs with less than 50 lines v: release targets a release version of minecraft
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants