From bcaa92905f24d339e069a9c79498e99aa963583e Mon Sep 17 00:00:00 2001
From: Jordan Atwood <jordan.atwood423@gmail.com>
Date: Tue, 17 Jul 2018 18:53:40 -0700
Subject: [PATCH] agility plugin: Use Item ID for arena timer

---
 .../plugins/agility/AgilityArenaTimer.java    |  29 ++----------------
 .../client/plugins/agility/AgilityPlugin.java |   7 ++++-
 .../plugins/agility/agilityarenaticket.png    | Bin 742 -> 0 bytes
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/agility/agilityarenaticket.png

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 55b841db979e8459bbcb8f056b6310fdf5ebc22f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq0012T000~a1^@s6ozJwY00001b5ch_0Itp)
z=>Px%ph-kQR7l6Ymd|PvQ543%$)s3?68i?Og)Ur(2qL)h1&mfuR5UJ>f=D)M#V9JR
z8>RRMl(v#0h-B4;C<tzfP!z-`aN)v*3Qb8enS1X!$Hh!;Cv+y6Ori&dJ2T9k-+bS>
z_sjuOha<u9-@=hvbzW-K`H_H~{_22Qbq)Z)%m9GnXRiYgCo44HTiu+!>Ht|7|43<n
z;PkoK%xd##?2G~@#+o1*F0J`Eb#bu5xCd<rh8WuLDC`Y@QCJ5!xw8#p2!;sSFoYR~
z7(|RymlrZwoCh3v^YVTyurThy*90Ph(F78K(FE7c!F6+)m2R6Ez*?9XYeFdvr3`#!
zU?}(~*Uf=KrPaqX$g*#{pp(12P@RD?21*%d9gF}VEFkKvWC1f{>CvTu!8WJwU(edy
z{e1e#KCt`zeh3HeBw}#5a+w*-0%CzM;bQrD>imXE#W^~C*Q$%g#^Ptxm%sD`63Z~f
zA+Txj;9)Q`D7?GpRvkZX7q(57;$9F7m<3FXnHx)~)H-q1=-t~X0Ko6>N31%3<?GfX
zC#Jd-cAzAJE3?ae!HH$?#eqZEae7~uodB$*o%1MAm_f`aS5|t0^GU$2nmYiHNCw}h
z(a^8H*#(mp$jrER?PSkwln5=Yuc5TQX7kp`VLu>qFjmUNL~smLoYMN5&51B2E}A4D
z5rbH8^Xjoko3qvKq}a@kJbO^GdF=-TfXzl5T8Gt4YY+<>o(m>IZS^Bk{vjNBGIyaT
z5CAqdTkw4aB8Ji$^=8h3qE6=1R*@v2?`t$Y1>aZjm4P-UR3)gbez2ec8nbS-5AU1-
zg%&m%Z8SZFR;wLrVH_+2Gyqr1#V%Nqg&DiS`1ti_6P~a7S~yzh27w8gU_*8L!*=<9
Y0aVq-g_Ue2?EnA(07*qoM6N<$f-~z=f&c&j