From 3553a98f9780fb10964cab3b6e9cb31f515943fa Mon Sep 17 00:00:00 2001 From: LoneVV <55526650+LoneVV@users.noreply.github.com> Date: Sun, 22 Sep 2019 23:30:22 +0300 Subject: [PATCH] MenuEntrySwapper: Improved Ardougne Cloak (#1623) --- .../MenuEntrySwapperConfig.java | 37 +++++++++++++------ .../MenuEntrySwapperPlugin.java | 13 ++++--- .../util/ArdougneCloakMode.java | 27 ++++++++++++++ 3 files changed, 61 insertions(+), 16 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ArdougneCloakMode.java 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 209db98854..b492bf5ea7 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 @@ -32,6 +32,7 @@ import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigSection; import net.runelite.client.config.Keybind; +import net.runelite.client.plugins.menuentryswapper.util.ArdougneCloakMode; import net.runelite.client.plugins.menuentryswapper.util.BurningAmuletMode; import net.runelite.client.plugins.menuentryswapper.util.CharterOption; import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode; @@ -334,22 +335,36 @@ public interface MenuEntrySwapperConfig extends Config } @ConfigItem( - keyName = "swapArdougneCape", - name = "Ardougne Cape", + keyName = "swapArdougneCloak", + name = "Ardougne Cloak", description = "Enables swapping of 'Teleport' and 'Wear'.", position = 2, section = "equipmentSwapperSection" ) - default boolean getSwapArdougneCape() + default boolean getSwapArdougneCloak() { return false; } + @ConfigItem( + keyName = "ardougneCloakMode", + name = "Mode", + description = "", + position = 3, + section = "equipmentSwapperSection", + hidden = true, + unhide = "swapArdougneCloak" + ) + default ArdougneCloakMode ardougneCloakMode() + { + return ArdougneCloakMode.TELE_TO_MONASTERY; + } + @ConfigItem( keyName = "swapConstructionCape", name = "Construction Cape", description = "Enables swapping of 'Teleport' and 'Wear'.", - position = 3, + position = 4, section = "equipmentSwapperSection" ) default boolean getSwapConstructionCape() @@ -361,7 +376,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "constructionCapeMode", name = "Mode", description = "", - position = 4, + position = 5, section = "equipmentSwapperSection", hidden = true, unhide = "swapConstructionCape" @@ -375,7 +390,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapCraftingCape", name = "Crafting Cape", description = "Enables swapping of 'Teleport' and 'Wear'.", - position = 5, + position = 6, section = "equipmentSwapperSection" ) default boolean getSwapCraftingCape() @@ -387,7 +402,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapMagicCape", name = "Magic Cape", description = "Enables swapping of 'Spellbook' and 'Wear'.", - position = 6, + position = 7, section = "equipmentSwapperSection" ) default boolean getSwapMagicCape() @@ -399,7 +414,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapExplorersRing", name = "Explorer's Ring", description = "Enables swapping of 'Spellbook' and 'Wear'.", - position = 7, + position = 8, section = "equipmentSwapperSection" ) default boolean getSwapExplorersRing() @@ -411,7 +426,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapAdmire", name = "Admire", description = "Swap 'Admire' with 'Teleport', 'Spellbook' and 'Perks' (max cape) for mounted skill capes.", - position = 8, + position = 9, section = "equipmentSwapperSection" ) default boolean swapAdmire() @@ -423,7 +438,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapQuestCape", name = "Quest Cape", description = "Enables swapping Quest cape options in worn interface.", - position = 9, + position = 10, section = "equipmentSwapperSection" ) default boolean swapQuestCape() @@ -435,7 +450,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "questCapeMode", name = "Mode", description = "", - position = 10, + position = 11, section = "equipmentSwapperSection", hidden = true, unhide = "swapQuestCape" 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 3609602357..61acee9b51 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 @@ -88,6 +88,7 @@ import net.runelite.client.plugins.menuentryswapper.comparables.EquipmentCompara import net.runelite.client.plugins.menuentryswapper.comparables.InventoryComparableEntry; import net.runelite.client.plugins.menuentryswapper.comparables.ShopComparableEntry; import net.runelite.client.plugins.menuentryswapper.comparables.WithdrawComparableEntry; +import net.runelite.client.plugins.menuentryswapper.util.ArdougneCloakMode; import net.runelite.client.plugins.menuentryswapper.util.BurningAmuletMode; import net.runelite.client.plugins.menuentryswapper.util.CharterOption; import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode; @@ -187,6 +188,7 @@ public class MenuEntrySwapperPlugin extends Plugin private BurningAmuletMode getBurningAmuletMode; private CharterOption charterOption; private CombatBraceletMode getCombatBraceletMode; + private ArdougneCloakMode ardougneCloakMode; private ConstructionCapeMode constructionCapeMode; private ConstructionMode getConstructionMode; private DigsitePendantMode getDigsitePendantMode; @@ -222,7 +224,7 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean getRingofWealth; private boolean getSkillsNecklace; private boolean getSlayerRing; - private boolean getSwapArdougneCape; + private boolean getSwapArdougneCloak; private boolean getSwapConstructionCape; private boolean getSwapCraftingCape; private boolean getSwapExplorersRing; @@ -770,10 +772,10 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.addPriorityEntry("Buy All").setPriority(10); } - if (this.getSwapArdougneCape) + if (this.getSwapArdougneCloak) { - menuManager.addPriorityEntry("Kandarin Monastery"); - menuManager.addPriorityEntry("Monastery Teleport"); + menuManager.addPriorityEntry(this.ardougneCloakMode.toString()).setPriority(100); + menuManager.addPriorityEntry(this.ardougneCloakMode.toString2()).setPriority(100); } if (this.getSwapCraftingCape) @@ -1536,6 +1538,7 @@ public class MenuEntrySwapperPlugin extends Plugin this.charterOption = config.charterOption(); this.configCustomShiftSwaps = config.shiftCustomSwaps(); this.configCustomSwaps = config.customSwaps(); + this.ardougneCloakMode = config.ardougneCloakMode(); this.constructionCapeMode = config.constructionCapeMode(); this.getBurningAmulet = config.getBurningAmulet(); this.getBurningAmuletMode = config.getBurningAmuletMode(); @@ -1559,7 +1562,7 @@ public class MenuEntrySwapperPlugin extends Plugin this.getSkillsNecklaceMode = config.getSkillsNecklaceMode(); this.getSlayerRing = config.getSlayerRing(); this.getSlayerRingMode = config.getSlayerRingMode(); - this.getSwapArdougneCape = config.getSwapArdougneCape(); + this.getSwapArdougneCloak = config.getSwapArdougneCloak(); this.getSwapConstructionCape = config.getSwapConstructionCape(); this.getSwapCraftingCape = config.getSwapCraftingCape(); this.getSwapExplorersRing = config.getSwapExplorersRing(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ArdougneCloakMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ArdougneCloakMode.java new file mode 100644 index 0000000000..02812ca8f4 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ArdougneCloakMode.java @@ -0,0 +1,27 @@ +package net.runelite.client.plugins.menuentryswapper.util; + +public enum ArdougneCloakMode +{ + TELE_TO_MONASTERY("Monastery Teleport", "Kandarin Monastery"), + TELE_TO_FARM("Farm Teleport", "Ardougne Farm"); + + private final String name, name2; + + ArdougneCloakMode(String name, String name2) + { + this.name = name; + this.name2 = name2; + } + + @Override + public String toString() + { + return name; + } + + public String toString2() + { + return name2; + } +} +