From ff89cac97e969f8560752ac9a48d68d75714e8df Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 29 Apr 2018 19:42:54 -0400
Subject: [PATCH] demonic gorilla plugin: use headicon api

---
 .../demonicgorilla/DemonicGorilla.java        |  8 +++---
 .../demonicgorilla/DemonicGorillaPlugin.java  | 27 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java
index 52e4409a9a..0a96a49635 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorilla.java
@@ -29,6 +29,7 @@ import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Actor;
+import net.runelite.api.HeadIcon;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCComposition;
 import net.runelite.api.coords.WorldArea;
@@ -112,7 +113,7 @@ public class DemonicGorilla
 
 	@Getter
 	@Setter
-	private int lastTickOverheadIcon;
+	private HeadIcon lastTickOverheadIcon;
 
 	@Getter
 	@Setter
@@ -125,16 +126,15 @@ public class DemonicGorilla
 		this.nextAttackTick = -100;
 		this.attacksUntilSwitch = ATTACKS_PER_SWITCH;
 		this.recentProjectileId = -1;
-		this.lastTickOverheadIcon = -1;
 	}
 
-	public int getOverheadIcon()
+	public HeadIcon getOverheadIcon()
 	{
 		NPCComposition composition = this.npc.getComposition();
 		if (composition != null)
 		{
 			return composition.getOverheadIcon();
 		}
-		return -1;
+		return null;
 	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
index 43c7f5cc03..52ad0681d3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
@@ -25,7 +25,6 @@
 package net.runelite.client.plugins.demonicgorilla;
 
 import com.google.common.eventbus.Subscribe;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.AnimationID;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.HeadIcon;
 import net.runelite.api.Hitsplat;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
@@ -65,10 +65,6 @@ import net.runelite.client.ui.overlay.Overlay;
 @Slf4j
 public class DemonicGorillaPlugin extends Plugin
 {
-	static final int OVERHEAD_ICON_MELEE = 0;
-	static final int OVERHEAD_ICON_RANGED = 1;
-	static final int OVERHEAD_ICON_MAGIC = 2;
-
 	@Inject
 	private Client client;
 
@@ -155,19 +151,22 @@ public class DemonicGorillaPlugin extends Plugin
 
 	private DemonicGorilla.AttackStyle getProtectedStyle(Player player)
 	{
-		if (player.getOverheadIcon() == OVERHEAD_ICON_MELEE)
+		HeadIcon headIcon = player.getOverheadIcon();
+		if (headIcon == null)
 		{
-			return DemonicGorilla.AttackStyle.MELEE;
+			return null;
 		}
-		else if (player.getOverheadIcon() == OVERHEAD_ICON_RANGED)
+		switch (headIcon)
 		{
-			return DemonicGorilla.AttackStyle.RANGED;
+			case MELEE:
+				return DemonicGorilla.AttackStyle.MELEE;
+			case RANGED:
+				return DemonicGorilla.AttackStyle.RANGED;
+			case MAGIC:
+				return DemonicGorilla.AttackStyle.MAGIC;
+			default:
+				return null;
 		}
-		else if (player.getOverheadIcon() == OVERHEAD_ICON_MAGIC)
-		{
-			return DemonicGorilla.AttackStyle.MAGIC;
-		}
-		return null;
 	}
 
 	private void onGorillaAttack(DemonicGorilla gorilla, final DemonicGorilla.AttackStyle attackStyle)