From 70c162019e290cdc929947676878655d4fe6da2c Mon Sep 17 00:00:00 2001 From: Ganom Date: Fri, 16 Aug 2019 00:54:24 -0400 Subject: [PATCH] menuentryswapper: various menu fixes --- .../MenuEntrySwapperPlugin.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 2604ca54d6..ea5d4b6309 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 @@ -1004,11 +1004,6 @@ public class MenuEntrySwapperPlugin extends Plugin private void addSwaps() { - if (this.getBurningAmulet) - { - menuManager.addPriorityEntry(this.getBurningAmuletMode.toString(), "burning amulet"); - } - if (this.getWithdrawOne) { Text.fromCSV(this.getWithdrawOneItems).forEach(item -> @@ -1153,8 +1148,9 @@ public class MenuEntrySwapperPlugin extends Plugin if (this.swapBankExchange) { - menuManager.addPriorityEntry("Bank").setPriority(1); - menuManager.addPriorityEntry("Exchange").setPriority(10); + menuManager.addPriorityEntry("Collect-notes").setPriority(1); + menuManager.addPriorityEntry("Bank"); + menuManager.addPriorityEntry("Exchange"); } if (this.swapContract) @@ -1312,7 +1308,7 @@ public class MenuEntrySwapperPlugin extends Plugin if (this.swapSearch) { - menuManager.addPriorityEntry("Search"); + menuManager.addPriorityEntry("Search").setPriority(1); } if (this.swapRogueschests) @@ -1405,6 +1401,11 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.addPriorityEntry("Quick-pay(100)", "Hardwood grove doors"); } + if (this.getBurningAmulet) + { + menuManager.addPriorityEntry(new EquipmentComparableEntry(this.getBurningAmuletMode.toString(), "burning amulet")); + } + if (this.getCombatBracelet) { menuManager.addPriorityEntry(new EquipmentComparableEntry(this.getCombatBraceletMode.toString(), "combat bracelet")); @@ -1530,6 +1531,7 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removePriorityEntry("Teleport", "Explorer's ring 3"); menuManager.removePriorityEntry("Teleport", "Explorer's ring 4"); menuManager.removePriorityEntry("Pickpocket"); + menuManager.removePriorityEntry("Collect"); menuManager.removePriorityEntry("Send-parcel", "Rionasta"); menuManager.removePriorityEntry("Bank"); menuManager.removePriorityEntry("Exchange"); @@ -1717,8 +1719,8 @@ public class MenuEntrySwapperPlugin extends Plugin return; } - menuManager.addPriorityEntry("build", item); - menuManager.addPriorityEntry("remove", item); + menuManager.addPriorityEntry("build", item).setPriority(100); + menuManager.addPriorityEntry("remove", item).setPriority(100); leftClickConstructionItems.add(item); });