From 5db59f083ef1e3999ca547d52eeaaf90166b1cdd Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Jun 2021 17:23:13 -0400 Subject: [PATCH] screenshot plugin: consolidate kill count fields --- .../plugins/screenshot/ScreenshotPlugin.java | 82 ++++++++----------- .../screenshot/ScreenshotPluginTest.java | 6 +- 2 files changed, 39 insertions(+), 49 deletions(-) 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 28449b69ca..6fe20b9c33 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 @@ -122,13 +122,16 @@ public class ScreenshotPlugin extends Plugin private String clueType; private Integer clueNumber; - private Integer barrowsNumber; + enum KillType + { + BARROWS, + COX, + COX_CM, + TOB + } - private Integer chambersOfXericNumber; - - private Integer chambersOfXericChallengeNumber; - - private Integer theatreOfBloodNumber; + private KillType killType; + private Integer killCountNumber; private boolean shouldTakeScreenshot; @@ -346,7 +349,8 @@ public class ScreenshotPlugin extends Plugin Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage)); if (m.find()) { - barrowsNumber = Integer.valueOf(m.group()); + killType = KillType.BARROWS; + killCountNumber = Integer.valueOf(m.group()); return; } } @@ -356,7 +360,8 @@ public class ScreenshotPlugin extends Plugin Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage)); if (m.find()) { - chambersOfXericNumber = Integer.valueOf(m.group()); + killType = KillType.COX; + killCountNumber = Integer.valueOf(m.group()); return; } } @@ -366,7 +371,8 @@ public class ScreenshotPlugin extends Plugin Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage)); if (m.find()) { - chambersOfXericChallengeNumber = Integer.valueOf(m.group()); + killType = KillType.COX_CM; + killCountNumber = Integer.valueOf(m.group()); return; } } @@ -376,7 +382,8 @@ public class ScreenshotPlugin extends Plugin Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage)); if (m.find()) { - theatreOfBloodNumber = Integer.valueOf(m.group()); + killType = KillType.TOB; + killCountNumber = Integer.valueOf(m.group()); return; } } @@ -515,47 +522,48 @@ public class ScreenshotPlugin extends Plugin } case CHAMBERS_OF_XERIC_REWARD_GROUP_ID: { - if (chambersOfXericNumber != null) + if (killType == KillType.COX) { - fileName = "Chambers of Xeric(" + chambersOfXericNumber + ")"; + fileName = "Chambers of Xeric(" + killCountNumber + ")"; screenshotSubDir = "Boss Kills"; - chambersOfXericNumber = null; + killType = null; + killCountNumber = 0; break; } - else if (chambersOfXericChallengeNumber != null) + else if (killType == KillType.COX_CM) { - fileName = "Chambers of Xeric Challenge Mode(" + chambersOfXericChallengeNumber + ")"; + fileName = "Chambers of Xeric Challenge Mode(" + killCountNumber + ")"; screenshotSubDir = "Boss Kills"; - chambersOfXericChallengeNumber = null; + killType = null; + killCountNumber = 0; break; } - else - { - return; - } + return; } case THEATRE_OF_BLOOD_REWARD_GROUP_ID: { - if (theatreOfBloodNumber == null) + if (killType != KillType.TOB) { return; } - fileName = "Theatre of Blood(" + theatreOfBloodNumber + ")"; + fileName = "Theatre of Blood(" + killCountNumber + ")"; screenshotSubDir = "Boss Kills"; - theatreOfBloodNumber = null; + killType = null; + killCountNumber = 0; break; } case BARROWS_REWARD_GROUP_ID: { - if (barrowsNumber == null) + if (killType != KillType.BARROWS) { return; } - fileName = "Barrows(" + barrowsNumber + ")"; + fileName = "Barrows(" + killCountNumber + ")"; screenshotSubDir = "Boss Kills"; - barrowsNumber = null; + killType = null; + killCountNumber = 0; break; } case LEVEL_UP_GROUP_ID: @@ -769,26 +777,8 @@ public class ScreenshotPlugin extends Plugin } @VisibleForTesting - int getBarrowsNumber() + int getKillCountNumber() { - return barrowsNumber; - } - - @VisibleForTesting - int getChambersOfXericNumber() - { - return chambersOfXericNumber; - } - - @VisibleForTesting - int getChambersOfXericChallengeNumber() - { - return chambersOfXericChallengeNumber; - } - - @VisibleForTesting - int gettheatreOfBloodNumber() - { - return theatreOfBloodNumber; + return killCountNumber; } } 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 edd5101817..06885f4854 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 @@ -143,7 +143,7 @@ public class ScreenshotPluginTest ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Seth", BARROWS_CHEST, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); - assertEquals(310, screenshotPlugin.getBarrowsNumber()); + assertEquals(310, screenshotPlugin.getKillCountNumber()); } @Test @@ -152,7 +152,7 @@ public class ScreenshotPluginTest ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Seth", CHAMBERS_OF_XERIC_CHEST, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); - assertEquals(489, screenshotPlugin.getChambersOfXericNumber()); + assertEquals(489, screenshotPlugin.getKillCountNumber()); } @Test @@ -161,7 +161,7 @@ public class ScreenshotPluginTest ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Magic fTail", THEATRE_OF_BLOOD_CHEST, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); - assertEquals(73, screenshotPlugin.gettheatreOfBloodNumber()); + assertEquals(73, screenshotPlugin.getKillCountNumber()); } @Test