From 42570da973eacab3fb7f3b2ab83fc2dd41c28575 Mon Sep 17 00:00:00 2001 From: Tyler Hardy Date: Tue, 24 Oct 2017 20:03:38 -0400 Subject: [PATCH] runelite-client: update fishing plugin to use new item image sprites --- .../client/plugins/fishing/FishingSpot.java | 10 +++++----- .../client/plugins/fishing/FishingSpotOverlay.java | 14 ++++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java index 6b9823c618..b3b889a8f6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java @@ -93,7 +93,7 @@ public enum FishingSpot private static final Map fishingSpots = new HashMap<>(); private final String name; - private final int itemSpriteId; + private final int fishSpriteId; private final int[] spots; static @@ -109,10 +109,10 @@ public enum FishingSpot } } - FishingSpot(String spot, int itemSpriteId, int... spots) + FishingSpot(String spot, int fishSpriteId, int... spots) { this.name = spot; - this.itemSpriteId = itemSpriteId; + this.fishSpriteId = fishSpriteId; this.spots = spots; } @@ -121,9 +121,9 @@ public enum FishingSpot return name; } - public int getItemSpriteId() + public int getFishSpriteId() { - return itemSpriteId; + return fishSpriteId; } public int[] getIds() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java index 8f2cc6503c..084b46cd32 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java @@ -28,14 +28,15 @@ import com.google.common.primitives.Ints; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; +import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.NPC; -import net.runelite.api.SpritePixels; import net.runelite.api.queries.NPCQuery; import net.runelite.client.RuneLite; +import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; @@ -81,10 +82,10 @@ class FishingSpotOverlay extends Overlay Color color = npc.getId() == FishingSpot.FLYING_FISH ? Color.RED : Color.CYAN; if (config.showIcons()) { - SpritePixels fishSprite = getFishSprite(spot); - if (fishSprite != null) + BufferedImage fishImage = getFishImage(spot); + if (fishImage != null) { - OverlayUtil.renderActorOverlaySprite(graphics, npc, fishSprite, color.darker()); + OverlayUtil.renderActorOverlayImage(graphics, npc, fishImage, color.darker()); } } else @@ -97,9 +98,10 @@ class FishingSpotOverlay extends Overlay return null; } - private SpritePixels getFishSprite(FishingSpot spot) + private BufferedImage getFishImage(FishingSpot spot) { - return client.createItemSprite(spot.getItemSpriteId(), 5, 1, SpritePixels.DEFAULT_SHADOW_COLOR, 0, false); + BufferedImage fishImage = ItemManager.getImage(spot.getFishSpriteId()); + return fishImage; } public void updateConfig()