ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fishing: make overlay colors configurable

Browse Source
This commit is contained in:
Lotto
2019-10-16 19:01:45 +02:00
parent 69ebb71239
commit 2ac1c2e387
3 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.fishing; package net.runelite.client.plugins.fishing;
import java.awt.Color;
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;
@@ -76,7 +77,40 @@ public interface FishingConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 4, keyName = "overlayColor",
name = "Overlay Color",
description = "Color of overlays",
position = 4
)
default Color getOverlayColor()
{
return Color.CYAN;
}
@ConfigItem(
keyName = "minnowsOverlayColor",
name = "Minnows Overlay Color",
description = "Color of overlays for Minnows",
position = 5
)
default Color getMinnowsOverlayColor()
{
return Color.RED;
}
@ConfigItem(
keyName = "aerialOverlayColor",
name = "Aerial Overlay Color",
description = "Color of overlays when 1-tick aerial fishing",
position = 6
)
default Color getAerialOverlayColor()
{
return Color.GREEN;
}
@ConfigItem(
position = 7,
keyName = "statTimeout", keyName = "statTimeout",
name = "Reset stats (minutes)", name = "Reset stats (minutes)",
description = "The time until fishing session data is reset in minutes." description = "The time until fishing session data is reset in minutes."
@@ -87,7 +121,7 @@ public interface FishingConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 5, position = 8,
keyName = "showFishingStats", keyName = "showFishingStats",
name = "Show Fishing session stats", name = "Show Fishing session stats",
description = "Display the fishing session stats." description = "Display the fishing session stats."
@@ -98,7 +132,7 @@ public interface FishingConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 6, position = 9,
keyName = "showMinnowOverlay", keyName = "showMinnowOverlay",
name = "Show Minnow Movement overlay", name = "Show Minnow Movement overlay",
description = "Display the minnow progress pie overlay." description = "Display the minnow progress pie overlay."
@@ -109,7 +143,7 @@ public interface FishingConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 7, position = 10,
keyName = "trawlerNotification", keyName = "trawlerNotification",
name = "Trawler activity notification", name = "Trawler activity notification",
description = "Send a notification when fishing trawler activity drops below 15%." description = "Send a notification when fishing trawler activity drops below 15%."
@@ -120,7 +154,7 @@ public interface FishingConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 8, position = 11,
keyName = "trawlerTimer", keyName = "trawlerTimer",
name = "Trawler timer in MM:SS", name = "Trawler timer in MM:SS",
description = "Trawler Timer will display a more accurate timer in MM:SS format." description = "Trawler Timer will display a more accurate timer in MM:SS format."

4
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
View File

@@ -76,7 +76,9 @@ class FishingSpotMinimapOverlay extends Overlay
continue; continue;
} }
Color color = npc.getGraphic() == GraphicID.FLYING_FISH ? Color.RED : Color.CYAN; Color color = npc.getGraphic() == GraphicID.FLYING_FISH
? config.getMinnowsOverlayColor()
: config.getOverlayColor();
net.runelite.api.Point minimapLocation = npc.getMinimapLocation(); net.runelite.api.Point minimapLocation = npc.getMinimapLocation();
if (minimapLocation != null) if (minimapLocation != null)

10
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
View File

@@ -107,15 +107,15 @@ class FishingSpotOverlay extends Overlay
Color color; Color color;
if (npc.getGraphic() == GraphicID.FLYING_FISH) if (npc.getGraphic() == GraphicID.FLYING_FISH)
{ {
color = Color.RED; color = config.getMinnowsOverlayColor();
} }
else if (spot == FishingSpot.COMMON_TENCH && npc.getWorldLocation().distanceTo2D(client.getLocalPlayer().getWorldLocation()) <= ONE_TICK_AERIAL_FISHING) else if (spot == FishingSpot.COMMON_TENCH && npc.getWorldLocation().distanceTo2D(client.getLocalPlayer().getWorldLocation()) <= ONE_TICK_AERIAL_FISHING)
{ {
color = Color.GREEN; color = config.getAerialOverlayColor();
} }
else else
{ {
color = Color.CYAN; color = config.getOverlayColor();
} }
if (spot == FishingSpot.MINNOW && config.showMinnowOverlay()) if (spot == FishingSpot.MINNOW && config.showMinnowOverlay())
@@ -156,12 +156,12 @@ class FishingSpotOverlay extends Overlay
if (config.showSpotIcons()) if (config.showSpotIcons())
{ {
BufferedImage fishImage = itemManager.getImage(spot.getFishSpriteId());; BufferedImage fishImage = itemManager.getImage(spot.getFishSpriteId());
if (spot == FishingSpot.COMMON_TENCH if (spot == FishingSpot.COMMON_TENCH
&& npc.getWorldLocation().distanceTo2D(client.getLocalPlayer().getWorldLocation()) <= ONE_TICK_AERIAL_FISHING) && npc.getWorldLocation().distanceTo2D(client.getLocalPlayer().getWorldLocation()) <= ONE_TICK_AERIAL_FISHING)
{ {
fishImage = ImageUtil.outlineImage(itemManager.getImage(spot.getFishSpriteId()), Color.GREEN); fishImage = ImageUtil.outlineImage(itemManager.getImage(spot.getFishSpriteId()), color);
} }
if (fishImage != null) if (fishImage != null)