diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityConfig.java new file mode 100644 index 0000000000..13292c6894 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityConfig.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2018, Cas + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.agilityplugin; + +import java.awt.Color; +import net.runelite.client.config.Config; +import net.runelite.client.config.ConfigGroup; +import net.runelite.client.config.ConfigItem; + +@ConfigGroup( + keyName = "agility", + name = "Agility", + description = "Placeholder" +) +public interface AgilityConfig extends Config +{ + @ConfigItem( + keyName = "overlayColor", + name = "Overlay Color", + description = "Color of Agility overlay" + ) + default Color getOverlayColor() + { + return Color.GREEN; + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java index 059f2362ac..f71d697cee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityOverlay.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2018, Adam + * Copyright (c) 2018, Cas * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,14 +45,16 @@ public class AgilityOverlay extends Overlay private final Client client; private final AgilityPlugin plugin; + private final AgilityConfig config; @Inject - public AgilityOverlay(Client client, AgilityPlugin plugin) + public AgilityOverlay(Client client, AgilityPlugin plugin, AgilityConfig config) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; + this.config = config; } @Override @@ -67,16 +70,17 @@ public class AgilityOverlay extends Overlay Area objectClickbox = object.getClickbox(); if (objectClickbox != null) { + Color configColor = config.getOverlayColor(); if (objectClickbox.contains(mousePosition.getX(), mousePosition.getY())) { - graphics.setColor(Color.GREEN.darker()); + graphics.setColor(configColor.darker()); } else { - graphics.setColor(Color.GREEN); + graphics.setColor(configColor); } graphics.draw(objectClickbox); - graphics.setColor(new Color(0, 0xff, 0, 20)); + graphics.setColor(new Color(configColor.getRed(), configColor.getGreen(), configColor.getBlue(), 50)); graphics.fill(objectClickbox); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java index d097ce1e94..b9f265927a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.agilityplugin; import com.google.common.eventbus.Subscribe; +import com.google.inject.Provides; import java.util.HashMap; import javax.inject.Inject; import lombok.Getter; @@ -45,6 +46,7 @@ import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; +import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -61,6 +63,12 @@ public class AgilityPlugin extends Plugin @Getter private AgilityOverlay overlay; + @Provides + AgilityConfig getConfig(ConfigManager configManager) + { + return configManager.getConfig(AgilityConfig.class); + } + @Override protected void shutDown() throws Exception {