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

Use client Varbit for index, lsb, msb

Browse Source
This commit is contained in:
Adam
2018-02-13 19:26:41 -05:00
parent 635ec89c91
commit 971692b025
10 changed files with 294 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
View File

@@ -35,6 +35,7 @@ import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Setting;
import net.runelite.api.Skill;
import net.runelite.api.Varbits;
import net.runelite.api.events.ConfigChanged;
@@ -104,7 +105,7 @@ public class AttackIndicatorPlugin extends Plugin
updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
updateAttackStyle(
client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE),
client.getSetting(Varbits.ATTACK_STYLE),
client.getSetting(Setting.ATTACK_STYLE),
client.getSetting(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(false);
}
@@ -160,9 +161,9 @@ public class AttackIndicatorPlugin extends Plugin
@Subscribe
public void onAttackStyleChange(VarbitChanged event)
{
if (attackStyleVarbit == -1 || attackStyleVarbit != client.getSetting(Varbits.ATTACK_STYLE))
if (attackStyleVarbit == -1 || attackStyleVarbit != client.getSetting(Setting.ATTACK_STYLE))
{
attackStyleVarbit = client.getSetting(Varbits.ATTACK_STYLE);
attackStyleVarbit = client.getSetting(Setting.ATTACK_STYLE);
updateAttackStyle(client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE), attackStyleVarbit,
client.getSetting(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(false);
@@ -175,7 +176,7 @@ public class AttackIndicatorPlugin extends Plugin
if (equippedWeaponTypeVarbit == -1 || equippedWeaponTypeVarbit != client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE))
{
equippedWeaponTypeVarbit = client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE);
updateAttackStyle(equippedWeaponTypeVarbit, client.getSetting(Varbits.ATTACK_STYLE),
updateAttackStyle(equippedWeaponTypeVarbit, client.getSetting(Setting.ATTACK_STYLE),
client.getSetting(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(true);
}
@@ -187,7 +188,7 @@ public class AttackIndicatorPlugin extends Plugin
if (castingModeVarbit == -1 || castingModeVarbit != client.getSetting(Varbits.DEFENSIVE_CASTING_MODE))
{
castingModeVarbit = client.getSetting(Varbits.DEFENSIVE_CASTING_MODE);
updateAttackStyle(client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE), client.getSetting(Varbits.ATTACK_STYLE),
updateAttackStyle(client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE), client.getSetting(Setting.ATTACK_STYLE),
castingModeVarbit);
updateWarning(false);
}

10
runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java
View File

@@ -31,7 +31,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.Point;
import net.runelite.api.Varbits;
import net.runelite.api.Setting;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.widgets.Widget;
@@ -133,14 +133,14 @@ public class SpecOrbOverlay extends Overlay
graphics.setColor(SPECIAL_ORB_BACKGROUND_COLOR);
boolean specialAttackEnabled = client.getSetting(Varbits.SPECIAL_ATTACK_ENABLED) == 1;
boolean specialAttackEnabled = client.getSetting(Setting.SPECIAL_ATTACK_ENABLED) == 1;
// draw relative to run orb
Point runOrbPoint = runOrb.getCanvasLocation();
Point specOrbPoint = new Point(runOrbPoint.getX() + (client.isResized() ? SPEC_ORB_X_RESIZABLE : SPEC_ORB_X_FIXED),
runOrbPoint.getY() + (client.isResized() ? SPEC_ORB_Y_RESIZABLE : SPEC_ORB_Y_FIXED));
double specialPercent = client.getSetting(Varbits.SPECIAL_ATTACK_PERCENT) / 1000.0;
double specialPercent = client.getSetting(Setting.SPECIAL_ATTACK_PERCENT) / 1000.0;
double specialRechargePercent = tickCounter / (double) RECHARGE_TIME_TICKS;
OverlayUtil.drawMinimapOrb(graphics, specOrbPoint, specialPercent,
@@ -153,7 +153,7 @@ public class SpecOrbOverlay extends Overlay
public void onVarbitChanged(VarbitChanged event)
{
int specialPercent = client.getSetting(Varbits.SPECIAL_ATTACK_PERCENT);
int specialPercent = client.getSetting(Setting.SPECIAL_ATTACK_PERCENT);
if (lastSpecialPercent != specialPercent)
{
int diff = specialPercent - lastSpecialPercent;
@@ -175,7 +175,7 @@ public class SpecOrbOverlay extends Overlay
public void onTick(GameTick event)
{
// 1000 = 100%, 500 = 50%, 0 = 0%
int specialPercent = client.getSetting(Varbits.SPECIAL_ATTACK_PERCENT);
int specialPercent = client.getSetting(Setting.SPECIAL_ATTACK_PERCENT);
// The recharge doesn't tick when at 100%
if (specialPercent == 1000)
{