From fb3225ec344cfbd4ce619c836cd74011b62e7edf Mon Sep 17 00:00:00 2001 From: Seth Date: Mon, 12 Mar 2018 18:31:39 -0500 Subject: [PATCH] fishing plugin: remove broken minnow npcs and swap to graphic check previous "bad" minnow spot (npc ID 7734) was removed/changed to something different and now the fishing spot will just change graphic animation when the spot is bad. --- runelite-api/src/main/java/net/runelite/api/GraphicID.java | 1 + .../client/plugins/fishing/FishingSpotMinimapOverlay.java | 3 ++- .../runelite/client/plugins/fishing/FishingSpotOverlay.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/GraphicID.java b/runelite-api/src/main/java/net/runelite/api/GraphicID.java index 4d4622c9c1..7ef582f2d6 100644 --- a/runelite-api/src/main/java/net/runelite/api/GraphicID.java +++ b/runelite-api/src/main/java/net/runelite/api/GraphicID.java @@ -35,4 +35,5 @@ public class GraphicID public static final int ICE_BARRAGE = 369; public static final int VENGEANCE = 726; public static final int IMBUED_HEART = 1316; + public static final int FLYING_FISH = 1387; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java index 5a455ca906..3c8eeb3a29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; import javax.inject.Inject; +import net.runelite.api.GraphicID; import net.runelite.api.NPC; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; @@ -65,7 +66,7 @@ class FishingSpotMinimapOverlay extends Overlay continue; } - Color color = npc.getId() == FishingSpot.FLYING_FISH ? Color.RED : Color.CYAN; + Color color = npc.getGraphic() == GraphicID.FLYING_FISH ? Color.RED : Color.CYAN; net.runelite.api.Point minimapLocation = npc.getMinimapLocation(); if (minimapLocation != null) 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 a79bfb76ab..bdb30af5af 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 @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.image.BufferedImage; import javax.inject.Inject; +import net.runelite.api.GraphicID; import net.runelite.api.NPC; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.Overlay; @@ -72,7 +73,7 @@ class FishingSpotOverlay extends Overlay continue; } - Color color = npc.getId() == FishingSpot.FLYING_FISH ? Color.RED : Color.CYAN; + Color color = npc.getGraphic() == GraphicID.FLYING_FISH ? Color.RED : Color.CYAN; if (config.showIcons()) { BufferedImage fishImage = getFishImage(spot);