diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java index 740852ef92..05b217e125 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java @@ -25,9 +25,7 @@ package net.runelite.client.plugins.agility; import java.awt.image.BufferedImage; -import java.io.IOException; import java.time.temporal.ChronoUnit; -import javax.imageio.ImageIO; import lombok.extern.slf4j.Slf4j; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.Timer; @@ -35,32 +33,9 @@ import net.runelite.client.ui.overlay.infobox.Timer; @Slf4j class AgilityArenaTimer extends Timer { - AgilityArenaTimer(Plugin plugin) + AgilityArenaTimer(Plugin plugin, BufferedImage image) { - super(1, ChronoUnit.MINUTES, getTicketImage(), plugin); + super(1, ChronoUnit.MINUTES, image, plugin); setTooltip("Time left until location changes"); } - - private static BufferedImage image; - private static BufferedImage getTicketImage() - { - if (image != null) - { - return image; - } - - try - { - synchronized (ImageIO.class) - { - image = ImageIO.read(AgilityArenaTimer.class.getResourceAsStream( "agilityarenaticket.png")); - } - } - catch (IOException ex) - { - log.warn("unable to load image", ex); - } - - return image; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index 06a33a285c..735a070cf2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -35,6 +35,7 @@ import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Item; import net.runelite.api.ItemID; +import static net.runelite.api.ItemID.AGILITY_ARENA_TICKET; import net.runelite.api.Player; import static net.runelite.api.Skill.AGILITY; import net.runelite.api.Tile; @@ -60,6 +61,7 @@ import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; +import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -101,6 +103,9 @@ public class AgilityPlugin extends Plugin @Inject private AgilityConfig config; + @Inject + private ItemManager itemManager; + @Getter private AgilitySession session; @@ -275,7 +280,7 @@ public class AgilityPlugin extends Plugin private void showNewAgilityArenaTimer() { removeAgilityArenaTimer(); - infoBoxManager.addInfoBox(new AgilityArenaTimer(this)); + infoBoxManager.addInfoBox(new AgilityArenaTimer(this, itemManager.getImage(AGILITY_ARENA_TICKET))); } @Subscribe diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/agility/agilityarenaticket.png b/runelite-client/src/main/resources/net/runelite/client/plugins/agility/agilityarenaticket.png deleted file mode 100644 index 55b841db97..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/agility/agilityarenaticket.png and /dev/null differ