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

Strip colors from search term #4044

Merged
merged 4 commits into from
Dec 8, 2023

Conversation

JustAHuman-xD
Copy link
Contributor

@JustAHuman-xD JustAHuman-xD commented Dec 7, 2023

Description

To allow any servers that have colored chat to still use the slimefun search system

Proposed changes

  • In SurvivalSlimefunGuide#openSearch when searchTerm is defined I wrapped it with ChatColor#stripColor
  • In TestGuideOpening I changed testOpenSearch to testOpenSearchHistory to better reflect the test
  • In TestGuideOpening I created a new testOpenSearch method that tests with a normal, and then colored version of the same search. It opens the search for both and asserts that the item registered that should be found by the search is in the upper inventory (where the search would be displayed)

Related Issues (if applicable)

Resolves #4043

Checklist

  • I have fully tested the proposed changes and promise that they will not break everything into chaos.
  • I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
  • I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.20.*).
  • I followed the existing code standards and didn't mess up the formatting.
  • I did my best to add documentation to any public classes or methods I added.
  • I have added Nonnull and Nullable annotations to my methods to indicate their behaviour for null values
  • I added sufficient Unit Tests to cover my code.

@JustAHuman-xD JustAHuman-xD requested a review from a team as a code owner December 7, 2023 17:45
@github-actions github-actions bot added the ✨ Fix This Pull Request fixes an issue. label Dec 7, 2023
Copy link
Contributor

github-actions bot commented Dec 7, 2023

Your Pull Request was automatically labelled as: "✨ Fix"
Thank you for contributing to this project! ❤️

Copy link
Contributor

github-actions bot commented Dec 7, 2023

Slimefun preview build

A Slimefun preview build is available for testing!
Commit: e876ec14

https://preview-builds.walshy.dev/download/Slimefun/4044/e876ec14

Note: This is not a supported build and is only here for the purposes of testing.
Do not run this on a live server and do not report bugs anywhere but this PR!

@WalshyDev
Copy link
Member

we've had searching forever and coloured chat is common, how has this not been hit before?

@JustAHuman-xD
Copy link
Contributor Author

we've had searching forever and coloured chat is common, how has this not been hit before?

no idea

WalshyDev
WalshyDev previously approved these changes Dec 7, 2023
@WalshyDev
Copy link
Member

I'd love a test for this, should be easy enough to do.

@JustAHuman-xD
Copy link
Contributor Author

I'd love a test for this, should be easy enough to do.

can do, just got on my computer

@JustAHuman-xD
Copy link
Contributor Author

Just made the test, I ran said test with and without my changes and without the change it fails on the colored query but with my change it doesn't, if there's a better way to do the test lmk but this is what I could think of lol

Copy link
Member

@Sfiguz7 Sfiguz7 left a comment

Choose a reason for hiding this comment

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

Blame Walshy if tests fail

@Sfiguz7 Sfiguz7 merged commit 123e3b5 into Slimefun:master Dec 8, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✨ Fix This Pull Request fixes an issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GradientChat | Search bug with SlimeFun
3 participants