menuentryswapper: various menu fixes and changes (#1359)

menuentryswapper: various menu fixes and changes
2019-08-16 21:28:20 +02:00
parent 3232b74f27 bc4168c400
commit 8a89aabee6
4 changed files with 251 additions and 222 deletions
--- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
@@ -569,6 +569,11 @@ public class MenuManager
 		return entry;
 	}

+	public void removePriorityEntry(AbstractComparableEntry entry)
+	{
+		priorityEntries.removeIf(entry::equals);
+	}
+
 	public void removePriorityEntry(String option)
 	{
 		option = Text.standardize(option);
--- 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
@@ -31,8 +31,10 @@ import net.runelite.client.config.Config;
 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.CharterOption;
 import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode;
 import net.runelite.client.plugins.menuentryswapper.util.ConstructionCapeMode;
+import net.runelite.client.plugins.menuentryswapper.util.ConstructionMode;
 import net.runelite.client.plugins.menuentryswapper.util.DigsitePendantMode;
 import net.runelite.client.plugins.menuentryswapper.util.DuelingRingMode;
 import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode;
@@ -48,7 +50,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.CharterOption;


@ConfigGroup("menuentryswapper")
@@ -208,7 +209,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapMax",
-		name = "Swap Max Cape",
+		name = "Max Cape",
 		description = "Enables swapping max cape options in worn interface.",
 		position = 0,
 		group = "Equipment swapper"
@@ -234,7 +235,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapArdougneCape",
-		name = "Swap Ardougne Cape",
+		name = "Ardougne Cape",
 		description = "Enables swapping of 'Teleport' and 'Wear'.",
 		position = 2,
 		group = "Equipment swapper"
@@ -246,7 +247,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapConstructionCape",
-		name = "Swap Construction Cape",
+		name = "Construction Cape",
 		description = "Enables swapping of 'Teleport' and 'Wear'.",
 		position = 3,
 		group = "Equipment swapper"
@@ -272,7 +273,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapCraftingCape",
-		name = "Swap Crafting Cape",
+		name = "Crafting Cape",
 		description = "Enables swapping of 'Teleport' and 'Wear'.",
 		position = 5,
 		group = "Equipment swapper"
@@ -284,7 +285,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapMagicCape",
-		name = "Swap Magic Cape",
+		name = "Magic Cape",
 		description = "Enables swapping of 'Spellbook' and 'Wear'.",
 		position = 6,
 		group = "Equipment swapper"
@@ -296,7 +297,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapExplorersRing",
-		name = "Swap Explorer's Ring",
+		name = "Explorer's Ring",
 		description = "Enables swapping of 'Spellbook' and 'Wear'.",
 		position = 7,
 		group = "Equipment swapper"
@@ -320,7 +321,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapQuestCape",
-		name = "Swap Quest Cape",
+		name = "Quest Cape",
 		description = "Enables swapping Quest cape options in worn interface.",
 		position = 9,
 		group = "Equipment swapper"
@@ -377,7 +378,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapCoalBag",
-		name = "Swap Coal Bag Empty",
+		name = "Coal Bag",
 		description = "Makes Empty the left click option when in a bank",
 		position = 2,
 		group = "Miscellaneous"
@@ -664,7 +665,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapBuyOne",
-		name = "Swappable Buy One",
+		name = "Buy One",
 		description = "",
 		position = 0,
 		group = "Shop / stores"
@@ -690,7 +691,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapBuyFive",
-		name = "Swappable Buy Five",
+		name = "Buy Five",
 		description = "",
 		position = 2,
 		group = "Shop / stores"
@@ -716,7 +717,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapBuyTen",
-		name = "Swappable Buy Ten",
+		name = "Buy Ten",
 		description = "",
 		position = 4,
 		group = "Shop / stores"
@@ -742,7 +743,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapBuyFifty",
-		name = "Swappable Buy Fifty",
+		name = "Buy Fifty",
 		description = "",
 		position = 6,
 		group = "Shop / stores"
@@ -768,7 +769,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSellOne",
-		name = "Swappable Sell One",
+		name = "Sell One",
 		description = "",
 		position = 8,
 		group = "Shop / stores"
@@ -794,7 +795,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSellFive",
-		name = "Swappable Sell Five",
+		name = "Sell Five",
 		description = "",
 		position = 10,
 		group = "Shop / stores"
@@ -820,7 +821,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSellTen",
-		name = "Swappable Sell Ten",
+		name = "Sell Ten",
 		description = "",
 		position = 12,
 		group = "Shop / stores"
@@ -846,7 +847,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSellFifty",
-		name = "Swappable Sell Fifty",
+		name = "Sell Fifty",
 		description = "",
 		position = 14,
 		group = "Shop / stores"
@@ -881,29 +882,28 @@ public interface MenuEntrySwapperConfig extends Config
 		position = 0,
 		group = "Skilling"
 	)
-
 	default boolean getEasyConstruction()
 	{
 		return true;
 	}

 	@ConfigItem(
-		keyName = "getEasyConstructionItems",
-		name = "Build Items",
+		keyName = "getConstructionMode",
+		name = "EZ Construction Type",
 		description = "",
 		position = 1,
 		group = "Skilling",
 		hidden = true,
 		unhide = "getEasyConstruction"
 	)
-	default String getEasyConstructionItems()
+	default ConstructionMode getConstructionMode()
 	{
-		return "";
+		return ConstructionMode.LARDER;
 	}

 	@ConfigItem(
 		keyName = "swapTanning",
-		name = "Swap Tanning",
+		name = "Tanning",
 		description = "Enables swapping of 'Tan-1' and 'Tan-all' options.",
 		position = 2,
 		group = "Skilling"
@@ -915,7 +915,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSawmill",
-		name = "Swap Sawmill Operator",
+		name = "Sawmill Operator",
 		description = "Makes 'Buy-plank' the default option on the Sawmill Operator.",
 		position = 3,
 		group = "Skilling"
@@ -927,7 +927,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSawmillPlanks",
-		name = "Swap Buy Planks",
+		name = "Buy Planks",
 		description = "Makes 'Buy All' the default option when buying planks.",
 		position = 4,
 		group = "Skilling"
@@ -939,7 +939,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapPuroPuro",
-		name = "Swap Puro-Puro Wheat",
+		name = "Puro-Puro Wheat",
 		description = "",
 		position = 5,
 		group = "Skilling"
@@ -1204,7 +1204,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapGamesNecklace",
-		name = "Swap Games Necklace",
+		name = "Games Necklace",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Games Necklace.",
 		position = 7,
 		group = "Teleportation"
@@ -1230,7 +1230,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapDuelingRing",
-		name = "Swap Dueling Ring",
+		name = "Dueling Ring",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Ring of Dueling.",
 		position = 9,
 		group = "Teleportation"
@@ -1256,7 +1256,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapGlory",
-		name = "Swap Glory",
+		name = "Glory",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Amulet of Glory / Amulet of Eternal Glory.",
 		position = 11,
 		group = "Teleportation"
@@ -1282,7 +1282,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapSkill",
-		name = "Swap Skill",
+		name = "Skills Necklace",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Skills Necklace.",
 		position = 13,
 		group = "Teleportation"
@@ -1308,7 +1308,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapPassage",
-		name = "Swap Passage",
+		name = "Passage Necklace",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Necklace of Passage.",
 		position = 15,
 		group = "Teleportation"
@@ -1334,7 +1334,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapDigsite",
-		name = "Swap Digsite",
+		name = "Digsite Pendant",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Digsite Pendant.",
 		position = 17,
 		group = "Teleportation"
@@ -1360,7 +1360,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapCombat",
-		name = "Swap Combat",
+		name = "Combat Bracelet",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Combat Bracelet.",
 		position = 19,
 		group = "Teleportation"
@@ -1386,7 +1386,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapburning",
-		name = "Swap Burning",
+		name = "Burning Amulet",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Burning Amulet.",
 		position = 21,
 		group = "Teleportation"
@@ -1412,7 +1412,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapxeric",
-		name = "Swap Xeric's",
+		name = "Xeric's Talisman",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Xeric's Talisman.",
 		position = 23,
 		group = "Teleportation"
@@ -1438,7 +1438,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapwealth",
-		name = "Swap Wealth",
+		name = "Ring of Wealth",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Ring of Wealth.",
 		position = 25,
 		group = "Teleportation"
@@ -1464,7 +1464,7 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "swapslayer",
-		name = "Swap Slayer Ring",
+		name = "Slayer Ring",
 		description = "",
 		position = 27,
 		group = "Teleportation"
@@ -1494,10 +1494,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideExamine",
-		name = "Hide Examine",
+		name = "Examine",
 		description = "Hides the 'Examine' option from the right click menu.",
 		position = 0,
-		group = "Right Click Options"
+		group = "Hide Right Click Options"
 	)
 	default boolean hideExamine()
 	{
@@ -1506,10 +1506,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideTradeWith",
-		name = "Hide Trade With",
+		name = "Trade With",
 		description = "Hides the 'Trade with' option from the right click menu.",
 		position = 1,
-		group = "Right Click Options"
+		group = "Hide Right Click Options"
 	)
 	default boolean hideTradeWith()
 	{
@@ -1518,10 +1518,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideReport",
-		name = "Hide Report",
+		name = "Report",
 		description = "Hides the 'Report' option from the right click menu.",
 		position = 2,
-		group = "Right Click Options"
+		group = "Hide Right Click Options"
 	)
 	default boolean hideReport()
 	{
@@ -1530,10 +1530,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideLookup",
-		name = "Hide Lookup",
+		name = "Lookup",
 		description = "Hides the 'Lookup' option from the right click menu.",
 		position = 3,
-		group = "Right Click Options"
+		group = "Hide Right Click Options"
 	)
 	default boolean hideLookup()
 	{
@@ -1542,10 +1542,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideNet",
-		name = "Hide Net",
+		name = "Net",
 		description = "Hides the 'Net' option from the right click menu.",
 		position = 4,
-		group = "Right Click Options"
+		group = "Hide Right Click Options"
 	)
 	default boolean hideNet()
 	{
@@ -1554,10 +1554,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideBait",
-		name = "Hide Bait",
+		name = "Bait",
 		description = "Hides the 'Bait' option from the right click menu.",
 		position = 5,
-		group = "Right Click Options"
+		group = "Hide Right Click Options"
 	)
 	default boolean hideBait()
 	{
@@ -1570,10 +1570,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDestroyRunepouch",
-		name = "Hide Destroy on Rune Pouch",
+		name = "Destroy on Rune Pouch",
 		description = "Hides the 'Destroy' option when right clicking a Rune pouch.",
 		position = 0,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDestroyRunepouch()
 	{
@@ -1582,10 +1582,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDestroyCoalbag",
-		name = "Hide Destroy on Coal bag",
+		name = "Destroy on Coal bag",
 		description = "Hides the 'Destroy' option when right clicking a Coal bag.",
 		position = 1,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDestroyCoalbag()
 	{
@@ -1594,10 +1594,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDestroyHerbsack",
-		name = "Hide Destroy on Herb sack",
+		name = "Destroy on Herb sack",
 		description = "Hides the 'Destroy' option when right clicking a Herb sack.",
 		position = 2,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDestroyHerbsack()
 	{
@@ -1606,10 +1606,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDestroyBoltpouch",
-		name = "Hide Destroy on Bolt pouch",
+		name = "Destroy on Bolt pouch",
 		description = "Hides the 'Destroy' option when right clicking a Bolt pouch.",
 		position = 3,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDestroyBoltpouch()
 	{
@@ -1618,10 +1618,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDestroyGembag",
-		name = "Hide Destroy on Gem bag",
+		name = "Destroy on Gem bag",
 		description = "Hides the 'Destroy' option when right clicking a Gem bag.",
 		position = 4,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDestroyGembag()
 	{
@@ -1630,10 +1630,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDestroyLootingBag",
-		name = "Hide Destroy on Looting bag",
+		name = "Destroy on Looting bag",
 		description = "Hides the 'Destroy' option when right clicking a Looting bag.",
 		position = 5,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDestroyLootingBag()
 	{
@@ -1642,10 +1642,10 @@ public interface MenuEntrySwapperConfig extends Config

 	@ConfigItem(
 		keyName = "hideDropRunecraftingPouch",
-		name = "Hide Drop on RC pouches",
+		name = "Drop on RC pouches",
 		description = "Hides the 'Drop' option when right clicking a Small, Medium, Large, or Giant pouch.",
 		position = 6,
-		group = "Untradeables"
+		group = "Hide Untradeable Options"
 	)
 	default boolean hideDropRunecraftingPouch()
 	{
--- 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
@@ -90,6 +90,7 @@ import net.runelite.client.plugins.menuentryswapper.util.BurningAmuletMode;
 import net.runelite.client.plugins.menuentryswapper.util.CharterOption;
 import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode;
 import net.runelite.client.plugins.menuentryswapper.util.ConstructionCapeMode;
+import net.runelite.client.plugins.menuentryswapper.util.ConstructionMode;
 import net.runelite.client.plugins.menuentryswapper.util.DigsitePendantMode;
 import net.runelite.client.plugins.menuentryswapper.util.DuelingRingMode;
 import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode;
@@ -187,130 +188,130 @@ public class MenuEntrySwapperPlugin extends Plugin
 	@Setter(AccessLevel.PACKAGE)
 	private boolean shiftModifier = false;

-	private boolean getWithdrawOne;
-	private String getWithdrawOneItems;
-	private boolean getWithdrawFive;
+	private ConstructionMode getConstructionMode;
+	private BurningAmuletMode getBurningAmuletMode;
+	private CharterOption charterOption;
+	private CombatBraceletMode getCombatBraceletMode;
+	private ConstructionCapeMode constructionCapeMode;
+	private DigsitePendantMode getDigsitePendantMode;
+	private DuelingRingMode getDuelingRingMode;
+	private FairyRingMode swapFairyRingMode;
+	private GamesNecklaceMode getGamesNecklaceMode;
+	private GloryMode getGloryMode;
+	private HouseMode swapHomePortalMode;
+	private MaxCapeMode maxMode;
+	private NecklaceOfPassageMode getNecklaceofPassageMode;
+	private ObeliskMode swapObeliskMode;
+	private OccultAltarMode swapOccultMode;
+	private QuestCapeMode questCapeMode;
+	private RingOfWealthMode getRingofWealthMode;
+	private Set<String> hideCastIgnoredCoX;
+	private Set<String> hideCastIgnoredToB;
+	private SkillsNecklaceMode getSkillsNecklaceMode;
+	private SlayerRingMode getSlayerRingMode;
+	private String configCustomSwaps;
+	private String getBuyFiftyItems;
+	private String getBuyFiveItems;
+	private String getBuyOneItems;
+	private String getBuyTenItems;
+	private String getRemovedObjects;
+	private String getSellFiftyItems;
+	private String getSellFiveItems;
+	private String getSellOneItems;
+	private String getSellTenItems;
+	private String getWithdrawAllItems;
 	private String getWithdrawFiveItems;
-	private boolean getWithdrawTen;
+	private String getWithdrawOneItems;
 	private String getWithdrawTenItems;
-	private boolean getWithdrawX;
 	private String getWithdrawXAmount;
 	private String getWithdrawXItems;
-	private boolean getWithdrawAll;
-	private String getWithdrawAllItems;
-	private boolean swapMax;
-	private MaxCapeMode maxMode;
-	private boolean getSwapArdougneCape;
-	private boolean getSwapConstructionCape;
-	private ConstructionCapeMode constructionCapeMode;
-	private boolean getSwapCraftingCape;
-	private boolean getSwapMagicCape;
-	private boolean getSwapExplorersRing;
-	private boolean swapAdmire;
-	private boolean swapQuestCape;
-	private QuestCapeMode questCapeMode;
-	private String configCustomSwaps;
-	private boolean shiftClickCustomization;
-	private boolean swapCoalBag;
-	private boolean swapBirdhouseEmpty;
-	private boolean swapBones;
-	private boolean swapChase;
-	private boolean swapHarpoon;
-	private OccultAltarMode swapOccultMode;
-	private HouseMode swapHomePortalMode;
-	private boolean swapPrivate;
-	private boolean swapPick;
-	private boolean swapQuick;
-	private boolean swapBoxTrap;
-	private boolean rockCake;
-	private boolean swapRogueschests;
-	private boolean swapClimbUpDown;
-	private boolean swapStun;
-	private boolean swapSearch;
-	private boolean swapHardWoodGrove;
-	private boolean getRemoveObjects;
-	private String getRemovedObjects;
-	private boolean swapImps;
-	private CharterOption charterOption;
-	private boolean getSwapBuyOne;
-	private String getBuyOneItems;
-	private boolean getSwapBuyFive;
-	private String getBuyFiveItems;
-	private boolean getSwapBuyTen;
-	private String getBuyTenItems;
-	private boolean getSwapBuyFifty;
-	private String getBuyFiftyItems;
-	private boolean getSwapSellOne;
-	private String getSellOneItems;
-	private boolean getSwapSellFive;
-	private String getSellFiveItems;
-	private boolean getSwapSellTen;
-	private String getSellTenItems;
-	private boolean getSwapSellFifty;
-	private String getSellFiftyItems;
+	private XericsTalismanMode getXericsTalismanMode;
+	private boolean getBurningAmulet;
+	private boolean getCombatBracelet;
+	private boolean getDigsitePendant;
+	private boolean getDuelingRing;
 	private boolean getEasyConstruction;
-	private String getEasyConstructionItems;
-	private boolean getSwapTanning;
+	private boolean getGamesNecklace;
+	private boolean getGlory;
+	private boolean getNecklaceofPassage;
+	private boolean getRemoveObjects;
+	private boolean getRingofWealth;
+	private boolean getSkillsNecklace;
+	private boolean getSlayerRing;
+	private boolean getSwapArdougneCape;
+	private boolean getSwapBuyFifty;
+	private boolean getSwapBuyFive;
+	private boolean getSwapBuyOne;
+	private boolean getSwapBuyTen;
+	private boolean getSwapConstructionCape;
+	private boolean getSwapCraftingCape;
+	private boolean getSwapExplorersRing;
+	private boolean getSwapMagicCape;
+	private boolean getSwapPuro;
 	private boolean getSwapSawmill;
 	private boolean getSwapSawmillPlanks;
-	private boolean getSwapPuro;
-	private boolean swapAssignment;
-	private boolean swapBankExchange;
-	private boolean swapContract;
-	private boolean swapInteract;
-	private boolean swapPickpocket;
-	private boolean swapPay;
-	private boolean swapAbyssTeleport;
-	private boolean swapTrade;
-	private boolean swapTravel;
-	private boolean swapMinigame;
-	private boolean swapPlank;
-	private boolean swapMetamorphosis;
-	private boolean swapEnchant;
-	private FairyRingMode swapFairyRingMode;
-	private ObeliskMode swapObeliskMode;
-	private boolean swapTeleportItem;
-	private boolean swapWildernessLever;
-	private boolean swapNexus;
-	private boolean getGamesNecklace;
-	private GamesNecklaceMode getGamesNecklaceMode;
-	private boolean getDuelingRing;
-	private DuelingRingMode getDuelingRingMode;
-	private boolean getGlory;
-	private GloryMode getGloryMode;
-	private boolean getSkillsNecklace;
-	private SkillsNecklaceMode getSkillsNecklaceMode;
-	private boolean getNecklaceofPassage;
-	private NecklaceOfPassageMode getNecklaceofPassageMode;
-	private boolean getDigsitePendant;
-	private DigsitePendantMode getDigsitePendantMode;
-	private boolean getCombatBracelet;
-	private CombatBraceletMode getCombatBraceletMode;
-	private boolean getBurningAmulet;
-	private BurningAmuletMode getBurningAmuletMode;
+	private boolean getSwapSellFifty;
+	private boolean getSwapSellFive;
+	private boolean getSwapSellOne;
+	private boolean getSwapSellTen;
+	private boolean getSwapTanning;
+	private boolean getWithdrawAll;
+	private boolean getWithdrawFive;
+	private boolean getWithdrawOne;
+	private boolean getWithdrawTen;
+	private boolean getWithdrawX;
 	private boolean getXericsTalisman;
-	private XericsTalismanMode getXericsTalismanMode;
-	private boolean getRingofWealth;
-	private RingOfWealthMode getRingofWealthMode;
-	private boolean getSlayerRing;
-	private SlayerRingMode getSlayerRingMode;
+	private boolean hideBait;
+	private boolean hideCastCoX;
+	private boolean hideCastToB;
+	private boolean hideDestroyBoltpouch;
+	private boolean hideDestroyCoalbag;
+	private boolean hideDestroyGembag;
+	private boolean hideDestroyHerbsack;
+	private boolean hideDestroyLootingBag;
+	private boolean hideDestroyRunepouch;
+	private boolean hideDropRunecraftingPouch;
 	private boolean hideExamine;
-	private boolean hideTradeWith;
-	private boolean hideReport;
 	private boolean hideLookup;
 	private boolean hideNet;
-	private boolean hideBait;
-	private boolean hideDestroyRunepouch;
-	private boolean hideDestroyCoalbag;
-	private boolean hideDestroyHerbsack;
-	private boolean hideDestroyBoltpouch;
-	private boolean hideDestroyGembag;
-	private boolean hideDestroyLootingBag;
-	private boolean hideDropRunecraftingPouch;
-	private boolean hideCastToB;
-	private Set<String> hideCastIgnoredToB;
-	private boolean hideCastCoX;
-	private Set<String> hideCastIgnoredCoX;
+	private boolean hideReport;
+	private boolean hideTradeWith;
+	private boolean rockCake;
+	private boolean shiftClickCustomization;
+	private boolean swapAbyssTeleport;
+	private boolean swapAdmire;
+	private boolean swapAssignment;
+	private boolean swapBankExchange;
+	private boolean swapBirdhouseEmpty;
+	private boolean swapBones;
+	private boolean swapBoxTrap;
+	private boolean swapChase;
+	private boolean swapClimbUpDown;
+	private boolean swapCoalBag;
+	private boolean swapContract;
+	private boolean swapEnchant;
+	private boolean swapHardWoodGrove;
+	private boolean swapHarpoon;
+	private boolean swapImps;
+	private boolean swapInteract;
+	private boolean swapMax;
+	private boolean swapMetamorphosis;
+	private boolean swapMinigame;
+	private boolean swapNexus;
+	private boolean swapPay;
+	private boolean swapPick;
+	private boolean swapPickpocket;
+	private boolean swapPlank;
+	private boolean swapPrivate;
+	private boolean swapQuestCape;
+	private boolean swapQuick;
+	private boolean swapRogueschests;
+	private boolean swapSearch;
+	private boolean swapStun;
+	private boolean swapTeleportItem;
+	private boolean swapTrade;
+	private boolean swapTravel;
+	private boolean swapWildernessLever;

 	@Provides
 	MenuEntrySwapperConfig provideConfig(ConfigManager configManager)
@@ -324,7 +325,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 		updateConfig();
 		addSubscriptions();
 		addSwaps();
-		loadConstructionItems(config.getEasyConstructionItems());
+		loadConstructionItems();

 		if (config.shiftClickCustomization())
 		{
@@ -345,7 +346,6 @@ public class MenuEntrySwapperPlugin extends Plugin
 		eventBus.unregister(this);

 		disableCustomization();
-		loadConstructionItems("");
 		loadCustomSwaps(""); // Removes all custom swaps
 		removeSwaps();

@@ -378,7 +378,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 		removeSwaps();
 		updateConfig();
 		addSwaps();
-		loadConstructionItems(this.getEasyConstructionItems);
+		loadConstructionItems();

 		if (!CONFIG_GROUP.equals(event.getGroup()))
 		{
@@ -492,7 +492,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}

-		loadConstructionItems(this.getEasyConstructionItems);
+		loadConstructionItems();
 	}

 	private void onVarbitChanged(VarbitChanged event)
@@ -721,7 +721,6 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}

-		final String pOptionToReplace = Text.removeTags(event.getOption()).toUpperCase();
 		final int eventId = event.getIdentifier();
 		final String option = Text.standardize(event.getOption());
 		final String target = Text.standardize(event.getTarget());
@@ -871,15 +870,11 @@ public class MenuEntrySwapperPlugin extends Plugin

 		if (this.shiftClickCustomization && shiftModifier && !option.equals("use"))
 		{
-			Integer customOption = getSwapConfig(eventId);
+			final Integer customOption = getSwapConfig(eventId);

 			if (customOption != null && customOption == -1)
 			{
-				menuManager.addPriorityEntry("Use");
-			}
-			else
-			{
-				menuManager.removePriorityEntry("Use");
+				swap(client, "use", option, target, true);
 			}
 		}
 	}
@@ -1004,11 +999,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 +1143,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 +1303,7 @@ public class MenuEntrySwapperPlugin extends Plugin

 		if (this.swapSearch)
 		{
-			menuManager.addPriorityEntry("Search");
+			menuManager.addPriorityEntry("Search").setPriority(1);
 		}

 		if (this.swapRogueschests)
@@ -1405,6 +1396,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 +1526,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-notes");
 		menuManager.removePriorityEntry("Send-parcel", "Rionasta");
 		menuManager.removePriorityEntry("Bank");
 		menuManager.removePriorityEntry("Exchange");
@@ -1608,6 +1605,8 @@ public class MenuEntrySwapperPlugin extends Plugin
 		menuManager.removeSwap("Wield", "", "Rub");
 		menuManager.removeSwap("Wear", "", "Teleport");
 		menuManager.removeSwap("Wield", "", "Teleport");
+		menuManager.removePriorityEntry(this.getConstructionMode.getBuild());
+		menuManager.removePriorityEntry(this.getConstructionMode.getRemove());

 		switch (this.swapFairyRingMode)
 		{
@@ -1689,39 +1688,24 @@ public class MenuEntrySwapperPlugin extends Plugin
 		}
 	}

-	private void loadConstructionItems(String from)
+	private void loadConstructionItems()
 	{
-		if (client.getGameState() != GameState.LOGGED_IN
-			|| Strings.isNullOrEmpty(from) && leftClickConstructionItems.isEmpty())
+		if (client.getGameState() != GameState.LOGGED_IN)
 		{
 			return;
 		}

-		if (!leftClickConstructionItems.isEmpty())
+		if (!buildingMode)
 		{
-			leftClickConstructionItems.forEach(item ->
-			{
-				menuManager.removePriorityEntry("build", item);
-				menuManager.removePriorityEntry("remove", item);
-			});
-
-			leftClickConstructionItems.clear();
+			menuManager.removePriorityEntry(this.getConstructionMode.getBuild());
+			menuManager.removePriorityEntry(this.getConstructionMode.getRemove());
+			return;
 		}

-		if (this.getEasyConstruction && !Strings.isNullOrEmpty(from) && buildingMode)
+		if (this.getEasyConstruction)
 		{
-			Text.fromCSV(from).forEach(item ->
-			{
-				if (leftClickConstructionItems.contains(item))
-				{
-					return;
-				}
-
-				menuManager.addPriorityEntry("build", item);
-				menuManager.addPriorityEntry("remove", item);
-
-				leftClickConstructionItems.add(item);
-			});
+			menuManager.addPriorityEntry(this.getConstructionMode.getBuild()).setPriority(100);
+			menuManager.addPriorityEntry(this.getConstructionMode.getRemove()).setPriority(100);
 		}
 	}

@@ -1732,7 +1716,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}

-		menuManager.addPriorityEntry("climb-up");
+		menuManager.addPriorityEntry("climb-up").setPriority(100);
 	}

 	void stopShift()
@@ -1747,7 +1731,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}

-		menuManager.addPriorityEntry("climb-down");
+		menuManager.addPriorityEntry("climb-down").setPriority(100);
 	}

 	void stopControl()
@@ -1872,7 +1856,6 @@ public class MenuEntrySwapperPlugin extends Plugin
 		this.getSwapSellFifty = config.getSwapSellFifty();
 		this.getSellFiftyItems = config.getSellFiftyItems();
 		this.getEasyConstruction = config.getEasyConstruction();
-		this.getEasyConstructionItems = config.getEasyConstructionItems();
 		this.getSwapTanning = config.getSwapTanning();
 		this.getSwapSawmill = config.getSwapSawmill();
 		this.getSwapSawmillPlanks = config.getSwapSawmillPlanks();
@@ -1911,6 +1894,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 		this.getCombatBraceletMode = config.getCombatBraceletMode();
 		this.getBurningAmulet = config.getBurningAmulet();
 		this.getBurningAmuletMode = config.getBurningAmuletMode();
+		this.getConstructionMode = config.getConstructionMode();
 		this.getXericsTalisman = config.getXericsTalisman();
 		this.getXericsTalismanMode = config.getXericsTalismanMode();
 		this.getRingofWealth = config.getRingofWealth();
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ConstructionMode.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/ConstructionMode.java
@@ -0,0 +1,40 @@
+package net.runelite.client.plugins.menuentryswapper.util;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.runelite.client.menus.BaseComparableEntry;
+import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry;
+
+@Getter
+@AllArgsConstructor
+public enum ConstructionMode
+{
+	BENCH("Benches",
+		newBaseComparableEntry("Remove", "bench", -1, -1, true, false),
+		newBaseComparableEntry("Build", "Seating space", -1, -1, true, true)),
+	CHAIR("Chairs",
+		newBaseComparableEntry("Remove", "chair", -1, -1, true, false),
+		newBaseComparableEntry("Build", "Chair space", -1, -1, true, true)),
+	DUNGEON("Dungeon Doors",
+		newBaseComparableEntry("Remove", "door", -1, -1, true, false),
+		newBaseComparableEntry("Build", "Door space", -1, -1, true, true)),
+	LARDER("Larders",
+		newBaseComparableEntry("Remove", "larder", -1, -1, true, false),
+		newBaseComparableEntry("Build", "Larder space", -1, -1, true, true)),
+	MYTH_CAPE("Myth Cape",
+		newBaseComparableEntry("Remove", "cape", -1, -1, true, false),
+		newBaseComparableEntry("Build", "Guild trophy space", -1, -1, true, true)),
+	TABLE("Tables",
+		newBaseComparableEntry("Remove", "table", -1, -1, true, false),
+		newBaseComparableEntry("Build", "Table space", -1, -1, true, true));
+
+	private final String name;
+	private final BaseComparableEntry build;
+	private final BaseComparableEntry remove;
+
+	@Override
+	public String toString()
+	{
+		return name;
+	}
+}