diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapeConfig.java index dda9608138..720d6258ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapeConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapeConfig.java @@ -1,6 +1,8 @@ /* - * Copyright (c) 2019, Owain van Brakel - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle + * Copyright (c) 2018, Owain van Brakel * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,6 +41,7 @@ import net.runelite.client.plugins.easyscape.util.CombatBraceletMode; import net.runelite.client.plugins.easyscape.util.SlayerRingMode; import net.runelite.client.plugins.easyscape.util.BurningAmuletMode; import net.runelite.client.plugins.easyscape.util.XericsTalismanMode; +import net.runelite.client.plugins.easyscape.util.RingOfWealthMode; @ConfigGroup("easyscape") public interface EasyscapeConfig extends Config @@ -748,13 +751,37 @@ public interface EasyscapeConfig extends Config return XericsTalismanMode.XERICS_LOOKOUT; } + @ConfigItem( + keyName = "swapwealth", + name = "Swap wealth", + description = "", + position = 59, + group = "Jewellery swapper" + ) + default boolean getRingofWealth() + { + return false; + } + + @ConfigItem( + keyName = "ringofwealthmode", + name = "Mode", + description = "", + position = 60, + group = "Jewellery swapper" + ) + default RingOfWealthMode getRingofWealthMode() + { + return RingOfWealthMode.GRAND_EXCHANGE; + } + // ----------------------------------------------------------- // @ConfigItem( keyName = "swapArdougneCape", name = "Swap Ardougne Cape", description = "Enables swapping of teleport and wear.", - position = 59, + position = 61, group = "Equipment swapper" ) default boolean getSwapArdougneCape() @@ -766,7 +793,7 @@ public interface EasyscapeConfig extends Config keyName = "swapConstructionCape", name = "Swap Construction Cape", description = "Enables swapping of teleport and wear.", - position = 60, + position = 62, group = "Equipment swapper" ) default boolean getSwapConstructionCape() @@ -778,7 +805,7 @@ public interface EasyscapeConfig extends Config keyName = "swapCraftingCape", name = "Swap Crafting Cape", description = "Enables swapping of teleport and wear.", - position = 61, + position = 63, group = "Equipment swapper" ) default boolean getSwapCraftingCape() @@ -790,7 +817,7 @@ public interface EasyscapeConfig extends Config keyName = "swapMagicCape", name = "Swap Magic Cape", description = "Enables swapping of spellbook and wear.", - position = 62, + position = 64, group = "Equipment swapper" ) default boolean getSwapMagicCape() @@ -802,10 +829,10 @@ public interface EasyscapeConfig extends Config keyName = "swapExplorersRing", name = "Swap Explorers Ring", description = "Enables swapping of spellbook and wear.", - position = 63, + position = 65, group = "Equipment swapper" ) - default boolean getExplorersRing() + default boolean getSwapExplorersRing() { return true; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapePlugin.java index bb9a246415..a14e303c0d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/EasyscapePlugin.java @@ -1,6 +1,8 @@ /* - * Copyright (c) 2019, Owain van Brakel - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle + * Copyright (c) 2018, Owain van Brakel * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -375,7 +377,7 @@ public class EasyscapePlugin extends Plugin swap(client, "Spellbook", option, target); } - if (target.toLowerCase().contains("explorer's ring") && config.getSwapMagicCape()) + if (target.toLowerCase().contains("explorer's ring") && config.getSwapExplorersRing()) { swap(client, "Teleport", option, target); } @@ -490,7 +492,15 @@ public class EasyscapePlugin extends Plugin { swap(client, config.getXericsTalismanMode().toString(), option, target); } - } + } + + if (config.getRingofWealth()) + { + if (target.toLowerCase().contains("ring of wealth")) + { + swap(client, config.getRingofWealthMode().toString(), option, target); + } + } } private void delete(int target) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/BurningAmuletMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/BurningAmuletMode.java index 0001b9eccc..e1552adb67 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/BurningAmuletMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/BurningAmuletMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java index 01bfdd65c9..000e8d8203 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java index 01a425cfe4..232feed044 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java index 89311be01c..74fae105d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/RingOfWealthMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/RingOfWealthMode.java new file mode 100644 index 0000000000..f30e74a6e4 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/RingOfWealthMode.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle + * 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.easyscape.util; + +public enum RingOfWealthMode +{ + MISCELLANIA("Miscellania"), + GRAND_EXCHANGE("Grand Exchange"), + FALADOR("Falador"), + DONDAKAN("Dondakan"); + + private final String name; + + RingOfWealthMode(String name) + { + this.name = name; + } + + @Override + public String toString() + { + return name; + } +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SkillsNecklaceMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SkillsNecklaceMode.java index 3c8b2dd382..7d60d834c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SkillsNecklaceMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SkillsNecklaceMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java index 56375a0bd1..b86d4aba30 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java index 0e09fac145..0212271f36 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java @@ -1,5 +1,6 @@ /* - * Copyright (c) 2019, Alan Baumgartner + * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, Kyle * All rights reserved. * * Redistribution and use in source and binary forms, with or without