diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index d763eff4d5..cdf28b582a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -1,6 +1,7 @@ /* * Copyright (c) 2017, Seth * Copyright (c) 2017, Adam + * Copyright (c) 2018, Jordan Atwood * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,94 +27,95 @@ package net.runelite.client.plugins.timers; import java.awt.image.BufferedImage; -import java.io.IOException; import java.time.Duration; import java.time.temporal.ChronoUnit; -import javax.imageio.ImageIO; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.GraphicID; +import net.runelite.api.ItemID; +import net.runelite.api.SpriteID; +import net.runelite.client.game.ItemManager; +import net.runelite.client.game.SpriteManager; @Slf4j public enum GameTimer { - STAMINA("stamina", "Stamina", 2, ChronoUnit.MINUTES), - ANTIFIRE("antifire", "Antifire", 6, ChronoUnit.MINUTES), - EXANTIFIRE("exantifire", "Extended antifire", 12, ChronoUnit.MINUTES), - OVERLOAD("overload", "Overload", 5, ChronoUnit.MINUTES), - CANNON("cannon", "Cannon", 25, ChronoUnit.MINUTES), - MAGICIMBUE("magicimbue", "Magic imbue", 12, ChronoUnit.SECONDS), - FULLTB("teleblock", "Full Teleblock", 5, ChronoUnit.MINUTES), - HALFTB("teleblock", "Half Teleblock", 150, ChronoUnit.SECONDS), - ANTIVENOMPLUS("antivenomplus", "Anti-venom+", 3, ChronoUnit.MINUTES), - SUPERANTIFIRE("superantifire", "Super antifire", 3, ChronoUnit.MINUTES), - ANTIDOTEPLUSPLUS("antidoteplusplus", "Antidote++", 12, ChronoUnit.MINUTES), - BIND("bind", "Bind", GraphicID.BIND, 5, ChronoUnit.SECONDS), - HALFBIND("bind", "Half Bind", GraphicID.BIND, 2500, ChronoUnit.MILLIS), - SNARE("snare", "Snare", GraphicID.SNARE, 10, ChronoUnit.SECONDS), - HALFSNARE("snare", "Half Snare", GraphicID.SNARE, 5, ChronoUnit.SECONDS), - ENTANGLE("entangle", "Engangle", GraphicID.ENTANGLE, 15, ChronoUnit.SECONDS), - HALFENTANGLE("entangle", "Half Entangle", GraphicID.ENTANGLE, 7500, ChronoUnit.MILLIS), - ICERUSH("icerush", "Ice rush", GraphicID.ICE_RUSH, 5, ChronoUnit.SECONDS), - ICEBURST("iceburst", "Ice burst", GraphicID.ICE_BURST, 10, ChronoUnit.SECONDS), - ICEBLITZ("iceblitz", "Ice blitz", GraphicID.ICE_BLITZ, 15, ChronoUnit.SECONDS), - ICEBARRAGE("icebarrage", "Ice barrage", GraphicID.ICE_BARRAGE, 20, ChronoUnit.SECONDS), - IMBUEDHEART("imbuedheart", "Imbued heart", GraphicID.IMBUED_HEART, 420, ChronoUnit.SECONDS), - VENGEANCE("vengeance", "Vengeance", GraphicID.VENGEANCE, 30, ChronoUnit.SECONDS), - VENGEANCEOTHER("vengeanceother", "Vengeance Other", GraphicID.VENGEANCE_OTHER, 30, ChronoUnit.SECONDS), - ANTIDOTEPLUS("antidoteplus", "Antidote+", 518, ChronoUnit.SECONDS), - ANTIVENOM("antivenom", "Anti-venom", 12, ChronoUnit.MINUTES), - EXSUPERANTIFIRE("exsuperantifire", "Extended Super AntiFire", 6, ChronoUnit.MINUTES), - SANFEW("sanfew", "Sanfew serum", 6, ChronoUnit.MINUTES), - OVERLOAD_RAID("overloadraid", "Overload", 5, ChronoUnit.MINUTES), - PRAYER_ENHANCE("prayerenhance", "Prayer enhance", 275, ChronoUnit.SECONDS), - GOD_WARS_ALTAR("altar", "God wars altar", 10, ChronoUnit.MINUTES), - ANTIPOISON("antipoison", "Antipoison", 90, ChronoUnit.SECONDS), - SUPERANTIPOISON("superantipoison", "Superantipoison", 346, ChronoUnit.SECONDS), - CHARGE("charge", "Charge", 6, ChronoUnit.MINUTES), - STAFF_OF_THE_DEAD("staffofthedead", "Staff of the Dead", 1, ChronoUnit.MINUTES); + STAMINA(ItemID.STAMINA_POTION4, GameTimerImageType.ITEM, "Stamina", 2, ChronoUnit.MINUTES), + ANTIFIRE(ItemID.ANTIFIRE_POTION4, GameTimerImageType.ITEM, "Antifire", 6, ChronoUnit.MINUTES), + EXANTIFIRE(ItemID.EXTENDED_ANTIFIRE4, GameTimerImageType.ITEM, "Extended antifire", 12, ChronoUnit.MINUTES), + OVERLOAD(ItemID.OVERLOAD_4, GameTimerImageType.ITEM, "Overload", 5, ChronoUnit.MINUTES), + CANNON(ItemID.CANNON_BARRELS, GameTimerImageType.ITEM, "Cannon", 25, ChronoUnit.MINUTES), + MAGICIMBUE(SpriteID.SPELL_MAGIC_IMBUE, GameTimerImageType.SPRITE, "Magic imbue", 12, ChronoUnit.SECONDS), + FULLTB(SpriteID.SPELL_TELE_BLOCK, GameTimerImageType.SPRITE, "Full Teleblock", 5, ChronoUnit.MINUTES), + HALFTB(SpriteID.SPELL_TELE_BLOCK, GameTimerImageType.SPRITE, "Half Teleblock", 150, ChronoUnit.SECONDS), + ANTIVENOMPLUS(ItemID.ANTIVENOM4_12913, GameTimerImageType.ITEM, "Anti-venom+", 3, ChronoUnit.MINUTES), + SUPERANTIFIRE(ItemID.SUPER_ANTIFIRE_POTION4, GameTimerImageType.ITEM, "Super antifire", 3, ChronoUnit.MINUTES), + ANTIDOTEPLUSPLUS(ItemID.ANTIDOTE4_5952, GameTimerImageType.ITEM, "Antidote++", 12, ChronoUnit.MINUTES), + BIND(SpriteID.SPELL_BIND, GameTimerImageType.SPRITE, "Bind", GraphicID.BIND, 5, ChronoUnit.SECONDS), + HALFBIND(SpriteID.SPELL_BIND, GameTimerImageType.SPRITE, "Half Bind", GraphicID.BIND, 2500, ChronoUnit.MILLIS), + SNARE(SpriteID.SPELL_SNARE, GameTimerImageType.SPRITE, "Snare", GraphicID.SNARE, 10, ChronoUnit.SECONDS), + HALFSNARE(SpriteID.SPELL_SNARE, GameTimerImageType.SPRITE, "Half Snare", GraphicID.SNARE, 5, ChronoUnit.SECONDS), + ENTANGLE(SpriteID.SPELL_ENTANGLE, GameTimerImageType.SPRITE, "Engangle", GraphicID.ENTANGLE, 15, ChronoUnit.SECONDS), + HALFENTANGLE(SpriteID.SPELL_ENTANGLE, GameTimerImageType.SPRITE, "Half Entangle", GraphicID.ENTANGLE, 7500, ChronoUnit.MILLIS), + ICERUSH(SpriteID.SPELL_ICE_RUSH, GameTimerImageType.SPRITE, "Ice rush", GraphicID.ICE_RUSH, 5, ChronoUnit.SECONDS), + ICEBURST(SpriteID.SPELL_ICE_BURST, GameTimerImageType.SPRITE, "Ice burst", GraphicID.ICE_BURST, 10, ChronoUnit.SECONDS), + ICEBLITZ(SpriteID.SPELL_ICE_BLITZ, GameTimerImageType.SPRITE, "Ice blitz", GraphicID.ICE_BLITZ, 15, ChronoUnit.SECONDS), + ICEBARRAGE(SpriteID.SPELL_ICE_BARRAGE, GameTimerImageType.SPRITE, "Ice barrage", GraphicID.ICE_BARRAGE, 20, ChronoUnit.SECONDS), + IMBUEDHEART(ItemID.IMBUED_HEART, GameTimerImageType.ITEM, "Imbued heart", GraphicID.IMBUED_HEART, 420, ChronoUnit.SECONDS), + VENGEANCE(SpriteID.SPELL_VENGEANCE, GameTimerImageType.SPRITE, "Vengeance", GraphicID.VENGEANCE, 30, ChronoUnit.SECONDS), + VENGEANCEOTHER(SpriteID.SPELL_VENGEANCE_OTHER, GameTimerImageType.SPRITE, "Vengeance Other", GraphicID.VENGEANCE_OTHER, 30, ChronoUnit.SECONDS), + ANTIDOTEPLUS(ItemID.ANTIDOTE4, GameTimerImageType.ITEM, "Antidote+", 518, ChronoUnit.SECONDS), + ANTIVENOM(ItemID.ANTIVENOM4, GameTimerImageType.ITEM, "Anti-venom", 12, ChronoUnit.MINUTES), + EXSUPERANTIFIRE(ItemID.EXTENDED_SUPER_ANTIFIRE4, GameTimerImageType.ITEM, "Extended Super AntiFire", 6, ChronoUnit.MINUTES), + SANFEW(ItemID.SANFEW_SERUM4, GameTimerImageType.ITEM, "Sanfew serum", 6, ChronoUnit.MINUTES), + OVERLOAD_RAID(ItemID.OVERLOAD_4_20996, GameTimerImageType.ITEM, "Overload", 5, ChronoUnit.MINUTES), + PRAYER_ENHANCE(ItemID.PRAYER_ENHANCE_4, GameTimerImageType.ITEM, "Prayer enhance", 275, ChronoUnit.SECONDS), + GOD_WARS_ALTAR(SpriteID.SKILL_PRAYER, GameTimerImageType.SPRITE, "God wars altar", 10, ChronoUnit.MINUTES), + ANTIPOISON(ItemID.ANTIPOISON4, GameTimerImageType.ITEM, "Antipoison", 90, ChronoUnit.SECONDS), + SUPERANTIPOISON(ItemID.SUPERANTIPOISON4, GameTimerImageType.ITEM, "Superantipoison", 346, ChronoUnit.SECONDS), + CHARGE(SpriteID.SPELL_CHARGE, GameTimerImageType.SPRITE, "Charge", 6, ChronoUnit.MINUTES), + STAFF_OF_THE_DEAD(ItemID.STAFF_OF_THE_DEAD, GameTimerImageType.ITEM, "Staff of the Dead", 1, ChronoUnit.MINUTES); - @Getter - private final String imageResource; @Getter private final Duration duration; @Getter private final Integer graphicId; @Getter private final String description; + private int imageId = -1; + private GameTimerImageType imageType; private BufferedImage image; - GameTimer(String imageResource, String description, Integer graphicId, long time, ChronoUnit unit) + GameTimer(int imageId, GameTimerImageType idType, String description, Integer graphicId, long time, ChronoUnit unit) { - this.imageResource = imageResource; this.description = description; this.graphicId = graphicId; this.duration = Duration.of(time, unit); + this.imageId = imageId; + this.imageType = idType; } - GameTimer(String imageResource, String description, long time, ChronoUnit unit) + GameTimer(int imageId, GameTimerImageType idType, String description, long time, ChronoUnit unit) { - this(imageResource, description, null, time, unit); + this(imageId, idType, description, null, time, unit); } - public BufferedImage getImage() + public BufferedImage getImage(ItemManager itemManager, SpriteManager spriteManager) { if (image != null) { return image; } - try + switch (imageType) { - synchronized (ImageIO.class) - { - image = ImageIO.read(GameTimer.class.getResourceAsStream(imageResource + ".png")); - } - } - catch (IOException ex) - { - log.warn("unable to load image", ex); + case ITEM: + image = itemManager.getImage(imageId); + break; + case SPRITE: + image = spriteManager.getSprite(imageId, 0); + break; } return image; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimerImageType.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimerImageType.java new file mode 100644 index 0000000000..1d51d05e34 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimerImageType.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018, Jordan Atwood + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.timers; + +enum GameTimerImageType +{ + ITEM, + SPRITE +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java index c3c9f75a1e..92bb4f1d04 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.timers; +import java.awt.image.BufferedImage; import java.time.temporal.ChronoUnit; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBoxPriority; @@ -33,9 +34,9 @@ public class TimerTimer extends Timer { private final GameTimer timer; - public TimerTimer(GameTimer timer, Plugin plugin) + public TimerTimer(GameTimer timer, Plugin plugin, BufferedImage image) { - super(timer.getDuration().toMillis(), ChronoUnit.MILLIS, timer.getImage(), plugin); + super(timer.getDuration().toMillis(), ChronoUnit.MILLIS, image, plugin); this.timer = timer; setPriority(InfoBoxPriority.MED); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index cbbe15343b..df339a1099 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.timers; import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; +import java.awt.image.BufferedImage; import javax.inject.Inject; import net.runelite.api.Actor; import net.runelite.api.AnimationID; @@ -46,6 +47,8 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.game.ItemManager; +import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.timers.GameTimer.ANTIDOTEPLUS; @@ -94,6 +97,12 @@ public class TimersPlugin extends Plugin { private int lastRaidVarb; + @Inject + private ItemManager itemManager; + + @Inject + private SpriteManager spriteManager; + @Inject private Client client; @@ -591,7 +600,8 @@ public class TimersPlugin extends Plugin { removeGameTimer(timer); - TimerTimer t = new TimerTimer(timer, this); + BufferedImage image = timer.getImage(itemManager, spriteManager); + TimerTimer t = new TimerTimer(timer, this, image); t.setTooltip(timer.getDescription()); infoBoxManager.addInfoBox(t); } diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/altar.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/altar.png deleted file mode 100644 index 346d32f4dc..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/altar.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antidoteplus.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antidoteplus.png deleted file mode 100644 index c8e4a89f5d..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antidoteplus.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antidoteplusplus.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antidoteplusplus.png deleted file mode 100644 index e269b23c73..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antidoteplusplus.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antifire.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antifire.png deleted file mode 100644 index cc1d3d2548..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antifire.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png deleted file mode 100644 index 050abed267..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antivenom.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antivenom.png deleted file mode 100644 index 5f67384b7b..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antivenom.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antivenomplus.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antivenomplus.png deleted file mode 100644 index ded709eb2a..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antivenomplus.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/bind.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/bind.png deleted file mode 100644 index cfaa07029c..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/bind.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/cannon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/cannon.png deleted file mode 100644 index b00bdc143b..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/cannon.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/charge.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/charge.png deleted file mode 100644 index ac40b6bb16..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/charge.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/entangle.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/entangle.png deleted file mode 100644 index abe631c595..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/entangle.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/exantifire.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/exantifire.png deleted file mode 100644 index b6007c0d41..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/exantifire.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/exsuperantifire.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/exsuperantifire.png deleted file mode 100644 index 56938b6eae..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/exsuperantifire.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/icebarrage.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/icebarrage.png deleted file mode 100644 index 0b1fd9a050..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/icebarrage.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/iceblitz.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/iceblitz.png deleted file mode 100644 index 49e0cf4ce9..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/iceblitz.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/iceburst.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/iceburst.png deleted file mode 100644 index 141df53986..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/iceburst.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/icerush.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/icerush.png deleted file mode 100644 index 31fa6d49c7..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/icerush.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/imbuedheart.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/imbuedheart.png deleted file mode 100644 index 89e85e4458..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/imbuedheart.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/magicimbue.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/magicimbue.png deleted file mode 100644 index e79369b21b..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/magicimbue.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/overload.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/overload.png deleted file mode 100644 index 7f13b3ad02..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/overload.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/overloadraid.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/overloadraid.png deleted file mode 100644 index 5f76477aaf..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/overloadraid.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/prayerenhance.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/prayerenhance.png deleted file mode 100644 index 7f92cd0344..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/prayerenhance.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/sanfew.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/sanfew.png deleted file mode 100644 index 7b2eaea22b..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/sanfew.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/snare.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/snare.png deleted file mode 100644 index 13f89814c6..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/snare.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png deleted file mode 100644 index 76a2713cce..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/staffofthedead.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/stamina.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/stamina.png deleted file mode 100644 index 77aadd9784..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/stamina.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantifire.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantifire.png deleted file mode 100644 index 6bd815a555..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantifire.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png deleted file mode 100644 index 3b01076737..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/teleblock.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/teleblock.png deleted file mode 100644 index 6b1cfe5258..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/teleblock.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/vengeance.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/vengeance.png deleted file mode 100644 index fd8f60557f..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/vengeance.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/vengeanceother.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/vengeanceother.png deleted file mode 100644 index 3d5f4a0da4..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/vengeanceother.png and /dev/null differ