From 2ccb2c7f5b5d6f35a507a05a5c0cf37ca5309306 Mon Sep 17 00:00:00 2001
From: Jordan Atwood <jordan.atwood423@gmail.com>
Date: Wed, 18 Jul 2018 17:13:51 -0700
Subject: [PATCH] fight caves plugin: Use Sprite IDs for overlay images

---
 .../plugins/fightcave/FightCaveOverlay.java   |  50 +++---------------
 .../resources/prayers/protect_from_magic.png  | Bin 254 -> 0 bytes
 .../prayers/protect_from_missiles.png         | Bin 220 -> 0 bytes
 3 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 runelite-client/src/main/resources/prayers/protect_from_magic.png
 delete mode 100644 runelite-client/src/main/resources/prayers/protect_from_missiles.png

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
index cb718637da..b1b33e724e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
@@ -28,11 +28,11 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
-import javax.imageio.ImageIO;
 import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
+import net.runelite.api.SpriteID;
+import net.runelite.client.game.SpriteManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
@@ -47,17 +47,17 @@ public class FightCaveOverlay extends Overlay
 
 	private final Client client;
 	private final FightCavePlugin plugin;
+	private final SpriteManager spriteManager;
 	private final PanelComponent imagePanelComponent = new PanelComponent();
-	private BufferedImage protectFromMagicImg;
-	private BufferedImage protectFromMissilesImg;
 
 	@Inject
-	private FightCaveOverlay(Client client, FightCavePlugin plugin)
+	private FightCaveOverlay(Client client, FightCavePlugin plugin, SpriteManager spriteManager)
 	{
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 		setPriority(OverlayPriority.HIGH);
 		this.client = client;
 		this.plugin = plugin;
+		this.spriteManager = spriteManager;
 	}
 
 	@Override
@@ -83,43 +83,7 @@ public class FightCaveOverlay extends Overlay
 
 	private BufferedImage getPrayerImage(JadAttack attack)
 	{
-		return attack == JadAttack.MAGIC ? getProtectFromMagicImage() : getProtectFromMissilesImage();
-	}
-
-	private BufferedImage getProtectFromMagicImage()
-	{
-		if (protectFromMagicImg == null)
-		{
-			String path = "/prayers/protect_from_magic.png";
-			protectFromMagicImg = getImage(path);
-		}
-		return protectFromMagicImg;
-	}
-
-	private BufferedImage getProtectFromMissilesImage()
-	{
-		if (protectFromMissilesImg == null)
-		{
-			String path = "/prayers/protect_from_missiles.png";
-			protectFromMissilesImg = getImage(path);
-		}
-		return protectFromMissilesImg;
-	}
-
-	private BufferedImage getImage(String path)
-	{
-		BufferedImage image = null;
-		try
-		{
-			synchronized (ImageIO.class)
-			{
-				image = ImageIO.read(FightCaveOverlay.class.getResourceAsStream(path));
-			}
-		}
-		catch (IOException e)
-		{
-			log.warn("Error loading image", e);
-		}
-		return image;
+		final int prayerSpriteID = attack == JadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
+		return spriteManager.getSprite(prayerSpriteID, 0);
 	}
 }
diff --git a/runelite-client/src/main/resources/prayers/protect_from_magic.png b/runelite-client/src/main/resources/prayers/protect_from_magic.png
deleted file mode 100644
index b71e1d395f683ca6150ae39b926c29d074e1555a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmV<a00IArP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp20002RNkl<Zc-pnr
zI}QRd3<OZqthf)S<S2VMS_&u@Z4oq#CSf=BL~{K!vGa*AtxLql6;5nj9^bNHm}Ey@
z&+uZH$dYW7sH|s<*b*tknh22wSravgQ<e8;2i{Sfs@ER{O<{c9@V1peqj7FXDZ~J#
zx!<loSP8_4f=&&@k-jKsDpjv9oTfpkF~^Iuw{3`}4liQ3WeQ3kUd9kmP<jGKn1ZIS
zq$8MutXLZQHy}I|>8GPN`dnpChx$8M{uAowI;xEI0b!SxPD#W9s{jB107*qoM6N<$
Eg4{1=YybcN

diff --git a/runelite-client/src/main/resources/prayers/protect_from_missiles.png b/runelite-client/src/main/resources/prayers/protect_from_missiles.png
deleted file mode 100644
index 210e0ff6d639b57de416f970b83b1573e2abd54b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gji#=T&Ln>}1CoEtvFf#aayiIZi
zV?x{7l<MxLl}U`d9-gS_s%<=5uu#Qujo74AL9@e&Vhh+MUBwin`3{+_+M}Vjd=;z0
z;fcD+x0y<=KQx|`!o9&&Pw{Z)HiqdBUr6@6YFnIcG)uy-EYPv*VaUm~$~OvXJbShD
zj)yJ_HjTJ2Il3^Gzm&&)`-00ens>D&Z)Rv&8D{;EOR4Kragx$ZHBpPTvlJLQZY}t?
UbQRlWpmP~KUHx3vIVCg!02zE#GXMYp