From 4bf0f1314d191fca5cb3939a17452f9395c56859 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Mon, 12 Nov 2018 16:26:56 +0100
Subject: [PATCH] Make barrows minimap respect client minimap colors, show
 players

- Make barrows minimap respect client minimap colors (what are
configurable from minimap plugin)
- Show all players on minimap inside barrows

Closes #2941

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 .../plugins/barrows/BarrowsOverlay.java       | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
index 1015ae9c44..dbedb3e5fa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
@@ -50,7 +50,7 @@ class BarrowsOverlay extends Overlay
 	private final BarrowsConfig config;
 
 	@Inject
-	BarrowsOverlay(Client client, BarrowsPlugin plugin, BarrowsConfig config)
+	private BarrowsOverlay(Client client, BarrowsPlugin plugin, BarrowsConfig config)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -63,27 +63,41 @@ class BarrowsOverlay extends Overlay
 	public Dimension render(Graphics2D graphics)
 	{
 		Player local = client.getLocalPlayer();
+		final Color npcColor = getMinimapDotColor(1);
+		final Color playerColor = getMinimapDotColor(2);
 
 		// tunnels are only on z=0
 		if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && config.showMinimap())
 		{
-			//NPC yellow dot
-			List<NPC> npcs = client.getNpcs();
+			// NPC dots
+			graphics.setColor(npcColor);
+			final List<NPC> npcs = client.getNpcs();
 			for (NPC npc : npcs)
 			{
 				net.runelite.api.Point minimapLocation = npc.getMinimapLocation();
 				if (minimapLocation != null)
 				{
-					graphics.setColor(Color.yellow);
 					graphics.fillOval(minimapLocation.getX(), minimapLocation.getY(), 4, 4);
 				}
 			}
 
-			//Render barrows walls/doors
+			// Player dots
+			graphics.setColor(npcColor);
+			final List<Player> players = client.getPlayers();
+			for (Player player : players)
+			{
+				net.runelite.api.Point minimapLocation = player.getMinimapLocation();
+				if (minimapLocation != null)
+				{
+					graphics.fillOval(minimapLocation.getX(), minimapLocation.getY(), 4, 4);
+				}
+			}
+
+			// Render barrows walls/doors
 			renderObjects(graphics, local);
 
-			//Player white dot
-			graphics.setColor(Color.white);
+			// Local player square
+			graphics.setColor(playerColor);
 			graphics.fillRect(local.getMinimapLocation().getX(), local.getMinimapLocation().getY(), 3, 3);
 		}
 		else if (config.showBrotherLoc())
@@ -140,6 +154,17 @@ class BarrowsOverlay extends Overlay
 		graphics.fillRect(minimapLocation.getX(), minimapLocation.getY(), 3, 3);
 	}
 
+	/**
+	 * Get minimap dot color from client
+	 * @param typeIndex index of minimap dot type (1 npcs, 2 players)
+	 * @return color
+	 */
+	private Color getMinimapDotColor(int typeIndex)
+	{
+		final int pixel = client.getMapDots()[typeIndex].getPixels()[1];
+		return new Color(pixel);
+	}
+
 	private void renderLadders(Graphics2D graphics, GameObject ladder)
 	{
 		net.runelite.api.Point minimapLocation = ladder.getMinimapLocation();