From 842749fe1566f6ba06f33b5f8008d0822ee8064a Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Mon, 4 May 2020 11:48:19 -0700 Subject: [PATCH] Move heart sprite recolors to public package --- .../client/game/AlternateSprites.java | 32 ++++++++++++++++++ .../client/plugins/poison/PoisonPlugin.java | 7 ++-- .../{plugins/poison => game}/1067-DISEASE.png | Bin .../{plugins/poison => game}/1067-POISON.png | Bin .../{plugins/poison => game}/1067-VENOM.png | Bin 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/game/AlternateSprites.java rename runelite-client/src/main/resources/net/runelite/client/{plugins/poison => game}/1067-DISEASE.png (100%) rename runelite-client/src/main/resources/net/runelite/client/{plugins/poison => game}/1067-POISON.png (100%) rename runelite-client/src/main/resources/net/runelite/client/{plugins/poison => game}/1067-VENOM.png (100%) diff --git a/runelite-client/src/main/java/net/runelite/client/game/AlternateSprites.java b/runelite-client/src/main/java/net/runelite/client/game/AlternateSprites.java new file mode 100644 index 0000000000..7455deed41 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/game/AlternateSprites.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2020 Jordan + * 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.game; + +public class AlternateSprites +{ + public static final String DISEASE_HEART = "1067-DISEASE.png"; + public static final String POISON_HEART = "1067-POISON.png"; + public static final String VENOM_HEART = "1067-VENOM.png"; +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java index cc53e2e9b9..22386a90ba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java @@ -44,6 +44,7 @@ import net.runelite.api.events.VarbitChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.game.AlternateSprites; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -70,9 +71,9 @@ public class PoisonPlugin extends Plugin static { - HEART_DISEASE = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(PoisonPlugin.class, "1067-DISEASE.png"), 26, 26); - HEART_POISON = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(PoisonPlugin.class, "1067-POISON.png"), 26, 26); - HEART_VENOM = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(PoisonPlugin.class, "1067-VENOM.png"), 26, 26); + HEART_DISEASE = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.DISEASE_HEART), 26, 26); + HEART_POISON = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.POISON_HEART), 26, 26); + HEART_VENOM = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.VENOM_HEART), 26, 26); } @Inject diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/poison/1067-DISEASE.png b/runelite-client/src/main/resources/net/runelite/client/game/1067-DISEASE.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/poison/1067-DISEASE.png rename to runelite-client/src/main/resources/net/runelite/client/game/1067-DISEASE.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/poison/1067-POISON.png b/runelite-client/src/main/resources/net/runelite/client/game/1067-POISON.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/poison/1067-POISON.png rename to runelite-client/src/main/resources/net/runelite/client/game/1067-POISON.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/poison/1067-VENOM.png b/runelite-client/src/main/resources/net/runelite/client/game/1067-VENOM.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/poison/1067-VENOM.png rename to runelite-client/src/main/resources/net/runelite/client/game/1067-VENOM.png