Replace fields in ConfigGroup with a single value field

This commit is contained in:
takuyakanbr
2018-07-03 13:32:07 +08:00
parent 96e263a4fe
commit 229d7dabfe
80 changed files with 109 additions and 401 deletions

View File

@@ -26,11 +26,7 @@ package net.runelite.client.config;
import java.awt.Color;
@ConfigGroup(
keyName = "textrecolor",
name = "Chat Text Recolor",
description = "Configuration for chat text recoloring"
)
@ConfigGroup("textrecolor")
public interface ChatColorConfig extends Config
{
@ConfigItem(

View File

@@ -33,9 +33,11 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE)
public @interface ConfigGroup
{
String keyName();
String name();
String description();
/**
* The key name of the config group used for storing configuration within the config group.
* This should typically be a lowercased version of your plugin name, with all spaces removed.
* <p>
* For example, the {@code Grand Exchange} plugin uses the key name {@code grandexchange}.
*/
String value();
}

View File

@@ -64,7 +64,7 @@ class ConfigInvocationHandler implements InvocationHandler
if (args == null)
{
// Getting configuration item
String value = manager.getConfiguration(group.keyName(), item.keyName());
String value = manager.getConfiguration(group.value(), item.keyName());
if (value == null)
{
@@ -85,7 +85,7 @@ class ConfigInvocationHandler implements InvocationHandler
}
catch (Exception e)
{
log.warn("Unable to unmarshal {}.{} ", group.keyName(), item.keyName(), e);
log.warn("Unable to unmarshal {}.{} ", group.value(), item.keyName(), e);
if (method.isDefault())
{
return callDefaultMethod(proxy, method, null);
@@ -111,19 +111,19 @@ class ConfigInvocationHandler implements InvocationHandler
if (Objects.equal(newValue, defaultValue))
{
// Just unset if it goes back to the default
manager.unsetConfiguration(group.keyName(), item.keyName());
manager.unsetConfiguration(group.value(), item.keyName());
return null;
}
}
if (newValue == null)
{
manager.unsetConfiguration(group.keyName(), item.keyName());
manager.unsetConfiguration(group.value(), item.keyName());
}
else
{
String newValueStr = ConfigManager.objectToString(newValue);
manager.setConfiguration(group.keyName(), item.keyName(), newValueStr);
manager.setConfiguration(group.value(), item.keyName(), newValueStr);
}
return null;
}

View File

@@ -386,11 +386,11 @@ public class ConfigManager
{
if (override)
{
String current = getConfiguration(group.keyName(), item.keyName());
String current = getConfiguration(group.value(), item.keyName());
// only unset if already set
if (current != null)
{
unsetConfiguration(group.keyName(), item.keyName());
unsetConfiguration(group.value(), item.keyName());
}
}
continue;
@@ -398,7 +398,7 @@ public class ConfigManager
if (!override)
{
String current = getConfiguration(group.keyName(), item.keyName());
String current = getConfiguration(group.value(), item.keyName());
if (current != null)
{
continue; // something else is already set
@@ -416,16 +416,16 @@ public class ConfigManager
continue;
}
String current = getConfiguration(group.keyName(), item.keyName());
String current = getConfiguration(group.value(), item.keyName());
String valueString = objectToString(defaultValue);
if (Objects.equals(current, valueString))
{
continue; // already set to the default value
}
log.debug("Setting default configuration value for {}.{} to {}", group.keyName(), item.keyName(), defaultValue);
log.debug("Setting default configuration value for {}.{} to {}", group.value(), item.keyName(), defaultValue);
setConfiguration(group.keyName(), item.keyName(), valueString);
setConfiguration(group.value(), item.keyName(), valueString);
}
}

View File

@@ -27,11 +27,7 @@ package net.runelite.client.config;
import java.awt.Dimension;
import net.runelite.api.Constants;
@ConfigGroup(
keyName = "runelite",
name = "RuneLite",
description = "Configuration for RuneLite client options"
)
@ConfigGroup("runelite")
public interface RuneLiteConfig extends Config
{
@ConfigItem(

View File

@@ -99,7 +99,7 @@ public class PluginManager
private final List<Plugin> plugins = new CopyOnWriteArrayList<>();
private final List<Plugin> activePlugins = new CopyOnWriteArrayList<>();
private final String runeliteGroupName = RuneLiteConfig.class
.getAnnotation(ConfigGroup.class).keyName();
.getAnnotation(ConfigGroup.class).value();
@Subscribe
public void onSessionOpen(SessionOpen event)

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "agility",
name = "Agility",
description = "Configuration for the Agility plugin"
)
@ConfigGroup("agility")
public interface AgilityConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = AnimationSmoothingPlugin.CONFIG_GROUP,
name = "Smooth Animations",
description = "Configuration for the smooth animations plugin"
)
@ConfigGroup(AnimationSmoothingPlugin.CONFIG_GROUP)
public interface AnimationSmoothingConfig extends Config
{

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "antiDrag",
name = "Anti Drag",
description = "Configuration for the anti drag plugin (shift only)"
)
@ConfigGroup("antiDrag")
public interface AntiDragConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "attackIndicator",
name = "Attack Styles",
description = "Configuration for the attack styles plugin"
)
@ConfigGroup("attackIndicator")
public interface AttackStylesConfig extends Config
{
@ConfigItem(

View File

@@ -29,10 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "bankvalue",
name = "Bank Value",
description = "Shows the value of your bank and/or current tab")
@ConfigGroup("bankvalue")
public interface BankValueConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "barbarianAssault",
name = "Barbarian Assault",
description = "Configuration for the barbarian assault plugin"
)
@ConfigGroup("barbarianAssault")
public interface BarbarianAssaultConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "barrows",
name = "Barrows Brothers",
description = "Configuration for the Barrows plugin"
)
@ConfigGroup("barrows")
public interface BarrowsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "blastfurnace",
name = "Blast Furnace",
description = "Configuration for the Blast furnace plugin"
)
@ConfigGroup("blastfurnace")
public interface BlastFurnaceConfig extends Config
{
@ConfigItem(

View File

@@ -30,11 +30,7 @@ import net.runelite.client.config.ConfigItem;
import java.awt.Color;
@ConfigGroup(
keyName = "blastmine",
name = "Blast Mine",
description = "Configuration for the Blast Mine plugin"
)
@ConfigGroup("blastmine")
public interface BlastMinePluginConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "boosts",
name = "Boosts Information",
description = "Configuration for the Boosts plugin"
)
@ConfigGroup("boosts")
public interface BoostsConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "cannon",
name = "Cannon",
description = "Configuration for the Cannon plugin"
)
@ConfigGroup("cannon")
public interface CannonConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "chatcommands",
name = "Chat Commands",
description = "Configuration for chat commands"
)
@ConfigGroup("chatcommands")
public interface ChatCommandsConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "chatnotification",
name = "Chat Notifications",
description = "Highlights and notifies you of chat messages"
)
@ConfigGroup("chatnotification")
public interface ChatNotificationsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
name = "Clue Scroll",
keyName = "cluescroll",
description = "Configuration for the clue scroll plugin"
)
@ConfigGroup("cluescroll")
public interface ClueScrollConfig extends Config
{
@ConfigItem(

View File

@@ -101,7 +101,7 @@ public class ConfigPanel extends PluginPanel
private static final ImageIcon BACK_ICON_HOVER;
private static final ImageIcon SEARCH;
private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).keyName();
private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value();
private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins";
private static final String RUNELITE_PLUGIN = "RuneLite";
private static final String CHAT_COLOR_PLUGIN = "Chat Color";
@@ -349,7 +349,7 @@ public class ConfigPanel extends PluginPanel
{
JCheckBox checkbox = new JCheckBox();
checkbox.setBackground(ColorScheme.LIGHT_GRAY_COLOR);
checkbox.setSelected(Boolean.parseBoolean(configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName())));
checkbox.setSelected(Boolean.parseBoolean(configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName())));
checkbox.addActionListener(ae -> changeConfiguration(listItem, config, checkbox, cd, cid));
item.add(checkbox, BorderLayout.EAST);
@@ -357,7 +357,7 @@ public class ConfigPanel extends PluginPanel
if (cid.getType() == int.class)
{
int value = Integer.parseInt(configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName()));
int value = Integer.parseInt(configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName()));
SpinnerModel model = new SpinnerNumberModel(value, 0, Integer.MAX_VALUE, 1);
JSpinner spinner = new JSpinner(model);
@@ -375,7 +375,7 @@ public class ConfigPanel extends PluginPanel
textField.setLineWrap(true);
textField.setWrapStyleWord(true);
textField.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
textField.setText(configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName()));
textField.setText(configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName()));
textField.addFocusListener(new FocusAdapter()
{
@@ -391,7 +391,7 @@ public class ConfigPanel extends PluginPanel
if (cid.getType() == Color.class)
{
String existing = configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName());
String existing = configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName());
Color existingColor;
JButton colorPicker;
@@ -442,7 +442,7 @@ public class ConfigPanel extends PluginPanel
JPanel dimensionPanel = new JPanel();
dimensionPanel.setLayout(new BorderLayout());
String str = configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName());
String str = configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName());
String[] splitStr = str.split("x");
int width = Integer.parseInt(splitStr[0]);
int height = Integer.parseInt(splitStr[1]);
@@ -460,7 +460,7 @@ public class ConfigPanel extends PluginPanel
heightSpinnerTextField.setColumns(4);
ChangeListener listener = e ->
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), widthSpinner.getValue() + "x" + heightSpinner.getValue());
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), widthSpinner.getValue() + "x" + heightSpinner.getValue());
widthSpinner.addChangeListener(listener);
heightSpinner.addChangeListener(listener);
@@ -483,7 +483,7 @@ public class ConfigPanel extends PluginPanel
box.setPrototypeDisplayValue("XXXXXXXX"); //sorry but this is the way to keep the size of the combobox in check.
try
{
Enum selectedItem = Enum.valueOf(type, configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName()));
Enum selectedItem = Enum.valueOf(type, configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName()));
box.setSelectedItem(selectedItem);
box.setToolTipText(selectedItem.toString());
}
@@ -504,7 +504,7 @@ public class ConfigPanel extends PluginPanel
if (cid.getType() == Keybind.class)
{
Keybind startingValue = configManager.getConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), Keybind.class);
Keybind startingValue = configManager.getConfiguration(cd.getGroup().value(), cid.getItem().keyName(), Keybind.class);
HotkeyButton button = new HotkeyButton(startingValue);
@@ -561,32 +561,32 @@ public class ConfigPanel extends PluginPanel
if (component instanceof JCheckBox)
{
JCheckBox checkbox = (JCheckBox) component;
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), "" + checkbox.isSelected());
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), "" + checkbox.isSelected());
}
else if (component instanceof JSpinner)
{
JSpinner spinner = (JSpinner) component;
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), "" + spinner.getValue());
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), "" + spinner.getValue());
}
else if (component instanceof JTextArea)
{
JTextArea textField = (JTextArea) component;
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), textField.getText());
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), textField.getText());
}
else if (component instanceof JColorChooser)
{
JColorChooser jColorChooser = (JColorChooser) component;
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), String.valueOf(jColorChooser.getColor().getRGB()));
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), String.valueOf(jColorChooser.getColor().getRGB()));
}
else if (component instanceof JComboBox)
{
JComboBox jComboBox = (JComboBox) component;
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), ((Enum) jComboBox.getSelectedItem()).name());
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) jComboBox.getSelectedItem()).name());
}
else if (component instanceof HotkeyButton)
{
HotkeyButton hotkeyButton = (HotkeyButton) component;
configManager.setConfiguration(cd.getGroup().keyName(), cid.getItem().keyName(), hotkeyButton.getValue());
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), hotkeyButton.getValue());
}
}

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "dailytaskindicators",
name = "Daily Task Indicators",
description = "Configuration for Daily Task Indicators plugin"
)
@ConfigGroup("dailytaskindicators")
public interface DailyTasksConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "deathIndicator",
name = "Death Indicator",
description = "Configuration for the death indicator plugin"
)
@ConfigGroup("deathIndicator")
public interface DeathIndicatorConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "defaultworld",
name = "Default World",
description = "Sets the default world and remembers it"
)
@ConfigGroup("defaultworld")
public interface DefaultWorldConfig extends Config
{
@ConfigItem(

View File

@@ -27,11 +27,7 @@ package net.runelite.client.plugins.devtools;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "devtools",
name = "Dev Tools",
description = "Configuration for developer tools"
)
@ConfigGroup("devtools")
public interface DevToolsConfig
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "discord",
name = "Discord",
description = "Configuration for Discord plugin"
)
@ConfigGroup("discord")
public interface DiscordConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "entityhider",
name = "Entity Hider",
description = "Hides various entities such as players and NPCs"
)
@ConfigGroup("entityhider")
public interface EntityHiderConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "xpdrop",
name = "XP Drop",
description = "Configuration for XP drop customization"
)
@ConfigGroup("xpdrop")
public interface XpDropConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "farmingTracker",
name = "Farming Tracker",
description = "Configuration for the farming tracker"
)
@ConfigGroup("farmingTracker")
public interface FarmingTrackerConfig extends Config
{
String KEY_NAME = "farmingTracker";

View File

@@ -4,11 +4,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "feed",
name = "News Feed",
description = "Displays client and game-related news"
)
@ConfigGroup("feed")
public interface FeedConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "fishing",
name = "Fishing",
description = "Configuration for the fishing plugin"
)
@ConfigGroup("fishing")
public interface FishingConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = FpsPlugin.CONFIG_GROUP_KEY,
name = "FPS Control",
description = "Lets you control what your game frame rate is, often helps keep CPU down too"
)
@ConfigGroup(FpsPlugin.CONFIG_GROUP_KEY)
public interface FpsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "grandexchange",
name = "Grand Exchange",
description = "Configuration for the Grand Exchange"
)
@ConfigGroup("grandexchange")
public interface GrandExchangeConfig extends Config
{
@ConfigItem(

View File

@@ -33,11 +33,7 @@ import net.runelite.client.plugins.grounditems.config.ItemHighlightMode;
import net.runelite.client.plugins.grounditems.config.MenuHighlightMode;
import net.runelite.client.plugins.grounditems.config.PriceDisplayMode;
@ConfigGroup(
keyName = "grounditems",
name = "Ground Items",
description = "Configuration for the ground items plugin"
)
@ConfigGroup("grounditems")
public interface GroundItemsConfig extends Config
{
@ConfigItem(

View File

@@ -32,11 +32,7 @@ import net.runelite.client.config.ConfigItem;
import java.awt.Color;
@ConfigGroup(
keyName = "groundMarker",
name = "Ground Marker",
description = "Mark ground tiles"
)
@ConfigGroup("groundMarker")
public interface GroundMarkerConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "herbiboar",
name = "Herbiboar",
description = "Configuration for the herbiboar plugin"
)
@ConfigGroup("herbiboar")
public interface HerbiboarConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "hiscore",
name = "HiScore",
description = "Configuration for the hiscore plugin"
)
@ConfigGroup("hiscore")
public interface HiscoreConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "hunterplugin",
name = "Hunter",
description = "Configuration for the hunter plugin"
)
@ConfigGroup("hunterplugin")
public interface HunterConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "idlenotifier",
name = "Idle Notifier",
description = "Configuration for the idle notifier plugin"
)
@ConfigGroup("idlenotifier")
public interface IdleNotifierConfig extends Config
{
@ConfigItem(

View File

@@ -33,11 +33,7 @@ import net.runelite.client.config.ConfigItem;
*
* @author robin
*/
@ConfigGroup(
keyName = "implings",
name = "Implings",
description = "Configuration for the implings plugin"
)
@ConfigGroup("implings")
public interface ImplingsConfig extends Config
{
@ConfigItem(

View File

@@ -30,11 +30,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "interfaceStyles",
name = "Interface Styles",
description = "Configuration for the Interface Styles plugin"
)
@ConfigGroup("interfaceStyles")
public interface InterfaceStylesConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "inventorytags",
name = "Inventory Tags",
description = "Configuration for the Inventory Item Tagging plugin"
)
@ConfigGroup("inventorytags")
public interface InventoryTagsConfig extends Config
{
String GROUP = "inventorytags";

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "itemCharge",
name = "Item Charges",
description = "Configuration for the Item Charges plugin"
)
@ConfigGroup("itemCharge")
public interface ItemChargeConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "itemprices",
name = "Item Prices",
description = "Configuration for the Item Prices plugin"
)
@ConfigGroup("itemprices")
public interface ItemPricesConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "itemstat",
name = "Item Stats",
description = "Show stat changes on items"
)
@ConfigGroup("itemstat")
public interface ItemStatConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "kourendLibrary",
name = "Kourend Library",
description = "Configuration for the KourendLibrary plugin"
)
@ConfigGroup("kourendLibrary")
public interface KourendLibraryConfig extends Config
{
String GROUP_KEY = "kourendLibrary";

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "menuentryswapper",
name = "Menu Entry Swapper",
description = "Swap menu entry options"
)
@ConfigGroup("menuentryswapper")
public interface MenuEntrySwapperConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "metronome",
name = "Metronome",
description = "Plays a sound on the specified tick to aid in efficient skilling"
)
@ConfigGroup("metronome")
public interface MetronomePluginConfiguration extends Config
{
@ConfigItem(

View File

@@ -29,10 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "minimap",
name = "Minimap",
description = "Configuration for the minimap")
@ConfigGroup("minimap")
public interface MinimapConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "motherlode",
name = "Motherlode Mine",
description = "Configuration for the Motherlode Mine plugin"
)
@ConfigGroup("motherlode")
public interface MotherlodeConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "mousehighlight",
name = "Mouse Tooltips",
description = "Configures the Mouse Tooltips plugin"
)
@ConfigGroup("mousehighlight")
public interface MouseHighlightConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "mta",
name = "Mage Training Arena",
description = "Configuration for the Mage Training Arena plugin"
)
@ConfigGroup("mta")
public interface MTAConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "nightmareZone",
name = "Nightmare Zone",
description = "Configuration for the nightmare zone plugin"
)
@ConfigGroup("nightmareZone")
public interface NightmareZoneConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "notes",
name = "Notes",
description = "Configuration for the Notes plugin"
)
@ConfigGroup("notes")
public interface NotesConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "npcindicators",
name = "NPC Indicators",
description = "Configuration for the NPC indicators plugin"
)
@ConfigGroup("npcindicators")
public interface NpcIndicatorsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "opponentinfo",
name = "Opponent Info",
description = "Configuration for the Opponent info plugin"
)
@ConfigGroup("opponentinfo")
public interface OpponentInfoConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "playerindicators",
name = "Player Indicators",
description = "Configuration for the player indicators plugin"
)
@ConfigGroup("playerindicators")
public interface PlayerIndicatorsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "poh",
name = "Player-owned House",
description = "Configuration for the POH plugin"
)
@ConfigGroup("poh")
public interface PohConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "prayer",
name = "Prayer",
description = "Various tools related to prayer"
)
@ConfigGroup("prayer")
public interface PrayerConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "puzzlesolver",
name = "Puzzle Solver",
description = "Shows you where to press to solve puzzle boxes"
)
@ConfigGroup("puzzlesolver")
public interface PuzzleSolverConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "raids",
name = "Chambers Of Xeric",
description = "Configuration for the raids plugin"
)
@ConfigGroup("raids")
public interface RaidsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "regenmeter",
name = "Regeneration Meter",
description = "Configuration for the data orb regeneration meters"
)
@ConfigGroup("regenmeter")
public interface RegenMeterConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = ReorderPrayersPlugin.CONFIG_GROUP_KEY,
name = "Reorder Prayers",
description = "Configuration for the data orb regeneration meters"
)
@ConfigGroup(ReorderPrayersPlugin.CONFIG_GROUP_KEY)
public interface ReorderPrayersConfig extends Config
{

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "reportButton",
name = "Report Button",
description = "Configuration for report button"
)
@ConfigGroup("reportButton")
public interface ReportButtonConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "runecraft",
name = "Runecraft",
description = "Configuration for the runecrafting plugin"
)
@ConfigGroup("runecraft")
public interface RunecraftConfig extends Config
{
@ConfigItem(

View File

@@ -30,11 +30,7 @@ import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
import net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode;
@ConfigGroup(
keyName = "runepouch",
name = "Rune Pouch",
description = "Configuration for the Runepouch plugin"
)
@ConfigGroup("runepouch")
public interface RunepouchConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Keybind;
@ConfigGroup(
keyName = "screenshot",
name = "Screenshot",
description = "Configuration for the Screenshot plugin"
)
@ConfigGroup("screenshot")
public interface ScreenshotConfig extends Config
{
@ConfigItem(

View File

@@ -30,11 +30,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "slayer",
name = "Slayer",
description = "Configuration for the slayer plugin"
)
@ConfigGroup("slayer")
public interface SlayerConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "stretchedfixedmode",
name = "Stretched Fixed Mode",
description = "Resizes the game while in fixed mode"
)
@ConfigGroup("stretchedfixedmode")
public interface StretchedFixedModeConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "teamCapes",
name = "Team Capes",
description = "Configuration for the team cape plugin"
)
@ConfigGroup("teamCapes")
public interface TeamCapesConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "tileindicators",
name = "Tile Indicators",
description = "Configuration for the tile indicators plugin"
)
@ConfigGroup("tileindicators")
public interface TileIndicatorsConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "timers",
name = "Timers",
description = "Configuration for the timers plugin"
)
@ConfigGroup("timers")
public interface TimersConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "tithefarmplugin",
name = "Tithe Farm",
description = "Configuration for the Tithe Farm plugin"
)
@ConfigGroup("tithefarmplugin")
public interface TitheFarmPluginConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "rememberusername",
name = "Username Syncer",
description = "Syncs the username that is currently remembered between computers"
)
@ConfigGroup("rememberusername")
public interface UsernameSyncerConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "woodcutting",
name = "Woodcutting",
description = "Configuration for the woodcutting plugin"
)
@ConfigGroup("woodcutting")
public interface WoodcuttingConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = WorldMapPlugin.CONFIG_KEY,
name = "World Map",
description = "Various World Map enhancements"
)
@ConfigGroup(WorldMapPlugin.CONFIG_KEY)
public interface WorldMapConfig extends Config
{
@ConfigItem(

View File

@@ -29,11 +29,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "xpglobes",
name = "XP Globes",
description = "Configuration for the XP globes plugin"
)
@ConfigGroup("xpglobes")
public interface XpGlobesConfig extends Config
{
@ConfigItem(

View File

@@ -28,11 +28,7 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup(
keyName = "zoom",
name = "Camera Zoom",
description = "Configuration for the camera zoom limit"
)
@ConfigGroup("zoom")
public interface ZoomConfig extends Config
{
@ConfigItem(

View File

@@ -53,7 +53,7 @@ public class OverlayManager
private static final String OVERLAY_CONFIG_PREFERRED_LOCATION = "_preferredLocation";
private static final String OVERLAY_CONFIG_PREFERRED_POSITION = "_preferredPosition";
private static final String OVERLAY_CONFIG_PREFERRED_SIZE = "_preferredSize";
private static final String RUNELITE_CONFIG_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).keyName();
private static final String RUNELITE_CONFIG_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value();
@VisibleForTesting
static final Comparator<Overlay> OVERLAY_COMPARATOR = (a, b) ->

View File

@@ -24,11 +24,7 @@
*/
package net.runelite.client.config;
@ConfigGroup(
keyName = "test",
name = "test",
description = "test"
)
@ConfigGroup("test")
public interface TestConfig
{
@ConfigItem(