From dfa892c2bc06775cdf7dd15d3d42a64d7ec57185 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 14 Jul 2018 15:50:18 -0400 Subject: [PATCH] screenshot plugin: rename "raids" to "chambers of xeric" Co-authored-by: Magic fTail --- .../net/runelite/api/widgets/WidgetID.java | 2 +- .../plugins/screenshot/ScreenshotPlugin.java | 20 +++++++++---------- .../screenshot/ScreenshotPluginTest.java | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 6f044ae09e..92b118ca7e 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -91,7 +91,7 @@ public class WidgetID public static final int BLAST_FURNACE_GROUP_ID = 474; public static final int WORLD_MAP_GROUP_ID = 595; public static final int PYRAMID_PLUNDER_GROUP_ID = 428; - public static final int RAIDS_REWARD_GROUP_ID = 539; + public static final int CHAMBERS_OF_XERIC_REWARD_GROUP_ID = 539; public static final int EXPERIENCE_TRACKER_GROUP_ID = 122; public static final int TITHE_FARM_GROUP_ID = 241; public static final int KINGDOM_GROUP_ID = 392; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 2ee51069e4..44109bcdcc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -61,7 +61,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.BARROWS_REWARD_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.RAIDS_REWARD_GROUP_ID; +import static net.runelite.api.widgets.WidgetID.CHAMBERS_OF_XERIC_REWARD_GROUP_ID; import static net.runelite.api.widgets.WidgetID.CLUE_SCROLL_REWARD_GROUP_ID; import static net.runelite.api.widgets.WidgetID.DIALOG_SPRITE_GROUP_ID; import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID; @@ -131,7 +131,7 @@ public class ScreenshotPlugin extends Plugin private Integer barrowsNumber; - private Integer raidsNumber; + private Integer chambersOfXericNumber; private boolean shouldTakeScreenshot; @@ -302,7 +302,7 @@ public class ScreenshotPlugin extends Plugin Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage)); if (m.find()) { - raidsNumber = Integer.valueOf(m.group()); + chambersOfXericNumber = Integer.valueOf(m.group()); return; } } @@ -330,7 +330,7 @@ public class ScreenshotPlugin extends Plugin { case QUEST_COMPLETED_GROUP_ID: case CLUE_SCROLL_REWARD_GROUP_ID: - case RAIDS_REWARD_GROUP_ID: + case CHAMBERS_OF_XERIC_REWARD_GROUP_ID: case BARROWS_REWARD_GROUP_ID: if (!config.screenshotRewards()) { @@ -360,15 +360,15 @@ public class ScreenshotPlugin extends Plugin takeScreenshot(fileName); break; } - case RAIDS_REWARD_GROUP_ID: + case CHAMBERS_OF_XERIC_REWARD_GROUP_ID: { - if (raidsNumber == null) + if (chambersOfXericNumber == null) { return; } - fileName = "Chambers of Xeric(" + raidsNumber + ")"; - raidsNumber = null; + fileName = "Chambers of Xeric(" + chambersOfXericNumber + ")"; + chambersOfXericNumber = null; break; } case BARROWS_REWARD_GROUP_ID: @@ -592,8 +592,8 @@ public class ScreenshotPlugin extends Plugin } @VisibleForTesting - int getRaidsNumber() + int getChambersOfXericNumber() { - return raidsNumber; + return chambersOfXericNumber; } } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java index a8ddeda280..9bd57f8efc 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java @@ -61,7 +61,7 @@ public class ScreenshotPluginTest { private static final String CLUE_SCROLL = "You have completed 28 medium Treasure Trails"; private static final String BARROWS_CHEST = "Your Barrows chest count is 310"; - private static final String RAIDS_CHEST = "Your completed Chambers of Xeric count is: 489."; + private static final String CHAMBERS_OF_XERIC_CHEST = "Your completed Chambers of Xeric count is: 489."; @Mock @Bind @@ -124,10 +124,10 @@ public class ScreenshotPluginTest @Test public void testChambersOfXericChest() { - ChatMessage chatMessageEvent = new ChatMessage(SERVER, "Seth", RAIDS_CHEST, null); + ChatMessage chatMessageEvent = new ChatMessage(SERVER, "Seth", CHAMBERS_OF_XERIC_CHEST, null); screenshotPlugin.onChatMessage(chatMessageEvent); - assertEquals(489, screenshotPlugin.getRaidsNumber()); + assertEquals(489, screenshotPlugin.getChambersOfXericNumber()); } @Test