diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotInput.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotInput.java index 1400f94639..0501332eef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotInput.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotInput.java @@ -28,7 +28,7 @@ import java.awt.event.KeyEvent; import java.util.Date; import javax.inject.Inject; import net.runelite.client.input.KeyListener; -import static net.runelite.client.plugins.screenshot.ScreenshotPlugin.TIME_FORMAT; +import static net.runelite.client.plugins.screenshot.ScreenshotPlugin.format; public class ScreenshotInput implements KeyListener { @@ -60,7 +60,7 @@ public class ScreenshotInput implements KeyListener if (event.getKeyCode() == KeyEvent.VK_INSERT) { - plugin.takeScreenshot(TIME_FORMAT.format(new Date())); + plugin.takeScreenshot(format(new Date())); } } 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 19e116adf2..fbf2922a18 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 @@ -102,7 +102,7 @@ public class ScreenshotPlugin extends Plugin private static final HttpUrl IMGUR_IMAGE_UPLOAD_URL = HttpUrl.parse("https://api.imgur.com/3/image"); private static final MediaType JSON = MediaType.parse("application/json"); - static final DateFormat TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); + private static final DateFormat TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)"); private static final Pattern LEVEL_UP_PATTERN = Pattern.compile("Your ([a-zA-Z]+) (?:level is|are)? now (\\d+)\\."); @@ -116,6 +116,14 @@ public class ScreenshotPlugin extends Plugin "Can anyone defeat you? Certainly", "was no match for you", "You were clearly a better fighter than", "RIP", "You have defeated", "What an embarrassing performance by", "was no match for your awesomeness"); + static String format(Date date) + { + synchronized (TIME_FORMAT) + { + return TIME_FORMAT.format(date); + } + } + private String clueType; private Integer clueNumber; @@ -182,7 +190,7 @@ public class ScreenshotPlugin extends Plugin titleBarButton = NavigationButton.builder() .tooltip("Take screenshot") .icon(iconImage) - .onClick(() -> takeScreenshot(TIME_FORMAT.format(new Date()))) + .onClick(() -> takeScreenshot(format(new Date()))) .popup(ImmutableMap .builder() .put("Open screenshot folder...", () -> @@ -259,13 +267,13 @@ public class ScreenshotPlugin extends Plugin if (config.screenshotPet() && PET_MESSAGES.stream().anyMatch(chatMessage::contains)) { - String fileName = "Pet " + TIME_FORMAT.format(new Date()); + String fileName = "Pet " + format(new Date()); takeScreenshot(fileName); } if (config.screenshotKills() && KILL_MESSAGES.stream().anyMatch(chatMessage::contains)) { - String fileName = "Kill " + TIME_FORMAT.format(new Date()); + String fileName = "Kill " + format(new Date()); takeScreenshot(fileName); } }