diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java index 047363e1e4..310e4088ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.attackstyles; +import lombok.Getter; import net.runelite.api.Skill; enum AttackStyle @@ -38,7 +39,9 @@ enum AttackStyle DEFENSIVE_CASTING("Defensive Casting", Skill.MAGIC, Skill.DEFENCE), OTHER("Other"); + @Getter private final String name; + @Getter private final Skill[] skills; AttackStyle(String name, Skill... skills) @@ -46,14 +49,4 @@ enum AttackStyle this.name = name; this.skills = skills; } - - public String getName() - { - return name; - } - - public Skill[] getSkills() - { - return skills; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java index de71de2424..6dfd494d48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.attackstyles; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.Getter; import static net.runelite.client.plugins.attackstyles.AttackStyle.ACCURATE; import static net.runelite.client.plugins.attackstyles.AttackStyle.AGGRESSIVE; import static net.runelite.client.plugins.attackstyles.AttackStyle.CASTING; @@ -65,8 +66,11 @@ enum WeaponType TYPE_24(ACCURATE, AGGRESSIVE, CONTROLLED, DEFENSIVE), TYPE_25(CONTROLLED, AGGRESSIVE, null, DEFENSIVE), TYPE_26(AGGRESSIVE, AGGRESSIVE, null, AGGRESSIVE), - TYPE_27(ACCURATE, null, null, OTHER); + TYPE_27(ACCURATE, null, null, OTHER), + TYPE_28(ACCURATE, ACCURATE, LONGRANGE), + TYPE_29(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE); + @Getter private final AttackStyle[] attackStyles; private static final Map weaponTypes; @@ -88,11 +92,6 @@ enum WeaponType this.attackStyles = attackStyles; } - public AttackStyle[] getAttackStyles() - { - return attackStyles; - } - public static WeaponType getWeaponType(int id) { return weaponTypes.get(id);