From d435fc51885cb6f9400b7505fb30048218ba1704 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sun, 19 May 2019 19:31:14 +0100 Subject: [PATCH 01/10] easyscape additions easyscape additions --- .../plugins/easyscape/EasyscapeConfig.java | 288 ++++++++++++++++-- .../plugins/easyscape/EasyscapePlugin.java | 76 +++++ .../easyscape/util/BurningAmuletMode.java | 45 +++ .../easyscape/util/CombatBraceletMode.java | 46 +++ .../easyscape/util/DigsitePendantMode.java | 45 +++ .../easyscape/util/NecklaceOfPassageMode.java | 45 +++ .../easyscape/util/SkillsNecklaceMode.java | 48 +++ .../easyscape/util/SlayerRingMode.java | 47 +++ .../easyscape/util/XericsTalismanMode.java | 47 +++ 9 files changed, 656 insertions(+), 31 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/BurningAmuletMode.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SkillsNecklaceMode.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java 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 cba9a8baaf..dda9608138 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 @@ -32,7 +32,13 @@ import net.runelite.client.plugins.easyscape.util.DuelingRingMode; import net.runelite.client.plugins.easyscape.util.EssenceMode; import net.runelite.client.plugins.easyscape.util.GamesNecklaceMode; import net.runelite.client.plugins.easyscape.util.GloryMode; - +import net.runelite.client.plugins.easyscape.util.SkillsNecklaceMode; +import net.runelite.client.plugins.easyscape.util.NecklaceOfPassageMode; +import net.runelite.client.plugins.easyscape.util.DigsitePendantMode; +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; @ConfigGroup("easyscape") public interface EasyscapeConfig extends Config @@ -440,23 +446,11 @@ public interface EasyscapeConfig extends Config return false; } - @ConfigItem( - keyName = "swapArdougneCape", - name = "Swap Ardougne Cape", - description = "Enables swapping of teleport and wear.", - position = 34, - group = "Miscellaneous swapper" - ) - default boolean getSwapArdougneCape() - { - return false; - } - @ConfigItem( keyName = "swapSawmill", name = "Swap Sawmill Operator", description = "Makes Buy-plank the default option on the sawmill operator.", - position = 35, + position = 34, group = "Miscellaneous swapper" ) default boolean getSwapSawmill() @@ -468,7 +462,7 @@ public interface EasyscapeConfig extends Config keyName = "swapSawmillPlanks", name = "Swap Buy Planks", description = "Makes Buy All the default option in buy planks.", - position = 36, + position = 35, group = "Miscellaneous swapper" ) default boolean getSwapSawmillPlanks() @@ -480,7 +474,7 @@ public interface EasyscapeConfig extends Config keyName = "swapPuroPuro", name = "Swap Puro Puro Wheat", description = "", - position = 37, + position = 36, group = "Miscellaneous swapper" ) default boolean getSwapPuro() @@ -492,7 +486,7 @@ public interface EasyscapeConfig extends Config keyName = "swapEssencePounch", name = "Swap Essence Pouch", description = "", - position = 38, + position = 37, group = "Miscellaneous swapper" ) default boolean getSwapEssencePouch() @@ -504,20 +498,22 @@ public interface EasyscapeConfig extends Config keyName = "essenceMode", name = "Mode", description = "", - position = 39, - group = "Miscellaneous swapper" + position = 38, + group = "Jewellery swapper" ) default EssenceMode getEssenceMode() { return EssenceMode.RUNECRAFTING; } +// ----------------------------------------------------------- // + @ConfigItem( keyName = "swapGamesNecklace", name = "Swap Games Necklace", description = "", - position = 40, - group = "Miscellaneous swapper" + position = 39, + group = "Jewellery swapper" ) default boolean getGamesNecklace() { @@ -528,8 +524,8 @@ public interface EasyscapeConfig extends Config keyName = "gamesNecklaceMode", name = "Mode", description = "", - position = 41, - group = "Miscellaneous swapper" + position = 40, + group = "Jewellery swapper" ) default GamesNecklaceMode getGamesNecklaceMode() { @@ -540,8 +536,8 @@ public interface EasyscapeConfig extends Config keyName = "swapDuelingRing", name = "Swap Dueling Ring", description = "", - position = 42, - group = "Miscellaneous swapper" + position = 41, + group = "Jewellery swapper" ) default boolean getDuelingRing() { @@ -552,8 +548,8 @@ public interface EasyscapeConfig extends Config keyName = "duelingRingMode", name = "Mode", description = "", - position = 43, - group = "Miscellaneous swapper" + position = 42, + group = "Jewellery swapper" ) default DuelingRingMode getDuelingRingMode() { @@ -564,8 +560,8 @@ public interface EasyscapeConfig extends Config keyName = "swapGlory", name = "Swap Glory", description = "", - position = 44, - group = "Miscellaneous swapper" + position = 43, + group = "Jewellery swapper" ) default boolean getGlory() { @@ -576,11 +572,241 @@ public interface EasyscapeConfig extends Config keyName = "gloryMode", name = "Mode", description = "", - position = 45, - group = "Miscellaneous swapper" + position = 44, + group = "Jewellery swapper" ) default GloryMode getGloryMode() { return GloryMode.EDGEVILLE; } + + @ConfigItem( + keyName = "swapSkill", + name = "Swap Skill", + description = "", + position = 45, + group = "Jewellery swapper" + ) + default boolean getSkillsNecklace() + { + return false; + } + + @ConfigItem( + keyName = "skillsnecklacemode", + name = "Mode", + description = "", + position = 46, + group = "Jewellery swapper" + ) + default SkillsNecklaceMode getSkillsNecklaceMode() + { + return SkillsNecklaceMode.FARMING_GUILD; + } + + @ConfigItem( + keyName = "swapPassage", + name = "Swap Passage", + description = "", + position = 47, + group = "Jewellery swapper" + ) + default boolean getNecklaceofPassage() + { + return false; + } + + @ConfigItem( + keyName = "necklaceofpassagemode", + name = "Mode", + description = "", + position = 48, + group = "Jewellery swapper" + ) + default NecklaceOfPassageMode getNecklaceofPassageMode() + { + return NecklaceOfPassageMode.WIZARDS_TOWER; + } + + @ConfigItem( + keyName = "swapDigsite", + name = "Swap Digsite", + description = "", + position = 49, + group = "Jewellery swapper" + ) + default boolean getDigsitePendant() + { + return false; + } + + @ConfigItem( + keyName = "digsitependantmode", + name = "Mode", + description = "", + position = 50, + group = "Jewellery swapper" + ) + default DigsitePendantMode getDigsitePendantMode() + { + return DigsitePendantMode.FOSSIL_ISLAND; + } + + @ConfigItem( + keyName = "swapCombat", + name = "Swap Combat", + description = "", + position = 51, + group = "Jewellery swapper" + ) + default boolean getCombatBracelet() + { + return false; + } + + @ConfigItem( + keyName = "combatbraceletmode", + name = "Mode", + description = "", + position = 52, + group = "Jewellery swapper" + ) + default CombatBraceletMode getCombatBraceletMode() + { + return CombatBraceletMode.WARRIORS_GUILD; + } + + @ConfigItem( + keyName = "swapslayer", + name = "Swap slayer", + description = "", + position = 53, + group = "Jewellery swapper" + ) + default boolean getSlayerRing() + { + return false; + } + + @ConfigItem( + keyName = "slayerringmode", + name = "Mode", + description = "", + position = 54, + group = "Jewellery swapper" + ) + default SlayerRingMode getSlayerRingMode() + { + return SlayerRingMode.SLAYER_TOWER; + } + + @ConfigItem( + keyName = "swapburning", + name = "Swap burning", + description = "", + position = 55, + group = "Jewellery swapper" + ) + default boolean getBurningAmulet() + { + return false; + } + + @ConfigItem( + keyName = "burningamuletmode", + name = "Mode", + description = "", + position = 56, + group = "Jewellery swapper" + ) + default BurningAmuletMode getBurningAmuletMode() + { + return BurningAmuletMode.BANDIT_CAMP; + } + + @ConfigItem( + keyName = "swapxeric", + name = "Swap xeric", + description = "", + position = 57, + group = "Jewellery swapper" + ) + default boolean getXericsTalisman() + { + return false; + } + + @ConfigItem( + keyName = "xericstalismanmode", + name = "Mode", + description = "", + position = 58, + group = "Jewellery swapper" + ) + default XericsTalismanMode getXericsTalismanMode() + { + return XericsTalismanMode.XERICS_LOOKOUT; + } + +// ----------------------------------------------------------- // + + @ConfigItem( + keyName = "swapArdougneCape", + name = "Swap Ardougne Cape", + description = "Enables swapping of teleport and wear.", + position = 59, + group = "Equipment swapper" + ) + default boolean getSwapArdougneCape() + { + return false; + } + + @ConfigItem( + keyName = "swapConstructionCape", + name = "Swap Construction Cape", + description = "Enables swapping of teleport and wear.", + position = 60, + group = "Equipment swapper" + ) + default boolean getSwapConstructionCape() + { + return true; + } + + @ConfigItem( + keyName = "swapCraftingCape", + name = "Swap Crafting Cape", + description = "Enables swapping of teleport and wear.", + position = 61, + group = "Equipment swapper" + ) + default boolean getSwapCraftingCape() + { + return true; + } + + @ConfigItem( + keyName = "swapMagicCape", + name = "Swap Magic Cape", + description = "Enables swapping of spellbook and wear.", + position = 62, + group = "Equipment swapper" + ) + default boolean getSwapMagicCape() + { + return true; + } + + @ConfigItem( + keyName = "swapExplorersRing", + name = "Swap Explorers Ring", + description = "Enables swapping of spellbook and wear.", + position = 63, + group = "Equipment swapper" + ) + default boolean getExplorersRing() + { + return true; + } } \ No newline at end of file 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 41476f163f..bb9a246415 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 @@ -359,6 +359,26 @@ public class EasyscapePlugin extends Plugin swap(client, "Kandarin Monastery", option, target); swap(client, "Monastery Teleport", option, target); } + + if (target.toLowerCase().contains("crafting cape") && config.getSwapCraftingCape()) + { + swap(client, "Teleport", option, target); + } + + if (target.toLowerCase().contains("construct. cape") && config.getSwapConstructionCape()) + { + swap(client, "Tele to poh", option, target); + } + + if (target.toLowerCase().contains("magic cape") && config.getSwapMagicCape()) + { + swap(client, "Spellbook", option, target); + } + + if (target.toLowerCase().contains("explorer's ring") && config.getSwapMagicCape()) + { + swap(client, "Teleport", option, target); + } if (config.getSwapEssencePouch()) { @@ -415,6 +435,62 @@ public class EasyscapePlugin extends Plugin swap(client, config.getGloryMode().toString(), option, target); } } + + if (config.getSkillsNecklace()) + { + if (target.toLowerCase().contains("skills necklace")) + { + swap(client, config.getSkillsNecklaceMode().toString(), option, target); + } + } + + if (config.getNecklaceofPassage()) + { + if (target.toLowerCase().contains("necklace of passage")) + { + swap(client, config.getNecklaceofPassageMode().toString(), option, target); + } + } + + if (config.getDigsitePendant()) + { + if (target.toLowerCase().contains("digsite pendant")) + { + swap(client, config.getDigsitePendantMode().toString(), option, target); + } + } + + if (config.getCombatBracelet()) + { + if (target.toLowerCase().contains("combat bracelet")) + { + swap(client, config.getCombatBraceletMode().toString(), option, target); + } + } + + if (config.getSlayerRing()) + { + if (target.toLowerCase().contains("slayer ring")) + { + swap(client, config.getSlayerRingMode().toString(), option, target); + } + } + + if (config.getBurningAmulet()) + { + if (target.toLowerCase().contains("burning amulet")) + { + swap(client, config.getBurningAmuletMode().toString(), option, target); + } + } + + if (config.getXericsTalisman()) + { + if (target.toLowerCase().contains("xeric's talisman")) + { + swap(client, config.getXericsTalismanMode().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 new file mode 100644 index 0000000000..0001b9eccc --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/BurningAmuletMode.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 BurningAmuletMode +{ + CHAOS_TEMPLE("Chaos Temple"), + BANDIT_CAMP("Bandit Camp"), + LAVA_MAZE("Lava Maze"); + + private final String name; + + BurningAmuletMode(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/CombatBraceletMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java new file mode 100644 index 0000000000..01bfdd65c9 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/CombatBraceletMode.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 CombatBraceletMode +{ + WARRIORS_GUILD("Warriors' Guild"), + CHAMPIONS_GUILD("Champions' Guild"), + EDGEVILLE_MONASTERY("Edgeville Monstery"), + RANGING_GUILD("Ranging Guild"); + + private final String name; + + CombatBraceletMode(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/DigsitePendantMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java new file mode 100644 index 0000000000..01a425cfe4 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/DigsitePendantMode.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 DigsitePendantMode +{ + DIGSITE("Digsite"), + FOSSIL_ISLAND("Fossil Island"), + LITHKREN("Lithkren"); + + private final String name; + + DigsitePendantMode(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/NecklaceOfPassageMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java new file mode 100644 index 0000000000..89311be01c --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/NecklaceOfPassageMode.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 NecklaceOfPassageMode +{ + WIZARDS_TOWER("Wizard's Tower"), + THE_OUTPOST("The Outpost"), + EAGLES_EYRIE("Eagle's Eyrie"); + + private final String name; + + NecklaceOfPassageMode(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 new file mode 100644 index 0000000000..3c8b2dd382 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SkillsNecklaceMode.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 SkillsNecklaceMode +{ + FISHING_GUILD("Fishing Guild"), + MINING_GUILD("Mining Guild"), + CRAFTING_GUILD("Crafting Guild"), + COOKING_GUILD("Cooking Guild"), + WOODCUTTING_GUILD("Woodcutting Guild"), + FARMING_GUILD("Farming Guild"); + + private final String name; + + SkillsNecklaceMode(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/SlayerRingMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java new file mode 100644 index 0000000000..56375a0bd1 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/SlayerRingMode.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 SlayerRingMode +{ + SLAYER_TOWER("Slayer Tower"), + FREMENNIK_SLAYER_DUNGEON("Fremennik Slayer Dungeon"), + TARNS_LAIR("Tarn's Lair"), + STRONGHOLD_SLAYER_CAVE("Stronghold Slayer Cave"), + DARK_BEASTS("Dark Beasts"); + + private final String name; + + SlayerRingMode(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/XericsTalismanMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java new file mode 100644 index 0000000000..0e09fac145 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/XericsTalismanMode.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019, Alan Baumgartner + * 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 XericsTalismanMode +{ + XERICS_LOOKOUT("Xeric's Lookout"), + XERICS_GLADE("Xeric's Glade"), + XERICS_INFERNO("Xeric's Inferno"), + XERICS_HEART("Xeric's Heart"), + XERICS_HONOUR("Xeric's Honour"); + + private final String name; + + XericsTalismanMode(String name) + { + this.name = name; + } + + @Override + public String toString() + { + return name; + } +} \ No newline at end of file From 05bb85a93b769453a98613f774f9ddd750ee1915 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sun, 19 May 2019 20:31:06 +0100 Subject: [PATCH 02/10] added ring of wealth + updated licence added ring of wealth + updated licences on all files. --- .../plugins/easyscape/EasyscapeConfig.java | 43 +++++++++++++---- .../plugins/easyscape/EasyscapePlugin.java | 18 +++++-- .../easyscape/util/BurningAmuletMode.java | 3 +- .../easyscape/util/CombatBraceletMode.java | 3 +- .../easyscape/util/DigsitePendantMode.java | 3 +- .../easyscape/util/NecklaceOfPassageMode.java | 3 +- .../easyscape/util/RingOfWealthMode.java | 47 +++++++++++++++++++ .../easyscape/util/SkillsNecklaceMode.java | 3 +- .../easyscape/util/SlayerRingMode.java | 3 +- .../easyscape/util/XericsTalismanMode.java | 3 +- 10 files changed, 110 insertions(+), 19 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/RingOfWealthMode.java 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 From b936559bcf99ff63a0ceebc88c6fb5b88e279543 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sun, 19 May 2019 21:32:57 +0100 Subject: [PATCH 03/10] oops --- .../net/runelite/client/plugins/easyscape/EasyscapeConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 720d6258ce..7b90681332 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 @@ -502,7 +502,7 @@ public interface EasyscapeConfig extends Config name = "Mode", description = "", position = 38, - group = "Jewellery swapper" + group = "Miscellaneous swapper" ) default EssenceMode getEssenceMode() { From 37d749c6882024147f9fe52ce9b9931b138777c1 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sun, 19 May 2019 22:26:55 +0100 Subject: [PATCH 04/10] remove pouch fill pouch fill exists in runecrafting plugin --- .../plugins/easyscape/EasyscapeConfig.java | 79 +++++++------------ .../plugins/easyscape/EasyscapePlugin.java | 32 -------- .../plugins/easyscape/util/EssenceMode.java | 44 ----------- 3 files changed, 27 insertions(+), 128 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/EssenceMode.java 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 7b90681332..964d07f3f3 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 @@ -31,7 +31,6 @@ import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; import net.runelite.client.plugins.easyscape.util.DuelingRingMode; -import net.runelite.client.plugins.easyscape.util.EssenceMode; import net.runelite.client.plugins.easyscape.util.GamesNecklaceMode; import net.runelite.client.plugins.easyscape.util.GloryMode; import net.runelite.client.plugins.easyscape.util.SkillsNecklaceMode; @@ -485,37 +484,13 @@ public interface EasyscapeConfig extends Config return false; } - @ConfigItem( - keyName = "swapEssencePounch", - name = "Swap Essence Pouch", - description = "", - position = 37, - group = "Miscellaneous swapper" - ) - default boolean getSwapEssencePouch() - { - return false; - } - - @ConfigItem( - keyName = "essenceMode", - name = "Mode", - description = "", - position = 38, - group = "Miscellaneous swapper" - ) - default EssenceMode getEssenceMode() - { - return EssenceMode.RUNECRAFTING; - } - // ----------------------------------------------------------- // @ConfigItem( keyName = "swapGamesNecklace", name = "Swap Games Necklace", description = "", - position = 39, + position = 37, group = "Jewellery swapper" ) default boolean getGamesNecklace() @@ -527,7 +502,7 @@ public interface EasyscapeConfig extends Config keyName = "gamesNecklaceMode", name = "Mode", description = "", - position = 40, + position = 38, group = "Jewellery swapper" ) default GamesNecklaceMode getGamesNecklaceMode() @@ -539,7 +514,7 @@ public interface EasyscapeConfig extends Config keyName = "swapDuelingRing", name = "Swap Dueling Ring", description = "", - position = 41, + position = 39, group = "Jewellery swapper" ) default boolean getDuelingRing() @@ -551,7 +526,7 @@ public interface EasyscapeConfig extends Config keyName = "duelingRingMode", name = "Mode", description = "", - position = 42, + position = 40, group = "Jewellery swapper" ) default DuelingRingMode getDuelingRingMode() @@ -563,7 +538,7 @@ public interface EasyscapeConfig extends Config keyName = "swapGlory", name = "Swap Glory", description = "", - position = 43, + position = 41, group = "Jewellery swapper" ) default boolean getGlory() @@ -575,7 +550,7 @@ public interface EasyscapeConfig extends Config keyName = "gloryMode", name = "Mode", description = "", - position = 44, + position = 42, group = "Jewellery swapper" ) default GloryMode getGloryMode() @@ -587,7 +562,7 @@ public interface EasyscapeConfig extends Config keyName = "swapSkill", name = "Swap Skill", description = "", - position = 45, + position = 43, group = "Jewellery swapper" ) default boolean getSkillsNecklace() @@ -599,7 +574,7 @@ public interface EasyscapeConfig extends Config keyName = "skillsnecklacemode", name = "Mode", description = "", - position = 46, + position = 44, group = "Jewellery swapper" ) default SkillsNecklaceMode getSkillsNecklaceMode() @@ -611,7 +586,7 @@ public interface EasyscapeConfig extends Config keyName = "swapPassage", name = "Swap Passage", description = "", - position = 47, + position = 45, group = "Jewellery swapper" ) default boolean getNecklaceofPassage() @@ -623,7 +598,7 @@ public interface EasyscapeConfig extends Config keyName = "necklaceofpassagemode", name = "Mode", description = "", - position = 48, + position = 46, group = "Jewellery swapper" ) default NecklaceOfPassageMode getNecklaceofPassageMode() @@ -635,7 +610,7 @@ public interface EasyscapeConfig extends Config keyName = "swapDigsite", name = "Swap Digsite", description = "", - position = 49, + position = 47, group = "Jewellery swapper" ) default boolean getDigsitePendant() @@ -647,7 +622,7 @@ public interface EasyscapeConfig extends Config keyName = "digsitependantmode", name = "Mode", description = "", - position = 50, + position = 48, group = "Jewellery swapper" ) default DigsitePendantMode getDigsitePendantMode() @@ -659,7 +634,7 @@ public interface EasyscapeConfig extends Config keyName = "swapCombat", name = "Swap Combat", description = "", - position = 51, + position = 49, group = "Jewellery swapper" ) default boolean getCombatBracelet() @@ -671,7 +646,7 @@ public interface EasyscapeConfig extends Config keyName = "combatbraceletmode", name = "Mode", description = "", - position = 52, + position = 50, group = "Jewellery swapper" ) default CombatBraceletMode getCombatBraceletMode() @@ -683,7 +658,7 @@ public interface EasyscapeConfig extends Config keyName = "swapslayer", name = "Swap slayer", description = "", - position = 53, + position = 51, group = "Jewellery swapper" ) default boolean getSlayerRing() @@ -695,7 +670,7 @@ public interface EasyscapeConfig extends Config keyName = "slayerringmode", name = "Mode", description = "", - position = 54, + position = 52, group = "Jewellery swapper" ) default SlayerRingMode getSlayerRingMode() @@ -707,7 +682,7 @@ public interface EasyscapeConfig extends Config keyName = "swapburning", name = "Swap burning", description = "", - position = 55, + position = 53, group = "Jewellery swapper" ) default boolean getBurningAmulet() @@ -719,7 +694,7 @@ public interface EasyscapeConfig extends Config keyName = "burningamuletmode", name = "Mode", description = "", - position = 56, + position = 54, group = "Jewellery swapper" ) default BurningAmuletMode getBurningAmuletMode() @@ -731,7 +706,7 @@ public interface EasyscapeConfig extends Config keyName = "swapxeric", name = "Swap xeric", description = "", - position = 57, + position = 55, group = "Jewellery swapper" ) default boolean getXericsTalisman() @@ -743,7 +718,7 @@ public interface EasyscapeConfig extends Config keyName = "xericstalismanmode", name = "Mode", description = "", - position = 58, + position = 56, group = "Jewellery swapper" ) default XericsTalismanMode getXericsTalismanMode() @@ -755,7 +730,7 @@ public interface EasyscapeConfig extends Config keyName = "swapwealth", name = "Swap wealth", description = "", - position = 59, + position = 57, group = "Jewellery swapper" ) default boolean getRingofWealth() @@ -767,7 +742,7 @@ public interface EasyscapeConfig extends Config keyName = "ringofwealthmode", name = "Mode", description = "", - position = 60, + position = 58, group = "Jewellery swapper" ) default RingOfWealthMode getRingofWealthMode() @@ -781,7 +756,7 @@ public interface EasyscapeConfig extends Config keyName = "swapArdougneCape", name = "Swap Ardougne Cape", description = "Enables swapping of teleport and wear.", - position = 61, + position = 59, group = "Equipment swapper" ) default boolean getSwapArdougneCape() @@ -793,7 +768,7 @@ public interface EasyscapeConfig extends Config keyName = "swapConstructionCape", name = "Swap Construction Cape", description = "Enables swapping of teleport and wear.", - position = 62, + position = 60, group = "Equipment swapper" ) default boolean getSwapConstructionCape() @@ -805,7 +780,7 @@ public interface EasyscapeConfig extends Config keyName = "swapCraftingCape", name = "Swap Crafting Cape", description = "Enables swapping of teleport and wear.", - position = 63, + position = 61, group = "Equipment swapper" ) default boolean getSwapCraftingCape() @@ -817,7 +792,7 @@ public interface EasyscapeConfig extends Config keyName = "swapMagicCape", name = "Swap Magic Cape", description = "Enables swapping of spellbook and wear.", - position = 64, + position = 62, group = "Equipment swapper" ) default boolean getSwapMagicCape() @@ -829,7 +804,7 @@ public interface EasyscapeConfig extends Config keyName = "swapExplorersRing", name = "Swap Explorers Ring", description = "Enables swapping of spellbook and wear.", - position = 65, + position = 63, group = "Equipment swapper" ) default boolean getSwapExplorersRing() 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 a14e303c0d..f386cb5bd5 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 @@ -382,38 +382,6 @@ public class EasyscapePlugin extends Plugin swap(client, "Teleport", option, target); } - if (config.getSwapEssencePouch()) - { - if (isEssencePouch(target)) - { - switch (config.getEssenceMode()) - { - case RUNECRAFTING: - if (widgetBankTitleBar == null || widgetBankTitleBar.isHidden()) - { - swap(client, "Empty", option, target); - } - else - { - swap(client, "Fill", option, target); - } - break; - case ESSENCE_MINING: - if (widgetBankTitleBar == null || widgetBankTitleBar.isHidden()) - { - swap(client, "Fill", option, target); - } - else - { - swap(client, "Empty", option, target); - } - break; - default: - break; - } - } - } - if (config.getGamesNecklace()) { if (target.toLowerCase().contains("games necklace")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/EssenceMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/EssenceMode.java deleted file mode 100644 index 57f37b7ae5..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/easyscape/util/EssenceMode.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2019, Alan Baumgartner - * 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 EssenceMode -{ - RUNECRAFTING("Runecrafting"), - ESSENCE_MINING("Essence Mining"); - - private final String name; - - EssenceMode(String name) - { - this.name = name; - } - - @Override - public String toString() - { - return name; - } -} \ No newline at end of file From 6e49cf410e9d9fd787ded39c3247a4141edfbfbe Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 20 May 2019 00:40:18 +0100 Subject: [PATCH 05/10] Update EasyscapePlugin.java --- .../plugins/easyscape/EasyscapePlugin.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 57166634a5..a9efab6d1b 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 @@ -360,27 +360,27 @@ public class EasyscapePlugin extends Plugin swap(client, "Monastery Teleport", option, target); } - if (target.toLowerCase().contains("crafting cape") && config.getSwapCraftingCape()) + if (target.contains("crafting cape") && config.getSwapCraftingCape()) { swap(client, "Teleport", option, target); } - if (target.toLowerCase().contains("construct. cape") && config.getSwapConstructionCape()) + if (target.contains("construct. cape") && config.getSwapConstructionCape()) { swap(client, "Tele to poh", option, target); } - if (target.toLowerCase().contains("magic cape") && config.getSwapMagicCape()) + if (target.contains("magic cape") && config.getSwapMagicCape()) { swap(client, "Spellbook", option, target); } - if (target.toLowerCase().contains("explorer's ring") && config.getSwapExplorersRing()) + if (target.contains("explorer's ring") && config.getSwapExplorersRing()) { swap(client, "Teleport", option, target); } - if (config.getGamesNecklace() && target.toLowerCase().contains("games necklace")) + if (config.getGamesNecklace() && target.contains("games necklace")) { swap(client, config.getGamesNecklaceMode().toString(), option, target); } @@ -390,47 +390,47 @@ public class EasyscapePlugin extends Plugin swap(client, config.getDuelingRingMode().toString(), option, target); } - if (config.getGlory() && (target.contains("amulet of glory") || target.contains("amulet of eternal glory"))) + if (config.getGlory() && target.contains("amulet of glory") || target.contains("amulet of eternal glory"))) { swap(client, config.getGloryMode().toString(), option, target); } - if (config.getSkillsNecklace() && (target.contains("skills necklace")) + if (config.getSkillsNecklace() && target.contains("skills necklace")) { swap(client, config.getSkillsNecklaceMode().toString(), option, target); } - if (config.getNecklaceofPassage() && (target.contains("necklace of passage")) + if (config.getNecklaceofPassage() && target.contains("necklace of passage")) { swap(client, config.getNecklaceofPassageMode().toString(), option, target); } - if (config.getDigsitePendant() && (target.contains("digsite pendant")) + if (config.getDigsitePendant() && target.contains("digsite pendant")) { swap(client, config.getDigsitePendantMode().toString(), option, target); } - if (config.getCombatBracelet() && (target.contains("combat bracelet")) + if (config.getCombatBracelet() && target.contains("combat bracelet")) { swap(client, config.getCombatBraceletMode().toString(), option, target); } - if (config.getSlayerRing() && (target.contains("slayer ring")) + if (config.getSlayerRing() && target.contains("slayer ring")) { swap(client, config.getSlayerRingMode().toString(), option, target); } - if (config.getBurningAmulet() && (target.contains("burning amulet")) + if (config.getBurningAmulet() && target.contains("burning amulet")) { swap(client, config.getBurningAmuletMode().toString(), option, target); } - if (config.getXericsTalisman() && (target.contains("xeric's talisman")) + if (config.getXericsTalisman() && target.contains("xeric's talisman")) { swap(client, config.getXericsTalismanMode().toString(), option, target); } - if (config.getRingofWealth() && (target.contains("ring of wealth")) + if (config.getRingofWealth() && target.contains("ring of wealth")) { swap(client, config.getRingofWealthMode().toString(), option, target); } @@ -463,4 +463,4 @@ public class EasyscapePlugin extends Plugin return location.getRegionID() == PURO_PURO_REGION_ID; } } -} \ No newline at end of file +} From 66394cc708ce93abd6167a5988575eecb8f9d742 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 20 May 2019 00:45:43 +0100 Subject: [PATCH 06/10] Update EasyscapePlugin.java --- .../net/runelite/client/plugins/easyscape/EasyscapePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a9efab6d1b..257230a6f6 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 @@ -390,7 +390,7 @@ public class EasyscapePlugin extends Plugin swap(client, config.getDuelingRingMode().toString(), option, target); } - if (config.getGlory() && target.contains("amulet of glory") || target.contains("amulet of eternal glory"))) + if (config.getGlory() && target.contains("amulet of glory") || target.contains("amulet of eternal glory")) { swap(client, config.getGloryMode().toString(), option, target); } From b8b2f7f4c1209b14681803e5d79f76693433a8aa Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 20 May 2019 00:58:55 +0100 Subject: [PATCH 07/10] Checkstyle fix --- .../client/plugins/easyscape/EasyscapePlugin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 257230a6f6..4c3b08ccc4 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 @@ -378,8 +378,8 @@ public class EasyscapePlugin extends Plugin if (target.contains("explorer's ring") && config.getSwapExplorersRing()) { swap(client, "Teleport", option, target); - } - + } + if (config.getGamesNecklace() && target.contains("games necklace")) { swap(client, config.getGamesNecklaceMode().toString(), option, target); @@ -394,7 +394,7 @@ public class EasyscapePlugin extends Plugin { swap(client, config.getGloryMode().toString(), option, target); } - + if (config.getSkillsNecklace() && target.contains("skills necklace")) { swap(client, config.getSkillsNecklaceMode().toString(), option, target); @@ -404,12 +404,12 @@ public class EasyscapePlugin extends Plugin { swap(client, config.getNecklaceofPassageMode().toString(), option, target); } - + if (config.getDigsitePendant() && target.contains("digsite pendant")) { swap(client, config.getDigsitePendantMode().toString(), option, target); } - + if (config.getCombatBracelet() && target.contains("combat bracelet")) { swap(client, config.getCombatBraceletMode().toString(), option, target); From 1c92e67421dcb165359d029863f69b98037d21c5 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 20 May 2019 01:46:29 +0100 Subject: [PATCH 08/10] Update EasyscapeConfig.java --- .../runelite/client/plugins/easyscape/EasyscapeConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 964d07f3f3..5bf434e88a 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 @@ -675,7 +675,7 @@ public interface EasyscapeConfig extends Config ) default SlayerRingMode getSlayerRingMode() { - return SlayerRingMode.SLAYER_TOWER; + return SlayerRingMode.CHECK; } @ConfigItem( @@ -811,4 +811,4 @@ public interface EasyscapeConfig extends Config { return true; } -} \ No newline at end of file +} From d97b15a8ae9cb1843ef28c1f99ad89c285236da0 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 20 May 2019 01:48:48 +0100 Subject: [PATCH 09/10] Update EasyscapePlugin.java Logic --- .../plugins/easyscape/EasyscapePlugin.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 4c3b08ccc4..481353b296 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 @@ -360,77 +360,77 @@ public class EasyscapePlugin extends Plugin swap(client, "Monastery Teleport", option, target); } - if (target.contains("crafting cape") && config.getSwapCraftingCape()) + else if (target.contains("crafting cape") && config.getSwapCraftingCape()) { swap(client, "Teleport", option, target); } - if (target.contains("construct. cape") && config.getSwapConstructionCape()) + else if (target.contains("construct. cape") && config.getSwapConstructionCape()) { swap(client, "Tele to poh", option, target); } - if (target.contains("magic cape") && config.getSwapMagicCape()) + else if (target.contains("magic cape") && config.getSwapMagicCape()) { swap(client, "Spellbook", option, target); } - if (target.contains("explorer's ring") && config.getSwapExplorersRing()) + else if (target.contains("explorer's ring") && config.getSwapExplorersRing()) { swap(client, "Teleport", option, target); } - if (config.getGamesNecklace() && target.contains("games necklace")) + else if (config.getGamesNecklace() && target.contains("games necklace")) { swap(client, config.getGamesNecklaceMode().toString(), option, target); } - if (config.getDuelingRing() && target.contains("ring of dueling")) + else if (config.getDuelingRing() && target.contains("ring of dueling")) { swap(client, config.getDuelingRingMode().toString(), option, target); } - if (config.getGlory() && target.contains("amulet of glory") || target.contains("amulet of eternal glory")) + else if (config.getGlory() && (target.contains("amulet of glory") || target.contains("amulet of eternal glory"))) { swap(client, config.getGloryMode().toString(), option, target); } - if (config.getSkillsNecklace() && target.contains("skills necklace")) + else if (config.getSkillsNecklace() && target.contains("skills necklace")) { swap(client, config.getSkillsNecklaceMode().toString(), option, target); } - if (config.getNecklaceofPassage() && target.contains("necklace of passage")) + else if (config.getNecklaceofPassage() && target.contains("necklace of passage")) { swap(client, config.getNecklaceofPassageMode().toString(), option, target); } - if (config.getDigsitePendant() && target.contains("digsite pendant")) + else if (config.getDigsitePendant() && target.contains("digsite pendant")) { swap(client, config.getDigsitePendantMode().toString(), option, target); } - if (config.getCombatBracelet() && target.contains("combat bracelet")) + else if (config.getCombatBracelet() && target.contains("combat bracelet")) { swap(client, config.getCombatBraceletMode().toString(), option, target); } - if (config.getSlayerRing() && target.contains("slayer ring")) + else if (config.getSlayerRing() && target.contains("slayer ring")) { swap(client, config.getSlayerRingMode().toString(), option, target); } - if (config.getBurningAmulet() && target.contains("burning amulet")) + else if (config.getBurningAmulet() && target.contains("burning amulet")) { swap(client, config.getBurningAmuletMode().toString(), option, target); } - if (config.getXericsTalisman() && target.contains("xeric's talisman")) + else if (config.getXericsTalisman() && target.contains("xeric's talisman")) { swap(client, config.getXericsTalismanMode().toString(), option, target); } - if (config.getRingofWealth() && target.contains("ring of wealth")) + else if (config.getRingofWealth() && target.contains("ring of wealth")) { swap(client, config.getRingofWealthMode().toString(), option, target); } From 43922285428005372cfc787e788df313da6cdd5e Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Mon, 20 May 2019 01:51:00 +0100 Subject: [PATCH 10/10] Update SlayerRingMode.java --- .../plugins/easyscape/util/SlayerRingMode.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 b86d4aba30..f9d1864f0e 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 @@ -27,11 +27,11 @@ package net.runelite.client.plugins.easyscape.util; public enum SlayerRingMode { - SLAYER_TOWER("Slayer Tower"), - FREMENNIK_SLAYER_DUNGEON("Fremennik Slayer Dungeon"), - TARNS_LAIR("Tarn's Lair"), - STRONGHOLD_SLAYER_CAVE("Stronghold Slayer Cave"), - DARK_BEASTS("Dark Beasts"); + CHECK("Check"), + TELEPORT("Teleport"), + MASTER("Master"), + PARTNER("Partner"), + LOG("Log"); private final String name; @@ -45,4 +45,4 @@ public enum SlayerRingMode { return name; } -} \ No newline at end of file +}