From 55f79acfef31975ebb5693d20695de429049dc32 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 16 Feb 2018 11:24:17 +0100 Subject: [PATCH] Add support for Karambwan/Karambwanji to fishing - Add support for Karambwan fishing spots - Add support for Karambwanji/Shrimp fishing spots Karambwan fishing is now great again and this is needed. Signed-off-by: Tomas Slusny --- .../client/plugins/fishing/FishingConfig.java | 19 +++++++++++++++++++ .../client/plugins/fishing/FishingPlugin.java | 8 ++++++++ .../client/plugins/fishing/FishingSpot.java | 17 +++++++++++++---- 3 files changed, 40 insertions(+), 4 deletions(-) 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 7d6e9f5c1b..f8e7343d6a 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 @@ -145,4 +145,23 @@ public interface FishingConfig extends Config return true; } + @ConfigItem( + keyName = "showKarambwanji", + name = "Show Karambwanji", + description = "Configures whether karambwanji is displayed" + ) + default boolean showKarambwanji() + { + return true; + } + + @ConfigItem( + keyName = "showKarambwan", + name = "Show Karambwan", + description = "Configures whether karambwan is displayed" + ) + default boolean showKarambwan() + { + return true; + } } 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 0e384f2887..8173a7c477 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 @@ -165,6 +165,14 @@ public class FishingPlugin extends Plugin { spotIds.addAll(Ints.asList(FishingSpot.INFERNAL_EEL.getIds())); } + if (config.showKarambwanji()) + { + spotIds.addAll(Ints.asList(FishingSpot.KARAMBWANJI.getIds())); + } + if (config.showKarambwan()) + { + spotIds.addAll(Ints.asList(FishingSpot.KARAMBWAN.getIds())); + } } @Subscribe 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 00b9a5d0f9..72d6b111d7 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 @@ -24,10 +24,9 @@ */ package net.runelite.client.plugins.fishing; -import net.runelite.api.ItemID; - import java.util.HashMap; import java.util.Map; +import net.runelite.api.ItemID; import static net.runelite.api.NpcID.FISHING_SPOT_1506; import static net.runelite.api.NpcID.FISHING_SPOT_1508; import static net.runelite.api.NpcID.FISHING_SPOT_1510; @@ -47,18 +46,21 @@ 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_4316; +import static net.runelite.api.NpcID.FISHING_SPOT_4710; +import static net.runelite.api.NpcID.FISHING_SPOT_4712; +import static net.runelite.api.NpcID.FISHING_SPOT_4713; import static net.runelite.api.NpcID.FISHING_SPOT_6825; import static net.runelite.api.NpcID.FISHING_SPOT_7155; import static net.runelite.api.NpcID.FISHING_SPOT_7199; import static net.runelite.api.NpcID.FISHING_SPOT_7200; import static net.runelite.api.NpcID.FISHING_SPOT_7469; import static net.runelite.api.NpcID.FISHING_SPOT_7470; +import static net.runelite.api.NpcID.FISHING_SPOT_7676; import static net.runelite.api.NpcID.FISHING_SPOT_7730; import static net.runelite.api.NpcID.FISHING_SPOT_7731; import static net.runelite.api.NpcID.FISHING_SPOT_7732; import static net.runelite.api.NpcID.FISHING_SPOT_7733; import static net.runelite.api.NpcID.FISHING_SPOT_7734; -import static net.runelite.api.NpcID.FISHING_SPOT_7676; public enum FishingSpot { @@ -91,7 +93,14 @@ public enum FishingSpot FISHING_SPOT_7730, FISHING_SPOT_7731, FISHING_SPOT_7732, FISHING_SPOT_7733, FISHING_SPOT_7734 ), INFERNAL_EEL("Infernal Eel", ItemID.INFERNAL_EEL, - FISHING_SPOT_7676); + FISHING_SPOT_7676 + ), + KARAMBWAN("Karambwan", ItemID.RAW_KARAMBWAN, + FISHING_SPOT_4712, FISHING_SPOT_4713 + ), + KARAMBWANJI("Karambwanji, Shrimp", ItemID.KARAMBWANJI, + FISHING_SPOT_4710 + ); public static final int FLYING_FISH = FISHING_SPOT_7734; private static final Map fishingSpots = new HashMap<>();