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 a8aafbe6dc..e57210a6a4 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.plugins.menuentryswapper.util.BurningAmuletMode; import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode; +import net.runelite.client.plugins.menuentryswapper.util.ConstructionCapeMode; import net.runelite.client.plugins.menuentryswapper.util.DigsitePendantMode; import net.runelite.client.plugins.menuentryswapper.util.DuelingRingMode; import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode; @@ -47,7 +48,6 @@ import net.runelite.client.plugins.menuentryswapper.util.RingOfWealthMode; import net.runelite.client.plugins.menuentryswapper.util.SkillsNecklaceMode; import net.runelite.client.plugins.menuentryswapper.util.SlayerRingMode; import net.runelite.client.plugins.menuentryswapper.util.XericsTalismanMode; -import net.runelite.client.plugins.menuentryswapper.util.teleEquippedMode; import net.runelite.client.plugins.menuentryswapper.util.CharterOption; @@ -218,37 +218,11 @@ public interface MenuEntrySwapperConfig extends Config return false; } - @ConfigItem( - keyName = "teleEquippedCape", - name = "Teleport Equipped Cape", - description = "Makes Teleport/Tele to POH the left click option on equip screen", - position = 1, - group = "Equipment swapper" - ) - default boolean teleEquippedCape() - { - return false; - } - - @ConfigItem( - keyName = "telecapeMode", - name = "ModeTeleCape", - description = "", - position = 2, - group = "Equipment swapper", - hidden = true, - unhide = "teleEquippedCape" - ) - default teleEquippedMode telecapeMode() - { - return teleEquippedMode.TELEPORT; - } - @ConfigItem( keyName = "maxMode", name = "Mode", description = "", - position = 3, + position = 1, group = "Equipment swapper", hidden = true, unhide = "swapMax" @@ -262,7 +236,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapArdougneCape", name = "Swap Ardougne Cape", description = "Enables swapping of 'Teleport' and 'Wear'.", - position = 4, + position = 2, group = "Equipment swapper" ) default boolean getSwapArdougneCape() @@ -274,7 +248,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapConstructionCape", name = "Swap Construction Cape", description = "Enables swapping of 'Teleport' and 'Wear'.", - position = 5, + position = 3, group = "Equipment swapper" ) default boolean getSwapConstructionCape() @@ -282,11 +256,25 @@ public interface MenuEntrySwapperConfig extends Config return true; } + @ConfigItem( + keyName = "constructionCapeMode", + name = "Mode", + description = "", + position = 4, + group = "Equipment swapper", + hidden = true, + unhide = "swapConstructionCape" + ) + default ConstructionCapeMode constructionCapeMode() + { + return ConstructionCapeMode.TELE_TO_POH; + } + @ConfigItem( keyName = "swapCraftingCape", name = "Swap Crafting Cape", description = "Enables swapping of 'Teleport' and 'Wear'.", - position = 6, + position = 5, group = "Equipment swapper" ) default boolean getSwapCraftingCape() @@ -298,7 +286,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapMagicCape", name = "Swap Magic Cape", description = "Enables swapping of 'Spellbook' and 'Wear'.", - position = 7, + position = 6, group = "Equipment swapper" ) default boolean getSwapMagicCape() @@ -310,7 +298,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapExplorersRing", name = "Swap Explorer's Ring", description = "Enables swapping of 'Spellbook' and 'Wear'.", - position = 8, + position = 7, group = "Equipment swapper" ) default boolean getSwapExplorersRing() @@ -322,19 +310,19 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapAdmire", name = "Admire", description = "Swap 'Admire' with 'Teleport', 'Spellbook' and 'Perks' (max cape) for mounted skill capes.", - position = 9, + position = 8, group = "Equipment swapper" ) default boolean swapAdmire() { return true; } - + @ConfigItem( keyName = "swapQuestCape", name = "Swap Quest Cape", description = "Enables swapping Quest cape options in worn interface.", - position = 10, + position = 9, group = "Equipment swapper" ) default boolean swapQuestCape() @@ -346,7 +334,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "questCapeMode", name = "Mode", description = "", - position = 11, + position = 10, group = "Equipment swapper", hidden = true, unhide = "swapQuestCape" @@ -652,20 +640,20 @@ public interface MenuEntrySwapperConfig extends Config description = "Don't open implings if bank has a clue.", position = 23, group = "Miscellaneous" -) -default boolean swapImps() + ) + default boolean swapImps() { return false; } -@ConfigItem( + @ConfigItem( keyName = "charterOption", name = "Trader Crew", description = "Configure whether you want Charter or Trade to be the first option of Trader Crewmembers.", position = 24, group = "Miscellaneous" -) -default CharterOption charterOption() + ) + default CharterOption charterOption() { return CharterOption.TRADE; } @@ -1665,9 +1653,9 @@ default CharterOption charterOption() ) default boolean hideCastToB() - { - return true; - } + { + return true; + } @ConfigItem( keyName = "hideCastIgnoredToB", 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 d8779a0101..da660f1463 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 @@ -104,7 +104,7 @@ import net.runelite.client.plugins.menuentryswapper.util.RingOfWealthMode; import net.runelite.client.plugins.menuentryswapper.util.SkillsNecklaceMode; import net.runelite.client.plugins.menuentryswapper.util.SlayerRingMode; import net.runelite.client.plugins.menuentryswapper.util.XericsTalismanMode; -import net.runelite.client.plugins.menuentryswapper.util.teleEquippedMode; +import net.runelite.client.plugins.menuentryswapper.util.ConstructionCapeMode; import static net.runelite.client.util.MenuUtil.swap; import net.runelite.client.plugins.pvptools.PvpToolsConfig; @@ -214,7 +214,7 @@ public class MenuEntrySwapperPlugin extends Plugin @Setter(AccessLevel.PACKAGE) private boolean shiftModifier = false; - + private boolean getWithdrawOne; private String getWithdrawOneItems; private boolean getWithdrawFive; @@ -227,11 +227,10 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean getWithdrawAll; private String getWithdrawAllItems; private boolean swapMax; - private boolean teleEquippedCape; - private teleEquippedMode telecapeMode; private MaxCapeMode maxMode; private boolean getSwapArdougneCape; private boolean getSwapConstructionCape; + private ConstructionCapeMode constructionCapeMode; private boolean getSwapCraftingCape; private boolean getSwapMagicCape; private boolean getSwapExplorersRing; @@ -610,9 +609,9 @@ public class MenuEntrySwapperPlugin extends Plugin { if (this.hideDropRunecraftingPouch && ( entry.getTarget().contains("Small pouch") - || entry.getTarget().contains("Medium pouch") - || entry.getTarget().contains("Large pouch") - || entry.getTarget().contains("Giant pouch"))) + || entry.getTarget().contains("Medium pouch") + || entry.getTarget().contains("Large pouch") + || entry.getTarget().contains("Giant pouch"))) { continue; } @@ -990,7 +989,7 @@ public class MenuEntrySwapperPlugin extends Plugin else if (target.contains("construct. cape") && this.getSwapConstructionCape) { - swap(client, "Tele to poh", option, target); + swap(client, constructionCapeMode.toString(), option, target); } else if (target.contains("magic cape") && this.getSwapMagicCape) @@ -1098,7 +1097,7 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - + if (option.equals("talk-to") || option.equals("attack")) { if (this.swapPickpocket) @@ -1228,12 +1227,12 @@ public class MenuEntrySwapperPlugin extends Plugin { swap(client, "pay-toll(10gp)", option, target, true); } - + else if (this.swapHardWoodGrove && option.equals("open") && target.equals("hardwood grove doors")) { swap(client, "quick-pay(100)", option, target, true); } - + else if (this.swapTravel && option.equals("inspect") && target.equals("trapdoor")) { swap(client, "travel", option, target, true); @@ -1362,7 +1361,7 @@ public class MenuEntrySwapperPlugin extends Plugin { swap(client, "quick-leave", option, target, true); } - + else if (this.swapAdmire && option.equals("admire")) { swap(client, "teleport", option, target, true); @@ -1551,12 +1550,6 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.addSwap("remove", "burning amulet", this.getBurningAmuletMode.toString()); } - if (this.teleEquippedCape) - { - menuManager.addSwap("remove", "tele to poh", this.telecapeMode.toString()); - menuManager.addSwap("remove", "teleport", this.telecapeMode.toString()); - } - if (this.getCombatBracelet) { menuManager.addSwap("remove", "combat bracelet", this.getCombatBraceletMode.toString()); @@ -1635,7 +1628,7 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removeSwaps("ring of wealth"); menuManager.removeSwaps("max cape"); menuManager.removeSwaps("quest point cape"); - + } private void delete(int target) @@ -1801,11 +1794,10 @@ public class MenuEntrySwapperPlugin extends Plugin this.getWithdrawAll = config.getWithdrawAll(); this.getWithdrawAllItems = config.getWithdrawAllItems(); this.swapMax = config.swapMax(); - this.teleEquippedCape = config.teleEquippedCape(); - this.telecapeMode = config.telecapeMode(); this.maxMode = config.maxMode(); this.getSwapArdougneCape = config.getSwapArdougneCape(); this.getSwapConstructionCape = config.getSwapConstructionCape(); + this.constructionCapeMode = config.constructionCapeMode(); this.getSwapCraftingCape = config.getSwapCraftingCape(); this.getSwapMagicCape = config.getSwapMagicCape(); this.getSwapExplorersRing = config.getSwapExplorersRing(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/teleEquippedMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ConstructionCapeMode.java similarity index 69% rename from runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/teleEquippedMode.java rename to runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ConstructionCapeMode.java index 9f22bcbc3e..41966d61d6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/teleEquippedMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ConstructionCapeMode.java @@ -1,13 +1,13 @@ package net.runelite.client.plugins.menuentryswapper.util; -public enum teleEquippedMode +public enum ConstructionCapeMode { TELE_TO_POH("Tele to POH"), - TELEPORT("teleport"); + TELEPORT("Teleport"); private final String name; - teleEquippedMode(String name) + ConstructionCapeMode(String name) { this.name = name; }