From 0432ce4ca95e3b7a24eeda7cc9555ba6a71cbcde Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 30 Oct 2018 16:31:47 +0000 Subject: [PATCH] Merge multiple varbitChanged events in AttackStyles to one (#6258) There's no good reason for this plugin to have 3 separate events for a Varbit changing. --- .../plugins/attackstyles/AttackStylesPlugin.java | 10 +--------- .../plugins/attackstyles/AttackStylesPluginTest.java | 6 +++--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index ea1633daca..c213d95808 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -178,7 +178,7 @@ public class AttackStylesPlugin extends Plugin } @Subscribe - public void onAttackStyleChange(VarbitChanged event) + public void onVarbitChanged(VarbitChanged event) { if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE)) { @@ -187,11 +187,7 @@ public class AttackStylesPlugin extends Plugin client.getVar(Varbits.DEFENSIVE_CASTING_MODE)); updateWarning(false); } - } - @Subscribe - public void onEquippedWeaponTypeChange(VarbitChanged event) - { if (equippedWeaponTypeVarbit == -1 || 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)); updateWarning(true); } - } - @Subscribe - public void onCastingModeChange(VarbitChanged event) - { if (castingModeVarbit == -1 || castingModeVarbit != client.getVar(Varbits.DEFENSIVE_CASTING_MODE)) { castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java index 966269b763..2060d0d536 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java @@ -93,14 +93,14 @@ public class AttackStylesPluginTest 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 - attackPlugin.onAttackStyleChange(new VarbitChanged()); + attackPlugin.onVarbitChanged(new VarbitChanged()); assertTrue(attackPlugin.isWarnedSkillSelected()); // Switch to attack style that doesn't give attack xp when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.AGGRESSIVE.ordinal()); // Verify the widget will now display white text - attackPlugin.onAttackStyleChange(new VarbitChanged()); + attackPlugin.onVarbitChanged(new VarbitChanged()); warnedSkills = attackPlugin.getWarnedSkills(); assertTrue(warnedSkills.contains(Skill.ATTACK)); assertFalse(attackPlugin.isWarnedSkillSelected()); @@ -129,7 +129,7 @@ public class AttackStylesPluginTest // equip type_4 weapon type on player 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 Set warnedSkills = attackPlugin.getWarnedSkills();