From 8ebef03e4ded77a40f4939b6205e58fce95e6a79 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Tue, 9 Nov 2021 16:55:54 -0500
Subject: [PATCH] opponent info: use long npc name if available

This name is used on the in game hd hud (eg "Baby Muttadile" instead of "Muttadile")
---
 .../src/main/java/net/runelite/api/ParamID.java      |  4 ++++
 .../plugins/opponentinfo/OpponentInfoOverlay.java    | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/runelite-api/src/main/java/net/runelite/api/ParamID.java b/runelite-api/src/main/java/net/runelite/api/ParamID.java
index 50d2bdf71f..d726067c5a 100644
--- a/runelite-api/src/main/java/net/runelite/api/ParamID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ParamID.java
@@ -29,6 +29,10 @@ package net.runelite.api;
  */
 public final class ParamID
 {
+	/**
+	 * Long name for NPCs used in the HP hud
+	 */
+	public static final int NPC_HP_NAME = 510;
 	/**
 	 * @see SettingID
 	 */
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
index e68146e002..672ab50e16 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
@@ -25,6 +25,7 @@
  */
 package net.runelite.client.plugins.opponentinfo;
 
+import com.google.common.base.Strings;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
@@ -36,6 +37,8 @@ import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.NPC;
+import net.runelite.api.NPCComposition;
+import net.runelite.api.ParamID;
 import net.runelite.api.Player;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.Varbits;
@@ -111,6 +114,15 @@ class OpponentInfoOverlay extends OverlayPanel
 			lastMaxHealth = null;
 			if (opponent instanceof NPC)
 			{
+				NPCComposition composition = ((NPC) opponent).getTransformedComposition();
+				if (composition != null)
+				{
+					String longName = composition.getStringValue(ParamID.NPC_HP_NAME);
+					if (!Strings.isNullOrEmpty(longName))
+					{
+						opponentName = longName;
+					}
+				}
 				lastMaxHealth = npcManager.getHealth(((NPC) opponent).getId());
 			}
 			else if (opponent instanceof Player)