added 2 items to ItemCooldowns #1018
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
kevinthegreat1
previously approved these changes
Oct 8, 2024
LifeIsAParadox
added
merge me please
LifeIsAParadox
added
reviews needed
|
pardon my tism, this might be slightly better? |
kevinthegreat1
requested changes
Oct 11, 2024
Comment on lines
115
to
117
| if (player.fishHook != null) { | ||
| handleItemCooldown(GRAPPLING_HOOK_ID, 2000, !isWearingBatArmor(player)); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (player.fishHook != null) { | |
| handleItemCooldown(GRAPPLING_HOOK_ID, 2000, !isWearingBatArmor(player)); | |
| } | |
| handleItemCooldown(GRAPPLING_HOOK_ID, 2000, player.fishHook != null && !isWearingBatArmor(player)); |
Comment on lines
83
to
94
| // Method to handle item cooldowns with optional condition | ||
| private static void handleItemCooldown(String itemId, int cooldownTime, boolean additionalCondition) { | ||
| if (!isOnCooldown(itemId) && additionalCondition) { | ||
| ITEM_COOLDOWNS.put(itemId, new CooldownEntry(cooldownTime)); | ||
| } | ||
| } | ||
|
|
||
| // Overloaded method for cases without additional conditions | ||
| private static void handleItemCooldown(String itemId, int cooldownTime) { | ||
| handleItemCooldown(itemId, cooldownTime, true); | ||
| } | ||
|
|
There was a problem hiding this comment.
It doesn't make sense to place these two methods here. Maybe after onItemInteract?
| if (!SkyblockerConfigManager.get().uiAndVisuals.itemCooldown.enableItemCooldowns) | ||
| return TypedActionResult.pass(ItemStack.EMPTY); | ||
| String usedItemId = ItemUtils.getItemId(player.getMainHandStack()); | ||
| switch (usedItemId) { |
There was a problem hiding this comment.
Can you sort this switch by the time while you're at it? You also have two entries for 30000.
LifeIsAParadox
added
changes requested
LifeIsAParadox
added
reviews needed
|
weeeee |
kevinthegreat1
approved these changes
Oct 11, 2024
LifeIsAParadox
added
merge me please
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.
added Rouge Sword and Ink Wand