Merge pull request #3212 from open-osrs/upstream-0506
This commit is contained in:
@@ -101,11 +101,22 @@ public interface BankConfig extends Config
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "rightClickPlaceholders",
|
||||
name = "Disable left click placeholders button",
|
||||
description = "Configures whether the placeholders button will be toggled on left click",
|
||||
position = 7
|
||||
)
|
||||
default boolean rightClickPlaceholders()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ConfigItem(
|
||||
keyName = "seedVaultValue",
|
||||
name = "Show seed vault value",
|
||||
description = "Adds the total value of all seeds inside the seed vault to the title",
|
||||
position = 7
|
||||
position = 8
|
||||
)
|
||||
default boolean seedVaultValue()
|
||||
{
|
||||
@@ -116,7 +127,7 @@ public interface BankConfig extends Config
|
||||
keyName = "bankPinKeyboard",
|
||||
name = "Keyboard Bankpin",
|
||||
description = "Allows using the keyboard keys for bank pin input",
|
||||
position = 8
|
||||
position = 9
|
||||
)
|
||||
default boolean bankPinKeyboard()
|
||||
{
|
||||
@@ -127,7 +138,7 @@ public interface BankConfig extends Config
|
||||
keyName = "searchKeybind",
|
||||
name = "Search Shortcut",
|
||||
description = "Keyboard shortcut for initiating a bank search",
|
||||
position = 9
|
||||
position = 10
|
||||
)
|
||||
default Keybind searchKeybind()
|
||||
{
|
||||
|
||||
@@ -79,6 +79,7 @@ public class BankPlugin extends Plugin
|
||||
private static final String DEPOSIT_WORN = "Deposit worn items";
|
||||
private static final String DEPOSIT_INVENTORY = "Deposit inventory";
|
||||
private static final String DEPOSIT_LOOT = "Deposit loot";
|
||||
private static final String TOGGLE_PLACEHOLDERS = "Always set placeholders";
|
||||
private static final String SEED_VAULT_TITLE = "Seed Vault";
|
||||
|
||||
private static final String NUMBER_REGEX = "[0-9]+(\\.[0-9]+)?[kmb]?";
|
||||
@@ -174,9 +175,12 @@ public class BankPlugin extends Plugin
|
||||
MenuEntry[] menuEntries = client.getMenuEntries();
|
||||
for (MenuEntry entry : menuEntries)
|
||||
{
|
||||
|
||||
if ((entry.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip())
|
||||
|| (entry.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory())
|
||||
|| (entry.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot()))
|
||||
|| (entry.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot())
|
||||
|| (entry.getTarget().contains(TOGGLE_PLACEHOLDERS) && config.rightClickPlaceholders())
|
||||
)
|
||||
{
|
||||
event.setForceRightClick(true);
|
||||
return;
|
||||
@@ -189,7 +193,8 @@ public class BankPlugin extends Plugin
|
||||
{
|
||||
if ((event.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip())
|
||||
|| (event.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory())
|
||||
|| (event.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot()))
|
||||
|| (event.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot())
|
||||
|| (event.getTarget().contains(TOGGLE_PLACEHOLDERS) && config.rightClickPlaceholders()))
|
||||
{
|
||||
forceRightClickFlag = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user