Merge branch 'master' of https://github.com/runelite/runelite into runelite-master

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

@@ -1001,4 +1001,5 @@ public interface RSClient extends RSGameShell, Client
 	
 	@Import("isSpellSelected")
 	boolean getIsSpellSelected();
+
 }

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

@@ -1,12 +1,29 @@
 package net.runelite.rs.api;
 
+import net.runelite.api.HealthBar;
 import net.runelite.mapping.Import;
 
-public interface RSHealthBar extends RSNode
+public interface RSHealthBar extends RSNode, HealthBar
 {
 	@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);
 }