diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java index fb01be8487..d16f96fa58 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerConfig.java @@ -44,8 +44,6 @@ public interface SlayerConfig extends Config String TASK_LOC_KEY = "taskLocation"; String STREAK_KEY = "streak"; String POINTS_KEY = "points"; - String EXPEDITIOUS_CHARGES_KEY = "expeditious"; - String SLAUGHTER_CHARGES_KEY = "slaughter"; @ConfigItem( position = 1, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java index f07954bd6e..d6c656fedc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java @@ -77,8 +77,6 @@ class SlayerOverlay extends WidgetItemOverlay ItemID.SLAYER_RING_ETERNAL, ItemID.ENCHANTED_GEM, ItemID.ETERNAL_GEM, - ItemID.BRACELET_OF_SLAUGHTER, - ItemID.EXPEDITIOUS_BRACELET, ItemID.SLAYER_RING_1, ItemID.SLAYER_RING_2, ItemID.SLAYER_RING_3, @@ -120,26 +118,11 @@ class SlayerOverlay extends WidgetItemOverlay return; } - int slaughterCount = plugin.getSlaughterChargeCount(); - int expeditiousCount = plugin.getExpeditiousChargeCount(); - graphics.setFont(FontManager.getRunescapeSmallFont()); final Rectangle bounds = widgetItem.getCanvasBounds(); final TextComponent textComponent = new TextComponent(); - - switch (itemId) - { - case ItemID.EXPEDITIOUS_BRACELET: - textComponent.setText(String.valueOf(expeditiousCount)); - break; - case ItemID.BRACELET_OF_SLAUGHTER: - textComponent.setText(String.valueOf(slaughterCount)); - break; - default: - textComponent.setText(String.valueOf(amount)); - break; - } + textComponent.setText(String.valueOf(amount)); // Draw the counter in the bottom left for equipment, and top left for jewelry textComponent.setPosition(new Point(bounds.x - 1, bounds.y - 1 + (SLAYER_JEWELRY.contains(itemId) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index bc9281980e..58f0942de2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -105,13 +105,7 @@ public class SlayerPlugin extends Plugin private static final String CHAT_CANCEL_MESSAGE_ZUK = "You no longer have a slayer task as you left the Inferno."; private static final String CHAT_SUPERIOR_MESSAGE = "A superior foe has appeared..."; private static final String CHAT_BRACELET_SLAUGHTER = "Your bracelet of slaughter prevents your slayer"; - private static final Pattern CHAT_BRACELET_SLAUGHTER_REGEX = Pattern.compile("Your bracelet of slaughter prevents your slayer count from decreasing. It has (\\d{1,2}) charges? left\\."); private static final String CHAT_BRACELET_EXPEDITIOUS = "Your expeditious bracelet helps you progress your"; - private static final Pattern CHAT_BRACELET_EXPEDITIOUS_REGEX = Pattern.compile("Your expeditious bracelet helps you progress your slayer (?:task )?faster. It has (\\d{1,2}) charges? left\\."); - private static final String CHAT_BRACELET_SLAUGHTER_CHARGE = "Your bracelet of slaughter has "; - private static final Pattern CHAT_BRACELET_SLAUGHTER_CHARGE_REGEX = Pattern.compile("Your bracelet of slaughter has (\\d{1,2}) charges? left\\."); - private static final String CHAT_BRACELET_EXPEDITIOUS_CHARGE = "Your expeditious bracelet has "; - private static final Pattern CHAT_BRACELET_EXPEDITIOUS_CHARGE_REGEX = Pattern.compile("Your expeditious bracelet has (\\d{1,2}) charges? left\\."); private static final Pattern COMBAT_BRACELET_TASK_UPDATE_MESSAGE = Pattern.compile("^You still need to kill (\\d+) monsters to complete your current Slayer assignment"); //NPC messages @@ -125,9 +119,6 @@ public class SlayerPlugin extends Plugin private static final int GROTESQUE_GUARDIANS_REGION = 6727; - private static final int EXPEDITIOUS_CHARGE = 30; - private static final int SLAUGHTER_CHARGE = 30; - // Chat Command private static final String TASK_COMMAND_STRING = "!task"; private static final Pattern TASK_STRING_VALIDATION = Pattern.compile("[^a-zA-Z0-9' -]"); @@ -200,14 +191,6 @@ public class SlayerPlugin extends Plugin @Setter(AccessLevel.PACKAGE) private String taskLocation; - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) - private int expeditiousChargeCount; - - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) - private int slaughterChargeCount; - @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private String taskName; @@ -235,8 +218,6 @@ public class SlayerPlugin extends Plugin if (getIntProfileConfig(SlayerConfig.AMOUNT_KEY) != -1 && !getStringProfileConfig(SlayerConfig.TASK_NAME_KEY).isEmpty()) { - setExpeditiousChargeCount(getIntProfileConfig(SlayerConfig.EXPEDITIOUS_CHARGES_KEY)); - setSlaughterChargeCount(getIntProfileConfig(SlayerConfig.SLAUGHTER_CHARGES_KEY)); clientThread.invoke(() -> setTask(getStringProfileConfig(SlayerConfig.TASK_NAME_KEY), getIntProfileConfig(SlayerConfig.AMOUNT_KEY), getIntProfileConfig(SlayerConfig.INIT_AMOUNT_KEY), @@ -288,8 +269,6 @@ public class SlayerPlugin extends Plugin && !getStringProfileConfig(SlayerConfig.TASK_NAME_KEY).isEmpty() && loginFlag) { - setExpeditiousChargeCount(getIntProfileConfig(SlayerConfig.EXPEDITIOUS_CHARGES_KEY)); - setSlaughterChargeCount(getIntProfileConfig(SlayerConfig.SLAUGHTER_CHARGES_KEY)); setTask(getStringProfileConfig(SlayerConfig.TASK_NAME_KEY), getIntProfileConfig(SlayerConfig.AMOUNT_KEY), getIntProfileConfig(SlayerConfig.INIT_AMOUNT_KEY), @@ -332,8 +311,6 @@ public class SlayerPlugin extends Plugin setProfileConfig(SlayerConfig.INIT_AMOUNT_KEY, initialAmount); setProfileConfig(SlayerConfig.TASK_NAME_KEY, taskName); setProfileConfig(SlayerConfig.TASK_LOC_KEY, taskLocation); - setProfileConfig(SlayerConfig.EXPEDITIOUS_CHARGES_KEY, expeditiousChargeCount); - setProfileConfig(SlayerConfig.SLAUGHTER_CHARGES_KEY, slaughterChargeCount); } @Subscribe @@ -394,22 +371,6 @@ public class SlayerPlugin extends Plugin } } - Widget braceletBreakWidget = client.getWidget(WidgetInfo.DIALOG_SPRITE_TEXT); - if (braceletBreakWidget != null) - { - String braceletText = Text.removeTags(braceletBreakWidget.getText()); //remove color and linebreaks - if (braceletText.contains("bracelet of slaughter")) - { - slaughterChargeCount = SLAUGHTER_CHARGE; - setProfileConfig(SlayerConfig.SLAUGHTER_CHARGES_KEY, slaughterChargeCount); - } - else if (braceletText.contains("expeditious bracelet")) - { - expeditiousChargeCount = EXPEDITIOUS_CHARGE; - setProfileConfig(SlayerConfig.EXPEDITIOUS_CHARGES_KEY, expeditiousChargeCount); - } - } - Widget rewardsBarWidget = client.getWidget(WidgetInfo.SLAYER_REWARDS_TOPBAR); if (rewardsBarWidget != null) { @@ -460,45 +421,11 @@ public class SlayerPlugin extends Plugin if (chatMsg.startsWith(CHAT_BRACELET_SLAUGHTER)) { - Matcher mSlaughter = CHAT_BRACELET_SLAUGHTER_REGEX.matcher(chatMsg); - amount++; - slaughterChargeCount = mSlaughter.find() ? Integer.parseInt(mSlaughter.group(1)) : SLAUGHTER_CHARGE; - setProfileConfig(SlayerConfig.SLAUGHTER_CHARGES_KEY, slaughterChargeCount); } - - if (chatMsg.startsWith(CHAT_BRACELET_EXPEDITIOUS)) + else if (chatMsg.startsWith(CHAT_BRACELET_EXPEDITIOUS)) { - Matcher mExpeditious = CHAT_BRACELET_EXPEDITIOUS_REGEX.matcher(chatMsg); - amount--; - expeditiousChargeCount = mExpeditious.find() ? Integer.parseInt(mExpeditious.group(1)) : EXPEDITIOUS_CHARGE; - setProfileConfig(SlayerConfig.EXPEDITIOUS_CHARGES_KEY, expeditiousChargeCount); - } - - if (chatMsg.startsWith(CHAT_BRACELET_EXPEDITIOUS_CHARGE)) - { - Matcher mExpeditious = CHAT_BRACELET_EXPEDITIOUS_CHARGE_REGEX.matcher(chatMsg); - - if (!mExpeditious.find()) - { - return; - } - - expeditiousChargeCount = Integer.parseInt(mExpeditious.group(1)); - setProfileConfig(SlayerConfig.EXPEDITIOUS_CHARGES_KEY, expeditiousChargeCount); - } - - if (chatMsg.startsWith(CHAT_BRACELET_SLAUGHTER_CHARGE)) - { - Matcher mSlaughter = CHAT_BRACELET_SLAUGHTER_CHARGE_REGEX.matcher(chatMsg); - if (!mSlaughter.find()) - { - return; - } - - slaughterChargeCount = Integer.parseInt(mSlaughter.group(1)); - setProfileConfig(SlayerConfig.SLAUGHTER_CHARGES_KEY, slaughterChargeCount); } if (chatMsg.startsWith("You've completed") && (chatMsg.contains("Slayer master") || chatMsg.contains("Slayer Master"))) @@ -939,8 +866,10 @@ public class SlayerPlugin extends Plugin migrateConfigKey(SlayerConfig.TASK_LOC_KEY); migrateConfigKey(SlayerConfig.STREAK_KEY); migrateConfigKey(SlayerConfig.POINTS_KEY); - migrateConfigKey(SlayerConfig.EXPEDITIOUS_CHARGES_KEY); - migrateConfigKey(SlayerConfig.SLAUGHTER_CHARGES_KEY); + configManager.unsetConfiguration(SlayerConfig.GROUP_NAME, "expeditious"); + configManager.unsetConfiguration(SlayerConfig.GROUP_NAME, "slaughter"); + configManager.unsetRSProfileConfiguration(SlayerConfig.GROUP_NAME, "expeditious"); + configManager.unsetRSProfileConfiguration(SlayerConfig.GROUP_NAME, "slaughter"); } private void migrateConfigKey(String key) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java index f10e525ce8..6785721349 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java @@ -120,21 +120,6 @@ public class SlayerPluginTest private static final String BRACLET_SLAUGHTER = "Your bracelet of slaughter prevents your slayer count from decreasing. It has 9 charges left."; private static final String BRACLET_EXPEDITIOUS = "Your expeditious bracelet helps you progress your slayer task faster. It has 9 charges left."; - private static final String BRACLET_SLAUGHTER_V2 = "Your bracelet of slaughter prevents your slayer count from decreasing. It has 1 charge left."; - private static final String BRACLET_EXPEDITIOUS_V2 = "Your expeditious bracelet helps you progress your slayer faster. It has 1 charge left."; - - private static final String BRACLET_SLAUGHTER_V3 = "Your bracelet of slaughter prevents your slayer count from decreasing. It then crumbles to dust."; - private static final String BRACLET_EXPEDITIOUS_V3 = "Your expeditious bracelet helps you progress your slayer faster. It then crumbles to dust."; - - private static final String CHAT_BRACELET_SLAUGHTER_CHARGE = "Your bracelet of slaughter has 12 charges left."; - private static final String CHAT_BRACELET_EXPEDITIOUS_CHARGE = "Your expeditious bracelet has 12 charges left."; - - private static final String CHAT_BRACELET_SLAUGHTER_CHARGE_ONE = "Your bracelet of slaughter has 1 charge left."; - private static final String CHAT_BRACELET_EXPEDITIOUS_CHARGE_ONE = "Your expeditious bracelet has 1 charge left."; - - private static final String BREAK_SLAUGHTER = "The bracelet shatters. Your next bracelet of slaughter
will start afresh from 30 charges."; - private static final String BREAK_EXPEDITIOUS = "The bracelet shatters. Your next expeditious bracelet
will start afresh from 30 charges."; - @Mock @Bind Client client; @@ -730,47 +715,10 @@ public class SlayerPluginTest public void testBraceletSlaughter() { ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_SLAUGHTER, null, 0); - slayerPlugin.setAmount(42); - slayerPlugin.setSlaughterChargeCount(10); slayerPlugin.onChatMessage(chatMessageEvent); - assertEquals(9, slayerPlugin.getSlaughterChargeCount()); - assertEquals(43, slayerPlugin.getAmount()); - - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_SLAUGHTER_CHARGE, null, 0); - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(12, slayerPlugin.getSlaughterChargeCount()); - - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_SLAUGHTER_CHARGE_ONE, null, 0); - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(1, slayerPlugin.getSlaughterChargeCount()); - - slayerPlugin.setSlaughterChargeCount(1); - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_SLAUGHTER_V3, null, 0); - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(30, slayerPlugin.getSlaughterChargeCount()); - - Widget braceletBreakWidget = mock(Widget.class); - when(braceletBreakWidget.getText()).thenReturn(BREAK_SLAUGHTER); - when(client.getWidget(WidgetInfo.DIALOG_SPRITE_TEXT)).thenReturn(braceletBreakWidget); - - slayerPlugin.setSlaughterChargeCount(-1); - slayerPlugin.onGameTick(new GameTick()); - assertEquals(30, slayerPlugin.getSlaughterChargeCount()); - - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_SLAUGHTER_V2, null, 0); - - slayerPlugin.setAmount(42); - slayerPlugin.setSlaughterChargeCount(2); - - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(1, slayerPlugin.getSlaughterChargeCount()); assertEquals(43, slayerPlugin.getAmount()); } @@ -778,48 +726,11 @@ public class SlayerPluginTest public void testBraceletExpeditious() { ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_EXPEDITIOUS, null, 0); - slayerPlugin.setAmount(42); - slayerPlugin.setExpeditiousChargeCount(10); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(41, slayerPlugin.getAmount()); - assertEquals(9, slayerPlugin.getExpeditiousChargeCount()); - - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_EXPEDITIOUS_CHARGE, null, 0); - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(12, slayerPlugin.getExpeditiousChargeCount()); - - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_EXPEDITIOUS_CHARGE_ONE, null, 0); - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(1, slayerPlugin.getExpeditiousChargeCount()); - - slayerPlugin.setExpeditiousChargeCount(1); - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_EXPEDITIOUS_V3, null, 0); - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(30, slayerPlugin.getExpeditiousChargeCount()); - - Widget braceletBreakWidget = mock(Widget.class); - when(braceletBreakWidget.getText()).thenReturn(BREAK_EXPEDITIOUS); - when(client.getWidget(WidgetInfo.DIALOG_SPRITE_TEXT)).thenReturn(braceletBreakWidget); - - slayerPlugin.setExpeditiousChargeCount(-1); - slayerPlugin.onGameTick(new GameTick()); - assertEquals(30, slayerPlugin.getExpeditiousChargeCount()); - - chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_EXPEDITIOUS_V2, null, 0); - - slayerPlugin.setAmount(42); - slayerPlugin.setExpeditiousChargeCount(2); - - slayerPlugin.onChatMessage(chatMessageEvent); - - assertEquals(41, slayerPlugin.getAmount()); - assertEquals(1, slayerPlugin.getExpeditiousChargeCount()); } @Test