From fca7b2ee7fb32f436817bf69737b8b627796ef97 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 13 Jul 2018 07:37:22 +0200 Subject: [PATCH] Remove investigate menu entry swap As this was added to official client, it is now unnecessary. Closes #4292 Signed-off-by: Tomas Slusny --- .../MenuEntrySwapperConfig.java | 39 +++++++------------ .../MenuEntrySwapperPlugin.java | 4 -- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index d88592b0ca..d4c8c1ea64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -77,17 +77,6 @@ public interface MenuEntrySwapperConfig extends Config @ConfigItem( position = 4, - keyName = "swapCatacombEntrance", - name = "Catacomb entrance", - description = "Swap Read with Investigate on Catacombs of Kourend entrance" - ) - default boolean swapCatacombEntrance() - { - return true; - } - - @ConfigItem( - position = 5, keyName = "swapChase", name = "Chase", description = "Allows to left click your cat to chase" @@ -98,7 +87,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 6, + position = 5, keyName = "claimSlime", name = "Claim Slime", description = "Swap Talk-to with Claim Slime from Morytania diaries" @@ -109,7 +98,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 7, + position = 6, keyName = "swapExchange", name = "Exchange", description = "Swap Talk-to with Exchange on NPC
Example: Grand Exchange Clerk, Tool Leprechaun, Void Knight" @@ -120,7 +109,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 8, + position = 7, keyName = "swapFairyRing", name = "Fairy ring", description = "Swap Zanaris with Last-destination or Configure on Fairy rings" @@ -131,7 +120,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 9, + position = 8, keyName = "swapHarpoon", name = "Harpoon", description = "Swap Cage, Big Net with Harpoon on Fishing spot" @@ -142,7 +131,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 10, + position = 9, keyName = "swapHomePortal", name = "Home", description = "Swap Enter with Home or Build or Friend's house on Portal" @@ -153,7 +142,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 11, + position = 10, keyName = "swapPickpocket", name = "Pickpocket on H.A.M.", description = "Swap Talk-to with Pickpocket on H.A.M members" @@ -164,7 +153,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 12, + position = 11, keyName = "swapPay", name = "Pay", description = "Swap Talk-to with Pay on NPC
Example: Elstan, Heskel, Fayeth" @@ -175,7 +164,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 13, + position = 12, keyName = "swapBoxTrap", name = "Reset", description = "Swap Check with Reset on box trap" @@ -186,7 +175,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 14, + position = 13, keyName = "swapTeleportItem", name = "Teleport item", description = "Swap Wear, Wield with Rub, Teleport on teleport item
Example: Amulet of glory, Ardougne cloak, Chronicle" @@ -197,7 +186,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 15, + position = 14, keyName = "swapAbyssTeleport", name = "Teleport to Abyss", description = "Swap Talk-to with Teleport for the Mage of Zamorak" @@ -208,7 +197,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 16, + position = 15, keyName = "swapTrade", name = "Trade", description = "Swap Talk-to with Trade on NPC
Example: Shop keeper, Shop assistant" @@ -219,7 +208,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 17, + position = 16, keyName = "swapTravel", name = "Travel", description = "Swap Talk-to with Travel, Take-boat, Pay-fare, Charter on NPC
Example: Squire, Monk of Entrana, Customs officer, Trader Crewmember" @@ -230,7 +219,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 18, + position = 17, keyName = "swapAssignment", name = "Assignment", description = "Swap Talk-to with Assignment for Slayer Masters. This will take priority over swapping Trade." @@ -241,7 +230,7 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - position = 19, + position = 18, keyName = "swapDecant", name = "Decant", description = "Swap Talk-to with Decant for Bob Barter and Murky Matt at the Grand Exchange." diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index e32dbee34d..7cdc8eab97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -447,10 +447,6 @@ public class MenuEntrySwapperPlugin extends Plugin { swap("lay", option, target, true); } - else if (config.swapCatacombEntrance() && option.equals("read")) - { - swap("investigate", option, target, true); - } else if (config.swapChase() && option.equals("pick-up")) { swap("chase", option, target, true);