ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

mes: add npc contact & hotkey description cleanup (#2255)

Browse Source 
mes: add Npc Contact
This commit is contained in:
Kyle
2020-01-16 16:24:10 +00:00
committed by GitHub
parent d43524ae68
commit 47dcb4ba2a
2 changed files with 73 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
View File

@@ -1955,12 +1955,25 @@ public interface MenuEntrySwapperConfig extends Config
{
return "";
}
@ConfigItem(
keyName = "swapNpcContact",
name = "NPC Contact",
description = "Enables Hotkey Left Click NPC Contact With Last Contacted NPC.",
position = 2,
section = "hotkeySwapping"
)
default boolean swapNpcContact()
{
return false;
}
@ConfigItem(
keyName = "bankWieldItem",
name = "Bank - Left Click 'Wield'",
description = "Enables Hotkey Left Click 'Wield' In Bank When Pressing The Hotkey",
position = 2,
description = "Enables Hotkey Left Click 'Wield' In The Bank Screen.",
position = 3,
section = "hotkeySwapping"
)
@@ -1972,8 +1985,8 @@ public interface MenuEntrySwapperConfig extends Config
@ConfigItem(
keyName = "bankWearItem",
name = "Bank - Left Click 'Wear'",
description = "Enables Hotkey Left Click 'Wear' In Bank When Pressing The Hotkey",
position = 3,
description = "Enables Hotkey Left Click 'Wear' In The Bank Screen.",
position = 4,
section = "hotkeySwapping"
)
@@ -1985,8 +1998,8 @@ public interface MenuEntrySwapperConfig extends Config
@ConfigItem(
keyName = "bankEatItem",
name = "Bank - Left Click 'Eat'",
description = "Enables Left Click 'Eat' In Bank When Pressing The Hotkey",
position = 4,
description = "Enables Left Click 'Eat' In The Bank Screen.",
position = 5,
section = "hotkeySwapping"
)
@@ -1998,8 +2011,8 @@ public interface MenuEntrySwapperConfig extends Config
@ConfigItem(
keyName = "bankDrinkItem",
name = "Bank - Left Click 'Drink'",
description = "Enables Left Click 'Drink' In Bank When Pressing The Hotkey",
position = 5,
description = "Enables Left Click 'Drink' In The Bank Screen.",
position = 6,
section = "hotkeySwapping"
)
@@ -2011,8 +2024,8 @@ public interface MenuEntrySwapperConfig extends Config
@ConfigItem(
keyName = "bankEquipItem",
name = "Bank - Left Click 'Equip'",
description = "Enables Left Click 'Equip' In Bank When Pressing The Hotkey",
position = 6,
description = "Enables Left Click 'Equip' In The Bank Screen.",
position = 7,
section = "hotkeySwapping"
)
@@ -2024,8 +2037,8 @@ public interface MenuEntrySwapperConfig extends Config
@ConfigItem(
keyName = "bankInvigorateItem",
name = "Bank - Left Click 'Invigorate'",
description = "Enables Left Click 'Invigorate' In Bank When Pressing The Hotkey",
position = 7,
description = "Enables Left Click 'Invigorate' In The Bank Screen.",
position = 8,
section = "hotkeySwapping"
)

75
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -144,6 +144,11 @@ public class MenuEntrySwapperPlugin extends Plugin
"miscellania", "grand exchange", "falador park", "dondakan's rock", "edgeville", "karamja",
"draynor village", "al kharid"
);
private static final List<String> npcContact = Arrays.asList(
"honest jimmy", "bert the sandman", "advisor ghrim", "dark mage", "lanthus", "turael",
"mazchna", "vannaka", "chaeldar", "nieve", "steve", "duradel", "krystilia", "konar",
"murphy", "cyrisus", "smoggy", "ginea", "watson", "barbarian guard", "random"
);
private static final Splitter NEWLINE_SPLITTER = Splitter
.on("\n")
@@ -266,6 +271,34 @@ public class MenuEntrySwapperPlugin extends Plugin
private boolean bankDrinkItem;
private boolean bankEquipItem;
private boolean bankInvigorateItem;
private boolean swapNpcContact;
private boolean swapCoalBag;
private boolean swapContract;
private boolean swapEnchant;
private boolean swapHardWoodGrove;
private boolean swapHarpoon;
private boolean swapHouseAd;
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;
private boolean swapJewelleryBox;
private final HotkeyListener hotkey = new HotkeyListener(() -> this.hotkeyMod)
{
@Override
@@ -298,33 +331,7 @@ public class MenuEntrySwapperPlugin extends Plugin
setControlActive(false);
}
};
private boolean swapCoalBag;
private boolean swapContract;
private boolean swapEnchant;
private boolean swapHardWoodGrove;
private boolean swapHarpoon;
private boolean swapHouseAd;
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;
private boolean swapJewelleryBox;
@Provides
MenuEntrySwapperConfig provideConfig(ConfigManager configManager)
@@ -1511,6 +1518,14 @@ public class MenuEntrySwapperPlugin extends Plugin
{
menuManager.addPriorityEntry("climb-up").setPriority(100);
}
if (this.swapNpcContact)
{
for (String npccontact : npcContact)
{
menuManager.addPriorityEntry(npccontact, "npc contact");
}
}
eventBus.unregister(HOTKEY);
}
@@ -1529,6 +1544,11 @@ public class MenuEntrySwapperPlugin extends Plugin
menuManager.removePriorityEntry(new BankComparableEntry("equip", "", false));
menuManager.removePriorityEntry(new BankComparableEntry("invigorate", "", false));
menuManager.removePriorityEntry("climb-up");
for (String npccontact : npcContact)
{
menuManager.removePriorityEntry(npccontact, "npc contact");
}
loadCustomSwaps("", customShiftSwaps);
eventBus.unregister(HOTKEY);
@@ -1767,6 +1787,7 @@ public class MenuEntrySwapperPlugin extends Plugin
this.bankDrinkItem = config.bankDrinkItem();
this.bankEquipItem = config.bankEquipItem();
this.bankInvigorateItem = config.bankInvigorateItem();
this.swapNpcContact = config.swapNpcContact();
}
private void addBuySellEntries()