From 319119b6364c2799b16bdd09336c12629ffc5f7c Mon Sep 17 00:00:00 2001 From: Ethan Date: Mon, 28 May 2018 21:28:14 -0500 Subject: [PATCH] Update menu swapper to support multiple fairy ring defaults --- .../menuentryswapper/FairyRingMode.java | 45 +++++++++++++++++++ .../MenuEntrySwapperConfig.java | 10 ++--- .../MenuEntrySwapperPlugin.java | 11 ++++- 3 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java 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 new file mode 100644 index 0000000000..615fd040ed --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018, Ethan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.menuentryswapper; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum FairyRingMode +{ + ZANARIS("Zanaris"), + LAST_DESTINATION("Last-Destination"), + CONFIGURE("Configure"); + + private final String name; + + @Override + public String toString() + { + return name; + } +} 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 4fab8d8f38..b075602811 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 @@ -125,13 +125,13 @@ public interface MenuEntrySwapperConfig extends Config @ConfigItem( position = 8, - keyName = "swapLastDestination", - name = "Last-destination (XXX)", - description = "Swap Zanaris with Last-destination on Fairy ring" + keyName = "swapFairyRing", + name = "Fairy ring", + description = "Swap Zanaris with Last-destination or Configure on Fairy rings" ) - default boolean swapLastDestination() + default FairyRingMode swapFairyRing() { - return true; + return FairyRingMode.LAST_DESTINATION; } @ConfigItem( 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 5d89ec515c..ca1d963c62 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 @@ -404,9 +404,16 @@ public class MenuEntrySwapperPlugin extends Plugin { swap("home", option, target, true); } - else if (config.swapLastDestination() && (option.equals("zanaris") || option.equals("tree"))) + else if (config.swapFairyRing() != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("tree"))) { - swap("last-destination (", option, target, false); + if (config.swapFairyRing() == FairyRingMode.LAST_DESTINATION) + { + swap("last-destination (", option, target, false); + } + else if (config.swapFairyRing() == FairyRingMode.CONFIGURE) + { + swap("configure", option, target, false); + } } else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle"))) {