From e9a1326fd40e388f01a9dc5bba6bbe59a15be3eb Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sun, 19 Apr 2020 13:42:31 +0100 Subject: [PATCH] move runepouch rune enum to client/game --- .../Runes.java => game/RunepouchRune.java} | 14 +++++++------- .../client/plugins/runepouch/RunepouchOverlay.java | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) rename runelite-client/src/main/java/net/runelite/client/{plugins/runepouch/Runes.java => game/RunepouchRune.java} (91%) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java b/runelite-client/src/main/java/net/runelite/client/game/RunepouchRune.java similarity index 91% rename from runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java rename to runelite-client/src/main/java/net/runelite/client/game/RunepouchRune.java index 3031aa7b97..f9a863124f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java +++ b/runelite-client/src/main/java/net/runelite/client/game/RunepouchRune.java @@ -22,7 +22,7 @@ * (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.runepouch; +package net.runelite.client.game; import com.google.common.collect.ImmutableMap; @@ -52,7 +52,7 @@ import static net.runelite.api.ItemID.STEAM_RUNE; import static net.runelite.api.ItemID.WATER_RUNE; import static net.runelite.api.ItemID.WRATH_RUNE; -public enum Runes +public enum RunepouchRune { AIR(1, AIR_RUNE), WATER(2, WATER_RUNE), @@ -85,25 +85,25 @@ public enum Runes @Setter private BufferedImage image; - private static final Map runes; + private static final Map runes; static { - ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); - for (Runes rune : values()) + ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); + for (RunepouchRune rune : values()) { builder.put(rune.getId(), rune); } runes = builder.build(); } - Runes(int id, int itemId) + RunepouchRune(int id, int itemId) { this.id = id; this.itemId = itemId; } - public static Runes getRune(int varbit) + public static RunepouchRune getRune(int varbit) { return runes.get(varbit); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 255f3f9ac1..962e47d413 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -35,6 +35,7 @@ import net.runelite.api.Point; import net.runelite.api.Varbits; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.game.ItemManager; +import net.runelite.client.game.RunepouchRune; import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.BOTH; import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.MOUSE_HOVER; import net.runelite.client.ui.FontManager; @@ -100,7 +101,7 @@ public class RunepouchOverlay extends WidgetItemOverlay Varbits runeVarbit = RUNE_VARBITS[i]; int runeId = client.getVar(runeVarbit); - Runes rune = Runes.getRune(runeId); + RunepouchRune rune = RunepouchRune.getRune(runeId); if (rune == null) { continue; @@ -149,7 +150,7 @@ public class RunepouchOverlay extends WidgetItemOverlay } } - private BufferedImage getRuneImage(Runes rune) + private BufferedImage getRuneImage(RunepouchRune rune) { BufferedImage runeImg = rune.getImage(); if (runeImg != null)