From a1933badc71ad131f3a76c793984dda37b6920e7 Mon Sep 17 00:00:00 2001 From: Ganom Date: Tue, 17 Sep 2019 15:36:34 -0400 Subject: [PATCH] menuentryswapper: convert adams house ad mode to our system. --- .../MenuEntrySwapperConfig.java | 57 +++-- .../MenuEntrySwapperPlugin.java | 204 +++++++++--------- .../util/HouseAdvertisementMode.java | 48 +++++ 3 files changed, 198 insertions(+), 111 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HouseAdvertisementMode.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 4110e70eb8..493c1daefb 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 @@ -42,6 +42,7 @@ import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode; import net.runelite.client.plugins.menuentryswapper.util.FairyTreeMode; import net.runelite.client.plugins.menuentryswapper.util.GamesNecklaceMode; import net.runelite.client.plugins.menuentryswapper.util.GloryMode; +import net.runelite.client.plugins.menuentryswapper.util.HouseAdvertisementMode; import net.runelite.client.plugins.menuentryswapper.util.HouseMode; import net.runelite.client.plugins.menuentryswapper.util.MaxCapeMode; import net.runelite.client.plugins.menuentryswapper.util.NecklaceOfPassageMode; @@ -527,11 +528,37 @@ public interface MenuEntrySwapperConfig extends Config return HouseMode.HOME; } + @ConfigItem( + keyName = "swapHouseAd", + name = "House Ad", + description = "Swap your house advertisement entries.", + position = 12, + group = "Miscellaneous" + ) + default boolean swapHouseAd() + { + return false; + } + + @ConfigItem( + keyName = "swapHouseAdMode", + name = "Mode", + description = "", + position = 13, + group = "Miscellaneous", + hidden = true, + unhide = "swapHouseAd" + ) + default HouseAdvertisementMode swapHouseAdMode() + { + return HouseAdvertisementMode.VIEW; + } + @ConfigItem( keyName = "swapPrivate", name = "Private", description = "Swap 'Shared' with 'Private' on the Chambers of Xeric storage units.", - position = 12, + position = 14, group = "Miscellaneous" ) default boolean swapPrivate() @@ -543,7 +570,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapPick", name = "Pick", description = "Swap 'Pick' with 'Pick-lots' of the Gourd tree in the Chambers of Xeric.", - position = 13, + position = 15, group = "Miscellaneous" ) default boolean swapPick() @@ -555,7 +582,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapQuick", name = "Quick Pass/Open/Start/Travel", description = "Swap 'Pass' with 'Quick-Pass', 'Open' with 'Quick-Open', 'Ring' with 'Quick-Start' and 'Talk-to' with 'Quick-Travel'.", - position = 14, + position = 16, group = "Miscellaneous" ) default boolean swapQuick() @@ -567,7 +594,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapBoxTrap", name = "Reset", description = "Swap 'Check' with 'Reset' on box traps.", - position = 15, + position = 17, group = "Miscellaneous" ) default boolean swapBoxTrap() @@ -579,7 +606,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "rockCake", name = "Rock Cake Guzzle", description = "Enables Left Click 'Guzzle' on the Dwarven Rock Cake.", - position = 16, + position = 18, group = "Miscellaneous" ) default boolean rockCake() @@ -591,7 +618,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapRogueschests", name = "Rogues Chests", description = "Swap Rogues Chests from 'Open' to 'Search for traps'.", - position = 17, + position = 19, group = "Miscellaneous" ) default boolean swapRogueschests() @@ -603,7 +630,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapClimbUpDown", name = "Climb", description = "Swap 'Climb-Up'/'Climb-Down' depending on Shift or Control key.", - position = 18, + position = 20, group = "Miscellaneous" ) default boolean swapClimbUpDown() @@ -615,7 +642,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapStun", name = "Stun Hoop Snakes", description = "Swap 'Attack' with 'Stun'.", - position = 19, + position = 21, group = "Miscellaneous" ) default boolean swapStun() @@ -627,7 +654,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapSearch", name = "Search", description = "Swap 'Close', 'Shut' with 'Search' on chests, cupboards, etc.", - position = 20, + position = 22, group = "Miscellaneous" ) default boolean swapSearch() @@ -639,7 +666,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapHardWoodGrove", name = "Hardwood Grove", description = "Swap 'Quick-Pay(100)' and 'Send-Parcel' at Hardwood Grove.", - position = 21, + position = 23, group = "Miscellaneous" ) default boolean swapHardWoodGrove() @@ -652,7 +679,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "removeObjects", name = "Remove Objects", description = "Removes interaction with the listed objects.", - position = 22, + position = 24, group = "Miscellaneous" ) default boolean getRemoveObjects() @@ -664,7 +691,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "removedObjects", name = "Objects", description = "Objects listed here will have all interaction be removed.", - position = 23, + position = 25, group = "Miscellaneous", hidden = true, unhide = "removeObjects" @@ -678,7 +705,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "swapImps", name = "Impling Jars", description = "Don't open implings if bank has a clue.", - position = 24, + position = 26, group = "Miscellaneous" ) default boolean swapImps() @@ -690,7 +717,7 @@ public interface MenuEntrySwapperConfig extends Config keyName = "charterOption", name = "Trader Crew", description = "Configure whether you want Charter or Trade to be the first option of Trader Crewmembers.", - position = 25, + position = 27, group = "Miscellaneous" ) default CharterOption charterOption() @@ -1178,7 +1205,7 @@ public interface MenuEntrySwapperConfig extends Config { return FairyRingMode.LAST_DESTINATION; } - + @ConfigItem( keyName = "swapFairyTree", name = "Fairy Tree", 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 087590fb2f..71565cf263 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 @@ -67,6 +67,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.VarbitChanged; +import net.runelite.api.util.Text; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; @@ -92,6 +93,7 @@ import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode; import net.runelite.client.plugins.menuentryswapper.util.FairyTreeMode; import net.runelite.client.plugins.menuentryswapper.util.GamesNecklaceMode; import net.runelite.client.plugins.menuentryswapper.util.GloryMode; +import net.runelite.client.plugins.menuentryswapper.util.HouseAdvertisementMode; import net.runelite.client.plugins.menuentryswapper.util.HouseMode; import net.runelite.client.plugins.menuentryswapper.util.MaxCapeMode; import net.runelite.client.plugins.menuentryswapper.util.NecklaceOfPassageMode; @@ -107,7 +109,6 @@ import net.runelite.client.plugins.pvptools.PvpToolsPlugin; import net.runelite.client.util.HotkeyListener; import static net.runelite.client.util.MenuUtil.swap; import net.runelite.client.util.MiscUtils; -import net.runelite.api.util.Text; import org.apache.commons.lang3.StringUtils; @PluginDescriptor( @@ -171,18 +172,20 @@ public class MenuEntrySwapperPlugin extends Plugin private final Map customShiftSwaps = new HashMap<>(); private final Map dePrioSwaps = new HashMap<>(); private List bankItemNames = new ArrayList<>(); - private ConstructionMode getConstructionMode; private BurningAmuletMode getBurningAmuletMode; private CharterOption charterOption; private CombatBraceletMode getCombatBraceletMode; private ConstructionCapeMode constructionCapeMode; + private ConstructionMode getConstructionMode; private DigsitePendantMode getDigsitePendantMode; private DuelingRingMode getDuelingRingMode; private FairyRingMode swapFairyRingMode; private FairyTreeMode swapFairyTreeMode; private GamesNecklaceMode getGamesNecklaceMode; private GloryMode getGloryMode; + private HouseAdvertisementMode swapHouseAdMode; private HouseMode swapHomePortalMode; + private Keybind hotkeyMod; private MaxCapeMode maxMode; private NecklaceOfPassageMode getNecklaceofPassageMode; private ObeliskMode swapObeliskMode; @@ -193,8 +196,8 @@ public class MenuEntrySwapperPlugin extends Plugin private Set hideCastIgnoredToB; private SkillsNecklaceMode getSkillsNecklaceMode; private SlayerRingMode getSlayerRingMode; - private String configCustomSwaps; private String configCustomShiftSwaps; + private String configCustomSwaps; private String getBuyFiftyItems; private String getBuyFiveItems; private String getBuyOneItems; @@ -276,6 +279,7 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean swapEnchant; private boolean swapHardWoodGrove; private boolean swapHarpoon; + private boolean swapHouseAd; private boolean swapImps; private boolean swapInteract; private boolean swapMax; @@ -296,7 +300,6 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean swapTrade; private boolean swapTravel; private boolean swapWildernessLever; - private Keybind hotkeyMod; @Provides MenuEntrySwapperConfig provideConfig(ConfigManager configManager) @@ -1108,7 +1111,7 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.addPriorityEntry("Last-destination", false); break; } - + switch (this.swapFairyTreeMode) { case OFF: @@ -1227,10 +1230,16 @@ public class MenuEntrySwapperPlugin extends Plugin { menuManager.addPriorityEntry(this.maxMode.toString(), "max cape"); } + if (this.swapQuestCape) { menuManager.addPriorityEntry(this.questCapeMode.toString(), "quest point cape"); } + + if (this.swapHouseAd) + { + menuManager.addPriorityEntry(this.swapHouseAdMode.getEntry()); + } } private void removeSwaps() @@ -1274,115 +1283,116 @@ public class MenuEntrySwapperPlugin extends Plugin Text.fromCSV(this.getSellFiveItems).forEach(item -> menuManager.removePriorityEntry("Sell 5", item)); Text.fromCSV(this.getSellTenItems).forEach(item -> menuManager.removePriorityEntry("Sell 10", item)); Text.fromCSV(this.getSellFiftyItems).forEach(item -> menuManager.removePriorityEntry("Sell 50", item)); - menuManager.removePriorityEntry("Tan All"); - menuManager.removePriorityEntry("Buy-plank", "Sawmill operator"); + menuManager.removePriorityEntry("Activate", "Box trap"); + menuManager.removePriorityEntry("Assignment"); + menuManager.removePriorityEntry("Bank"); menuManager.removePriorityEntry("Buy All"); + menuManager.removePriorityEntry("Buy-plank"); + menuManager.removePriorityEntry("Buy-plank", "Sawmill operator"); + menuManager.removePriorityEntry("Charter"); + menuManager.removePriorityEntry("Chase"); + menuManager.removePriorityEntry("Claim"); + menuManager.removePriorityEntry("Claim-slime"); + menuManager.removePriorityEntry("Contract"); + menuManager.removePriorityEntry("Decant"); + menuManager.removePriorityEntry("Dream"); + menuManager.removePriorityEntry("Edgeville", "Lever"); + menuManager.removePriorityEntry("Empty", "Birdhouse"); + menuManager.removePriorityEntry("Empty", "Magic Birdhouse"); + menuManager.removePriorityEntry("Empty", "Mahogany Birdhouse"); + menuManager.removePriorityEntry("Empty", "Maple Birdhouse"); + menuManager.removePriorityEntry("Empty", "Oak Birdhouse"); + menuManager.removePriorityEntry("Empty", "Redwood Birdhouse"); + menuManager.removePriorityEntry("Empty", "Teak Birdhouse"); + menuManager.removePriorityEntry("Empty", "Willow Birdhouse"); + menuManager.removePriorityEntry("Empty", "Yew Birdhouse"); + menuManager.removePriorityEntry("Enchant"); + menuManager.removePriorityEntry("Escort"); + menuManager.removePriorityEntry("Exchange"); + menuManager.removePriorityEntry("Fill", "Coal bag"); + menuManager.removePriorityEntry("Fly"); + menuManager.removePriorityEntry("Follow", "Elkoy"); + menuManager.removePriorityEntry("Guzzle", "Dwarven rock cake"); + menuManager.removePriorityEntry("Harpoon"); + menuManager.removePriorityEntry("Heal"); + menuManager.removePriorityEntry("Help"); + menuManager.removePriorityEntry("Jatizso"); menuManager.removePriorityEntry("Kandarin Monastery"); + menuManager.removePriorityEntry("Lay", "Box trap"); + menuManager.removePriorityEntry("Metamorphosis", "Baby chinchompa"); menuManager.removePriorityEntry("Monastery Teleport"); - menuManager.removePriorityEntry("Teleport", "Crafting cape"); - menuManager.removePriorityEntry("Teleport", "Crafting cape(t)"); - menuManager.removePriorityEntry(this.constructionCapeMode.toString(), "Construct. cape"); - menuManager.removePriorityEntry(this.constructionCapeMode.toString(), "Construct. cape(t)"); + menuManager.removePriorityEntry("Neitiznot"); + menuManager.removePriorityEntry("Pay (", false); + menuManager.removePriorityEntry("Pay"); + menuManager.removePriorityEntry("Pay-fare"); + menuManager.removePriorityEntry("Pay-toll(10gp)", "Gate"); + menuManager.removePriorityEntry("Pay-toll(2-ecto)", "Energy barrier"); + menuManager.removePriorityEntry("Perks", "Mounted Max Cape"); + menuManager.removePriorityEntry("Pick-lots"); + menuManager.removePriorityEntry("Pickpocket"); + menuManager.removePriorityEntry("Private"); + menuManager.removePriorityEntry("Quick-enter"); + menuManager.removePriorityEntry("Quick-leave"); + menuManager.removePriorityEntry("Quick-open"); + menuManager.removePriorityEntry("Quick-pass"); + menuManager.removePriorityEntry("Quick-pay", "Hardwood grove doors"); + menuManager.removePriorityEntry("Quick-start"); + menuManager.removePriorityEntry("Quick-travel"); + menuManager.removePriorityEntry("Rellekka"); + menuManager.removePriorityEntry("Repairs"); + menuManager.removePriorityEntry("Reset", "Shaking box"); + menuManager.removePriorityEntry("Search for traps"); + menuManager.removePriorityEntry("Search"); + menuManager.removePriorityEntry("Send-parcel", "Rionasta"); + menuManager.removePriorityEntry("Shop"); menuManager.removePriorityEntry("Spellbook", "Magic cape"); menuManager.removePriorityEntry("Spellbook", "Magic cape(t)"); + menuManager.removePriorityEntry("Spellbook", "Mounted Magic Cape"); + menuManager.removePriorityEntry("Start-minigame"); + menuManager.removePriorityEntry("Story"); + menuManager.removePriorityEntry("Stun", "Hoop snake"); + menuManager.removePriorityEntry("Take-boat"); + menuManager.removePriorityEntry("Tan All"); + menuManager.removePriorityEntry("Teleport menu", "Portal nexus"); + menuManager.removePriorityEntry("Teleport", "Crafting cape"); + menuManager.removePriorityEntry("Teleport", "Crafting cape(t)"); menuManager.removePriorityEntry("Teleport", "Explorer's ring 2"); menuManager.removePriorityEntry("Teleport", "Explorer's ring 3"); menuManager.removePriorityEntry("Teleport", "Explorer's ring 4"); - menuManager.removePriorityEntry("Pickpocket"); - menuManager.removePriorityEntry("Send-parcel", "Rionasta"); - menuManager.removePriorityEntry(new BankComparableEntry("collect", "", false)); - menuManager.removePriorityEntry("Bank"); - menuManager.removePriorityEntry("Exchange"); - menuManager.removePriorityEntry("Contract"); - menuManager.removePriorityEntry("Repairs"); - menuManager.removePriorityEntry("Claim-slime"); - menuManager.removePriorityEntry("Decant"); - menuManager.removePriorityEntry("Claim"); - menuManager.removePriorityEntry("Heal"); - menuManager.removePriorityEntry("Help"); - menuManager.removePriorityEntry("Assignment"); - menuManager.removePriorityEntry("Buy-plank"); - menuManager.removePriorityEntry("Trade"); - menuManager.removePriorityEntry("Trade-with"); - menuManager.removePriorityEntry("Shop"); - menuManager.removePriorityEntry("Story"); - menuManager.removePriorityEntry("Escort"); - menuManager.removePriorityEntry("Dream"); - menuManager.removePriorityEntry("Start-minigame"); - menuManager.removePriorityEntry("Travel"); - menuManager.removePriorityEntry("Pay-fare"); - menuManager.removePriorityEntry("Charter"); - menuManager.removePriorityEntry("Take-boat"); - menuManager.removePriorityEntry("Fly"); - menuManager.removePriorityEntry("Jatizso"); - menuManager.removePriorityEntry("Neitiznot"); - menuManager.removePriorityEntry("Rellekka"); - menuManager.removePriorityEntry("Follow", "Elkoy"); - menuManager.removePriorityEntry("Transport"); menuManager.removePriorityEntry("Teleport", "Mage of zamorak"); - menuManager.removePriorityEntry("Pay"); - menuManager.removePriorityEntry("Pay (", false); - menuManager.removePriorityEntry("Quick-travel"); - menuManager.removePriorityEntry("Enchant"); - menuManager.removePriorityEntry("Edgeville", "Lever"); - menuManager.removePriorityEntry("Metamorphosis", "Baby chinchompa"); - menuManager.removePriorityEntry("Stun", "Hoop snake"); - menuManager.removePriorityEntry("Pay-toll(2-ecto)", "Energy barrier"); - menuManager.removePriorityEntry("Pay-toll(10gp)", "Gate"); - menuManager.removePriorityEntry("Travel", "Trapdoor"); - menuManager.removePriorityEntry("Harpoon"); - menuManager.removePriorityEntry("Reset", "Shaking box"); - menuManager.removePriorityEntry("Lay", "Box trap"); - menuManager.removePriorityEntry("Activate", "Box trap"); - menuManager.removePriorityEntry("Chase"); - menuManager.removePriorityEntry("Empty", "Birdhouse"); - menuManager.removePriorityEntry("Empty", "Oak Birdhouse"); - menuManager.removePriorityEntry("Empty", "Willow Birdhouse"); - menuManager.removePriorityEntry("Empty", "Teak Birdhouse"); - menuManager.removePriorityEntry("Empty", "Maple Birdhouse"); - menuManager.removePriorityEntry("Empty", "Mahogany Birdhouse"); - menuManager.removePriorityEntry("Empty", "Yew Birdhouse"); - menuManager.removePriorityEntry("Empty", "Magic Birdhouse"); - menuManager.removePriorityEntry("Empty", "Redwood Birdhouse"); - menuManager.removePriorityEntry("Quick-enter"); - menuManager.removePriorityEntry("Quick-start"); - menuManager.removePriorityEntry("Quick-pass"); - menuManager.removePriorityEntry("Quick-open"); - menuManager.removePriorityEntry("Quick-leave"); - menuManager.removePriorityEntry("Teleport", "Mounted Strength Cape"); menuManager.removePriorityEntry("Teleport", "Mounted Construction Cape"); menuManager.removePriorityEntry("Teleport", "Mounted Crafting Cape"); - menuManager.removePriorityEntry("Teleport", "Mounted Hunter Cape"); menuManager.removePriorityEntry("Teleport", "Mounted Fishing Cape"); - menuManager.removePriorityEntry("Spellbook", "Mounted Magic Cape"); - menuManager.removePriorityEntry("Perks", "Mounted Max Cape"); - menuManager.removePriorityEntry("Private"); - menuManager.removePriorityEntry("Pick-lots"); - menuManager.removePriorityEntry("Search"); - menuManager.removePriorityEntry("Search for traps"); - menuManager.removePriorityEntry("Guzzle", "Dwarven rock cake"); - menuManager.removePriorityEntry(new InventoryComparableEntry("Rub", "", false)); - menuManager.removePriorityEntry(new InventoryComparableEntry("Teleport", "", false)); - menuManager.removePriorityEntry("Fill", "Coal bag"); - menuManager.removePriorityEntry(newBankComparableEntry("Empty", "Coal bag")); - menuManager.removePriorityEntry(new InventoryComparableEntry("Use", "bone", false)); - menuManager.removePriorityEntry("Teleport menu", "Portal nexus"); - menuManager.removePriorityEntry("Quick-pay", "Hardwood grove doors"); + menuManager.removePriorityEntry("Teleport", "Mounted Hunter Cape"); + menuManager.removePriorityEntry("Teleport", "Mounted Strength Cape"); + menuManager.removePriorityEntry("Trade"); + menuManager.removePriorityEntry("Trade-with"); + menuManager.removePriorityEntry("Transport"); + menuManager.removePriorityEntry("Travel"); + menuManager.removePriorityEntry("Travel", "Trapdoor"); + menuManager.removePriorityEntry(new BankComparableEntry("collect", "", false)); menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getBurningAmuletMode.toString(), "burning amulet")); menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getCombatBraceletMode.toString(), "combat bracelet")); - menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getGamesNecklaceMode.toString(), "games necklace")); - menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getDuelingRingMode.toString(), "ring of dueling")); - menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getGloryMode.toString(), "glory")); - menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getSkillsNecklaceMode.toString(), "skills necklace")); - menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getNecklaceofPassageMode.toString(), "necklace of passage")); menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getDigsitePendantMode.toString(), "digsite pendant")); + menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getDuelingRingMode.toString(), "ring of dueling")); + menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getGamesNecklaceMode.toString(), "games necklace")); + menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getGloryMode.toString(), "glory")); + menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getNecklaceofPassageMode.toString(), "necklace of passage")); + menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getRingofWealthMode.toString(), "ring of wealth")); + menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getSkillsNecklaceMode.toString(), "skills necklace")); menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getSlayerRingMode.toString(), "slayer ring")); menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getXericsTalismanMode.toString(), "talisman")); - menuManager.removePriorityEntry(new EquipmentComparableEntry(this.getRingofWealthMode.toString(), "ring of wealth")); - menuManager.removePriorityEntry(this.maxMode.toString(), "max cape"); - menuManager.removePriorityEntry(this.questCapeMode.toString(), "quest point cape"); + menuManager.removePriorityEntry(new InventoryComparableEntry("Rub", "", false)); + menuManager.removePriorityEntry(new InventoryComparableEntry("Teleport", "", false)); + menuManager.removePriorityEntry(new InventoryComparableEntry("Use", "bone", false)); + menuManager.removePriorityEntry(newBankComparableEntry("Empty", "Coal bag")); + menuManager.removePriorityEntry(this.constructionCapeMode.toString(), "Construct. cape"); + menuManager.removePriorityEntry(this.constructionCapeMode.toString(), "Construct. cape(t)"); menuManager.removePriorityEntry(this.getConstructionMode.getBuild()); menuManager.removePriorityEntry(this.getConstructionMode.getRemove()); + menuManager.removePriorityEntry(this.maxMode.toString(), "max cape"); + menuManager.removePriorityEntry(this.questCapeMode.toString(), "quest point cape"); + menuManager.removePriorityEntry(this.swapHouseAdMode.getEntry()); switch (this.swapFairyRingMode) { @@ -1398,7 +1408,7 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removePriorityEntry("Last-destination", false); break; } - + switch (this.swapFairyTreeMode) { case OFF: @@ -1770,6 +1780,8 @@ public class MenuEntrySwapperPlugin extends Plugin this.swapTrade = config.swapTrade(); this.swapTravel = config.swapTravel(); this.swapWildernessLever = config.swapWildernessLever(); + this.swapHouseAd = config.swapHouseAd(); + this.swapHouseAdMode = config.swapHouseAdMode(); } /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HouseAdvertisementMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HouseAdvertisementMode.java new file mode 100644 index 0000000000..1baa1e3b8f --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/HouseAdvertisementMode.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2019, Adam + * 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.menuentryswapper.util; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import net.runelite.client.menus.AbstractComparableEntry; +import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry; + +@Getter +@RequiredArgsConstructor +public enum HouseAdvertisementMode +{ + VIEW("View", newBaseComparableEntry("View", "House Advertisement")), + ADD_HOUSE("Add-House", newBaseComparableEntry("Add-House", "House Advertisement")), + VISIT_LAST("Visit-Last", newBaseComparableEntry("Visit-Last", "House Advertisement")); + + private final String name; + private final AbstractComparableEntry entry; + + @Override + public String toString() + { + return name; + } +} \ No newline at end of file