From 65e79034527bd2f967a8c580681534435280d5f1 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:49:37 +0200 Subject: renamed config classes --- .../at/hannibal2/skyhanni/config/Features.java | 56 +- .../skyhanni/config/features/Ashfang.java | 66 - .../skyhanni/config/features/AshfangConfig.java | 66 + .../hannibal2/skyhanni/config/features/Bazaar.java | 32 - .../skyhanni/config/features/BazaarConfig.java | 32 + .../hannibal2/skyhanni/config/features/Bingo.java | 82 -- .../skyhanni/config/features/BingoConfig.java | 82 ++ .../skyhanni/config/features/CommandsConfig.java | 24 + .../skyhanni/config/features/CommandsFeatures.java | 24 - .../skyhanni/config/features/Dungeon.java | 157 --- .../skyhanni/config/features/DungeonConfig.java | 157 +++ .../skyhanni/config/features/Fishing.java | 191 --- .../skyhanni/config/features/FishingConfig.java | 191 +++ .../at/hannibal2/skyhanni/config/features/GUI.java | 20 - .../skyhanni/config/features/GUIConfig.java | 20 + .../hannibal2/skyhanni/config/features/Garden.java | 1349 ------------------- .../skyhanni/config/features/GardenConfig.java | 1359 ++++++++++++++++++++ .../skyhanni/config/features/Inventory.java | 255 ---- .../skyhanni/config/features/InventoryConfig.java | 262 ++++ .../skyhanni/config/features/ItemAbilities.java | 37 - .../config/features/ItemAbilityConfig.java | 42 + .../config/features/MarkedPlayerConfig.java | 24 + .../skyhanni/config/features/MarkedPlayers.java | 24 - .../skyhanni/config/features/Minions.java | 86 -- .../skyhanni/config/features/MinionsConfig.java | 91 ++ .../hannibal2/skyhanni/config/features/Mobs.java | 85 -- .../skyhanni/config/features/MobsConfig.java | 85 ++ .../skyhanni/config/features/Summonings.java | 43 - .../skyhanni/config/features/SummoningsConfig.java | 43 + 29 files changed, 2506 insertions(+), 2479 deletions(-) delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/GUI.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Garden.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilities.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayerConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Minions.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MobsConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 2f2de9fc5..d43b3fe39 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -2,29 +2,29 @@ package at.hannibal2.skyhanni.config; import at.hannibal2.skyhanni.SkyHanniMod; import at.hannibal2.skyhanni.config.features.About; -import at.hannibal2.skyhanni.config.features.Ashfang; -import at.hannibal2.skyhanni.config.features.Bazaar; -import at.hannibal2.skyhanni.config.features.Bingo; +import at.hannibal2.skyhanni.config.features.AshfangConfig; +import at.hannibal2.skyhanni.config.features.BazaarConfig; +import at.hannibal2.skyhanni.config.features.BingoConfig; import at.hannibal2.skyhanni.config.features.ChatConfig; -import at.hannibal2.skyhanni.config.features.CommandsFeatures; +import at.hannibal2.skyhanni.config.features.CommandsConfig; import at.hannibal2.skyhanni.config.features.DamageIndicatorConfig; import at.hannibal2.skyhanni.config.features.DevConfig; import at.hannibal2.skyhanni.config.features.DianaConfig; -import at.hannibal2.skyhanni.config.features.Dungeon; -import at.hannibal2.skyhanni.config.features.Fishing; -import at.hannibal2.skyhanni.config.features.GUI; -import at.hannibal2.skyhanni.config.features.Garden; +import at.hannibal2.skyhanni.config.features.DungeonConfig; +import at.hannibal2.skyhanni.config.features.FishingConfig; +import at.hannibal2.skyhanni.config.features.GUIConfig; +import at.hannibal2.skyhanni.config.features.GardenConfig; import at.hannibal2.skyhanni.config.features.GhostCounterConfig; -import at.hannibal2.skyhanni.config.features.Inventory; -import at.hannibal2.skyhanni.config.features.ItemAbilities; -import at.hannibal2.skyhanni.config.features.MarkedPlayers; -import at.hannibal2.skyhanni.config.features.Minions; +import at.hannibal2.skyhanni.config.features.InventoryConfig; +import at.hannibal2.skyhanni.config.features.ItemAbilityConfig; +import at.hannibal2.skyhanni.config.features.MarkedPlayerConfig; +import at.hannibal2.skyhanni.config.features.MinionsConfig; import at.hannibal2.skyhanni.config.features.MiscConfig; -import at.hannibal2.skyhanni.config.features.Mobs; +import at.hannibal2.skyhanni.config.features.MobsConfig; import at.hannibal2.skyhanni.config.features.OldHidden; import at.hannibal2.skyhanni.config.features.RiftConfig; import at.hannibal2.skyhanni.config.features.SlayerConfig; -import at.hannibal2.skyhanni.config.features.Summonings; +import at.hannibal2.skyhanni.config.features.SummoningsConfig; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.Config; import io.github.moulberry.moulconfig.Social; @@ -68,7 +68,7 @@ public class Features extends Config { @Expose @Category(name = "GUI Locations", desc = "Change the locations of GUI elements. (§e/sh gui§7)") - public GUI gui = new GUI(); + public GUIConfig gui = new GUIConfig(); @Expose @Category(name = "Chat", desc = "Change how the chat looks.") @@ -76,35 +76,35 @@ public class Features extends Config { @Expose @Category(name = "Dungeon", desc = "Features that change the dungeon experience in catacombs.") - public Dungeon dungeon = new Dungeon(); + public DungeonConfig dungeon = new DungeonConfig(); @Expose @Category(name = "Inventory", desc = "Changing the behavior around items and the inventory.") - public Inventory inventory = new Inventory(); + public InventoryConfig inventory = new InventoryConfig(); @Expose @Category(name = "Item Abilities", desc = "Stuff about item abilities.") - public ItemAbilities itemAbilities = new ItemAbilities(); + public ItemAbilityConfig itemAbilities = new ItemAbilityConfig(); @Expose @Category(name = "Summonings", desc = "Mobs you revive.") - public Summonings summonings = new Summonings(); + public SummoningsConfig summonings = new SummoningsConfig(); @Expose @Category(name = "Ashfang", desc = "Ashfang fight in Crimson Isle.") - public Ashfang ashfang = new Ashfang(); + public AshfangConfig ashfang = new AshfangConfig(); @Expose @Category(name = "Minion", desc = "The minions at your private island.") - public Minions minions = new Minions(); + public MinionsConfig minions = new MinionsConfig(); @Expose @Category(name = "Bazaar", desc = "Bazaar settings.") - public Bazaar bazaar = new Bazaar(); + public BazaarConfig bazaar = new BazaarConfig(); @Expose @Category(name = "Fishing", desc = "Fishing stuff.") - public Fishing fishing = new Fishing(); + public FishingConfig fishing = new FishingConfig(); @Expose @Category(name = "Damage Indicator", desc = "Better damage overview in combat with bosses of all sorts.") @@ -120,23 +120,23 @@ public class Features extends Config { @Expose @Category(name = "Commands", desc = "Enable or disable commands.") - public CommandsFeatures commands = new CommandsFeatures(); + public CommandsConfig commands = new CommandsConfig(); @Expose @Category(name = "Marked Players", desc = "Players that got marked with /shmarkplayer.") - public MarkedPlayers markedPlayers = new MarkedPlayers(); + public MarkedPlayerConfig markedPlayers = new MarkedPlayerConfig(); @Expose @Category(name = "Bingo", desc = "Features for the Bingo mode.") - public Bingo bingo = new Bingo(); + public BingoConfig bingo = new BingoConfig(); @Expose @Category(name = "Mobs", desc = "Visual help for Mobs") - public Mobs mobs = new Mobs(); + public MobsConfig mobs = new MobsConfig(); @Expose @Category(name = "Garden", desc = "Features on the Garden island.") - public Garden garden = new Garden(); + public GardenConfig garden = new GardenConfig(); @Expose @Category(name = "The Rift", desc = "Features for The Rift dimension.") diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java b/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java deleted file mode 100644 index 5b7536965..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java +++ /dev/null @@ -1,66 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class Ashfang { - - @Expose - @ConfigOption(name = "Freeze", desc = "Show the cooldown for how long Ashfang blocks your abilities.") - @ConfigEditorBoolean - public boolean freezeCooldown = false; - - @Expose - public Position freezeCooldownPos = new Position(10, 10, false, true); - - @Expose - @ConfigOption(name = "Reset Time", desc = "Show the cooldown until Ashfang pulls his underlings back.") - @ConfigEditorBoolean - public boolean nextResetCooldown = false; - - @Expose - public Position nextResetCooldownPos = new Position(10, 10, false, true); - - @Expose - @ConfigOption(name = "Gravity Orbs", desc = "Shows the Gravity Orbs more clearly.") - @ConfigEditorBoolean - public boolean gravityOrbs = false; - - @Expose - @ConfigOption(name = "Orbs Color", desc = "Color of the Ashfang Gravity Orbs.") - @ConfigEditorColour - public String gravityOrbsColor = "0:120:255:85:85"; - - @Expose - @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.") - @ConfigEditorBoolean - public boolean blazingSouls = false; - - @Expose - @ConfigOption(name = "Souls Color", desc = "Color of the Ashfang Blazing Souls.") - @ConfigEditorColour - public String blazingSoulsColor = "0:245:85:255:85"; - - @Expose - @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respective colors.") - @ConfigEditorBoolean - public boolean highlightBlazes = false; - - @Expose - @ConfigOption(name = "Hide Particles", desc = "Hide particles around the Ashfang boss.") - @ConfigEditorBoolean - public boolean hideParticles = false; - - @Expose - @ConfigOption(name = "Hide Names", desc = "Hide the names of full health blazes around Ashfang (only useful when highlight blazes is enabled)") - @ConfigEditorBoolean - public boolean hideNames = false; - - @Expose - @ConfigOption(name = "Hide Damage", desc = "Hide damage splashes around Ashfang.") - @ConfigEditorBoolean - public boolean hideDamageSplash = false; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java new file mode 100644 index 000000000..3515b9280 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java @@ -0,0 +1,66 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class AshfangConfig { + + @Expose + @ConfigOption(name = "Freeze", desc = "Show the cooldown for how long Ashfang blocks your abilities.") + @ConfigEditorBoolean + public boolean freezeCooldown = false; + + @Expose + public Position freezeCooldownPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption(name = "Reset Time", desc = "Show the cooldown until Ashfang pulls his underlings back.") + @ConfigEditorBoolean + public boolean nextResetCooldown = false; + + @Expose + public Position nextResetCooldownPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption(name = "Gravity Orbs", desc = "Shows the Gravity Orbs more clearly.") + @ConfigEditorBoolean + public boolean gravityOrbs = false; + + @Expose + @ConfigOption(name = "Orbs Color", desc = "Color of the Ashfang Gravity Orbs.") + @ConfigEditorColour + public String gravityOrbsColor = "0:120:255:85:85"; + + @Expose + @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.") + @ConfigEditorBoolean + public boolean blazingSouls = false; + + @Expose + @ConfigOption(name = "Souls Color", desc = "Color of the Ashfang Blazing Souls.") + @ConfigEditorColour + public String blazingSoulsColor = "0:245:85:255:85"; + + @Expose + @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respective colors.") + @ConfigEditorBoolean + public boolean highlightBlazes = false; + + @Expose + @ConfigOption(name = "Hide Particles", desc = "Hide particles around the Ashfang boss.") + @ConfigEditorBoolean + public boolean hideParticles = false; + + @Expose + @ConfigOption(name = "Hide Names", desc = "Hide the names of full health blazes around Ashfang (only useful when highlight blazes is enabled)") + @ConfigEditorBoolean + public boolean hideNames = false; + + @Expose + @ConfigOption(name = "Hide Damage", desc = "Hide damage splashes around Ashfang.") + @ConfigEditorBoolean + public boolean hideDamageSplash = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java deleted file mode 100644 index f357e76fd..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java +++ /dev/null @@ -1,32 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class Bazaar { - - @Expose - @ConfigOption(name = "Purchase Helper", desc = "Highlights the item you are trying to buy in the Bazaar.") - @ConfigEditorBoolean - public boolean purchaseHelper = true; - - @Expose - @ConfigOption(name = "Order Helper", desc = "Show visual hints inside the Bazaar Manage Order view when items are ready to pickup or outbid.") - @ConfigEditorBoolean - public boolean orderHelper = false; - - @Expose - @ConfigOption(name = "Best Sell Method", desc = "Show the price difference between sell instantly and sell offer.") - @ConfigEditorBoolean - public boolean bestSellMethod = false; - - @Expose - public Position bestSellMethodPos = new Position(394, 142, false, true); - - @Expose - @ConfigOption(name = "Cancelled Buy Order Clipboard", desc = "Saves missing items from cancelled buy orders to clipboard for faster re-entry.") - @ConfigEditorBoolean - public boolean cancelledBuyOrderClipboard = false; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java new file mode 100644 index 000000000..8f12ba667 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java @@ -0,0 +1,32 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class BazaarConfig { + + @Expose + @ConfigOption(name = "Purchase Helper", desc = "Highlights the item you are trying to buy in the Bazaar.") + @ConfigEditorBoolean + public boolean purchaseHelper = true; + + @Expose + @ConfigOption(name = "Order Helper", desc = "Show visual hints inside the Bazaar Manage Order view when items are ready to pickup or outbid.") + @ConfigEditorBoolean + public boolean orderHelper = false; + + @Expose + @ConfigOption(name = "Best Sell Method", desc = "Show the price difference between sell instantly and sell offer.") + @ConfigEditorBoolean + public boolean bestSellMethod = false; + + @Expose + public Position bestSellMethodPos = new Position(394, 142, false, true); + + @Expose + @ConfigOption(name = "Cancelled Buy Order Clipboard", desc = "Saves missing items from cancelled buy orders to clipboard for faster re-entry.") + @ConfigEditorBoolean + public boolean cancelledBuyOrderClipboard = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java deleted file mode 100644 index 6a6979b11..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java +++ /dev/null @@ -1,82 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; - -public class Bingo { - - @Expose - @ConfigOption(name = "Bingo Card", desc = "") - @Accordion - public BingoCard bingoCard = new BingoCard(); - - public static class BingoCard { - @Expose - @ConfigOption(name = "Enable", desc = "Displays the bingo card.") - @ConfigEditorBoolean - public boolean enabled = true; - @Expose - @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the bingo card or the step helper by sneaking with SkyBlock menu in hand.") - @ConfigEditorBoolean - public boolean quickToggle = 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 = "Hide Community Goals", desc = "Hide Community Goals from the Bingo Card display.") - @ConfigEditorBoolean - public Property hideCommunityGoals = Property.of(false); - - @Expose - @ConfigOption( - name = "Show Guide", - desc = "Show tips and difficulty for bingo goals inside the bingo card inventory.\n" + - "§eData from Bingo Splash Community§7, made by §cMayxo" - ) - @ConfigEditorBoolean - public boolean bingoSplashGuide = true; - - @Expose - public Position bingoCardPos = new Position(10, 10, false, true); - } - - @Expose - @ConfigOption(name = "Compact Chat Messages", desc = "") - @Accordion - public CompactChat compactChat = new CompactChat(); - - public static class CompactChat { - - @Expose - @ConfigOption(name = "Enable", desc = "Shortens chat messages about skill level ups, collection gains, " + - "new area discoveries and skyblock level up messages while on bingo.") - @ConfigEditorBoolean - public boolean enabled = true; - - @Expose - @ConfigOption(name = "Hide Border", desc = "Hide the border messages before and after the compact level up messages.") - @ConfigEditorBoolean - public boolean hideBorder = true; - - @Expose - @ConfigOption(name = "Outside Bingo", desc = "Compact the level up chat messages outside of an bingo profile as well.") - @ConfigEditorBoolean - public boolean outsideBingo = 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 - public boolean minionCraftHelperEnabled = true; - - @Expose - public Position minionCraftHelperPos = new Position(10, 10, false, true); -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java new file mode 100644 index 000000000..e083fbcbe --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java @@ -0,0 +1,82 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.Accordion; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.moulberry.moulconfig.observer.Property; + +public class BingoConfig { + + @Expose + @ConfigOption(name = "Bingo Card", desc = "") + @Accordion + public BingoCard bingoCard = new BingoCard(); + + public static class BingoCard { + @Expose + @ConfigOption(name = "Enable", desc = "Displays the bingo card.") + @ConfigEditorBoolean + public boolean enabled = true; + @Expose + @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the bingo card or the step helper by sneaking with SkyBlock menu in hand.") + @ConfigEditorBoolean + public boolean quickToggle = 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 = "Hide Community Goals", desc = "Hide Community Goals from the Bingo Card display.") + @ConfigEditorBoolean + public Property hideCommunityGoals = Property.of(false); + + @Expose + @ConfigOption( + name = "Show Guide", + desc = "Show tips and difficulty for bingo goals inside the bingo card inventory.\n" + + "§eData from Bingo Splash Community§7, made by §cMayxo" + ) + @ConfigEditorBoolean + public boolean bingoSplashGuide = true; + + @Expose + public Position bingoCardPos = new Position(10, 10, false, true); + } + + @Expose + @ConfigOption(name = "Compact Chat Messages", desc = "") + @Accordion + public CompactChat compactChat = new CompactChat(); + + public static class CompactChat { + + @Expose + @ConfigOption(name = "Enable", desc = "Shortens chat messages about skill level ups, collection gains, " + + "new area discoveries and skyblock level up messages while on bingo.") + @ConfigEditorBoolean + public boolean enabled = true; + + @Expose + @ConfigOption(name = "Hide Border", desc = "Hide the border messages before and after the compact level up messages.") + @ConfigEditorBoolean + public boolean hideBorder = true; + + @Expose + @ConfigOption(name = "Outside Bingo", desc = "Compact the level up chat messages outside of an bingo profile as well.") + @ConfigEditorBoolean + public boolean outsideBingo = 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 + public boolean minionCraftHelperEnabled = true; + + @Expose + public Position minionCraftHelperPos = new Position(10, 10, false, true); +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java new file mode 100644 index 000000000..dd0668743 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java @@ -0,0 +1,24 @@ +package at.hannibal2.skyhanni.config.features; + +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class CommandsConfig { + + @Expose + @ConfigOption(name = "Fandom Wiki", desc = "Use Fandom wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7).") + @ConfigEditorBoolean + public boolean useFandomWiki = false; + + @Expose + @ConfigOption(name = "Party transfer", desc = "Allows §e/pt §7as alias for §e/party transfer§7.\n" + + "§7SkyBlock command §e/pt §7to check the play time still works.") + @ConfigEditorBoolean + public boolean usePartyTransferAlias = true; + + @Expose + @ConfigOption(name = "Replace Warp Is", desc = "Replaces §e/warp is §7with §e/is§7. Idk why. Ask §cKaeso") + @ConfigEditorBoolean + public boolean replaceWarpIs = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java deleted file mode 100644 index c5be4a03b..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java +++ /dev/null @@ -1,24 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class CommandsFeatures { - - @Expose - @ConfigOption(name = "Fandom Wiki", desc = "Use Fandom wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7).") - @ConfigEditorBoolean - public boolean useFandomWiki = false; - - @Expose - @ConfigOption(name = "Party transfer", desc = "Allows §e/pt §7as alias for §e/party transfer§7.\n" + - "§7SkyBlock command §e/pt §7to check the play time still works.") - @ConfigEditorBoolean - public boolean usePartyTransferAlias = true; - - @Expose - @ConfigOption(name = "Replace Warp Is", desc = "Replaces §e/warp is §7with §e/is§7. Idk why. Ask §cKaeso") - @ConfigEditorBoolean - public boolean replaceWarpIs = false; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java deleted file mode 100644 index b3021a63f..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java +++ /dev/null @@ -1,157 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigAccordionId; -import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class Dungeon { - - @Expose - @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and wither essence when clicked in dungeons.") - @ConfigEditorBoolean - public boolean highlightClickedBlocks = false; - - @Expose - @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in dungeons.") - @ConfigEditorBoolean - public boolean showMilestonesDisplay = false; - - @Expose - public Position showMileStonesDisplayPos = new Position(10, 10, false, true); - - @Expose - @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current dungeon.") - @ConfigEditorBoolean - public boolean deathCounterDisplay = false; - - @Expose - public Position deathCounterPos = new Position(10, 10, false, true); - - @ConfigOption(name = "Clean End", desc = "") - @ConfigEditorAccordion(id = 2) - public boolean cleanEnd = false; - - @Expose - @ConfigOption(name = "Clean Ending", desc = "After the last dungeon boss has died, all entities and " + - "particles are no longer displayed and the music stops playing, but the loot chests are still displayed.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean cleanEndToggle = false; - - @Expose - @ConfigOption(name = "Ignore Guardians", desc = "Ignore F3 and M3 guardians from the clean end feature when " + - "sneaking. Makes it easier to kill them after the boss died already. Thanks Hypixel.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean cleanEndF3IgnoreGuardians = false; - - @Expose - @ConfigOption(name = "Boss Damage Splash", desc = "Hides damage splashes while inside the boss room (fixes a Skytils feature).") - @ConfigEditorBoolean - public boolean damageSplashBoss = false; - - @Expose - @ConfigOption(name = "Highlight Deathmites", desc = "Highlight deathmites in dungeon in red color.") - @ConfigEditorBoolean - public boolean highlightDeathmites = true; - - @ConfigOption(name = "Object Hider", desc = "Hide various things in dungeons.") - @ConfigEditorAccordion(id = 3) - public boolean objectHider = false; - - @Expose - @ConfigOption(name = "Hide Superboom TNT", desc = "Hide Superboom TNT laying around in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideSuperboomTNT = false; - - @Expose - @ConfigOption(name = "Hide Blessings", desc = "Hide Blessings laying around in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideBlessing = false; - - @Expose - @ConfigOption(name = "Hide Revive Stones", desc = "Hide Revive Stones laying around in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideReviveStone = false; - - @Expose - @ConfigOption(name = "Hide Premium Flesh", desc = "Hide Premium Flesh laying around in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hidePremiumFlesh = false; - - @Expose - @ConfigOption(name = "Hide Journal Entry", desc = "Hide Journal Entry pages laying around in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideJournalEntry = false; - - @Expose - @ConfigOption(name = "Hide Skeleton Skull", desc = "Hide Skeleton Skulls laying around in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideSkeletonSkull = true; - - @Expose - @ConfigOption(name = "Hide Healer Orbs", desc = "Hides the damage, ability damage and defensive orbs that spawn when the healer kills mobs.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideHealerOrbs = false; - - @Expose - @ConfigOption(name = "Hide Healer Fairy", desc = "Hide the golden fairy that follows the healer in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean hideHealerFairy = false; - - @ConfigOption(name = "Message Filter", desc = "") - @ConfigEditorAccordion(id = 4) - public boolean messageFilter = false; - - @Expose - @ConfigOption(name = "Keys and Doors", desc = "Hides the chat message when picking up keys or opening doors in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 4) - public boolean messageFilterKeysAndDoors = false; - - @ConfigOption(name = "Dungeon Copilot", desc = "") - @ConfigEditorAccordion(id = 5) - public boolean dungeonCopilot = false; - - @Expose - @ConfigOption(name = "Copilot Enabled", desc = "Suggests what to do next in dungeons.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 5) - public boolean copilotEnabled = false; - - @Expose - public Position copilotPos = new Position(10, 10, false, true); - - @ConfigOption(name = "Party Finder", desc = "") - @ConfigEditorAccordion(id = 6) - public boolean partyFinder = false; - - @Expose - @ConfigOption(name = "Colored Class Level", desc = "Color class levels in party finder.") - @ConfigAccordionId(id = 6) - @ConfigEditorBoolean - public boolean partyFinderColoredClassLevel = true; - - @Expose - @ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into an " + - "orange Skeletor (not useful when combined with feature Hide Skeleton Skull).") - @ConfigEditorBoolean - public boolean highlightSkeletonSkull = true; - - @Expose - @ConfigOption(name = "Croesus Chest", desc = "Adds a visual highlight to the Croesus inventory that " + - "shows unopened chests.") - @ConfigEditorBoolean - public boolean croesusUnopenedChestTracker = true; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java new file mode 100644 index 000000000..3e086812e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java @@ -0,0 +1,157 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigAccordionId; +import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class DungeonConfig { + + @Expose + @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and wither essence when clicked in dungeons.") + @ConfigEditorBoolean + public boolean highlightClickedBlocks = false; + + @Expose + @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in dungeons.") + @ConfigEditorBoolean + public boolean showMilestonesDisplay = false; + + @Expose + public Position showMileStonesDisplayPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current dungeon.") + @ConfigEditorBoolean + public boolean deathCounterDisplay = false; + + @Expose + public Position deathCounterPos = new Position(10, 10, false, true); + + @ConfigOption(name = "Clean End", desc = "") + @ConfigEditorAccordion(id = 2) + public boolean cleanEnd = false; + + @Expose + @ConfigOption(name = "Clean Ending", desc = "After the last dungeon boss has died, all entities and " + + "particles are no longer displayed and the music stops playing, but the loot chests are still displayed.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean cleanEndToggle = false; + + @Expose + @ConfigOption(name = "Ignore Guardians", desc = "Ignore F3 and M3 guardians from the clean end feature when " + + "sneaking. Makes it easier to kill them after the boss died already. Thanks Hypixel.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean cleanEndF3IgnoreGuardians = false; + + @Expose + @ConfigOption(name = "Boss Damage Splash", desc = "Hides damage splashes while inside the boss room (fixes a Skytils feature).") + @ConfigEditorBoolean + public boolean damageSplashBoss = false; + + @Expose + @ConfigOption(name = "Highlight Deathmites", desc = "Highlight deathmites in dungeon in red color.") + @ConfigEditorBoolean + public boolean highlightDeathmites = true; + + @ConfigOption(name = "Object Hider", desc = "Hide various things in dungeons.") + @ConfigEditorAccordion(id = 3) + public boolean objectHider = false; + + @Expose + @ConfigOption(name = "Hide Superboom TNT", desc = "Hide Superboom TNT laying around in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideSuperboomTNT = false; + + @Expose + @ConfigOption(name = "Hide Blessings", desc = "Hide Blessings laying around in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideBlessing = false; + + @Expose + @ConfigOption(name = "Hide Revive Stones", desc = "Hide Revive Stones laying around in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideReviveStone = false; + + @Expose + @ConfigOption(name = "Hide Premium Flesh", desc = "Hide Premium Flesh laying around in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hidePremiumFlesh = false; + + @Expose + @ConfigOption(name = "Hide Journal Entry", desc = "Hide Journal Entry pages laying around in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideJournalEntry = false; + + @Expose + @ConfigOption(name = "Hide Skeleton Skull", desc = "Hide Skeleton Skulls laying around in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideSkeletonSkull = true; + + @Expose + @ConfigOption(name = "Hide Healer Orbs", desc = "Hides the damage, ability damage and defensive orbs that spawn when the healer kills mobs.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideHealerOrbs = false; + + @Expose + @ConfigOption(name = "Hide Healer Fairy", desc = "Hide the golden fairy that follows the healer in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean hideHealerFairy = false; + + @ConfigOption(name = "Message Filter", desc = "") + @ConfigEditorAccordion(id = 4) + public boolean messageFilter = false; + + @Expose + @ConfigOption(name = "Keys and Doors", desc = "Hides the chat message when picking up keys or opening doors in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 4) + public boolean messageFilterKeysAndDoors = false; + + @ConfigOption(name = "Dungeon Copilot", desc = "") + @ConfigEditorAccordion(id = 5) + public boolean dungeonCopilot = false; + + @Expose + @ConfigOption(name = "Copilot Enabled", desc = "Suggests what to do next in dungeons.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 5) + public boolean copilotEnabled = false; + + @Expose + public Position copilotPos = new Position(10, 10, false, true); + + @ConfigOption(name = "Party Finder", desc = "") + @ConfigEditorAccordion(id = 6) + public boolean partyFinder = false; + + @Expose + @ConfigOption(name = "Colored Class Level", desc = "Color class levels in party finder.") + @ConfigAccordionId(id = 6) + @ConfigEditorBoolean + public boolean partyFinderColoredClassLevel = true; + + @Expose + @ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into an " + + "orange Skeletor (not useful when combined with feature Hide Skeleton Skull).") + @ConfigEditorBoolean + public boolean highlightSkeletonSkull = true; + + @Expose + @ConfigOption(name = "Croesus Chest", desc = "Adds a visual highlight to the Croesus inventory that " + + "shows unopened chests.") + @ConfigEditorBoolean + public boolean croesusUnopenedChestTracker = true; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java deleted file mode 100644 index 8ff337693..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java +++ /dev/null @@ -1,191 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigAccordionId; -import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; - -public class Fishing { - - @ConfigOption(name = "Trophy Fishing", desc = "") - @ConfigEditorAccordion(id = 0) - public boolean trophyFishing = false; - - @Expose - @ConfigOption( - name = "Trophy Counter", - desc = "Counts Trophy messages from chat and tells you how many you have found." - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyCounter = false; - - @Expose - @ConfigOption( - name = "Trophy Counter Design", - desc = "§fStyle 1: §72. §6§lGOLD §5Moldfin\n" + - "§fStyle 2: §bYou caught a §5Moldfin §6§lGOLD§b. §7(2)\n" + - "§fStyle 3: §bYou caught your 2nd §6§lGOLD §5Moldfin§b." - ) - @ConfigEditorDropdown(values = {"Style 1", "Style 2", "Style 3"}) - @ConfigAccordionId(id = 0) - public int trophyDesign = 0; - - @Expose - @ConfigOption(name = "Hide Repeated Catches", desc = "Delete past catches of the same trophy fish from chat.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyFishDuplicateHider = false; - - @Expose - @ConfigOption(name = "Show total amount", desc = "Show total amount of all rarities at the end of the chat message.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyFishTotalAmount = false; - - @Expose - @ConfigOption(name = "Trophy Fish Info", desc = "Show information and stats about a trophy fish when hovering over a catch message in chat.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyFishTooltip = true; - - @Expose - @ConfigOption(name = "Bronze Duplicates", desc = "Hide duplicate messages for bronze trophy fishes from chat.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyFishBronzeHider = false; - - @Expose - @ConfigOption(name = "Silver Duplicates", desc = "Hide duplicate messages for silver trophy fishes from chat.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyFishSilverHider = false; - - @Expose - @ConfigOption(name = "Fillet Tooltip", desc = "Show fillet value of trophy fish in tooltip.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean trophyFilletTooltip = true; - - @Expose - @ConfigOption(name = "Odger Waypoint", desc = "Show the Odger waypoint when trophy fishes are in the inventory and no lava rod in hand.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean odgerLocation = true; - - @ConfigOption(name = "Thunder Spark", desc = "") - @ConfigEditorAccordion(id = 1) - public boolean thunderSpark = false; - - @Expose - @ConfigOption(name = "Thunder Spark Highlight", desc = "Highlight Thunder Sparks after killing a Thunder") - @ConfigEditorBoolean - @ConfigAccordionId(id = 1) - public boolean thunderSparkHighlight = false; - - @Expose - @ConfigOption(name = "Thunder Spark Color", desc = "Color of the Thunder Sparks") - @ConfigEditorColour - @ConfigAccordionId(id = 1) - public String thunderSparkColor = "0:255:255:255:255"; - - @ConfigOption(name = "Barn Fishing Timer", desc = "") - @ConfigEditorAccordion(id = 2) - public boolean barnTimer_ = false; - - @Expose - @ConfigOption( - name = "Barn Fishing Timer", - desc = "Show the time and amount of sea creatures while fishing on the barn via hub." - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean barnTimer = true; - - @Expose - public Position barnTimerPos = new Position(10, 10, false, true); - - @Expose - @ConfigOption( - name = "Worm Fishing", - desc = "Show the barn fishing timer even for worms or other sea creatures in the crystal hollows." - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean barnTimerCrystalHollows = true; - - @Expose - @ConfigOption(name = "Fishing Timer Alert", desc = "Change the amount of time in seconds until the timer dings.") - @ConfigEditorSlider( - minValue = 240, - maxValue = 360, - minStep = 10 - ) - @ConfigAccordionId(id = 2) - public int barnTimerAlertTime = 330; - - @Expose - @ConfigOption(name = "Chum/Chumcap Bucket Hider", desc = "") - @Accordion - public ChumBucketHider chumBucketHider = new ChumBucketHider(); - - public static class ChumBucketHider { - - @Expose - @ConfigOption(name = "Enable", desc = "Hide the Chum/Chumcap Bucket name tags for other players.") - @ConfigEditorBoolean - public Property enabled = Property.of(true); - - @Expose - @ConfigOption(name = "Hide Bucket", desc = "Hide the Chum/Chumcap Bucket.") - @ConfigEditorBoolean - public Property hideBucket = Property.of(false); - - @Expose - @ConfigOption(name = "Hide Own", desc = "Hides your own Chum/Chumcap Bucket.") - @ConfigEditorBoolean - public Property hideOwn = Property.of(false); - } - - @Expose - @ConfigOption(name = "Fished Item Name", desc = "") - @Accordion - public FishedItemName fishedItemName = new FishedItemName(); - - public static class FishedItemName { - - @Expose - @ConfigOption(name = "Enabled", desc = "Show the fished item name above the item when fishing.") - @ConfigEditorBoolean - public boolean enabled = true; - - @Expose - @ConfigOption(name = "Show Bait", desc = "Also show the name of the consumed bait.") - @ConfigEditorBoolean - public boolean showBaits = false; - - } - - @Expose - @ConfigOption( - name = "Shark Fish Counter", - desc = "Counts how many sharks have been caught." - ) - @ConfigEditorBoolean - public boolean sharkFishCounter = false; - - @Expose - public Position sharkFishCounterPos = new Position(10, 10, false, true); - - @Expose - @ConfigOption(name = "Shorten Fishing Message", desc = "Shortens the chat message that says what type of sea creature you have fished.") - @ConfigEditorBoolean - public boolean shortenFishingMessage = false; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java new file mode 100644 index 000000000..b5018173c --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java @@ -0,0 +1,191 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.Accordion; +import io.github.moulberry.moulconfig.annotations.ConfigAccordionId; +import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; +import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; +import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; +import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.moulberry.moulconfig.observer.Property; + +public class FishingConfig { + + @ConfigOption(name = "Trophy Fishing", desc = "") + @ConfigEditorAccordion(id = 0) + public boolean trophyFishing = false; + + @Expose + @ConfigOption( + name = "Trophy Counter", + desc = "Counts Trophy messages from chat and tells you how many you have found." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyCounter = false; + + @Expose + @ConfigOption( + name = "Trophy Counter Design", + desc = "§fStyle 1: §72. §6§lGOLD §5Moldfin\n" + + "§fStyle 2: §bYou caught a §5Moldfin §6§lGOLD§b. §7(2)\n" + + "§fStyle 3: §bYou caught your 2nd §6§lGOLD §5Moldfin§b." + ) + @ConfigEditorDropdown(values = {"Style 1", "Style 2", "Style 3"}) + @ConfigAccordionId(id = 0) + public int trophyDesign = 0; + + @Expose + @ConfigOption(name = "Hide Repeated Catches", desc = "Delete past catches of the same trophy fish from chat.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyFishDuplicateHider = false; + + @Expose + @ConfigOption(name = "Show total amount", desc = "Show total amount of all rarities at the end of the chat message.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyFishTotalAmount = false; + + @Expose + @ConfigOption(name = "Trophy Fish Info", desc = "Show information and stats about a trophy fish when hovering over a catch message in chat.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyFishTooltip = true; + + @Expose + @ConfigOption(name = "Bronze Duplicates", desc = "Hide duplicate messages for bronze trophy fishes from chat.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyFishBronzeHider = false; + + @Expose + @ConfigOption(name = "Silver Duplicates", desc = "Hide duplicate messages for silver trophy fishes from chat.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyFishSilverHider = false; + + @Expose + @ConfigOption(name = "Fillet Tooltip", desc = "Show fillet value of trophy fish in tooltip.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean trophyFilletTooltip = true; + + @Expose + @ConfigOption(name = "Odger Waypoint", desc = "Show the Odger waypoint when trophy fishes are in the inventory and no lava rod in hand.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean odgerLocation = true; + + @ConfigOption(name = "Thunder Spark", desc = "") + @ConfigEditorAccordion(id = 1) + public boolean thunderSpark = false; + + @Expose + @ConfigOption(name = "Thunder Spark Highlight", desc = "Highlight Thunder Sparks after killing a Thunder") + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean thunderSparkHighlight = false; + + @Expose + @ConfigOption(name = "Thunder Spark Color", desc = "Color of the Thunder Sparks") + @ConfigEditorColour + @ConfigAccordionId(id = 1) + public String thunderSparkColor = "0:255:255:255:255"; + + @ConfigOption(name = "Barn Fishing Timer", desc = "") + @ConfigEditorAccordion(id = 2) + public boolean barnTimer_ = false; + + @Expose + @ConfigOption( + name = "Barn Fishing Timer", + desc = "Show the time and amount of sea creatures while fishing on the barn via hub." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean barnTimer = true; + + @Expose + public Position barnTimerPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption( + name = "Worm Fishing", + desc = "Show the barn fishing timer even for worms or other sea creatures in the crystal hollows." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean barnTimerCrystalHollows = true; + + @Expose + @ConfigOption(name = "Fishing Timer Alert", desc = "Change the amount of time in seconds until the timer dings.") + @ConfigEditorSlider( + minValue = 240, + maxValue = 360, + minStep = 10 + ) + @ConfigAccordionId(id = 2) + public int barnTimerAlertTime = 330; + + @Expose + @ConfigOption(name = "Chum/Chumcap Bucket Hider", desc = "") + @Accordion + public ChumBucketHider chumBucketHider = new ChumBucketHider(); + + public static class ChumBucketHider { + + @Expose + @ConfigOption(name = "Enable", desc = "Hide the Chum/Chumcap Bucket name tags for other players.") + @ConfigEditorBoolean + public Property enabled = Property.of(true); + + @Expose + @ConfigOption(name = "Hide Bucket", desc = "Hide the Chum/Chumcap Bucket.") + @ConfigEditorBoolean + public Property hideBucket = Property.of(false); + + @Expose + @ConfigOption(name = "Hide Own", desc = "Hides your own Chum/Chumcap Bucket.") + @ConfigEditorBoolean + public Property hideOwn = Property.of(false); + } + + @Expose + @ConfigOption(name = "Fished Item Name", desc = "") + @Accordion + public FishedItemName fishedItemName = new FishedItemName(); + + public static class FishedItemName { + + @Expose + @ConfigOption(name = "Enabled", desc = "Show the fished item name above the item when fishing.") + @ConfigEditorBoolean + public boolean enabled = true; + + @Expose + @ConfigOption(name = "Show Bait", desc = "Also show the name of the consumed bait.") + @ConfigEditorBoolean + public boolean showBaits = false; + + } + + @Expose + @ConfigOption( + name = "Shark Fish Counter", + desc = "Counts how many sharks have been caught." + ) + @ConfigEditorBoolean + public boolean sharkFishCounter = false; + + @Expose + public Position sharkFishCounterPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption(name = "Shorten Fishing Message", desc = "Shortens the chat message that says what type of sea creature you have fished.") + @ConfigEditorBoolean + public boolean shortenFishingMessage = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GUI.java b/src/main/java/at/hannibal2/skyhanni/config/features/GUI.java deleted file mode 100644 index e1a8f23c0..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/GUI.java +++ /dev/null @@ -1,20 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.data.GuiEditManager; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import org.lwjgl.input.Keyboard; - -public class GUI { - - @ConfigOption(name = "Edit GUI Locations", desc = "Change the position of SkyHanni's overlays") - @ConfigEditorButton(buttonText = "Edit") - public Runnable positions = GuiEditManager::openGuiPositionEditor; - - @Expose - @ConfigOption(name = "Open Hotkey", desc = "Press this key to open the GUI Editor.") - @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) - public int keyBindOpen = Keyboard.KEY_NONE; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java new file mode 100644 index 000000000..2e02156e3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java @@ -0,0 +1,20 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.data.GuiEditManager; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; +import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; +import io.github.moulberry.moulconfig.annotations.ConfigOption; +import org.lwjgl.input.Keyboard; + +public class GUIConfig { + + @ConfigOption(name = "Edit GUI Locations", desc = "Change the position of SkyHanni's overlays") + @ConfigEditorButton(buttonText = "Edit") + public Runnable positions = GuiEditManager::openGuiPositionEditor; + + @Expose + @ConfigOption(name = "Open Hotkey", desc = "Press this key to open the GUI Editor.") + @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) + public int keyBindOpen = Keyboard.KEY_NONE; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java deleted file mode 100644 index 5244aac76..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ /dev/null @@ -1,1349 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.commands.Commands; -import at.hannibal2.skyhanni.config.core.config.Position; -import at.hannibal2.skyhanni.features.garden.inventory.GardenPlotIcon; -import at.hannibal2.skyhanni.utils.LorenzUtils; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.*; -import io.github.moulberry.moulconfig.observer.Property; -import net.minecraft.client.Minecraft; -import org.lwjgl.input.Keyboard; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@SuppressWarnings("deprecation") -public class Garden { - - @Expose - @ConfigOption(name = "SkyMart", desc = "") - @ConfigEditorAccordion(id = 0) - public boolean skyMart = false; - - @Expose - @ConfigOption(name = "Copper Price", desc = "Show copper to coin prices inside the SkyMart inventory.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean skyMartCopperPrice = true; - - @Expose - @ConfigOption(name = "Advanced Stats", desc = "Show the bin price and copper price for every item.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean skyMartCopperPriceAdvancedStats = false; - - @Expose - public Position skyMartCopperPricePos = new Position(211, 132, false, true); - - @Expose - @ConfigOption(name = "Visitor", desc = "") - @ConfigEditorAccordion(id = 1) - public boolean visitor = false; - - @Expose - @ConfigOption(name = "Visitor Timer", desc = "") - @ConfigAccordionId(id = 1) - @ConfigEditorAccordion(id = 2) - public boolean visitorTimer = false; - - @Expose - @ConfigOption(name = "Visitor Timer", desc = "Timer when the next visitor will appear, " + - "and a number for how many visitors are already waiting.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean visitorTimerEnabled = true; - - @Expose - @ConfigOption(name = "Sixth Visitor Estimate", desc = "Estimate when the sixth visitor in the queue will arrive. " + - "May be inaccurate with coop members farming simultaneously.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean visitorTimerSixthVisitorEnabled = true; - - @Expose - @ConfigOption(name = "Sixth Visitor Warning", desc = "Notifies when it is believed that the sixth visitor has arrived. " + - "May be inaccurate with coop members farming simultaneously.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean visitorTimerSixthVisitorWarning = true; - - @Expose - public Position visitorTimerPos = new Position(390, 65, false, true); - - @Expose - @ConfigOption(name = "Visitor Items Needed", desc = "") - @ConfigAccordionId(id = 1) - @ConfigEditorAccordion(id = 3) - public boolean visitorNeeds = false; - - @Expose - @ConfigOption(name = "Items Needed", desc = "Show all items needed for the visitors.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean visitorNeedsDisplay = true; - - @Expose - public Position visitorNeedsPos = new Position(180, 170, false, true); - - @Expose - @ConfigOption(name = "Only when Close", desc = "Only show the needed items when close to the visitors.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean visitorNeedsOnlyWhenClose = false; - - @Expose - @ConfigOption(name = "Bazaar Alley", desc = "Show the Visitor Items List while inside the Bazaar Alley in the Hub. " + - "This helps buying the correct amount when not having a booster cookie buff active.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean visitorNeedsInBazaarAlley = true; - - @Expose - @ConfigOption(name = "Show Price", desc = "Show the coin price in the items needed list.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean visitorNeedsShowPrice = true; - - @Expose - @ConfigOption(name = "Item Preview", desc = "Show the base type for the required items next to new visitors. §cNote that some visitors may require any crop.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 3) - public boolean visitorItemPreview = true; - - @Expose - @ConfigOption(name = "Visitor Inventory", desc = "") - @ConfigAccordionId(id = 1) - @ConfigEditorAccordion(id = 4) - public boolean visitorInventory = false; - - @Expose - @ConfigOption(name = "Visitor Price", desc = "Show the bazaar price of the items required for the visitors, like in NEU.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 4) - public boolean visitorShowPrice = false; - - @Expose - @ConfigOption(name = "Amount and Time", desc = "Show the exact item amount and the remaining time when farmed manually. Especially useful for ironman.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 4) - public boolean visitorExactAmountAndTime = true; - - @Expose - @ConfigOption(name = "Copper Price", desc = "Show the price per copper inside the visitor gui.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 4) - public boolean visitorCopperPrice = true; - - @Expose - @ConfigOption(name = "Copper Time", desc = "Show the time required per copper inside the visitor gui.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 4) - public boolean visitorCopperTime = false; - - @Expose - @ConfigOption(name = "Garden Exp Price", desc = "Show the price per garden experience inside t