From 62efc12ae194f8aee0bac3991ed584f9e426e549 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sat, 23 Jul 2022 08:40:56 +0200 Subject: adding anvil combine helper feature --- .../at/hannibal2/skyhanni/config/Features.java | 10 +-- .../skyhanni/config/features/Inventory.java | 71 ++++++++++++++++++++++ .../hannibal2/skyhanni/config/features/Items.java | 66 -------------------- 3 files changed, 73 insertions(+), 74 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Items.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 990bbae5c..a45ad3abd 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -62,8 +62,8 @@ public class Features { public Dungeon dungeon = new Dungeon(); @Expose - @Category(name = "Items", desc = "Changing the behavior around items and the inventory.") - public Items items = new Items(); + @Category(name = "Inventory", desc = "Changing the behavior around items and the inventory.") + public Inventory inventory = new Inventory(); @Expose @Category(name = "Bazaar", desc = "Bazaar settings.") @@ -84,10 +84,4 @@ public class Features { @Expose @Category(name = "Debug", desc = "Debug and test stuff.") public Debug debug = new Debug(); - - - - - - } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java new file mode 100644 index 000000000..eddb9fe15 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java @@ -0,0 +1,71 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId; +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion; +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean; +import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption; +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") + @ConfigEditorBoolean + public boolean hideNotClickableItems = false; + + @Expose + @ConfigOption(name = "Item number as stack size", desc = "") + @ConfigEditorAccordion(id = 2) + public boolean filterTypes = false; + + @Expose + @ConfigOption(name = "Master Star Number", desc = "Show the Tier of the Master Star.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean displayMasterStarNumber = false; + + @Expose + @ConfigOption(name = "Master Skull Number", desc = "Show the tier of the Master Skull accessory.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean displayMasterSkullNumber = false; + + @Expose + @ConfigOption(name = "Dungeon Head Floor", desc = "Show the correct floor for golden and diamond heads.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean displayDungeonHeadFloor = false; + + @Expose + @ConfigOption(name = "New Year Cake", desc = "Show the Number of the Year of New Year Cakes.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean displayNewYearCakeNumber = false; + + @Expose + @ConfigOption(name = "Pet Level", desc = "Show the level of the pet when not maxed.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean displayPetLevel = false; + + @Expose + @ConfigOption(name = "Minion Tier", desc = "Show the Minion Tier over Items.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean displayMinionTier = false; + + @Expose + @ConfigOption(name = "Sack Name", desc = "Show an abbreviation of the Sack name.") + @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 + public boolean anvilCombineHelper = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Items.java b/src/main/java/at/hannibal2/skyhanni/config/features/Items.java deleted file mode 100644 index 2c172aa9f..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Items.java +++ /dev/null @@ -1,66 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId; -import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion; -import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean; -import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption; -import com.google.gson.annotations.Expose; - -public class Items { - - @Expose - @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; - - @Expose - @ConfigOption(name = "Item number as stack size", desc = "") - @ConfigEditorAccordion(id = 2) - public boolean filterTypes = false; - - @Expose - @ConfigOption(name = "Master Star Number", desc = "Show the Tier of the Master Star.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean displayMasterStarNumber = false; - - @Expose - @ConfigOption(name = "Master Skull Number", desc = "Show the tier of the Master Skull accessory.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean displayMasterSkullNumber = false; - - @Expose - @ConfigOption(name = "Dungeon Head Floor", desc = "Show the correct floor for golden and diamond heads.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean displayDungeonHeadFloor = false; - - @Expose - @ConfigOption(name = "New Year Cake", desc = "Show the Number of the Year of New Year Cakes.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean displayNewYearCakeNumber = false; - - @Expose - @ConfigOption(name = "Pet Level", desc = "Show the level of the pet when not maxed.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean displayPetLevel = false; - - @Expose - @ConfigOption(name = "Minion Tier", desc = "Show the Minion Tier over Items.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean displayMinionTier = false; - - @Expose - @ConfigOption(name = "Sack Name", desc = "Show an abbreviation of the Sack name.") - @ConfigEditorBoolean - public boolean displaySackName = false; - - @Expose - @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.") - @ConfigEditorBoolean - public boolean itemAbilityCooldown = false; -} -- cgit