From d000b60b5c39eafc8cf969dc20c779e6d7b63649 Mon Sep 17 00:00:00 2001 From: Kamiel Date: Thu, 2 Aug 2018 00:44:31 +0200 Subject: [PATCH 1/3] menu entry swapper: fix last destination on arceuus fairy ring Fixes #2590 --- .../client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ad2451e702..678a792bca 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 @@ -434,7 +434,7 @@ public class MenuEntrySwapperPlugin extends Plugin { if (config.swapFairyRing() == FairyRingMode.LAST_DESTINATION) { - swap("last-destination (", option, target, false); + swap("last-destination", option, target, false); } else if (config.swapFairyRing() == FairyRingMode.CONFIGURE) { From 00e9d1cd1fede475459aa1746503b481416d00c0 Mon Sep 17 00:00:00 2001 From: Kamiel Date: Thu, 2 Aug 2018 00:55:24 +0200 Subject: [PATCH 2/3] menu entry swapper: fix zanaris fairy ring not being recognized Fixes #1639 --- .../client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 678a792bca..60c52ee938 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 @@ -430,7 +430,7 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - else if (config.swapFairyRing() != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("tree"))) + else if (config.swapFairyRing() != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("configure") || option.equals("tree"))) { if (config.swapFairyRing() == FairyRingMode.LAST_DESTINATION) { From dd852dbd89c61428a4b91df658f4335fce7fb583 Mon Sep 17 00:00:00 2001 From: Kamiel Date: Thu, 2 Aug 2018 01:05:21 +0200 Subject: [PATCH 3/3] menu entry swapper: fix zanaris swap not working for PoH tree-ring combo --- .../client/plugins/menuentryswapper/FairyRingMode.java | 3 ++- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java index 615fd040ed..731561a9a6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java @@ -33,7 +33,8 @@ public enum FairyRingMode { ZANARIS("Zanaris"), LAST_DESTINATION("Last-Destination"), - CONFIGURE("Configure"); + CONFIGURE("Configure"), + OFF("Off"); private final String name; 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 60c52ee938..3f8ecfdbe5 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 @@ -430,7 +430,8 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - else if (config.swapFairyRing() != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("configure") || option.equals("tree"))) + else if (config.swapFairyRing() != FairyRingMode.OFF && config.swapFairyRing() != FairyRingMode.ZANARIS + && (option.equals("zanaris") || option.equals("configure") || option.equals("tree"))) { if (config.swapFairyRing() == FairyRingMode.LAST_DESTINATION) { @@ -441,6 +442,10 @@ public class MenuEntrySwapperPlugin extends Plugin swap("configure", option, target, false); } } + else if (config.swapFairyRing() == FairyRingMode.ZANARIS && option.equals("tree")) + { + swap("zanaris", option, target, false); + } else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle"))) { swap("reset", option, target, true);