Skip to content

[New Feature] Block grappling on its cooldown #444

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[New Feature] Block grappling on its cooldown #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d7fd01
New feature to block grappling on its cooldown
RobotHanzo Oct 27, 2020
83c5544
Merge branch 'development' of https://github.com/BiscuitDevelopment/S…
RobotHanzo Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/codes/biscuit/skyblockaddons/core/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ public enum Feature {
COMPACT_TAB_LIST(152, "settings.compactTabList", null, false),
ENCHANTMENTS_HIGHLIGHT(153, "settings.highlightMaxEnchantments", new GuiFeatureData(ColorCode.GOLD, true), false),

BLOCK_GRAPPLING_HOOK_ON_COOLDOWN(152, "settings.blockGrapplingHookOnCooldown", null, false),

WARNING_TIME(-1, Message.SETTING_WARNING_DURATION, false),
WARP_ADVANCED_MODE(-1, Message.SETTING_ADVANCED_MODE, true),
ADD(-1, null, false),
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/codes/biscuit/skyblockaddons/listeners/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,11 @@ public void onInteract(PlayerInteractEvent e) {
lastBobberEnteredWater = Long.MAX_VALUE;
oldBobberPosY = 0;
}
if (Objects.equals(ItemUtils.getSkyBlockItemID(heldItem), "GRAPPLING_HOOK")
&& main.getConfigValues().isEnabled(Feature.BLOCK_GRAPPLING_HOOK_ON_COOLDOWN)
&& CooldownManager.isOnCooldown(heldItem)) {
e.setCanceled(true);
}
if (main.getConfigValues().isEnabled(Feature.SHOW_ITEM_COOLDOWNS) && mc.thePlayer.fishEntity != null) {
CooldownManager.put(mc.thePlayer.getHeldItem());
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/codes/biscuit/skyblockaddons/utils/EnumUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ public enum FeatureCredit {
Feature.DUNGEONS_SECRETS_DISPLAY, Feature.SHOW_SALVAGE_ESSENCES_COUNTER, Feature.SHOW_SWORD_KILLS, Feature.ENCHANTMENTS_HIGHLIGHT),
TIRELESS_TRAVELER("TirelessTraveler", "github.com/ILikePlayingGames", Feature.DUNGEON_DEATH_COUNTER),
KAASBROODJU("kaasbroodju", "github.com/kaasbroodju", Feature.SKILL_PROGRESS_BAR, Feature.SHOW_SKILL_PERCENTAGE_INSTEAD_OF_XP, Feature.SHOW_SKILL_XP_GAINED),
PHOUBE("Phoube", "github.com/Phoube", Feature.HIDE_OTHER_PLAYERS_PRESENTS, Feature.EASIER_PRESENT_OPENING);
PHOUBE("Phoube", "github.com/Phoube", Feature.HIDE_OTHER_PLAYERS_PRESENTS, Feature.EASIER_PRESENT_OPENING),
ROBOTHANZO("RobotHanzo", "robothanzo.dev", Feature.BLOCK_GRAPPLING_HOOK_ON_COOLDOWN);

private Set<Feature> features;
private String author;
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@
"easierPresentOpening": "Open Presents Easier",
"showSwordKills": "Show Sword Kills",
"compactTabList": "Compact Tab List",
"highlightMaxEnchantments": "Highlight Special Enchantments"
"highlightMaxEnchantments": "Highlight Special Enchantments",
"blockGrapplingHookOnCooldown": "Block Grappling Hook on Cooldown"
},
"messages": {
"enchants": "Enchants",
Expand Down