From 5f2f88ac52502cb5da0a48f2a61a4977e005917c Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sat, 6 Aug 2022 13:21:48 +0200 Subject: add ashfang freeze cooldown --- .../at/hannibal2/skyhanni/config/Features.java | 9 ++++++++ .../skyhanni/config/features/Abilities.java | 25 ++++++++++++++++++++++ .../skyhanni/config/features/Dungeon.java | 2 +- .../skyhanni/config/features/Fishing.java | 2 +- .../skyhanni/config/features/Inventory.java | 7 +----- 5 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java (limited to 'src/main/java/at/hannibal2/skyhanni/config') diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 8b4b66524..00eaa6074 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -51,6 +51,11 @@ public class Features { editOverlay(activeConfigCategory, 200, 16, bazaar.bestSellMethodPos); return; } + + if (runnableId.equals("ashfangFreezeCooldown")) { + editOverlay(activeConfigCategory, 200, 16, abilities.ashfangFreezeCooldownPos); + return; + } } @Expose @@ -65,6 +70,10 @@ public class Features { @Category(name = "Inventory", desc = "Changing the behavior around items and the inventory.") public Inventory inventory = new Inventory(); + @Expose + @Category(name = "Abilitiies", desc = "Stuff about abilities") + public Abilities abilities = new Abilities(); + @Expose @Category(name = "Bazaar", desc = "Bazaar settings.") public Bazaar bazaar = new Bazaar(); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java b/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java new file mode 100644 index 000000000..c5776087c --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java @@ -0,0 +1,25 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.gui.core.config.Position; +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean; +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton; +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption; +import com.google.gson.annotations.Expose; + +public class Abilities { + + @Expose + @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.") + @ConfigEditorBoolean + public boolean itemAbilityCooldown = false; + + @Expose + @ConfigOption(name = "Ashfang Freeze", desc = "Show the cooldown how long Ashfang blocks all your abilities.") + @ConfigEditorBoolean + public boolean ashfangFreezeCooldown = false; + + @Expose + @ConfigOption(name = "Ashfang Freeze Position", desc = "") + @ConfigEditorButton(runnableId = "ashfangFreezeCooldown", buttonText = "Edit") + public Position ashfangFreezeCooldownPos = new Position(10, 10, false, true); +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java index 466192e72..8217c71a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java @@ -9,7 +9,7 @@ import com.google.gson.annotations.Expose; public class Dungeon { @Expose - @ConfigOption(name = "Clicked Blocks", desc = "Highlight the following blocks when clicked in dungeon: Lever, Chest, Wither Essence") + @ConfigOption(name = "Clicked Blocks", desc = "Highlight the following blocks when clicked in dungeon: Lever, Chest, Wither Essence.") @ConfigEditorBoolean public boolean highlightClickedBlocks = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java index 18adebc90..384a28075 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java @@ -17,7 +17,7 @@ public class Fishing { public boolean trophyFishBronzeHider = false; @Expose - @ConfigOption(name = "Shorten Fishing Message", desc = "Shorten the message what type of sea creature you have fished") + @ConfigOption(name = "Shorten Fishing Message", desc = "Shorten the message what type of sea creature you have fished.") @ConfigEditorBoolean public boolean shortenFishingMessage = false; } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java index eddb9fe15..884f245ea 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java @@ -9,7 +9,7 @@ import com.google.gson.annotations.Expose; public class Inventory { @Expose - @ConfigOption(name = "Not Clickable Items", desc = "Hide items that are not clickable in " + "the current inventory: ah, bz, accessory bag, etc") + @ConfigOption(name = "Not Clickable Items", desc = "Hide items that are not clickable in " + "the current inventory: ah, bz, accessory bag, etc.") @ConfigEditorBoolean public boolean hideNotClickableItems = false; @@ -59,11 +59,6 @@ public class Inventory { @ConfigEditorBoolean public boolean displaySackName = false; - @Expose - @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.") - @ConfigEditorBoolean - public boolean itemAbilityCooldown = false; - @Expose @ConfigOption(name = "Anvil Combine Helper", desc = "Suggests the same item in the inventory when trying to combine two items in the anvil.") @ConfigEditorBoolean -- cgit