diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config')
3 files changed, 26 insertions, 22 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 489a52f7c..abed49281 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -128,7 +128,7 @@ public class Features extends Config { } if (runnableId.equals("minionCraftHelper")) { - editOverlay(activeConfigCategory, 200, 16, minions.minionCraftHelperPos); + editOverlay(activeConfigCategory, 200, 16, bingo.minionCraftHelperPos); return; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java index aa202849b..4b4610d75 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java @@ -1,9 +1,7 @@ package at.hannibal2.skyhanni.config.features; import at.hannibal2.skyhanni.config.core.config.Position; -import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean; -import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorButton; -import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption; +import at.hannibal2.skyhanni.config.core.config.annotations.*; import com.google.gson.annotations.Expose; public class Bingo { @@ -15,12 +13,34 @@ public class Bingo { public boolean compactChatMessages = true; @Expose - @ConfigOption(name = "Bingo Card", desc = "Show the bingo card.") + @ConfigOption(name = "Bingo Card View", desc = "Simply showing the bingo card. Toggle by sneaking with skyblock menu in hand.") @ConfigEditorBoolean - public boolean bingoCard = false; + public boolean cardDisplay = true; + + @Expose + @ConfigOption(name = "Bingo Steps", desc = "Show help with the next step in bingo instead of the bingo card. " + + "§cThis feature is in early development. Expect bugs and missing goals.") + @ConfigEditorBoolean + public boolean stepHelper = false; @Expose @ConfigOption(name = "Bingo Card Position", desc = "") @ConfigEditorButton(runnableId = "bingoCard", buttonText = "Edit") public Position bingoCardPos = new Position(10, 10, false, true); + + @ConfigOption(name = "Minion Craft Helper", desc = "") + @ConfigEditorAccordion(id = 0) + public boolean minionCraftHelper = false; + + @Expose + @ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for bingo.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean minionCraftHelperEnabled = true; + + @Expose + @ConfigOption(name = "Minion Craft Helper Position", desc = "") + @ConfigEditorButton(runnableId = "minionCraftHelper", buttonText = "Edit") + @ConfigAccordionId(id = 0) + public Position minionCraftHelperPos = new Position(10, 10, false, true); } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java b/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java index 8d2963ea8..d29eb45bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java @@ -82,22 +82,6 @@ public class Minions { @ConfigAccordionId(id = 2) public Position hopperProfitPos = new Position(10, 10, false, true); - @ConfigOption(name = "Minion Craft Helper", desc = "") - @ConfigEditorAccordion(id = 3) - public boolean minionCraftHelper = false; - - @Expose - @ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for bingo.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean minionCraftHelperEnabled = false; - - @Expose - @ConfigOption(name = "Minion Craft Helper Position", desc = "") - @ConfigEditorButton(runnableId = "minionCraftHelper", buttonText = "Edit") - @ConfigAccordionId(id = 3) - public Position minionCraftHelperPos = new Position(10, 10, false, true); - @Expose @ConfigOption(name = "Hide Mob Nametag", desc = "Hiding the nametag of mobs close to minions") @ConfigEditorBoolean |