From bd9a69dc19e03e04c9c1b3d1e334f4337dc8f154 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sat, 6 Apr 2019 13:41:32 -0400
Subject: [PATCH] runescape-api: rename CombatInfo2 to HealthBar

---
 .../src/main/java/net/runelite/mixins/RSActorMixin.java       | 4 ++--
 .../main/java/net/runelite/rs/api/RSCombatInfoListHolder.java | 4 ++--
 .../runelite/rs/api/{RSCombatInfo2.java => RSHealthBar.java}  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename runescape-api/src/main/java/net/runelite/rs/api/{RSCombatInfo2.java => RSHealthBar.java} (97%)

diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
index 97855e9b2b..7c2d19323f 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
@@ -52,7 +52,7 @@ import net.runelite.api.mixins.Shadow;
 import net.runelite.rs.api.RSActor;
 import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSCombatInfo1;
-import net.runelite.rs.api.RSCombatInfo2;
+import net.runelite.rs.api.RSHealthBar;
 import net.runelite.rs.api.RSCombatInfoList;
 import net.runelite.rs.api.RSCombatInfoListHolder;
 import net.runelite.rs.api.RSNPC;
@@ -123,7 +123,7 @@ public abstract class RSActorMixin implements RSActor
 			if (next instanceof RSCombatInfoListHolder)
 			{
 				RSCombatInfoListHolder combatInfoListWrapper = (RSCombatInfoListHolder) next;
-				RSCombatInfo2 cf = combatInfoListWrapper.getCombatInfo2();
+				RSHealthBar cf = combatInfoListWrapper.getHealthBar();
 				return cf.getHealthScale();
 			}
 		}
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java
index 8b8d84432c..dcfab0d976 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java
@@ -31,6 +31,6 @@ public interface RSCombatInfoListHolder extends RSNode
 	@Import("combatInfo1")
 	RSCombatInfoList getCombatInfo1();
 
-	@Import("combatInfo2")
-	RSCombatInfo2 getCombatInfo2();
+	@Import("healthBar")
+	RSHealthBar getHealthBar();
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo2.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java
similarity index 97%
rename from runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo2.java
rename to runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java
index 3e3f69e42a..66997d990d 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo2.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java
@@ -26,7 +26,7 @@ package net.runelite.rs.api;
 
 import net.runelite.mapping.Import;
 
-public interface RSCombatInfo2
+public interface RSHealthBar
 {
 	@Import("healthScale")
 	int getHealthScale();