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

# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
This commit is contained in:
James Munson
2019-04-22 19:45:23 -07:00
7 changed files with 136 additions and 1 deletions

View File

@@ -25,10 +25,15 @@
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;
@@ -38,6 +43,9 @@ 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;
@@ -93,4 +101,13 @@ public abstract class RSHealthBarMixin implements RSHealthBar
? (RSSpritePixels) healthBarOverride.frontSprite
: (RSSpritePixels) healthBarOverride.frontSpriteLarge;
}
@MethodHook(value = "read", end = true)
@Inject
public void onRead(RSBuffer buffer)
{
PostHealthBar postHealthBar = new PostHealthBar();
postHealthBar.setHealthBar(this);
client.getCallbacks().post(postHealthBar);
}
}