diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java similarity index 97% rename from runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackStyle.java rename to runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java index 7f867ed051..c32ba11af3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.attackindicator; +package net.runelite.client.plugins.attackstyles; import net.runelite.api.Skill; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java similarity index 93% rename from runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorConfig.java rename to runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java index 0e65a1d9f4..faa1b9ac6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.attackindicator; +package net.runelite.client.plugins.attackstyles; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; @@ -30,10 +30,10 @@ import net.runelite.client.config.ConfigItem; @ConfigGroup( keyName = "attackIndicator", - name = "Attack Indicators", - description = "Configuration for the attack indicator plugin" + name = "Attack Styles", + description = "Configuration for the attack styles plugin" ) -public interface AttackIndicatorConfig extends Config +public interface AttackStylesConfig extends Config { @ConfigItem( keyName = "warnForDefensive", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java similarity index 91% rename from runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java rename to runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java index 3a3752c744..d75c7927fc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.attackindicator; +package net.runelite.client.plugins.attackstyles; import java.awt.Color; import java.awt.Dimension; @@ -32,15 +32,15 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; -public class AttackIndicatorOverlay extends Overlay +public class AttackStylesOverlay extends Overlay { private static final int COMPONENT_WIDTH = 80; - private final AttackIndicatorPlugin plugin; + private final AttackStylesPlugin plugin; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public AttackIndicatorOverlay(AttackIndicatorPlugin plugin) + public AttackStylesOverlay(AttackStylesPlugin plugin) { setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java similarity index 94% rename from runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java rename to runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index aa2f564741..6f0db7508a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.attackindicator; +package net.runelite.client.plugins.attackstyles; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashBasedTable; @@ -49,15 +49,15 @@ import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import static net.runelite.client.plugins.attackindicator.AttackStyle.CASTING; -import static net.runelite.client.plugins.attackindicator.AttackStyle.DEFENSIVE_CASTING; -import static net.runelite.client.plugins.attackindicator.AttackStyle.OTHER; +import static net.runelite.client.plugins.attackstyles.AttackStyle.CASTING; +import static net.runelite.client.plugins.attackstyles.AttackStyle.DEFENSIVE_CASTING; +import static net.runelite.client.plugins.attackstyles.AttackStyle.OTHER; @PluginDescriptor( - name = "Attack Indicators" + name = "Attack Styles" ) @Slf4j -public class AttackIndicatorPlugin extends Plugin +public class AttackStylesPlugin extends Plugin { private int attackStyleVarbit = -1; private int equippedWeaponTypeVarbit = -1; @@ -71,19 +71,19 @@ public class AttackIndicatorPlugin extends Plugin private Client client; @Inject - private AttackIndicatorConfig config; + private AttackStylesConfig config; @Inject - private AttackIndicatorOverlay overlay; + private AttackStylesOverlay overlay; @Provides - AttackIndicatorConfig provideConfig(ConfigManager configManager) + AttackStylesConfig provideConfig(ConfigManager configManager) { - return configManager.getConfig(AttackIndicatorConfig.class); + return configManager.getConfig(AttackStylesConfig.class); } @Override - public AttackIndicatorOverlay getOverlay() + public AttackStylesOverlay getOverlay() { return overlay; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java similarity index 96% rename from runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java rename to runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java index b6975b0dff..19369104f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java @@ -22,11 +22,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.attackindicator; +package net.runelite.client.plugins.attackstyles; import java.util.HashMap; import java.util.Map; -import static net.runelite.client.plugins.attackindicator.AttackStyle.*; +import static net.runelite.client.plugins.attackstyles.AttackStyle.*; public enum WeaponType { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java similarity index 97% rename from runelite-client/src/test/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPluginTest.java rename to runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java index f85e89a37a..73e295f32b 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.attackindicator; +package net.runelite.client.plugins.attackstyles; import com.google.inject.Guice; import com.google.inject.testing.fieldbinder.Bind; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.when; import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class AttackIndicatorPluginTest +public class AttackStylesPluginTest { @Mock @Bind @@ -56,10 +56,10 @@ public class AttackIndicatorPluginTest @Mock @Bind - AttackIndicatorConfig attackConfig; + AttackStylesConfig attackConfig; @Inject - AttackIndicatorPlugin attackPlugin; + AttackStylesPlugin attackPlugin; @Before public void before() @@ -102,7 +102,7 @@ public class AttackIndicatorPluginTest } /* - * Verify that attack style widgets are hidden when filtered with the AttackIndicatorPlugin. + * Verify that attack style widgets are hidden when filtered with the AttackStylesPlugin. */ @Test public void testHiddenWidget()