From 05567739b95eae36ba26219f85220865a9a8e7f2 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 10 Jun 2022 15:47:45 -0400 Subject: [PATCH] spec counter: add config option for infoboxes --- .../plugins/specialcounter/SpecialCounterConfig.java | 11 +++++++++++ .../plugins/specialcounter/SpecialCounterPlugin.java | 10 ++++++++-- .../specialcounter/SpecialCounterPluginTest.java | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterConfig.java index 4249fa3be8..9773544618 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterConfig.java @@ -66,6 +66,17 @@ public interface SpecialCounterConfig extends Config return Color.WHITE; } + @ConfigItem( + position = 3, + keyName = "infobox", + name = "Infobox", + description = "Adds an infobox counting special attacks" + ) + default boolean infobox() + { + return true; + } + @ConfigItem( position = 10, keyName = "dragonWarhammerThreshold", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index 4d757f9775..fccb15e6ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -293,7 +293,10 @@ public class SpecialCounterPlugin extends Plugin int hit = getHit(specialWeapon, hitsplat); int localPlayerId = client.getLocalPlayer().getId(); - updateCounter(specialWeapon, null, hit); + if (config.infobox()) + { + updateCounter(specialWeapon, null, hit); + } if (!party.getMembers().isEmpty()) { @@ -359,7 +362,10 @@ public class SpecialCounterPlugin extends Plugin // Otherwise we only add the count if it is against a npc we are already tracking if (interactedNpcIds.contains(event.getNpcId())) { - updateCounter(event.getWeapon(), name, event.getHit()); + if (config.infobox()) + { + updateCounter(event.getWeapon(), name, event.getHit()); + } } if (event.getWorld() == client.getWorld()) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java index da98d11a5e..55bfdc6237 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java @@ -115,6 +115,8 @@ public class SpecialCounterPluginTest { Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); + when(specialCounterConfig.infobox()).thenReturn(true); + // Set up spec weapon ItemContainer equipment = mock(ItemContainer.class); when(equipment.getItem(EquipmentInventorySlot.WEAPON.getSlotIdx())).thenReturn(new Item(ItemID.BANDOS_GODSWORD, 1));