1.21.4 port #686
Merged
1.21.4 port #686
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Enchantment and tool work (QuiltMC#585) * 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. (QuiltMC#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> * Improved some `BookEditScreen` and related names. (QuiltMC#587) * 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> * fix 'overrides final method' error * update InteractionEntity's tracked data fields to match method name changes --------- Co-authored-by: ix0rai <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Enchantment and tool work (QuiltMC#585) * 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. (QuiltMC#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> * Improved some `BookEditScreen` and related names. (QuiltMC#587) * 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> * fix 'overrides final method' error * update InteractionEntity's tracked data fields to match method name changes --------- Co-authored-by: ix0rai <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Enchantment and tool work (QuiltMC#585) * 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. (QuiltMC#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> * Improved some `BookEditScreen` and related names. (QuiltMC#587) * 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> * fix 'overrides final method' error * update InteractionEntity's tracked data fields to match method name changes --------- Co-authored-by: ix0rai <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
update enigma and plugin to latest
* add missing CommonColor constants * clarify ALTERNATE_WHITE to LIGHTER_GRAY Co-authored-by: Will <[email protected]> --------- Co-authored-by: Will <[email protected]>
…uiltMC#680) * add mappings for LocationPredicate.Builder fields and setter methods * Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping Co-authored-by: Will <[email protected]> * Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping Co-authored-by: Will <[email protected]> * Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping Co-authored-by: Will <[email protected]> * Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping Co-authored-by: Will <[email protected]> * Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping Co-authored-by: Will <[email protected]> --------- Co-authored-by: Will <[email protected]>
this includes restoring GlStateManager which was somehow missing on 1.21.4
supersaiyansubtlety
added
bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ports 1.21.1 changes to 1.21.4, including updating engima to 2.5.3
also restores
GlStateManagerfrom 1.21.3 which was somehow missing on 1.21.4