ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

runelite-client: update fishing plugin to use new item image sprites

Browse Source
This commit is contained in:
Tyler Hardy
2017-10-24 20:03:38 -04:00
committed by Adam
parent 446430324c
commit 42570da973
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
View File

@@ -93,7 +93,7 @@ public enum FishingSpot
private static final Map<Integer, FishingSpot> fishingSpots = new HashMap<>(); private static final Map<Integer, FishingSpot> fishingSpots = new HashMap<>();
private final String name; private final String name;
private final int itemSpriteId; private final int fishSpriteId;
private final int[] spots; private final int[] spots;
static 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.name = spot;
this.itemSpriteId = itemSpriteId; this.fishSpriteId = fishSpriteId;
this.spots = spots; this.spots = spots;
} }
@@ -121,9 +121,9 @@ public enum FishingSpot
return name; return name;
} }
public int getItemSpriteId() public int getFishSpriteId()
{ {
return itemSpriteId; return fishSpriteId;
} }
public int[] getIds() public int[] getIds()

14
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
View File

@@ -28,14 +28,15 @@ import com.google.common.primitives.Ints;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.SpritePixels;
import net.runelite.api.queries.NPCQuery; import net.runelite.api.queries.NPCQuery;
import net.runelite.client.RuneLite; import net.runelite.client.RuneLite;
import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil; 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; Color color = npc.getId() == FishingSpot.FLYING_FISH ? Color.RED : Color.CYAN;
if (config.showIcons()) if (config.showIcons())
{ {
SpritePixels fishSprite = getFishSprite(spot); BufferedImage fishImage = getFishImage(spot);
if (fishSprite != null) if (fishImage != null)
{ {
OverlayUtil.renderActorOverlaySprite(graphics, npc, fishSprite, color.darker()); OverlayUtil.renderActorOverlayImage(graphics, npc, fishImage, color.darker());
} }
} }
else else
@@ -97,9 +98,10 @@ class FishingSpotOverlay extends Overlay
return null; 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() public void updateConfig()