Config options (#327)

* Fix duplicate options when using groups

* Add some examples of the new config options

Check style
This commit is contained in:
sdburns1998
2019-05-20 22:13:00 +02:00
committed by Kyleeld
parent 2b1a6fc3d6
commit a327cc2a42
3 changed files with 160 additions and 63 deletions

View File

@@ -29,38 +29,75 @@ package net.runelite.client.plugins.aoewarnings;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Stub;
@ConfigGroup("aoe") @ConfigGroup("aoe")
public interface AoeWarningConfig extends Config public interface AoeWarningConfig extends Config
{ {
@ConfigItem(
keyName = "overlayStub",
name = "Overlay",
description = "",
position = 1
)
default Stub overlayStub()
{
return new Stub();
}
@ConfigItem( @ConfigItem(
keyName = "outline", keyName = "outline",
name = "Display Outline", name = "Display Outline",
description = "Configures whether or not AoE Projectile Warnings have an outline", description = "Configures whether or not AoE Projectile Warnings have an outline",
position = 1 parent = "overlayStub",
position = 2
) )
default boolean isOutlineEnabled() default boolean isOutlineEnabled()
{ {
return true; return true;
} }
@ConfigItem(
keyName = "delay",
name = "Fade delay",
description = "Configures the amount of time in milliseconds that the warning lingers for after the projectile has touched the ground",
parent = "overlayStub",
position = 3
)
default int delay()
{
return 300;
}
@ConfigItem( @ConfigItem(
keyName = "fade", keyName = "fade",
name = "Fade Warnings", name = "Fade Warnings",
description = "Configures whether or not AoE Projectile Warnings fade over time", description = "Configures whether or not AoE Projectile Warnings fade over time",
position = 2 parent = "overlayStub",
position = 4
) )
default boolean isFadeEnabled() default boolean isFadeEnabled()
{ {
return true; return true;
} }
@ConfigItem(
keyName = "npcStub",
name = "NPC's",
description = "",
position = 5
)
default Stub npcStub()
{
return new Stub();
}
@ConfigItem( @ConfigItem(
keyName = "lizardmanaoe", keyName = "lizardmanaoe",
name = "Lizardman Shamans", name = "Lizardman Shamans",
description = "Configures whether or not AoE Projectile Warnings for Lizardman Shamans is displayed", description = "Configures whether or not AoE Projectile Warnings for Lizardman Shamans is displayed",
position = 3 parent = "npcStub",
position = 6
) )
default boolean isShamansEnabled() default boolean isShamansEnabled()
{ {
@@ -71,7 +108,8 @@ public interface AoeWarningConfig extends Config
keyName = "archaeologistaoe", keyName = "archaeologistaoe",
name = "Crazy Archaeologist", name = "Crazy Archaeologist",
description = "Configures whether or not AoE Projectile Warnings for Archaeologist is displayed", description = "Configures whether or not AoE Projectile Warnings for Archaeologist is displayed",
position = 4 parent = "npcStub",
position = 7
) )
default boolean isArchaeologistEnabled() default boolean isArchaeologistEnabled()
{ {
@@ -82,7 +120,8 @@ public interface AoeWarningConfig extends Config
keyName = "icedemon", keyName = "icedemon",
name = "Ice Demon", name = "Ice Demon",
description = "Configures whether or not AoE Projectile Warnings for Ice Demon is displayed", description = "Configures whether or not AoE Projectile Warnings for Ice Demon is displayed",
position = 5 parent = "npcStub",
position = 8
) )
default boolean isIceDemonEnabled() default boolean isIceDemonEnabled()
{ {
@@ -93,7 +132,8 @@ public interface AoeWarningConfig extends Config
keyName = "vasa", keyName = "vasa",
name = "Vasa", name = "Vasa",
description = "Configures whether or not AoE Projectile Warnings for Vasa is displayed", description = "Configures whether or not AoE Projectile Warnings for Vasa is displayed",
position = 6 parent = "npcStub",
position = 9
) )
default boolean isVasaEnabled() default boolean isVasaEnabled()
{ {
@@ -104,7 +144,8 @@ public interface AoeWarningConfig extends Config
keyName = "tekton", keyName = "tekton",
name = "Tekton", name = "Tekton",
description = "Configures whether or not AoE Projectile Warnings for Tekton is displayed", description = "Configures whether or not AoE Projectile Warnings for Tekton is displayed",
position = 7 parent = "npcStub",
position = 10
) )
default boolean isTektonEnabled() default boolean isTektonEnabled()
{ {
@@ -115,7 +156,8 @@ public interface AoeWarningConfig extends Config
keyName = "vorkath", keyName = "vorkath",
name = "Vorkath", name = "Vorkath",
description = "Configures whether or not AoE Projectile Warnings for Vorkath are displayed", description = "Configures whether or not AoE Projectile Warnings for Vorkath are displayed",
position = 7 parent = "npcStub",
position = 11
) )
default boolean isVorkathEnabled() default boolean isVorkathEnabled()
{ {
@@ -126,7 +168,8 @@ public interface AoeWarningConfig extends Config
keyName = "galvek", keyName = "galvek",
name = "Galvek", name = "Galvek",
description = "Configures whether or not AoE Projectile Warnings for Galvek are displayed", description = "Configures whether or not AoE Projectile Warnings for Galvek are displayed",
position = 8 parent = "npcStub",
position = 12
) )
default boolean isGalvekEnabled() default boolean isGalvekEnabled()
{ {
@@ -137,7 +180,8 @@ public interface AoeWarningConfig extends Config
keyName = "gargboss", keyName = "gargboss",
name = "Gargoyle Boss", name = "Gargoyle Boss",
description = "Configs whether or not AoE Projectile Warnings for Dawn/Dusk are displayed", description = "Configs whether or not AoE Projectile Warnings for Dawn/Dusk are displayed",
position = 9 parent = "npcStub",
position = 13
) )
default boolean isGargBossEnabled() default boolean isGargBossEnabled()
{ {
@@ -148,7 +192,8 @@ public interface AoeWarningConfig extends Config
keyName = "vetion", keyName = "vetion",
name = "Vet'ion", name = "Vet'ion",
description = "Configures whether or not AoE Projectile Warnings for Vet'ion are displayed", description = "Configures whether or not AoE Projectile Warnings for Vet'ion are displayed",
position = 10 parent = "npcStub",
position = 14
) )
default boolean isVetionEnabled() default boolean isVetionEnabled()
{ {
@@ -159,7 +204,8 @@ public interface AoeWarningConfig extends Config
keyName = "chaosfanatic", keyName = "chaosfanatic",
name = "Chaos Fanatic", name = "Chaos Fanatic",
description = "Configures whether or not AoE Projectile Warnings for Chaos Fanatic are displayed", description = "Configures whether or not AoE Projectile Warnings for Chaos Fanatic are displayed",
position = 11 parent = "npcStub",
position = 15
) )
default boolean isChaosFanaticEnabled() default boolean isChaosFanaticEnabled()
{ {
@@ -170,7 +216,8 @@ public interface AoeWarningConfig extends Config
keyName = "olm", keyName = "olm",
name = "Olm", name = "Olm",
description = "Configures whether or not AoE Projectile Warnings for The Great Olm are displayed", description = "Configures whether or not AoE Projectile Warnings for The Great Olm are displayed",
position = 12 parent = "npcStub",
position = 16
) )
default boolean isOlmEnabled() default boolean isOlmEnabled()
{ {
@@ -181,7 +228,8 @@ public interface AoeWarningConfig extends Config
keyName = "bombDisplay", keyName = "bombDisplay",
name = "Olm Bombs", name = "Olm Bombs",
description = "Display a timer and colour-coded AoE for Olm's crystal-phase bombs.", description = "Display a timer and colour-coded AoE for Olm's crystal-phase bombs.",
position = 13 parent = "npcStub",
position = 17
) )
default boolean bombDisplay() default boolean bombDisplay()
{ {
@@ -192,7 +240,8 @@ public interface AoeWarningConfig extends Config
keyName = "corp", keyName = "corp",
name = "Corporeal Beast", name = "Corporeal Beast",
description = "Configures whether or not AoE Projectile Warnings for the Corporeal Beast are displayed", description = "Configures whether or not AoE Projectile Warnings for the Corporeal Beast are displayed",
position = 14 parent = "npcStub",
position = 18
) )
default boolean isCorpEnabled() default boolean isCorpEnabled()
{ {
@@ -203,7 +252,8 @@ public interface AoeWarningConfig extends Config
keyName = "wintertodt", keyName = "wintertodt",
name = "Wintertodt Snow Fall", name = "Wintertodt Snow Fall",
description = "Configures whether or not AOE Projectile Warnings for the Wintertodt snow fall are displayed", description = "Configures whether or not AOE Projectile Warnings for the Wintertodt snow fall are displayed",
position = 15 parent = "npcStub",
position = 19
) )
default boolean isWintertodtEnabled() default boolean isWintertodtEnabled()
{ {
@@ -214,7 +264,8 @@ public interface AoeWarningConfig extends Config
keyName = "isXarpusEnabled", keyName = "isXarpusEnabled",
name = "Xarpus", name = "Xarpus",
description = "Configures whether or not AOE Projectile Warnings for Xarpus are displayed", description = "Configures whether or not AOE Projectile Warnings for Xarpus are displayed",
position = 16 parent = "npcStub",
position = 20
) )
default boolean isXarpusEnabled() default boolean isXarpusEnabled()
{ {
@@ -225,7 +276,8 @@ public interface AoeWarningConfig extends Config
keyName = "lightning", keyName = "lightning",
name = "Olm Lightning Trails", name = "Olm Lightning Trails",
description = "Show Lightning Trails", description = "Show Lightning Trails",
position = 17 parent = "npcStub",
position = 21
) )
default boolean LightningTrail() default boolean LightningTrail()
{ {
@@ -236,7 +288,8 @@ public interface AoeWarningConfig extends Config
keyName = "addyDrags", keyName = "addyDrags",
name = "Addy Drags", name = "Addy Drags",
description = "Show Bad Areas", description = "Show Bad Areas",
position = 18 parent = "npcStub",
position = 22
) )
default boolean addyDrags() default boolean addyDrags()
{ {
@@ -246,7 +299,8 @@ public interface AoeWarningConfig extends Config
@ConfigItem( @ConfigItem(
keyName = "drake", name = "Drakes Breath", keyName = "drake", name = "Drakes Breath",
description = "Configures if Drakes Breath tile markers are displayed", description = "Configures if Drakes Breath tile markers are displayed",
position = 19 parent = "npcStub",
position = 23
) )
default boolean isDrakeEnabled() default boolean isDrakeEnabled()
{ {
@@ -257,21 +311,11 @@ public interface AoeWarningConfig extends Config
keyName = "cerbFire", keyName = "cerbFire",
name = "Cerberus Fire", name = "Cerberus Fire",
description = "Configures if Cerberus fire tile markers are displayed", description = "Configures if Cerberus fire tile markers are displayed",
position = 20 parent = "npcStub",
position = 24
) )
default boolean isCerbFireEnabled() default boolean isCerbFireEnabled()
{ {
return true; return true;
} }
@ConfigItem(
keyName = "delay",
name = "Fade delay",
description = "Configures the amount of time in milliseconds that the warning lingers for after the projectile has touched the ground",
position = 21
)
default int delay()
{
return 300;
}
} }

View File

@@ -421,12 +421,11 @@ public class ConfigPanel extends PluginPanel
title.setToolTipText("<html>" + name + ":<br>" + listItem.getDescription() + "</html>"); title.setToolTipText("<html>" + name + ":<br>" + listItem.getDescription() + "</html>");
topPanel.add(title); topPanel.add(title);
ConfigPanelItem mainParent = new ConfigPanelItem(null, null);
List<ConfigPanelItem> parents = new ArrayList<>();
List<ConfigItemDescriptor> allItems = new ArrayList<>();
for (ConfigItemsGroup cig : cd.getItemGroups()) for (ConfigItemsGroup cig : cd.getItemGroups())
{ {
ConfigPanelItem mainParent = new ConfigPanelItem(null, null);
List<ConfigItemDescriptor> allItems = new ArrayList<>();
boolean collapsed = false; boolean collapsed = false;
if (!cig.getGroup().equals("")) if (!cig.getGroup().equals(""))
{ {

View File

@@ -62,7 +62,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 1, position = 1,
group = "Banking" group = "Banking",
hidden = true,
unhide = "withdrawOne"
) )
default String getWithdrawOneItems() default String getWithdrawOneItems()
{ {
@@ -86,7 +88,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 3, position = 3,
group = "Banking" group = "Banking",
hidden = true,
unhide = "withdrawFive"
) )
default String getWithdrawFiveItems() default String getWithdrawFiveItems()
{ {
@@ -110,7 +114,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 5, position = 5,
group = "Banking" group = "Banking",
hidden = true,
unhide = "withdrawTen"
) )
default String getWithdrawTenItems() default String getWithdrawTenItems()
{ {
@@ -134,7 +140,9 @@ public interface EasyscapeConfig extends Config
name = "Amount", name = "Amount",
description = "", description = "",
position = 7, position = 7,
group = "Banking" group = "Banking",
hidden = true,
unhide = "withdrawX"
) )
default String getWithdrawXAmount() default String getWithdrawXAmount()
{ {
@@ -146,7 +154,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 8, position = 8,
group = "Banking" group = "Banking",
hidden = true,
unhide = "withdrawX"
) )
default String getWithdrawXItems() default String getWithdrawXItems()
{ {
@@ -170,7 +180,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 10, position = 10,
group = "Banking" group = "Banking",
hidden = true,
unhide = "withdrawAll"
) )
default String getWithdrawAllItems() default String getWithdrawAllItems()
{ {
@@ -196,7 +208,9 @@ public interface EasyscapeConfig extends Config
name = "Objects", name = "Objects",
description = "Objects listed here will have all interaction be removed.", description = "Objects listed here will have all interaction be removed.",
position = 13, position = 13,
group = "Miscellaneous easyscape" group = "Miscellaneous easyscape",
hidden = true,
unhide = "removeObjects"
) )
default String getRemovedObjects() default String getRemovedObjects()
{ {
@@ -222,7 +236,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 15, position = 15,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapBuyOne"
) )
default String getBuyOneItems() default String getBuyOneItems()
{ {
@@ -246,7 +262,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 17, position = 17,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapBuyFive"
) )
default String getBuyFiveItems() default String getBuyFiveItems()
{ {
@@ -270,7 +288,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 19, position = 19,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapBuyTen"
) )
default String getBuyTenItems() default String getBuyTenItems()
{ {
@@ -294,7 +314,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 21, position = 21,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapBuyFifty"
) )
default String getBuyFiftyItems() default String getBuyFiftyItems()
{ {
@@ -318,7 +340,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 23, position = 23,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapSellOne"
) )
default String getSellOneItems() default String getSellOneItems()
{ {
@@ -342,7 +366,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 25, position = 25,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapSellFive"
) )
default String getSellFiveItems() default String getSellFiveItems()
{ {
@@ -366,7 +392,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 27, position = 27,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapSellTen"
) )
default String getSellTenItems() default String getSellTenItems()
{ {
@@ -390,7 +418,9 @@ public interface EasyscapeConfig extends Config
name = "Items", name = "Items",
description = "", description = "",
position = 29, position = 29,
group = "Shop / stores" group = "Shop / stores",
hidden = true,
unhide = "swapSellFifty"
) )
default String getSellFiftyItems() default String getSellFiftyItems()
{ {
@@ -416,7 +446,9 @@ public interface EasyscapeConfig extends Config
name = "Construction Items", name = "Construction Items",
description = "Items listed here will have the default option set to \"Removed\" in build mode.", description = "Items listed here will have the default option set to \"Removed\" in build mode.",
position = 31, position = 31,
group = "Miscellaneous swapper" group = "Miscellaneous swapper",
hidden = true,
unhide = "easyConstruction"
) )
default String getConstructionItems() default String getConstructionItems()
{ {
@@ -503,7 +535,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 38, position = 38,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapGamesNecklace"
) )
default GamesNecklaceMode getGamesNecklaceMode() default GamesNecklaceMode getGamesNecklaceMode()
{ {
@@ -527,7 +561,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 40, position = 40,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapDuelingRing"
) )
default DuelingRingMode getDuelingRingMode() default DuelingRingMode getDuelingRingMode()
{ {
@@ -551,7 +587,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 42, position = 42,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapGlory"
) )
default GloryMode getGloryMode() default GloryMode getGloryMode()
{ {
@@ -575,7 +613,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 44, position = 44,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapSkill"
) )
default SkillsNecklaceMode getSkillsNecklaceMode() default SkillsNecklaceMode getSkillsNecklaceMode()
{ {
@@ -599,7 +639,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 46, position = 46,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapPassage"
) )
default NecklaceOfPassageMode getNecklaceofPassageMode() default NecklaceOfPassageMode getNecklaceofPassageMode()
{ {
@@ -623,7 +665,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 48, position = 48,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapDigsite"
) )
default DigsitePendantMode getDigsitePendantMode() default DigsitePendantMode getDigsitePendantMode()
{ {
@@ -647,7 +691,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 50, position = 50,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapCombat"
) )
default CombatBraceletMode getCombatBraceletMode() default CombatBraceletMode getCombatBraceletMode()
{ {
@@ -671,7 +717,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 52, position = 52,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapslayer"
) )
default SlayerRingMode getSlayerRingMode() default SlayerRingMode getSlayerRingMode()
{ {
@@ -695,7 +743,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 54, position = 54,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapburning"
) )
default BurningAmuletMode getBurningAmuletMode() default BurningAmuletMode getBurningAmuletMode()
{ {
@@ -719,7 +769,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 56, position = 56,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapxeric"
) )
default XericsTalismanMode getXericsTalismanMode() default XericsTalismanMode getXericsTalismanMode()
{ {
@@ -743,7 +795,9 @@ public interface EasyscapeConfig extends Config
name = "Mode", name = "Mode",
description = "", description = "",
position = 58, position = 58,
group = "Jewellery swapper" group = "Jewellery swapper",
hidden = true,
unhide = "swapwealth"
) )
default RingOfWealthMode getRingofWealthMode() default RingOfWealthMode getRingofWealthMode()
{ {