diff options
Diffstat (limited to 'src/main/java')
11 files changed, 28 insertions, 111 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java b/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java index 180e80ed7..5b7536965 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java @@ -14,8 +14,6 @@ public class Ashfang { public boolean freezeCooldown = false; @Expose -// @ConfigOption(name = "Freeze Position", desc = "") -// @ConfigEditorButton(runnableId = "ashfangFreezeCooldown", buttonText = "Edit") public Position freezeCooldownPos = new Position(10, 10, false, true); @Expose @@ -24,8 +22,6 @@ public class Ashfang { public boolean nextResetCooldown = false; @Expose -// @ConfigOption(name = "Reset Position", desc = "") -// @ConfigEditorButton(runnableId = "ashfangResetCooldown", buttonText = "Edit") public Position nextResetCooldownPos = new Position(10, 10, false, true); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java index 98a0d0852..3d0a65b0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java @@ -18,8 +18,6 @@ public class Bazaar { public boolean bestSellMethod = false; @Expose -// @ConfigOption(name = "Best Sell Method Position", desc = "") -// @ConfigEditorButton(runnableId = "bestSellMethod", buttonText = "Edit") public Position bestSellMethodPos = new Position(10, 10, false, true); @Expose @@ -33,7 +31,5 @@ public class Bazaar { public boolean updateTimer = false; @Expose -// @ConfigOption(name = "Update timer Position", desc = "") -// @ConfigEditorButton(runnableId = "bazzarUpdateTimer", buttonText = "Edit") public Position updateTimerPos = new Position(10, 10, false, true); } 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 0d49786af..fe62f0610 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java @@ -2,8 +2,10 @@ 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.Overlay; -import io.github.moulberry.moulconfig.annotations.*; +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 Bingo { @@ -25,8 +27,6 @@ public class Bingo { 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 = "") @@ -40,8 +40,5 @@ public class Bingo { 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/DamageIndicator.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java index 966ece63c..3a8d243aa 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java @@ -36,26 +36,26 @@ public class DamageIndicator { ) @ConfigEditorDraggableList( exampleText = { - "\u00a7bDungeon All", - "\u00a7bNether Mini Bosses", - "\u00a7bVanquisher", - "\u00a7bEndstone Protector (not tested)", - "\u00a7bEnder Dragon (not finished)", - "\u00a7bRevenant Horror", - "\u00a7bTarantula Broodfather", - "\u00a7bSven Packmaster", - "\u00a7bVoidgloom Seraph", - "\u00a7bInferno Demonlord (only tier 1 yet)", - "\u00a7bHeadless Horseman (bugged)", - "\u00a7bDungeon Floor 1", - "\u00a7bDungeon Floor 2", - "\u00a7bDungeon Floor 3", - "\u00a7bDungeon Floor 4", - "\u00a7bDungeon Floor 5", - "\u00a7bDungeon Floor 6", - "\u00a7bDungeon Floor 7", - "\u00a7bDiana Mobs", - "\u00a7bSea Creatures", + "§bDungeon All", + "§bNether Mini Bosses", + "§bVanquisher", + "§bEndstone Protector (not tested)", + "§bEnder Dragon (not finished)", + "§bRevenant Horror", + "§bTarantula Broodfather", + "§bSven Packmaster", + "§bVoidgloom Seraph", + "§bInferno Demonlord (only tier 1 yet)", + "§bHeadless Horseman (bugged)", + "§bDungeon Floor 1", + "§bDungeon Floor 2", + "§bDungeon Floor 3", + "§bDungeon Floor 4", + "§bDungeon Floor 5", + "§bDungeon Floor 6", + "§bDungeon Floor 7", + "§bDiana Mobs", + "§bSea Creatures", "Dummy" } ) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java index 74711781c..97ba39573 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java @@ -2,8 +2,10 @@ 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.Overlay; -import io.github.moulberry.moulconfig.annotations.*; +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 DevData { @@ -24,9 +26,6 @@ public class DevData { public boolean debugEnabled = false; @Expose -// @ConfigOption(name = "Debug Location", desc = "") -// @ConfigEditorButton(runnableId = "debugPos", buttonText = "Edit") -// @ConfigAccordionId(id = 0) public Position debugPos = new Position(10, 10, false, true); @Expose 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 7b10030ad..5e53a7139 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java @@ -25,9 +25,6 @@ public class Dungeon { public boolean showMilestonesDisplay = false; @Expose -// @ConfigOption(name = "Milestone Display Position", desc = "") -// @ConfigEditorButton(runnableId = "dungeonMilestonesDisplay", buttonText = "Edit") -// @ConfigAccordionId(id = 0) public Position showMileStonesDisplayPos = new Position(10, 10, false, true); @ConfigOption(name = "Death Counter", desc = "") @@ -41,9 +38,6 @@ public class Dungeon { public boolean deathCounterDisplay = false; @Expose -// @ConfigOption(name = "Death Counter Position", desc = "") -// @ConfigEditorButton(runnableId = "dungeonDeathCounter", buttonText = "Edit") -// @ConfigAccordionId(id = 1) public Position deathCounterPos = new Position(10, 10, false, true); @ConfigOption(name = "Clean End", desc = "") @@ -147,9 +141,6 @@ public class Dungeon { public boolean copilotEnabled = false; @Expose -// @ConfigOption(name = "Copilot Pos", desc = "") -// @ConfigEditorButton(runnableId = "dungeonCopilot", buttonText = "Edit") -// @ConfigAccordionId(id = 5) public Position copilotPos = new Position(10, 10, false, true); @ConfigOption(name = "Party Finder", desc = "") 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 55b3d8f22..5c2680e6b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java @@ -84,9 +84,6 @@ public class Fishing { public boolean barnTimer = true; @Expose -// @ConfigOption(name = "Fishing Timer Location", desc = "") -// @ConfigEditorButton(runnableId = "barnTimer", buttonText = "Edit") -// @ConfigAccordionId(id = 2) public Position barnTimerPos = new Position(10, 10, false, true); @Expose @@ -113,9 +110,6 @@ public class Fishing { public boolean sharkFishCounter = false; @Expose -// @ConfigOption(name = "Shark Location", desc = "") -// @ConfigEditorButton(runnableId = "sharkFishCounter", buttonText = "Edit") -// @ConfigAccordionId(id = 3) public Position sharkFishCounterPos = new Position(10, 10, false, true); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java index 8b627c6d3..32e8c054e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -72,9 +72,6 @@ public class Garden { public boolean visitorNeedsDisplay = true; @Expose -// @ConfigOption(name = "Items Needed Position", desc = "") -// @ConfigEditorButton(runnableId = "visitorNeeds", buttonText = "Edit") -// @ConfigAccordionId(id = 3) public Position visitorNeedsPos = new Position(155, -57, false, true); @Expose @@ -210,9 +207,6 @@ public class Garden { public List<Integer> cropMilestoneText = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4)); @Expose -// @ConfigOption(name = "Display Position", desc = "") -// @ConfigEditorButton(runnableId = "cropMilestoneProgress", buttonText = "Edit") -// @ConfigAccordionId(id = 6) public Position cropMilestoneProgressDisplayPos = new Position(376, 19, false, true); @Expose @@ -258,9 +252,6 @@ public class Garden { public boolean cropMilestoneBestAlwaysOn = false; @Expose -// @ConfigOption(name = "Display Position", desc = "") -// @ConfigEditorButton(runnableId = "cropMilestoneNext", buttonText = "Edit") -// @ConfigAccordionId(id = 7) public Position cropMilestoneNextDisplayPos = new Position(-112, -143, false, true); @Expose @@ -296,9 +287,6 @@ public class Garden { public List<Integer> cropMilestoneMushroomPetPerkText = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); @Expose -// @ConfigOption(name = "Display Position", desc = "") -// @ConfigEditorButton(runnableId = "cropMilestoneMushroomPetPerk", buttonText = "Edit") -// @ConfigAccordionId(id = 15) public Position cropMilestoneMushroomPetPerkPos = new Position(-112, -143, false, true); // TODO moulconfig runnable support @@ -402,9 +390,6 @@ public class Garden { public boolean optimalSpeedWarning = false; @Expose -// @ConfigOption(name = "Speed Warning Position", desc = "") -// @ConfigEditorButton(runnableId = "optimalSpeed", buttonText = "Edit") -// @ConfigAccordionId(id = 9) public Position optimalSpeedPos = new Position(188, -105, false, true); @Expose @@ -419,9 +404,6 @@ public class Garden { public boolean gardenLevelDisplay = true; @Expose -// @ConfigOption(name = "Garden Level Position", desc = "") -// @ConfigEditorButton(runnableId = "gardenLevel", buttonText = "Edit") -// @ConfigAccordionId(id = 10) public Position gardenLevelPos = new Position(-375, -215, false, true); @Expose @@ -438,9 +420,6 @@ public class Garden { public boolean eliteFarmingWeightDisplay = true; @Expose -// @ConfigOption(name = "Farming Weight Position", desc = "") -// @ConfigEditorButton(runnableId = "eliteFarmingWeight", buttonText = "Edit") -// @ConfigAccordionId(id = 11) public Position eliteFarmingWeightPos = new Position(-370, -167, false, true); @Expose @@ -481,9 +460,6 @@ public class Garden { public boolean dicerCounterHideChat = false; @Expose -// @ConfigOption(name = "Dicer Counter Position", desc = "") -// @ConfigEditorButton(runnableId = "dicerCounter", buttonText = "Edit") -// @ConfigAccordionId(id = 12) public Position dicerCounterPos = new Position(16, -232, false, true); @Expose @@ -539,9 +515,6 @@ public class Garden { public boolean moneyPerHourAdvancedStats = false; @Expose -// @ConfigOption(name = "Money per hour Position", desc = "") -// @ConfigEditorButton(runnableId = "moneyPerHour", buttonText = "Edit") -// @ConfigAccordionId(id = 13) public Position moneyPerHourPos = new Position(16, -232, false, true); @Expose @@ -568,9 +541,6 @@ public class Garden { public boolean nextJacobContestOtherGuis = false; @Expose -// @ConfigOption(name = "Jacob Contest Position", desc = "") -// @ConfigEditorButton(runnableId = "nextJacobContest", buttonText = "Edit") -// @ConfigAccordionId(id = 14) public Position nextJacobContestPos = new Position(-278, 11, false, true); @Expose 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 03022c08f..ce7043da3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java @@ -77,9 +77,6 @@ public class Minions { public boolean hopperProfitDisplay = true; @Expose -// @ConfigOption(name = "Best Sell Method Position", desc = "") -// @ConfigEditorButton(runnableId = "hopperProfitDisplay", buttonText = "Edit") -// @ConfigAccordionId(id = 2) public Position hopperProfitPos = new Position(10, 10, false, true); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java index 3ef26c89b..54e63c904 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -22,9 +22,6 @@ public class Misc { public boolean petDisplay = false; @Expose -// @ConfigOption(name = "Pet Display Position", desc = "") -// @ConfigEditorButton(runnableId = "petDisplay", buttonText = "Edit") -// @ConfigAccordionId(id = 0) public Position petDisplayPos = new Position(-111, 221, false, true); @Expose @@ -39,9 +36,6 @@ public class Misc { public boolean realTime = false; @Expose -// @ConfigOption(name = "Real Time Position", desc = "") -// @ConfigEditorButton(runnableId = "realTime", buttonText = "Edit") -// @ConfigAccordionId(id = 1) public Position realTimePos = new Position(10, 10, false, true); @Expose @@ -90,9 +84,6 @@ public class Misc { public boolean nonGodPotEffectDisplay = false; @Expose -// @ConfigOption(name = "Pot Effects Position", desc = "") -// @ConfigEditorButton(runnableId = "nonGodPotEffect", buttonText = "Edit") -// @ConfigAccordionId(id = 5) public Position nonGodPotEffectPos = new Position(10, 10, false, true); @Expose @@ -107,9 +98,6 @@ public class Misc { public boolean crimsonIsleReputationHelper = true; @Expose -// @ConfigOption(name = "Reputation Position", desc = "") -// @ConfigEditorButton(runnableId = "crimsonIsleReputationHelper", buttonText = "Edit") -// @ConfigAccordionId(id = 6) public Position crimsonIsleReputationHelperPos = new Position(10, 10, false, true); @Expose @@ -159,9 +147,6 @@ public class Misc { public boolean tpsDisplayEnabled = false; @Expose -// @ConfigOption(name = "Tps Display Position", desc = "") -// @ConfigEditorButton(runnableId = "tpsDisplay", buttonText = "Edit") -// @ConfigAccordionId(id = 8) public Position tpsDisplayPosition = new Position(10, 10, false, true); @Expose @@ -223,9 +208,6 @@ public class Misc { public boolean chickenHeadTimerHideChat = true; @Expose -// @ConfigOption(name = "Timer Position", desc = "") -// @ConfigEditorButton(runnableId = "chickenHeadTimer", buttonText = "Edit") -// @ConfigAccordionId(id = 10) public Position chickenHeadTimerPosition = new Position(-372, 73, false, true); @Expose @@ -234,8 +216,6 @@ public class Misc { public boolean hideExpBottles = false; @Expose -// @ConfigOption(name = "Collection Counter Position", desc = "Tracking the number of items you collect. §cDoes not work with sacks.") -// @ConfigEditorButton(runnableId = "collectionCounter", buttonText = "Edit") public Position collectionCounterPos = new Position(10, 10, false, true); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java b/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java index 6c38e1f50..f9c121fb7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java @@ -27,9 +27,6 @@ public class Summonings { public boolean summoningMobDisplay = false; @Expose -// @ConfigOption(name = "Summoning Mob Display Position", desc = "") -// @ConfigEditorButton(runnableId = "summoningMobDisplay", buttonText = "Edit") -// @ConfigAccordionId(id = 0) public Position summoningMobDisplayPos = new Position(10, 10, false, true); @Expose |