From 39ac378f4d71a9d8c5f28ac357213ac23f6bd043 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Wed, 18 Jul 2018 00:09:09 -0700 Subject: [PATCH] kingdom plugin: Use Item ID for overlay image --- .../kingdomofmiscellania/KingdomPlugin.java | 19 ++++++------------ .../kingdomofmiscellania/teak_chest.png | Bin 1755 -> 0 bytes 2 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/kingdomofmiscellania/teak_chest.png diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java index 9da8c27813..09302135f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java @@ -26,16 +26,16 @@ package net.runelite.client.plugins.kingdomofmiscellania; import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.Subscribe; -import java.awt.image.BufferedImage; -import javax.imageio.ImageIO; import javax.inject.Inject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; +import static net.runelite.api.ItemID.TEAK_CHEST; import net.runelite.api.Varbits; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.VarbitChanged; +import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @@ -57,20 +57,13 @@ public class KingdomPlugin extends Plugin @Inject private InfoBoxManager infoBoxManager; + @Inject + private ItemManager itemManager; + @Getter private int favor = 0, coffer = 0; private KingdomCounter counter; - private BufferedImage counterImage; - - @Override - protected void startUp() throws Exception - { - synchronized (ImageIO.class) - { - counterImage = ImageIO.read(getClass().getResourceAsStream("teak_chest.png")); - } - } @Override protected void shutDown() throws Exception @@ -112,7 +105,7 @@ public class KingdomPlugin extends Plugin { if (counter == null) { - counter = new KingdomCounter(counterImage, this); + counter = new KingdomCounter(itemManager.getImage(TEAK_CHEST), this); infoBoxManager.addInfoBox(counter); log.debug("Added Kingdom Infobox"); } diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/kingdomofmiscellania/teak_chest.png b/runelite-client/src/main/resources/net/runelite/client/plugins/kingdomofmiscellania/teak_chest.png deleted file mode 100644 index 9fc9961b4f3076db19cd59844754f7a3c9000718..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1755 zcmeAS@N?(olHy`uVBq!ia0vp^azHH2!3-p0l+P;zDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIHvP03SRQf9QK&T7x-ZfxvrZtiPso!Hhk zxubn*SLd{z?iqc(v-ekHhb2JIkQ*Jox6Je{Iv@f ztXs5b!;&Q%mo440a>cgQtG2IMvvb|Lof|gn-nenk=FR)IZaKJP`=OmXkL=!kbkCk+ z`}Q5*zyIW+gQpH30tebCF&sjm@S&nHFat1@1o;L3AK8E*_&d8QFitrOJR*x382Et6 zobM2$sD@VqP*AeOHKHUqKdq!Zu_%=xATcwqM9*JZOD1Q-&QhtC#KHRD>_bYa=r&aDmHD>~R%pDg0YdhgkDb<6wzY-M{xZI1sv zYI)ya^Je4DrxTes{PvQ$d~0{?0YSD8XIFnOn8N7r+U{xXQt&Ge6~AxSVkQ zLd3M`DG@qYhF|pmLj$6G5_&xStULy{&zMT&u8-~a@6CTHsj2h)#nfe&H?6y0fAhTby*nCQlDmE~ z{TBMad)D_7q4@TG)s`y($z3*e=j0FW$iJGrhb44s&xM1fcmEY!iGF*|=vYOn)!hrm va~+=?tUH@Ln=9`H@1Y&CAF2ZRdFI!@ycKD1?!Q?nsDSWv^>bP0l+XkKr)SEw