diff options
12 files changed, 264 insertions, 15 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java index 425cd9d07..9833cf182 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java @@ -164,5 +164,6 @@ public class ChatConfig { @Expose @ConfigOption(name = "Translator", desc = "Click on a message to translate it into English. Use /shcopytranslation to get the translation from English. Translation is not guaranteed to be 100% accurate.") @ConfigEditorBoolean + @FeatureToggle public boolean translator = 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 index 472a0a50d..3dccd1b3c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java @@ -68,12 +68,14 @@ public class FishingConfig { @ConfigOption(name = "Fillet Tooltip", desc = "Show fillet value of trophy fish in tooltip.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) + @FeatureToggle 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) + @FeatureToggle public boolean odgerLocation = true; @ConfigOption(name = "Thunder Spark", desc = "") @@ -84,6 +86,7 @@ public class FishingConfig { @ConfigOption(name = "Thunder Spark Highlight", desc = "Highlight Thunder Sparks after killing a Thunder") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean thunderSparkHighlight = false; @Expose @@ -103,6 +106,7 @@ public class FishingConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean barnTimer = true; @Expose @@ -115,6 +119,7 @@ public class FishingConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean barnTimerCrystalHollows = true; @Expose @@ -152,6 +157,7 @@ public class FishingConfig { @Expose @ConfigOption(name = "Enable", desc = "Hide the Chum/Chumcap Bucket name tags for other players.") @ConfigEditorBoolean + @FeatureToggle public Property<Boolean> enabled = Property.of(true); @Expose @@ -175,6 +181,7 @@ public class FishingConfig { @Expose @ConfigOption(name = "Enabled", desc = "Show the fished item name above the item when fishing.") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = true; @Expose @@ -190,6 +197,7 @@ public class FishingConfig { desc = "Counts how many sharks have been caught." ) @ConfigEditorBoolean + @FeatureToggle public boolean sharkFishCounter = false; @Expose @@ -198,10 +206,12 @@ public class FishingConfig { @Expose @ConfigOption(name = "Shorten Fishing Message", desc = "Shortens the chat message that says what type of sea creature you have fished.") @ConfigEditorBoolean + @FeatureToggle public boolean shortenFishingMessage = false; @Expose @ConfigOption(name = "Compact Double Hook", desc = "Adds Double Hook to the sea creature chat message instead of in a previous line.") @ConfigEditorBoolean + @FeatureToggle public boolean compactDoubleHook = true; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java index 403aed763..1d13f5441 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.config.features; +import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.commands.Commands; import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.features.garden.inventory.GardenPlotIcon; @@ -26,6 +27,7 @@ public class GardenConfig { @ConfigOption(name = "Copper Price", desc = "Show copper to coin prices inside the SkyMart inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) + @FeatureToggle public boolean skyMartCopperPrice = true; @Expose @@ -53,6 +55,7 @@ public class GardenConfig { "and a number for how many visitors are already waiting.") @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean visitorTimerEnabled = true; @Expose @@ -82,6 +85,7 @@ public class GardenConfig { @ConfigOption(name = "Items Needed", desc = "Show all items needed for the visitors.") @ConfigEditorBoolean @ConfigAccordionId(id = 3) + @FeatureToggle public boolean visitorNeedsDisplay = true; @Expose @@ -110,6 +114,7 @@ public class GardenConfig { @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) + @FeatureToggle public boolean visitorItemPreview = true; @Expose @@ -122,6 +127,7 @@ public class GardenConfig { @ConfigOption(name = "Visitor Price", desc = "Show the bazaar price of the items required for the visitors, like in NEU.") @ConfigEditorBoolean @ConfigAccordionId(id = 4) + @FeatureToggle public boolean visitorShowPrice = false; @Expose @@ -134,18 +140,21 @@ public class GardenConfig { @ConfigOption(name = "Copper Price", desc = "Show the price per copper inside the visitor gui.") @ConfigEditorBoolean @ConfigAccordionId(id = 4) + @FeatureToggle public boolean visitorCopperPrice = true; @Expose @ConfigOption(name = "Copper Time", desc = "Show the time required per copper inside the visitor gui.") @ConfigEditorBoolean @ConfigAccordionId(id = 4) + @FeatureToggle public boolean visitorCopperTime = false; @Expose @ConfigOption(name = "Garden Exp Price", desc = "Show the price per garden experience inside the visitor gui.") @ConfigEditorBoolean @ConfigAccordionId(id = 4) + @FeatureToggle public boolean visitorExperiencePrice = false; @Expose @@ -159,16 +168,19 @@ public class GardenConfig { @Expose @ConfigOption(name = "Notify in Chat", desc = "Send a Chat message once you talk to a visitor with reward.") @ConfigEditorBoolean + @FeatureToggle public boolean notifyInChat = true; @Expose @ConfigOption(name = "Show over Name", desc = "Show the reward name above the visitor name.") @ConfigEditorBoolean + @FeatureToggle public boolean showOverName = true; @Expose @ConfigOption(name = "Prevent Refusing", desc = "Prevent the refusal of a visitor with reward.") @ConfigEditorBoolean + @FeatureToggle public boolean preventRefusing = true; @Expose @@ -206,12 +218,14 @@ public class GardenConfig { @ConfigOption(name = "Notification Chat", desc = "Show in chat when a new visitor is visiting your island.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean visitorNotificationChat = true; @Expose @ConfigOption(name = "Notification Title", desc = "Show a title when a new visitor is visiting your island.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean visitorNotificationTitle = true; @Expose @@ -224,18 +238,21 @@ public class GardenConfig { @ConfigOption(name = "Colored Name", desc = "Show the visitor name in the color of the rarity.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean visitorColoredName = true; @Expose @ConfigOption(name = "Hypixel Message", desc = "Hide the chat message from Hypixel that a new visitor has arrived at your garden.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean visitorHypixelArrivedMessage = true; @Expose @ConfigOption(name = "Hide Chat", desc = "Hide chat messages from the visitors in garden. (Except Beth and Spaceman)") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean visitorHideChat = true; @Expose @@ -251,6 +268,7 @@ public class GardenConfig { desc = "Tallies up statistic about visitors and the rewards you have received from them." ) @ConfigEditorBoolean + @FeatureToggle public boolean enabled = true; @Expose @@ -312,24 +330,28 @@ public class GardenConfig { @ConfigOption(name = "Crop Milestone", desc = "Show the number of crop milestones in the inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 5) + @FeatureToggle public boolean numberCropMilestone = true; @Expose @ConfigOption(name = "Average Milestone", desc = "Show the average crop milestone in the crop milestone inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 5) + @FeatureToggle public boolean numberAverageCropMilestone = true; @Expose @ConfigOption(name = "Crop Upgrades", desc = "Show the number of upgrades in the crop upgrades inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 5) + @FeatureToggle public boolean numberCropUpgrades = true; @Expose @ConfigOption(name = "Composter Upgrades", desc = "Show the number of upgrades in the composter upgrades inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 5) + @FeatureToggle public boolean numberComposterUpgrades = true; @Expose @@ -345,6 +367,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 6) + @FeatureToggle public boolean cropMilestoneProgress = true; @Expose @@ -428,6 +451,7 @@ public class GardenConfig { desc = "Lists all crops and their ETA till next milestone. Sorts for best crop for getting garden or SkyBlock levels.") @ConfigEditorBoolean @ConfigAccordionId(id = 7) + @FeatureToggle public boolean cropMilestoneBestDisplay = true; // TODO moulconfig runnable support @@ -496,6 +520,7 @@ public class GardenConfig { desc = "Show the progress and ETA for mushroom crops when farming other crops because of the mushroom cow perk.") @ConfigEditorBoolean @ConfigAccordionId(id = 15) + @FeatureToggle public boolean cropMilestoneMushroomPetPerkEnabled = true; @Expose @@ -529,6 +554,7 @@ public class GardenConfig { @ConfigOption(name = "Enabled", desc = "Use custom keybinds while holding a farming tool or daedalus axe in the hand. §cOnly updates after scrolling in the hotbar.") @ConfigEditorBoolean @ConfigAccordionId(id = 8) + @FeatureToggle public boolean keyBindEnabled = false; @ConfigOption(name = "Disable All", desc = "Disable all keys.") @@ -616,9 +642,11 @@ public class GardenConfig { public boolean optimalSpeed = false; @Expose - @ConfigOption(name = "Enabled", desc = "Show the optimal speed for your current tool in the hand.\n(Thanks MelonKingDE for the default values).") + @ConfigOption(name = "Enabled", desc = "Show the optimal speed for your current tool in the hand.\n" + + "(Thanks MelonKingDE for the default values).") @ConfigEditorBoolean @ConfigAccordionId(id = 9) + @FeatureToggle public boolean optimalSpeedEnabled = true; @Expose @@ -631,6 +659,7 @@ public class GardenConfig { @ConfigOption(name = "Rancher Boots", desc = "Allows you to set the optimal speed in the rancher boots overlay by clicking on the presets.") @ConfigEditorBoolean @ConfigAccordionId(id = 9) + @FeatureToggle public boolean optimalSpeedSignEnabled = true; @Expose @@ -728,6 +757,7 @@ public class GardenConfig { @ConfigOption(name = "Display", desc = "Show the current garden level and progress to the next level.") @ConfigEditorBoolean @ConfigAccordionId(id = 10) + @FeatureToggle public boolean gardenLevelDisplay = true; @Expose @@ -744,6 +774,7 @@ public class GardenConfig { "See §ehttps://elitebot.dev/info §7for more info.") @ConfigEditorBoolean @ConfigAccordionId(id = 11) + @FeatureToggle public boolean eliteFarmingWeightDisplay = true; @Expose @@ -796,12 +827,14 @@ public class GardenConfig { @ConfigOption(name = "Rng Drop Counter", desc = "Count RNG drops for Melon Dicer and Pumpkin Dicer.") @ConfigEditorBoolean @ConfigAccordionId(id = 12) + @FeatureToggle public boolean dicerCounterDisplay = true; @Expose @ConfigOption(name = "Hide Chat", desc = "Hide the chat message when dropping a RNG Dicer drop.") @ConfigEditorBoolean @ConfigAccordionId(id = 12) + @FeatureToggle public boolean dicerCounterHideChat = false; @Expose @@ -818,6 +851,7 @@ public class GardenConfig { "Supports Bountiful, Mushroom Cow Perk and Dicer drops. Thier toggles are below.") @ConfigEditorBoolean @ConfigAccordionId(id = 13) + @FeatureToggle public boolean moneyPerHourDisplay = true; // TODO moulconfig runnable support @@ -937,6 +971,7 @@ public class GardenConfig { @ConfigOption(name = "Show Jacob's Contest", desc = "Show the current or next Jacob's farming contest time and crops.") @ConfigEditorBoolean @ConfigAccordionId(id = 14) + @FeatureToggle public boolean nextJacobContestDisplay = true; @Expose @@ -998,12 +1033,14 @@ public class GardenConfig { @ConfigOption(name = "Show Counter", desc = "Count all §9Cropie§7, §5Squash §7and §6Fermento §7dropped.") @ConfigEditorBoolean @ConfigAccordionId(id = 18) + @FeatureToggle public boolean farmingArmorDropsEnabled = true; @Expose @ConfigOption(name = "Hide Chat", desc = "Hide the chat message when receiving a farming armor drop.") @ConfigEditorBoolean @ConfigAccordionId(id = 18) + @FeatureToggle public boolean farmingArmorDropsHideChat = false; @Expose @@ -1022,6 +1059,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 16) + @FeatureToggle public boolean anitaMedalProfitEnabled = true; @Expose @@ -1030,6 +1068,7 @@ public class GardenConfig { desc = "Show current tier and cost to max out in the item tooltip.") @ConfigEditorBoolean @ConfigAccordionId(id = 16) + @FeatureToggle public boolean extraFarmingFortune = true; @Expose @@ -1047,6 +1086,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 17) + @FeatureToggle public boolean composterOverlay = true; @Expose @@ -1068,6 +1108,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 17) + @FeatureToggle public boolean composterDisplayEnabled = true; @Expose @@ -1095,6 +1136,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 17) + @FeatureToggle public boolean composterUpgradePrice = true; @Expose @@ -1113,6 +1155,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 17) + @FeatureToggle public boolean composterHighLightUpgrade = true; @Expose @@ -1122,6 +1165,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 17) + @FeatureToggle public boolean composterInventoryNumbers = true; @Expose @@ -1134,6 +1178,7 @@ public class GardenConfig { @ConfigOption(name = "Enable", desc = "Show a notification when organic matter or fuel runs low in your composter.") @ConfigEditorBoolean @ConfigAccordionId(id = 21) + @FeatureToggle public boolean composterNotifyLowEnabled = true; @Expose @@ -1180,6 +1225,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 22) + @FeatureToggle public boolean farmingFortuneDisplay = true; @Expose @@ -1211,6 +1257,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 20) + @FeatureToggle public boolean compactToolTooltips = false; @Expose @@ -1240,6 +1287,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 20) + @FeatureToggle public boolean cropMilestoneTotalProgress = true; @Expose @@ -1252,6 +1300,7 @@ public class GardenConfig { @Expose @ConfigOption(name = "Enable", desc = "Displays yaw and pitch while holding a farming tool. Automatically fades out if there is no movement.") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = false; @Expose @@ -1312,6 +1361,7 @@ public class GardenConfig { @Expose @ConfigOption(name = "Enable", desc = "Show the start waypoint for your farm with the currently holding tool.") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = false; } @@ -1325,6 +1375,7 @@ public class GardenConfig { @Expose @ConfigOption(name = "Enable", desc = "Enable icon replacement in the Configure Plots menu.") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = true; @ConfigOption(name = "Hard Reset", desc = "Reset every slot to it's original item.") @@ -1338,27 +1389,32 @@ public class GardenConfig { @Expose @ConfigOption(name = "Plot Price", desc = "Show the price of the plot in coins when inside the Configure Plots inventory.") @ConfigEditorBoolean + @FeatureToggle public boolean plotPrice = true; @Expose @ConfigOption(name = "Desk in Menu", desc = "Show a Desk button in the SkyBlock Menu. Opens the /desk command on click.") @ConfigEditorBoolean + @FeatureToggle public boolean deskInSkyBlockMenu = true; @Expose @ConfigOption(name = "Fungi Cutter Warning", desc = "Warn when breaking mushroom with the wrong Fungi Cutter mode.") @ConfigEditorBoolean + @FeatureToggle public boolean fungiCutterWarn = true; @Expose @ConfigOption(name = "Burrowing Spores", desc = "Show a notification when a Burrowing Spores spawns during farming mushrooms.") @ConfigEditorBoolean + @FeatureToggle public boolean burrowingSporesNotification = true; @Expose @ConfigOption(name = "Wild Strawberry", desc = "Show a notification when a Wild Strawberry Dye drops during farming.") @ConfigEditorBoolean + @FeatureToggle public boolean wildStrawberryDyeNotification = true; @Expose @@ -1367,6 +1423,7 @@ public class GardenConfig { desc = "Show the minimum needed Farming Fortune for reaching each medal in Jacob's Farming Contest inventory." ) @ConfigEditorBoolean + @FeatureToggle public boolean farmingFortuneForContest = true; @Expose @@ -1378,6 +1435,7 @@ public class GardenConfig { desc = "Show the time and missing FF for every crop inside Jacob's Farming Contest inventory." ) @ConfigEditorBoolean + @FeatureToggle public boolean jacobContextTimes = true; @Expose @@ -1389,6 +1447,7 @@ public class GardenConfig { desc = "Show the average Blocks Per Second and blocks clicked at the end of a Jacob Farming Contest in chat." ) @ConfigEditorBoolean + @FeatureToggle public boolean jacobContestSummary = true; @Expose @@ -1402,5 +1461,6 @@ public class GardenConfig { @Expose @ConfigOption(name = "Enable Plot Borders", desc = "Enable the use of F3 + G hotkey to show Garden plot borders. Similar to how later minecraft version render chunk borders.") @ConfigEditorBoolean + @FeatureToggle public boolean plotBorders = true; }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounterConfig.java index 4e41b0dbc..da971dd6c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounterConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/GhostCounterConfig.java @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.config.features; +import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostFormatting; import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostUtil; @@ -15,6 +16,7 @@ public class GhostCounterConfig { @Expose @ConfigOption(name = "Enabled", desc = "Enable ghost counter.") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = true; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java index 4ddf71101..571a9a15b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.config.features; +import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.*; @@ -18,6 +19,7 @@ public class InventoryConfig { @ConfigOption(name = "Enabled", desc = "Hide items that are not clickable in the current inventory: ah, bz, accessory bag, etc.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) + @FeatureToggle public boolean hideNotClickableItems = false; @Expose @@ -53,18 +55,21 @@ public class InventoryConfig { @ConfigOption(name = "Floor Names", desc = "Show the floor names in the catacombs rng meter inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean rngMeterFloorName = false; @Expose @ConfigOption(name = "No Drop", desc = "Highlight floors without a drop selected in the catacombs rng meter inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean rngMeterNoDrop = false; @Expose @ConfigOption(name = "Selected Drop", desc = "Highlight the selected drop in the catacombs or slayer rng meter inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean rngMeterSelectedDrop = false; @ConfigOption(name = "Stats Tuning", desc = "") @@ -75,24 +80,28 @@ public class InventoryConfig { @ConfigOption(name = "Selected Stats", desc = "Show the tuning stats in the Thaumaturgy inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean statsTuningSelectedStats = true; @Expose @ConfigOption(name = "Tuning Points", desc = "Show the amount of selected tuning points in the stats tuning inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean statsTuningPoints = true; @Expose @ConfigOption(name = "Selected Template", desc = "Highlight the selected template in the stats tuning inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean statsTuningSelectedTemplate = true; @Expose @ConfigOption(name = "Template Stats", desc = "Show the type of stats for the tuning point templates.") @ConfigEditorBoolean @ConfigAccordionId(id = 2) + @FeatureToggle public boolean statsTuningTemplateStats = true; @Expose @@ -104,18 +113,21 @@ public class InventoryConfig { @ConfigOption(name = "Unclaimed Rewards", desc = "Highlight contests with unclaimed rewards in the jacob inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 3) + @FeatureToggle public boolean jacobFarmingContestHighlightRewards = true; @Expose @ConfigOption(name = "Duplicate Hider", desc = "Hides duplicate farming contests in the inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 3) + @FeatureToggle public boolean jacobFarmingContestHideDuplicates = true; @Expose @ConfigOption(name = "Contest Time", desc = "Adds the real time format to the contest description.") @ConfigEditorBoolean @ConfigAccordionId(id = 3) + @FeatureToggle public boolean jacobFarmingContestRealTime = true; @Expose @@ -128,6 +140,7 @@ public class InventoryConfig { @Expose @ConfigOption(name = "Enabled", desc = "Show contained items inside a sack inventory.") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = true; @Expose @@ -196,6 +209,7 @@ public class InventoryConfig { @Expose @ConfigOption(name = "Enabled", desc = "Enabled estimated value of chest") @ConfigEditorBoolean + @FeatureToggle public boolean enabled = false; @Expose @@ -216,6 +230,7 @@ public class InventoryConfig { @Expose @ConfigOption(name = "Highlight slot", desc = "Highlight slot where the item is when you hover over it in the display.") @ConfigEditorBoolean + @FeatureToggle public boolean enableHighlight = true; @Expose @@ -286,35 +301,41 @@ public class InventoryConfig { @Expose @ConfigOption(name = "Sack Name", desc = "Show an abbreviation of the sack name.") @ConfigEditorBoolean + @FeatureToggle public boolean displaySackName = 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 + @FeatureToggle public boolean anvilCombineHelper = false; @Expose @ConfigOption(name = "Item Stars", desc = "Show a compact star count in the item name for all items.") @ConfigEditorBoolean + @FeatureToggle public boolean itemStars = false; @Expose @ConfigOption(name = "Highlight Depleted Bonzo's Masks", desc = "Highlights used Bonzo's Masks with a background.") @ConfigEditorBoolean + @FeatureToggle public boolean highlightDepletedBonzosMasks = false; @Expose @ConfigOption(name = "Missing Tasks", desc = "Highlight missing tasks in the SkyBlock level guide inventory.") @ConfigEditorBoolean + @FeatureToggle public boolean highlightMissingSkyBlockLevelGuide = true; @Expose @ConfigOption(name = "Highlight Auctions", desc = "Highlight own items that are sold in green and that are expired in red.") @ConfigEditorBoolean + @FeatureToggle public boolean highlightAuctions = true; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java index e4fc4f186..4b245db4d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java @@ -1,18 +1,15 @@ package at.hannibal2.skyhanni.config.features; +import at.hannibal2.skyhanni.config.FeatureToggle; 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.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.moulberry.moulconfig.annotations.*; public class ItemAbilityConfig { @Expose @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.") @ConfigEditorBoolean + @FeatureToggle public boolean itemAbilityCooldown = false; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java index 17abf034a..dd2debc75 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java @@ -1,19 +1,16 @@ package at.hannibal2.skyhanni.config.features; +import at.hannibal2.skyhanni.config.FeatureToggle; 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.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.moulberry.moulconfig.annotations.*; public class MinionsConfig { @Expose @ConfigOption(name = "Name Display", desc = "Show the minion name and tier over the minion.") @ConfigEditorBoolean + @FeatureToggle public boolean nameDisplay = true; @Expose @@ -29,6 +26,7 @@ public class MinionsConfig { @ConfigOption(name = "Last Minion Display", desc = "Marks the location of the last clicked minion, even through walls.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) + @FeatureToggle public boolean lastClickedMinionDisplay = false; @Expose @@ -61,6 +59,7 @@ public class MinionsConfig { @ConfigOption(name = "Emptied Time Display", desc = "Show the time when the hopper in the minion was last emptied.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) + @FeatureToggle public boolean emptiedTimeDisplay = false; @Expose @@ -87,5 +86,6 @@ public class MinionsConfig { @Expose @ConfigOption(name = "Hide Mob Nametag", desc = "Hiding the nametag of mobs close to minions.") @ConfigEditorBoolean + @FeatureToggle public boolean hideMobsNametagNearby = false; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java index 1f6745f6c..5b6c7f66c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.config.features; +import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.*; @@ -21,6 +22,7 @@ public class MiscConfig { @ConfigOption(name = "Pet Display", desc = "Show the currently active pet.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) + @FeatureToggle public boolean petDisplay = false; @Expose @@ -34,6 +36,7 @@ public class MiscConfig { @Expose @ConfigOption(name = "Enabled", desc = "Show the full pet exp and the progress to level 100 (ignoring rarity) when hovering over an pet while pressing shift key.") @ConfigEditorBoolean + @FeatureToggle public boolean petDisplay = true; @Expose @@ -56,6 +59,7 @@ public class MiscConfig { @Expose @ConfigOption(name = "Real Time", desc = "Display the current computer time, a handy feature when playing in full-screen mode.") @ConfigEditorBoolean + @FeatureToggle public boolean realTime = false; @Expose @@ -64,6 +68,7 @@ public class MiscConfig { @Expose @ConfigOption(name = "Winter Time", desc = "While on the Winter Island, show a timer until Jerry's Workshop closes.") @ConfigEditorBoolean + @FeatureToggle public boolean winterTime = true; @Expose @@ -100,6 +105,7 @@ public class MiscConfig { @ConfigOption(name = "Hide Damage Splash", desc = "Hide all damage splashes anywhere in SkyBlock.") @ConfigEditorBoolean @ConfigAccordionId(id = 4) + @FeatureToggle public boolean hideDamageSplash = false; @Expose |