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

Refactors shift tooltips on MetaBaseItem a bit #3333

Merged
merged 7 commits into from
Oct 17, 2024

Conversation

querns
Copy link
Contributor

@querns querns commented Oct 5, 2024

When I added the ability to create a separate tooltip on MetaBaseItems by holding Shift, it caused a little bit of undesirable behavior. Regular items, like the wrench or data stick, were having some of their normal tooltips be clobbered by a too-eager shift tooltip invocation. I've refactored the way tooltips are applied from IItemBehaviors a bit to make it not do that. Now MetaBaseItems with no shift-tooltip defined won't clobber part of their normal tooltip.

@FourIsTheNumber FourIsTheNumber added refactor For PRs rewritting a part of the code to have a nicer code overall. bug fix Fix a bug. Please link it in the PR. labels Oct 5, 2024
@Dream-Master Dream-Master requested a review from a team October 5, 2024 23:11
@Lyfts Lyfts enabled auto-merge (squash) October 15, 2024 12:05
Copy link
Contributor

@RecursivePineapple RecursivePineapple left a comment

Choose a reason for hiding this comment

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

There's minor a conflict with Alex's tooltip changes, but beyond that this looks good.

@Dream-Master
Copy link
Member

@querns @RecursivePineapple can this resolved ? @Alexdoru

# Conflicts:
#	src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java
auto-merge was automatically disabled October 16, 2024 19:06

Head branch was pushed to by a user without write access

@querns
Copy link
Contributor Author

querns commented Oct 16, 2024

should be fixed now

@Dream-Master Dream-Master merged commit 19e99fe into GTNewHorizons:master Oct 17, 2024
5 checks passed
@querns querns deleted the shift-tooltip-tweak branch October 29, 2024 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix Fix a bug. Please link it in the PR. refactor For PRs rewritting a part of the code to have a nicer code overall.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants