Bazaar Lookup/Misc Options #792
Merged
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
src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java
Outdated
Show resolved
Hide resolved
LifeIsAParadox
added
merge conflicts
|
Uh... 
least horrendous merge conflict be like |
The merge conflicts were even worse when it was a part of bleeding edge lol 😭 |
BigloBot
reviewed
Jun 26, 2024
|
|
||
| public abstract class BazaarHelper extends ContainerSolver { | ||
| public BazaarHelper() { | ||
| super("Your Bazaar Orders"); |
There was a problem hiding this comment.
Fun fact. this changes on Co-ops
Co-op Bazaar Orders
|
This is ready to be rebased. Please let me know if you need any help. |
yes please :( |
Added a Debug Options to the Misc config tab which has the added options to always have debug bounding box's enable and a option to Refresh ToolTip Prices
VeritasDL
force-pushed
the
bleeding-edge-bz
branch
from
24301e8
to
5c89e46
Compare
LifeIsAParadox
added
reviews needed
|
i think i got it idk |
Comment on lines
313
to
321
| "skyblocker.config.helpers.bazaar.bazaarLookup": "Bazaar Lookup", | ||
| "skyblocker.config.helpers.bazaar.bazaarLookup.enableBazaarLookup": "Enable Bazaar Lookup", | ||
| "skyblocker.config.helpers.bazaar.bazaarLookup.enableBazaarLookup.@Tooltip": "Searches the Bazaar for the current hovered item with the F3 key.", | ||
| "skyblocker.config.helpers.bazaar.bazaarLookup.failedBazaarLookup": "Failed to find item in the Bazaar", | ||
| "skyblocker.config.helpers.bazaar.bazaarRefresh.BazaarRefresh": "Bazaar Refresh", | ||
| "skyblocker.config.helpers.bazaar.bazaarRefresh.enableBazaarRefresh": "Enable Bazaar Refresh", | ||
| "skyblocker.config.helpers.bazaar.bazaarRefresh.enableBazaarRefresh.@Tooltip": "Refresh the Bazaar prices with the Z key.", | ||
| "skyblocker.config.helpers.bazaar.bazaarRefresh.yesBazaarRefresh": "Bazaar Refreshed", | ||
| "skyblocker.config.helpers.bazaar.bazaarRefresh.noBazaarRefresh": "Bazaar Refresh Failed", |
There was a problem hiding this comment.
These translation keys should match the config and unused keys should be removed. I have fixed this but please remember next time.
Comment on lines
43
to
59
| public static KeyBinding BazaarLookup; | ||
| public static KeyBinding BazaarRefresh; | ||
| public static String itemName; | ||
| public static void init() { | ||
| BazaarLookup = KeyBindingHelper.registerKeyBinding(new KeyBinding( | ||
| "key.bazaarLookup", | ||
| InputUtil.Type.KEYSYM, | ||
| GLFW.GLFW_KEY_F3, | ||
| "key.categories.skyblocker" | ||
| )); | ||
| BazaarRefresh = KeyBindingHelper.registerKeyBinding(new KeyBinding( | ||
| "key.bazaarRefresh", | ||
| InputUtil.Type.KEYSYM, | ||
| GLFW.GLFW_KEY_Z, | ||
| "key.categories.skyblocker" | ||
| )); | ||
| } |
There was a problem hiding this comment.
Fields should go in front of constructors, and constructors should go in front of static methods. I have fixed this too.
kevinthegreat1
approved these changes
Jul 29, 2024
LifeIsAParadox
added
merge me please
VeritasDL
commented
Aug 2, 2024
There was a problem hiding this comment.
why comment out =[
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.
BZ Lookup "backported" to Master
Added a Debug Options to the Misc config tab
which has the added options to always have debug bounding box's enable and a option to Refresh ToolTip Prices