api: implement resetHealthBarCaches and getHealthBarFrontSpriteId

Remove getHealthBarCache

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -1639,5 +1639,5 @@ public interface Client extends GameEngine
 
 	void draw2010Menu();
 
-	NodeCache getHealthBarCache();
+	void resetHealthBarCaches();
 }

runelite-api/src/main/java/net/runelite/api/HealthBar.java

@@ -30,5 +30,7 @@ public interface HealthBar
 
 	SpritePixels getHealthBarBackSprite();
 
+	int getHealthBarFrontSpriteId();
+
 	void setPadding(int padding);
 }

runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java

@@ -33,7 +33,6 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.HealthBar;
 import net.runelite.api.HealthBarOverride;
-import net.runelite.api.NodeCache;
 import net.runelite.api.SpriteID;
 import net.runelite.api.SpritePixels;
 import net.runelite.api.events.BeforeMenuRender;
@@ -94,8 +93,7 @@ public class InterfaceStylesPlugin extends Plugin
 			removeGameframe();
 			healthBarOverride = null;
 			client.setHealthBarOverride(null);
-			NodeCache heathBarCache = client.getHealthBarCache();
+			client.resetHealthBarCaches(); // invalidate healthbar cache so padding resets
-			heathBarCache.reset(); // invalidate healthbar cache so padding resets
 		});
 	}
 
@@ -273,8 +271,7 @@ public class InterfaceStylesPlugin extends Plugin
 	private void overrideHealthBars()
 	{
 		// Reset health bar cache to reset applied padding
-		NodeCache healthBarCache = client.getHealthBarCache();
+		client.resetHealthBarCaches();
-		healthBarCache.reset();
 
 		if (config.hdHealthBars())
 		{

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -1550,4 +1550,12 @@ public abstract class RSClientMixin implements RSClient
 		enumCache.put(id, rsEnum);
 		return rsEnum;
 	}
+
+	@Inject
+	@Override
+	public void resetHealthBarCaches()
+	{
+		getHealthBarCache().reset();
+		getHealthBarSpriteCache().reset();
+	}
 }

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

@@ -982,6 +982,8 @@ public interface RSClient extends RSGameEngine, Client
 	void RasterizerDrawCircle(int x, int y, int r, int rgb);
 
 	@Import("healthbarCache")
-	@Override
 	RSNodeCache getHealthBarCache();
+
+	@Import("healthBarSpriteCache")
+	RSNodeCache getHealthBarSpriteCache();
 }

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

@@ -32,6 +32,10 @@ public interface RSHealthBar extends RSCacheableNode, HealthBar
 	@Import("healthScale")
 	int getHealthScale();
 
+	@Import("healthBarFrontSpriteId")
+	@Override
+	int getHealthBarFrontSpriteId();
+
 	@Import("getHealthBarFrontSprite")
 	@Override
 	RSSpritePixels getHealthBarFrontSprite();