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

Merge multiple varbitChanged events in AttackStyles to one (#6258)

Browse Source 
There's no good reason for this plugin to have 3 separate events for a Varbit changing.
This commit is contained in:
Hydrox6
2018-10-30 16:31:47 +00:00
committed by Tomas Slusny
parent efe25c54cd
commit 0432ce4ca9
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
View File

@@ -178,7 +178,7 @@ public class AttackStylesPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onAttackStyleChange(VarbitChanged event) public void onVarbitChanged(VarbitChanged event)
{ {
if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE)) if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE))
{ {
@@ -187,11 +187,7 @@ public class AttackStylesPlugin extends Plugin
client.getVar(Varbits.DEFENSIVE_CASTING_MODE)); client.getVar(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(false); updateWarning(false);
} }
}
@Subscribe
public void onEquippedWeaponTypeChange(VarbitChanged event)
{
if (equippedWeaponTypeVarbit == -1 || equippedWeaponTypeVarbit != client.getVar(Varbits.EQUIPPED_WEAPON_TYPE)) if (equippedWeaponTypeVarbit == -1 || equippedWeaponTypeVarbit != client.getVar(Varbits.EQUIPPED_WEAPON_TYPE))
{ {
equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE); equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE);
@@ -199,11 +195,7 @@ public class AttackStylesPlugin extends Plugin
client.getVar(Varbits.DEFENSIVE_CASTING_MODE)); client.getVar(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(true); updateWarning(true);
} }
}
@Subscribe
public void onCastingModeChange(VarbitChanged event)
{
if (castingModeVarbit == -1 || castingModeVarbit != client.getVar(Varbits.DEFENSIVE_CASTING_MODE)) if (castingModeVarbit == -1 || castingModeVarbit != client.getVar(Varbits.DEFENSIVE_CASTING_MODE))
{ {
castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE); castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE);

6
runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java
View File

@@ -93,14 +93,14 @@ public class AttackStylesPluginTest
when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.ACCURATE.ordinal()); when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.ACCURATE.ordinal());
// verify that earning xp in a warned skill will display red text on the widget // verify that earning xp in a warned skill will display red text on the widget
attackPlugin.onAttackStyleChange(new VarbitChanged()); attackPlugin.onVarbitChanged(new VarbitChanged());
assertTrue(attackPlugin.isWarnedSkillSelected()); assertTrue(attackPlugin.isWarnedSkillSelected());
// Switch to attack style that doesn't give attack xp // Switch to attack style that doesn't give attack xp
when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.AGGRESSIVE.ordinal()); when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.AGGRESSIVE.ordinal());
// Verify the widget will now display white text // Verify the widget will now display white text
attackPlugin.onAttackStyleChange(new VarbitChanged()); attackPlugin.onVarbitChanged(new VarbitChanged());
warnedSkills = attackPlugin.getWarnedSkills(); warnedSkills = attackPlugin.getWarnedSkills();
assertTrue(warnedSkills.contains(Skill.ATTACK)); assertTrue(warnedSkills.contains(Skill.ATTACK));
assertFalse(attackPlugin.isWarnedSkillSelected()); assertFalse(attackPlugin.isWarnedSkillSelected());
@@ -129,7 +129,7 @@ public class AttackStylesPluginTest
// equip type_4 weapon type on player // equip type_4 weapon type on player
when(client.getVar(Varbits.EQUIPPED_WEAPON_TYPE)).thenReturn(WeaponType.TYPE_4.ordinal()); when(client.getVar(Varbits.EQUIPPED_WEAPON_TYPE)).thenReturn(WeaponType.TYPE_4.ordinal());
attackPlugin.onEquippedWeaponTypeChange(new VarbitChanged()); attackPlugin.onVarbitChanged(new VarbitChanged());
// Verify there is a warned skill // Verify there is a warned skill
Set<Skill> warnedSkills = attackPlugin.getWarnedSkills(); Set<Skill> warnedSkills = attackPlugin.getWarnedSkills();