From dc6436a66a0993bc0027473d53a44c3abaf2ae65 Mon Sep 17 00:00:00 2001
From: Kyle Fricilone <kfricilone@gmail.com>
Date: Fri, 9 Jun 2017 22:28:00 -0400
Subject: [PATCH] runelite-client: add graphic to devtools overlay

---
 .../src/main/java/net/runelite/api/Actor.java |  5 ++++
 .../plugins/devtools/DevToolsOverlay.java     | 30 +++++++++----------
 .../main/java/net/runelite/rs/api/Actor.java  |  3 ++
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/runelite-api/src/main/java/net/runelite/api/Actor.java b/runelite-api/src/main/java/net/runelite/api/Actor.java
index d23d2194c2..e12329d8e8 100644
--- a/runelite-api/src/main/java/net/runelite/api/Actor.java
+++ b/runelite-api/src/main/java/net/runelite/api/Actor.java
@@ -128,6 +128,11 @@ public abstract class Actor extends Renderable
 		return actor.getAnimation();
 	}
 
+	public int getGraphic()
+	{
+		return actor.getGraphic();
+	}
+
 	public int getModelHeight()
 	{
 		return actor.getModelHeight();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
index 7ceecb78f4..c38dc359e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
@@ -138,15 +138,15 @@ public class DevToolsOverlay extends Overlay
 				{
 					if (!p.getName().equals(local.getName()))
 					{
-						String text = p.getName() + " (A: " + p.getAnimation() + ")";
-						renderActorOverlay(graphics, p, text, BLUE);
+						String text = p.getName() + " (A: " + p.getAnimation() + ") (G: " + p.getGraphic() + ")";
+						OverlayUtil.renderActorOverlay(graphics, p, text, BLUE);
 					}
 				}
 			}
 		}
 
-		String text = local.getName() + " (A: " + local.getAnimation() + ")";
-		renderActorOverlay(graphics, local, text, CYAN);
+		String text = local.getName() + " (A: " + local.getAnimation() + ") (G: " + local.getGraphic() + ")";
+		OverlayUtil.renderActorOverlay(graphics, local, text, CYAN);
 	}
 
 	private void renderNpcs(Graphics2D graphics)
@@ -158,14 +158,14 @@ public class DevToolsOverlay extends Overlay
 			{
 				if (npc != null)
 				{
-					String text = npc.getName() + " (A: " + npc.getAnimation() + ")";
+					String text = npc.getName() + " (A: " + npc.getAnimation() + ") (G: " + npc.getGraphic() + ")";
 					if (npc.getCombatLevel() > 1)
 					{
-						renderActorOverlay(graphics, npc, text, YELLOW);
+						OverlayUtil.renderActorOverlay(graphics, npc, text, YELLOW);
 					}
 					else
 					{
-						renderActorOverlay(graphics, npc, text, ORANGE);
+						OverlayUtil.renderActorOverlay(graphics, npc, text, ORANGE);
 					}
 				}
 			}
@@ -235,7 +235,7 @@ public class DevToolsOverlay extends Overlay
 				while (current instanceof Item)
 				{
 					Item item = (Item) current;
-					renderTileOverlay(graphics, itemLayer, "ID: " + item.getId() + " Qty:" + item.getQuantity(), RED);
+					OverlayUtil.renderTileOverlay(graphics, itemLayer, "ID: " + item.getId() + " Qty:" + item.getQuantity(), RED);
 					current = current.getNext();
 				}
 			}
@@ -253,7 +253,7 @@ public class DevToolsOverlay extends Overlay
 				{
 					if (player.getLocalLocation().distanceTo(gameObject.getLocalLocation()) <= MAX_DISTANCE)
 					{
-						renderTileOverlay(graphics, gameObject, "ID: " + gameObject.getId(), GREEN);
+						OverlayUtil.renderTileOverlay(graphics, gameObject, "ID: " + gameObject.getId(), GREEN);
 					}
 				}
 			}
@@ -267,7 +267,7 @@ public class DevToolsOverlay extends Overlay
 		{
 			if (player.getLocalLocation().distanceTo(groundObject.getLocalLocation()) <= MAX_DISTANCE)
 			{
-				renderTileOverlay(graphics, groundObject, "ID: " + groundObject.getId(), PURPLE);
+				OverlayUtil.renderTileOverlay(graphics, groundObject, "ID: " + groundObject.getId(), PURPLE);
 			}
 		}
 	}
@@ -279,7 +279,7 @@ public class DevToolsOverlay extends Overlay
 		{
 			if (player.getLocalLocation().distanceTo(wallObject.getLocalLocation()) <= MAX_DISTANCE)
 			{
-				renderTileOverlay(graphics, wallObject, "ID: " + wallObject.getId(), GRAY);
+				OverlayUtil.renderTileOverlay(graphics, wallObject, "ID: " + wallObject.getId(), GRAY);
 			}
 		}
 	}
@@ -291,7 +291,7 @@ public class DevToolsOverlay extends Overlay
 		{
 			if (player.getLocalLocation().distanceTo(decorObject.getLocalLocation()) <= MAX_DISTANCE)
 			{
-				renderTileOverlay(graphics, decorObject, "ID: " + decorObject.getId(), DEEP_PURPLE);
+				OverlayUtil.renderTileOverlay(graphics, decorObject, "ID: " + decorObject.getId(), DEEP_PURPLE);
 			}
 		}
 	}
@@ -368,8 +368,8 @@ public class DevToolsOverlay extends Overlay
 
 		Widget childComponent = widgetChild.getChild(itemIndex);
 		if (childComponent != null && !childComponent.isHidden()
-			&& childComponent.getItemId() != ITEM_EMPTY
-			&& childComponent.getItemId() != ITEM_FILLED)
+				&& childComponent.getItemId() != ITEM_EMPTY
+				&& childComponent.getItemId() != ITEM_FILLED)
 		{
 			Rectangle componentBounds = childComponent.getBounds();
 
@@ -413,4 +413,4 @@ public class DevToolsOverlay extends Overlay
 		graphics.drawString(text, textX, textY);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/Actor.java b/runescape-api/src/main/java/net/runelite/rs/api/Actor.java
index dd955a3b5c..d37b12f80a 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/Actor.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/Actor.java
@@ -47,6 +47,9 @@ public interface Actor extends Renderable
 	@Import("animation")
 	int getAnimation();
 
+	@Import("graphic")
+	int getGraphic();
+
 	@Import("combatInfoList")
 	CombatInfoList getCombatInfoList();
 }