ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3438 from shmeeps/1602

Browse Source 
Update menu swapper to support multiple fairy ring defaults
This commit is contained in:
Adam
2018-05-29 10:33:43 -04:00
committed by GitHub
parent 2e4f720c14 319119b636
commit 58303c454d
3 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright (c) 2018, Ethan <http://github.com/shmeeps>
* 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;
}
}

10
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
View File

@@ -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(

11
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -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")))
{