Fix healthbar stuff, remove double constant

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -986,9 +986,11 @@ public interface RSClient extends RSGameShell, Client
 	void rasterizerDrawCircle(int x, int y, int r, int rgb);
 
 	@Import("HealthBarDefinition_cached")
-	@Override
 	RSEvictingDualNodeHashTable getHealthBarCache();
 
+	@Import("HealthBarDefinition_cachedSprites")
+	RSEvictingDualNodeHashTable getHealthBarSpriteCache();
+
 	@Import("renderSelf")
 	@Override
 	void setRenderSelf(boolean enabled);

runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java

@@ -1,29 +1,12 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.HealthBar;
 import net.runelite.mapping.Import;
 
-public interface RSHealthBar extends RSNode, HealthBar
+public interface RSHealthBar extends RSNode
 {
 	@Import("updates")
 	RSIterableNodeDeque getUpdates(); // "combatinfolist" but only thing it has is getNode so this works
 
 	@Import("definition")
 	RSHealthBarDefinition getDefinition();
-	
-	@Import("healthBarFrontSpriteId")
-	@Override
-	int getHealthBarFrontSpriteId();
-
-	@Import("getHealthBarFrontSprite")
-	@Override
-	RSSprite getHealthBarFrontSprite();
-
-	@Import("getHealthBarBackSprite")
-	@Override
-	RSSprite getHealthBarBackSprite();
-
-	@Import("healthBarPadding")
-	@Override
-	void setPadding(int padding);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarDefinition.java

@@ -8,6 +8,10 @@ public interface RSHealthBarDefinition extends RSDualNode, HealthBar
 	@Import("width")
 	int getHealthScale();
 
+	@Import("spriteId1")
+	@Override
+	int getHealthBarFrontSpriteId();
+
 	@Import("getSprite1")
 	RSSprite getHealthBarFrontSprite();