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

Merge pull request #337 from Noremac201/attStyle

Browse Source 
Hidden attack styles are now hidden upon login, and fixed bug with styles.
This commit is contained in:
Adam
2018-01-09 09:23:26 -05:00
committed by GitHub
parent 5b7e2e355d 4010729c9f
commit 81ebc99e99
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,12 +38,14 @@ import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.ConfigChanged;
import net.runelite.client.events.GameStateChanged;
import net.runelite.client.events.VarbitChanged; import net.runelite.client.events.VarbitChanged;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
@@ -100,16 +102,6 @@ public class AttackIndicatorPlugin extends Plugin
return warnedSkillSelected; return warnedSkillSelected;
} }
@Override
protected void startUp() throws Exception
{
updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
updateWarnedSkills(config.warnForDefensive(), Skill.DEFENCE);
updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
}
@Schedule( @Schedule(
period = 600, period = 600,
unit = ChronoUnit.MILLIS unit = ChronoUnit.MILLIS
@@ -132,6 +124,19 @@ public class AttackIndicatorPlugin extends Plugin
} }
} }
@Subscribe
public void onGameStateChange(GameStateChanged event)
{
if (event.getGameState() == GameState.LOGGED_IN)
{
updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
updateWarnedSkills(config.warnForDefensive(), Skill.DEFENCE);
updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
}
}
@Subscribe @Subscribe
public void onAttackStyleChange(VarbitChanged event) public void onAttackStyleChange(VarbitChanged event)
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java
View File

@@ -50,7 +50,7 @@ public enum WeaponType
TYPE_17(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE), TYPE_17(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE),
TYPE_18(ACCURATE, AGGRESSIVE, null, DEFENSIVE, CASTING), TYPE_18(ACCURATE, AGGRESSIVE, null, DEFENSIVE, CASTING),
TYPE_19(RANGING, RANGING, null, LONGRANGE), TYPE_19(RANGING, RANGING, null, LONGRANGE),
TYPE_20(ACCURATE, CONTROLLED, null, LONGRANGE), TYPE_20(ACCURATE, CONTROLLED, null, DEFENSIVE),
TYPE_21(ACCURATE, AGGRESSIVE, null, DEFENSIVE), TYPE_21(ACCURATE, AGGRESSIVE, null, DEFENSIVE),
TYPE_22(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE), TYPE_22(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE),
TYPE_23(CASTING, CASTING, null, DEFENSIVE_CASTING), TYPE_23(CASTING, CASTING, null, DEFENSIVE_CASTING),