ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

api: remove unneeded Health Bar Override code

Browse Source
This commit is contained in:
Hydrox6
2019-06-15 14:43:26 +01:00
parent 940a404ec6
commit 381ffdabf6
5 changed files with 0 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -42,7 +42,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
public RSClientMixin()
{
@@ -1253,13 +1249,6 @@ public abstract class RSClientMixin implements RSClient
client.getCallbacks().post(new UsernameChanged());
}
@Inject
@Override
public void setHealthBarOverride(HealthBarOverride override)
{
healthBarOverride = override;
}
@Override
@Inject
public int getTickCount()

63
runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarMixin.java
View File

@@ -24,84 +24,21 @@
*/
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.RSHealthBar;
import net.runelite.rs.api.RSSpritePixels;
@Mixin(RSHealthBar.class)
public abstract class RSHealthBarMixin implements RSHealthBar
{
// Larger values are used for bosses like Corporeal Beast
private static final int DEFAULT_HEALTH_SCALE = 30;
@Shadow("clientInstance")
private static RSClient client;
@Shadow("healthBarOverride")
private static HealthBarOverride healthBarOverride;
@Copy("getHealthBarBackSprite")
abstract RSSpritePixels rs$getHealthBarBackSprite();
@Replace("getHealthBarBackSprite")
public RSSpritePixels rl$getHealthBarBackSprite()
{
/*
* If this combat info already uses sprites for health bars,
* use those instead, and don't override.
*/
RSSpritePixels pixels = rs$getHealthBarBackSprite();
if (pixels != null)
{
return pixels;
}
if (healthBarOverride == null)
{
return null;
}
return getHealthScale() == DEFAULT_HEALTH_SCALE
? (RSSpritePixels) healthBarOverride.backSprite
: (RSSpritePixels) healthBarOverride.backSpriteLarge;
}
@Copy("getHealthBarFrontSprite")
abstract RSSpritePixels rs$getHealthBarFrontSprite();
@Replace("getHealthBarFrontSprite")
public RSSpritePixels rl$getHealthBarFrontSprite()
{
/*
* If this combat info already uses sprites for health bars,
* use those instead, and don't override.
*/
RSSpritePixels 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
? (RSSpritePixels) healthBarOverride.frontSprite
: (RSSpritePixels) healthBarOverride.frontSpriteLarge;
}
@MethodHook(value = "read", end = true)
@Inject
public void onRead(RSBuffer buffer)