From 642c36212a8329259ff8c2e7b3d81b783210a71c Mon Sep 17 00:00:00 2001 From: Trees Date: Tue, 24 Apr 2018 05:27:49 -0400 Subject: [PATCH] Add Sacred Eels and Barehand Fishing (#1857) - Add Sacred Eels to fishing plugin - Add barehanded fishing animation to idle notifier plugin Closes #1852 and closes #1354 and closes #1859 --- .../src/main/java/net/runelite/api/AnimationID.java | 1 + .../runelite/client/plugins/fishing/FishingConfig.java | 10 ++++++++++ .../runelite/client/plugins/fishing/FishingPlugin.java | 4 ++++ .../runelite/client/plugins/fishing/FishingSpot.java | 4 ++++ .../plugins/idlenotifier/IdleNotifierPlugin.java | 1 + 5 files changed, 20 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 54266b166d..fc0911974f 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -85,6 +85,7 @@ public final class AnimationID public static final int FISHING_OILY_ROD = 622; public static final int FISHING_KARAMBWAN = 1193; public static final int FISHING_CRUSHING_INFERNAL_EELS = 7553; + public static final int FISHING_BAREHAND = 6709; public static final int MINING_BRONZE_PICKAXE = 625; public static final int MINING_IRON_PICKAXE = 626; public static final int MINING_STEEL_PICKAXE = 627; 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 33e58ba12e..e2de40fe5c 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,6 +145,16 @@ public interface FishingConfig extends Config return true; } + @ConfigItem( + keyName = "showSacredEel", + name = "Show Sacred Eel", + description = "Configures whether sacred eel is displayed" + ) + default boolean showSacredEel() + { + 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 38afc85e86..a23e89514c 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 @@ -167,6 +167,10 @@ 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.showKarambwanji()) { 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 4a66e422c0..6d62dd8fe3 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 @@ -43,6 +43,7 @@ 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_6488; 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; @@ -103,6 +104,9 @@ public enum FishingSpot ), KARAMBWANJI("Karambwanji, Shrimp", ItemID.KARAMBWANJI, FISHING_SPOT_4710 + ), + SACRED_EEL("Sacred eel", ItemID.SACRED_EEL, + FISHING_SPOT_6488 ); private static final Map fishingSpots = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 73850336d7..631a9d654e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -148,6 +148,7 @@ public class IdleNotifierPlugin extends Plugin case FISHING_OILY_ROD: case FISHING_KARAMBWAN: case FISHING_CRUSHING_INFERNAL_EELS: + case FISHING_BAREHAND: /* Mining(Normal) */ case MINING_BRONZE_PICKAXE: case MINING_IRON_PICKAXE: