From 0553d8d91f317e5c07c752324762cf6948a1da74 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Tue, 3 Sep 2019 14:48:46 +0100 Subject: [PATCH] . --- .../groundmarkers/GroundMarkerConfig.java | 86 ++++++++++++++++--- .../GroundMarkerMinimapOverlay.java | 14 ++- .../groundmarkers/GroundMarkerOverlay.java | 14 ++- .../groundmarkers/GroundMarkerPlugin.java | 26 +++++- 4 files changed, 126 insertions(+), 14 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerConfig.java index e44b35e94e..f3d1dcc3f6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerConfig.java @@ -47,7 +47,11 @@ public interface GroundMarkerConfig extends Config FIVE("5"), SIX("6"), SEVEN("7"), - EIGHT("8"); + EIGHT("8"), + NINE("9"), + TEN("10"), + ELEVEN("11"), + TWELVE("12"); private final String name; @@ -78,11 +82,11 @@ public interface GroundMarkerConfig extends Config @ConfigItem( position = 1, keyName = "markerColor", - name = "Default Marked tile Color", + name = "Default tile Color", description = "Configures the default color of marked tiles", hidden = true, unhide = "amount", - unhideValue = "1 || 2 || 3 || 4 || 5 || 6 || 7 || 8" + unhideValue = "1 || 2 || 3 || 4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor() { @@ -97,7 +101,7 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 2nd group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "2 || 3 || 4 || 5 || 6 || 7 || 8" + unhideValue = "2 || 3 || 4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor2() { @@ -112,7 +116,7 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 3rd group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "3 || 4 || 5 || 6 || 7 || 8" + unhideValue = "3 || 4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor3() { @@ -127,7 +131,7 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 4th group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "4 || 5 || 6 || 7 || 8" + unhideValue = "4 || 5 || 6 || 7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor4() { @@ -142,7 +146,7 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 5th group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "5 || 6 || 7 || 8" + unhideValue = "5 || 6 || 7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor5() { @@ -157,7 +161,7 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 6th group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "6 || 7 || 8" + unhideValue = "6 || 7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor6() { @@ -172,7 +176,7 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 7th group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "7 || 8" + unhideValue = "7 || 8 || 9 || 10 || 11 || 12" ) default Color markerColor7() { @@ -187,15 +191,75 @@ public interface GroundMarkerConfig extends Config description = "Configures the color of the 8th group of marked tiles", hidden = true, unhide = "amount", - unhideValue = "8" + unhideValue = "8 || 9 || 10 || 11 || 12" ) default Color markerColor8() { return Color.MAGENTA; } + @Alpha @ConfigItem( position = 10, + keyName = "markerColor9", + name = "Group 9 tile color", + description = "Configures the color of the 9th group of marked tiles", + hidden = true, + unhide = "amount", + unhideValue = "9 || 10 || 11 || 12" + ) + default Color markerColor9() + { + return Color.CYAN; + } + + @Alpha + @ConfigItem( + position = 11, + keyName = "markerColor10", + name = "Group 10 tile color", + description = "Configures the color of the 10th group of marked tiles", + hidden = true, + unhide = "amount", + unhideValue = "10 || 11 || 12" + ) + default Color markerColor10() + { + return Color.ORANGE; + } + + @Alpha + @ConfigItem( + position = 12, + keyName = "markerColor11", + name = "Group 11 tile color", + description = "Configures the color of the 11th group of marked tiles", + hidden = true, + unhide = "amount", + unhideValue = "11 || 12" + ) + default Color markerColor11() + { + return Color.PINK; + } + + @Alpha + @ConfigItem( + position = 13, + keyName = "markerColor12", + name = "Group 12 tile color", + description = "Configures the color of the 12th group of marked tiles", + hidden = true, + unhide = "amount", + unhideValue = "12" + ) + default Color markerColor12() + { + return Color.LIGHT_GRAY; + } + + @ConfigItem( + position = 14, keyName = "showMinimap", name = "Show on minimap", description = "Shows marked tiles on the minimap" @@ -210,7 +274,7 @@ public interface GroundMarkerConfig extends Config max = 100 ) @ConfigItem( - position = 11, + position = 15, keyName = "minimapOpacity", name = "Minimap opacity", description = "The opacity of the minimap markers" diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java index eda6be221d..794bed0859 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java @@ -101,6 +101,18 @@ class GroundMarkerMinimapOverlay extends Overlay break; case 8: color = plugin.getMarkerColor8(); + break; + case 9: + color = plugin.getMarkerColor9(); + break; + case 10: + color = plugin.getMarkerColor10(); + break; + case 11: + color = plugin.getMarkerColor11(); + break; + case 12: + color = plugin.getMarkerColor12(); } int opacity = (int) floor(plugin.getMinimapOverlayOpacity() * 2.55); @@ -129,4 +141,4 @@ class GroundMarkerMinimapOverlay extends Overlay OverlayUtil.renderMinimapRect(client, graphics, posOnMinimap, TILE_WIDTH, TILE_HEIGHT, color); } -} +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java index 66972a157d..e17bd1c336 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java @@ -113,7 +113,19 @@ public class GroundMarkerOverlay extends Overlay break; case 8: color = plugin.getMarkerColor8(); + break; + case 9: + color = plugin.getMarkerColor9(); + break; + case 10: + color = plugin.getMarkerColor10(); + break; + case 11: + color = plugin.getMarkerColor11(); + break; + case 12: + color = plugin.getMarkerColor12(); } OverlayUtil.renderPolygon(graphics, poly, color); } -} +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 292e70d014..ab37bac5e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -162,6 +162,14 @@ public class GroundMarkerPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private Color markerColor8; @Getter(AccessLevel.PACKAGE) + private Color markerColor9; + @Getter(AccessLevel.PACKAGE) + private Color markerColor10; + @Getter(AccessLevel.PACKAGE) + private Color markerColor11; + @Getter(AccessLevel.PACKAGE) + private Color markerColor12; + @Getter(AccessLevel.PACKAGE) private boolean showMinimap; @Getter(AccessLevel.PACKAGE) private int minimapOverlayOpacity; @@ -459,6 +467,18 @@ public class GroundMarkerPlugin extends Plugin break; case 8: color = this.markerColor8; + break; + case 9: + color = this.markerColor9; + break; + case 10: + color = this.markerColor10; + break; + case 11: + color = this.markerColor11; + break; + case 12: + color = this.markerColor12; } return color; @@ -483,7 +503,11 @@ public class GroundMarkerPlugin extends Plugin this.markerColor6 = config.markerColor6(); this.markerColor7 = config.markerColor7(); this.markerColor8 = config.markerColor8(); + this.markerColor9 = config.markerColor9(); + this.markerColor10 = config.markerColor10(); + this.markerColor11 = config.markerColor11(); + this.markerColor12 = config.markerColor12(); this.showMinimap = config.showMinimap(); this.minimapOverlayOpacity = config.minimapOverlayOpacity(); } -} +} \ No newline at end of file