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

Fix healthbar stuff, remove double constant

Browse Source
This commit is contained in:
Lucas
2019-06-21 18:50:32 +02:00
parent 8020f758e1
commit 24228f86fe
13 changed files with 17 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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)

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

@@ -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);
}
}