From 1d242172cad390ff983993ce8053e4f87496189d Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 29 Jun 2018 16:44:59 -0700 Subject: [PATCH] fishing plugin: Add cave eel and slimy eel spots Ref: https://user-images.githubusercontent.com/2199511/42118923-8fe9e94a-7bf6-11e8-93b2-e51bbce4fbf6.png https://user-images.githubusercontent.com/2199511/42118912-8c7e82c0-7bf6-11e8-9e07-d429439a73d0.png https://user-images.githubusercontent.com/2199511/42118914-8c982446-7bf6-11e8-9df6-dab9f2b63b4e.png https://user-images.githubusercontent.com/2199511/42118915-8cb14e62-7bf6-11e8-864f-718f48afb134.png https://user-images.githubusercontent.com/2199511/42118916-8cca2964-7bf6-11e8-95ab-2f58d62e6e36.png https://user-images.githubusercontent.com/2199511/42118917-8ce564e0-7bf6-11e8-800e-821c0443100d.png https://user-images.githubusercontent.com/2199511/42118918-8d0b1f28-7bf6-11e8-9304-0149ac8ab9b9.png Fixes runelite/runelite#4091 --- .../client/plugins/fishing/FishingConfig.java | 20 +++++++++++++++++++ .../client/plugins/fishing/FishingPlugin.java | 10 +++++++++- .../client/plugins/fishing/FishingSpot.java | 11 ++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java index e2de40fe5c..75f4f05906 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java @@ -155,6 +155,26 @@ public interface FishingConfig extends Config return true; } + @ConfigItem( + keyName = "showCaveEel", + name = "Show Cave Eel", + description = "Configures whether cave eel is displayed" + ) + default boolean showCaveEel() + { + return true; + } + + @ConfigItem( + keyName = "showSlimyEel", + name = "Show Slimy Eel", + description = "Configures whether slimy eel is displayed" + ) + default boolean showSlimyEel() + { + return true; + } + @ConfigItem( keyName = "showKarambwanji", name = "Show Karambwanji", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 93c1061886..83782ad881 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -173,11 +173,19 @@ public class FishingPlugin extends Plugin if (config.showInfernalEel()) { spotIds.addAll(Ints.asList(FishingSpot.INFERNAL_EEL.getIds())); - } + } if (config.showSacredEel()) { spotIds.addAll(Ints.asList(FishingSpot.SACRED_EEL.getIds())); } + if (config.showCaveEel()) + { + spotIds.addAll(Ints.asList(FishingSpot.CAVE_EEL.getIds())); + } + if (config.showSlimyEel()) + { + spotIds.addAll(Ints.asList(FishingSpot.SLIMY_EEL.getIds())); + } if (config.showKarambwanji()) { spotIds.addAll(Ints.asList(FishingSpot.KARAMBWANJI.getIds())); 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 34a5a2a3b0..f400d0fb7c 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 @@ -27,6 +27,8 @@ package net.runelite.client.plugins.fishing; import java.util.HashMap; import java.util.Map; import net.runelite.api.ItemID; +import static net.runelite.api.NpcID.FISHING_SPOT_1497; +import static net.runelite.api.NpcID.FISHING_SPOT_1498; import static net.runelite.api.NpcID.FISHING_SPOT_1510; import static net.runelite.api.NpcID.FISHING_SPOT_1511; import static net.runelite.api.NpcID.FISHING_SPOT_1518; @@ -41,6 +43,9 @@ import static net.runelite.api.NpcID.FISHING_SPOT_1528; import static net.runelite.api.NpcID.FISHING_SPOT_1530; import static net.runelite.api.NpcID.FISHING_SPOT_1542; import static net.runelite.api.NpcID.FISHING_SPOT_1544; +import static net.runelite.api.NpcID.FISHING_SPOT_2653; +import static net.runelite.api.NpcID.FISHING_SPOT_2654; +import static net.runelite.api.NpcID.FISHING_SPOT_2655; import static net.runelite.api.NpcID.FISHING_SPOT_3913; import static net.runelite.api.NpcID.FISHING_SPOT_3914; import static net.runelite.api.NpcID.FISHING_SPOT_3915; @@ -137,6 +142,12 @@ public enum FishingSpot ), SACRED_EEL("Sacred eel", ItemID.SACRED_EEL, FISHING_SPOT_6488 + ), + CAVE_EEL("Cave eel", ItemID.RAW_CAVE_EEL, + FISHING_SPOT_1497, FISHING_SPOT_1498 + ), + SLIMY_EEL("Slimy eel", ItemID.RAW_SLIMY_EEL, + FISHING_SPOT_2653, FISHING_SPOT_2654, FISHING_SPOT_2655 ); private static final Map fishingSpots = new HashMap<>();