Fix healthbar stuff, remove double constant

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

@@ -934,7 +934,7 @@ public interface Client extends GameShell
 	 *
 	 * @return all projectiles
 	 */
-	java.util.List<Projectile> getProjectiles();
+	List<Projectile> getProjectiles();
 
 	/**
 	 * Gets a list of all graphics objects currently drawn.
@@ -1631,7 +1631,7 @@ public interface Client extends GameShell
 
 	void draw2010Menu();
 
-	NodeCache getHealthBarCache();
+	void resetHealthBarCaches();
 
 	void setRenderSelf(boolean enabled);
 
@@ -1655,6 +1655,4 @@ public interface Client extends GameShell
 	String getSelectedSpellName();
 	
 	boolean getIsSpellSelected();
-	
-	void resetHealthBarCaches();
 }

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

@@ -99,9 +99,11 @@ public class Constants
 	public static final int GAME_TICK_LENGTH = 600;
 
 	/**
-	 * Used when getting High Alchemy value - multiplied by general store price.
+	 * High alchemy = shop price * HIGH_ALCHEMY_MULTIPLIER
+	 *
+	 * @see ItemDefinition#getPrice
 	 */
-	public static final float HIGH_ALCHEMY_CONSTANT = 0.6f;
+	public static final float HIGH_ALCHEMY_MULTIPLIER = 0.6f;
 
 	/**
 	 * Width of a standard item sprite
@@ -112,11 +114,4 @@ public class Constants
 	 * Height of a standard item sprite
 	 */
 	public static final int ITEM_SPRITE_HEIGHT = 32;
-
-	/**
-	 * High alchemy = shop price * HIGH_ALCHEMY_MULTIPLIER
-	 *
-	 * @see ItemComposition#getPrice
-	 */
-	public static final float HIGH_ALCHEMY_MULTIPLIER = .6f;
 }

runelite-client/src/main/java/net/runelite/client/game/ItemManager.java

@@ -46,7 +46,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import static net.runelite.api.Constants.CLIENT_DEFAULT_ZOOM;
-import static net.runelite.api.Constants.HIGH_ALCHEMY_CONSTANT;
+import static net.runelite.api.Constants.HIGH_ALCHEMY_MULTIPLIER;
 import net.runelite.api.GameState;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
@@ -424,7 +424,7 @@ public class ItemManager
 			return 1000;
 		}
 
-		return (int) Math.max(1, composition.getPrice() * HIGH_ALCHEMY_CONSTANT);
+		return (int) Math.max(1, composition.getPrice() * HIGH_ALCHEMY_MULTIPLIER);
 	}
 
 	public int getAlchValue(int itemID)
@@ -438,7 +438,7 @@ public class ItemManager
 			return 1000;
 		}
 
-		return (int) Math.max(1, getItemDefinition(itemID).getPrice() * HIGH_ALCHEMY_CONSTANT);
+		return (int) Math.max(1, getItemDefinition(itemID).getPrice() * HIGH_ALCHEMY_MULTIPLIER);
 	}
 
 	/**

runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java

@@ -34,7 +34,6 @@ import javax.inject.Inject;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
-import net.runelite.api.Constants;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;

runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java

@@ -37,7 +37,6 @@ import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
-import net.runelite.api.Constants;
 import net.runelite.api.Experience;
 import net.runelite.api.IconID;
 import net.runelite.api.ItemDefinition;

runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java

@@ -36,7 +36,6 @@ import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
-import net.runelite.api.Constants;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.GameStateChanged;

runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java

@@ -49,7 +49,6 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
-import net.runelite.api.Constants;
 import net.runelite.api.GameState;
 import net.runelite.api.Item;
 import net.runelite.api.ItemDefinition;

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

@@ -32,7 +32,6 @@ import net.runelite.api.GameState;
 import net.runelite.api.GrandExchangeOffer;
 import net.runelite.api.GraphicsObject;
 import net.runelite.api.HashTable;
-import net.runelite.api.HealthBarOverride;
 import net.runelite.api.HintArrowType;
 import net.runelite.api.Ignore;
 import net.runelite.api.IndexDataBase;
@@ -190,9 +189,6 @@ public abstract class RSClientMixin implements RSClient
 		.maximumSize(64)
 		.build();
 
-	@Inject
-	private static HealthBarOverride healthBarOverride;
-
 	@Inject
 	private static boolean printMenuActions;
 

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

@@ -1,83 +1,20 @@
 package net.runelite.mixins;
 
-import net.runelite.api.HealthBarOverride;
 import net.runelite.api.events.PostHealthBar;
-import net.runelite.api.mixins.Copy;
 import net.runelite.api.mixins.Inject;
 import net.runelite.api.mixins.MethodHook;
 import net.runelite.api.mixins.Mixin;
-import net.runelite.api.mixins.Replace;
 import net.runelite.api.mixins.Shadow;
 import net.runelite.rs.api.RSBuffer;
 import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSHealthBarDefinition;
-import net.runelite.rs.api.RSSprite;
 
 @Mixin(RSHealthBarDefinition.class)
 public abstract class RSHealthBarDefinitionMixin implements RSHealthBarDefinition
 {
-	// Larger values are used for bosses like Corporeal Beast
-	private static final int DEFAULT_HEALTH_SCALE = 30;
-
 	@Shadow("client")
 	private static RSClient client;
 
-	@Shadow("healthBarOverride")
-	private static HealthBarOverride healthBarOverride;
-
-	@Copy("getSprite2")
-	abstract RSSprite rs$getHealthBarBackSprite();
-
-	@Replace("getSprite2")
-	public RSSprite rl$getHealthBarBackSprite()
-	{
-		/*
-		 * If this combat info already uses sprites for health bars,
-		 * use those instead, and don't override.
-		 */
-		RSSprite pixels = rs$getHealthBarBackSprite();
-		if (pixels != null)
-		{
-			return pixels;
-		}
-
-		if (healthBarOverride == null)
-		{
-			return null;
-		}
-
-		return getHealthScale() == DEFAULT_HEALTH_SCALE
-			? (RSSprite) healthBarOverride.backSprite
-			: (RSSprite) healthBarOverride.backSpriteLarge;
-	}
-
-	@Copy("getSprite1")
-	abstract RSSprite rs$getHealthBarFrontSprite();
-
-	@Replace("getSprite1")
-	public RSSprite rl$getHealthBarFrontSprite()
-	{
-		/*
-		 * If this combat info already uses sprites for health bars,
-		 * use those instead, and don't override.
-		 */
-		RSSprite pixels = rs$getHealthBarFrontSprite();
-		if (pixels != null)
-		{
-			return pixels;
-		}
-
-		if (healthBarOverride == null)
-		{
-			return null;
-		}
-
-		// 30 is the default size, large is for bosses like Corporeal Beast
-		return getHealthScale() == DEFAULT_HEALTH_SCALE
-			? (RSSprite) healthBarOverride.frontSprite
-			: (RSSprite) healthBarOverride.frontSpriteLarge;
-	}
-
 	@MethodHook(value = "read", end = true)
 	@Inject
 	public void onRead(RSBuffer buffer)

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

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2019, Lotto <https://github.com/devLotto>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.runelite.mixins;
-
-import net.runelite.api.events.PostHealthBar;
-import net.runelite.api.mixins.Inject;
-import net.runelite.api.mixins.MethodHook;
-import net.runelite.api.mixins.Mixin;
-import net.runelite.api.mixins.Shadow;
-import net.runelite.rs.api.RSBuffer;
-import net.runelite.rs.api.RSClient;
-import net.runelite.rs.api.RSHealthBar;
-
-@Mixin(RSHealthBar.class)
-public abstract class RSHealthBarMixin implements RSHealthBar
-{
-	@Shadow("client")
-	private static RSClient client;
-
-	@MethodHook(value = "get", end = true)
-	@Inject
-	public void onRead(RSBuffer buffer)
-	{
-		PostHealthBar postHealthBar = new PostHealthBar();
-		postHealthBar.setHealthBar(this);
-		client.getCallbacks().post(postHealthBar);
-	}
-}

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();