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

bank plugin: add quantity search

Browse Source 
Co-authored-by: EliasLahham <eliaslahham@yahoo.com>
This commit is contained in:
Adam
2022-04-26 20:31:02 -04:00
committed by Adam
parent 9789d6f392
commit 2d01ea2fb7
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
View File

@@ -82,7 +82,7 @@ public class BankPlugin extends Plugin
private static final String SEED_VAULT_TITLE = "Seed Vault"; private static final String SEED_VAULT_TITLE = "Seed Vault";
private static final String NUMBER_REGEX = "[0-9]+(\\.[0-9]+)?[kmb]?"; private static final String NUMBER_REGEX = "[0-9]+(\\.[0-9]+)?[kmb]?";
private static final Pattern VALUE_SEARCH_PATTERN = Pattern.compile("^(?<mode>ge|ha|alch)?" + private static final Pattern VALUE_SEARCH_PATTERN = Pattern.compile("^(?<mode>qty|ge|ha|alch)?" +
" *(((?<op>[<>=]|>=|<=) *(?<num>" + NUMBER_REGEX + "))|" + " *(((?<op>[<>=]|>=|<=) *(?<num>" + NUMBER_REGEX + "))|" +
"((?<num1>" + NUMBER_REGEX + ") *- *(?<num2>" + NUMBER_REGEX + ")))$", Pattern.CASE_INSENSITIVE); "((?<num1>" + NUMBER_REGEX + ") *- *(?<num2>" + NUMBER_REGEX + ")))$", Pattern.CASE_INSENSITIVE);
@@ -413,13 +413,26 @@ public class BankPlugin extends Plugin
final int qty = itemQuantities.count(itemId); final int qty = itemQuantities.count(itemId);
final long gePrice = (long) itemManager.getItemPrice(itemId) * qty; final long gePrice = (long) itemManager.getItemPrice(itemId) * qty;
final long haPrice = (long) itemComposition.getHaPrice() * qty; final long haPrice = (long) itemComposition.getHaPrice() * qty;
final boolean isPlaceholder = itemComposition.getPlaceholderTemplateId() != -1;
long value = Math.max(gePrice, haPrice); long value = Math.max(gePrice, haPrice);
final String mode = matcher.group("mode"); final String mode = matcher.group("mode");
if (mode != null) if (mode != null)
{ {
value = mode.toLowerCase().equals("ge") ? gePrice : haPrice; switch (mode.toLowerCase())
{
case "qty":
value = isPlaceholder ? 0 : qty;
break;
case "ge":
value = gePrice;
break;
case "ha":
case "alch":
value = haPrice;
break;
}
} }
final String op = matcher.group("op"); final String op = matcher.group("op");

6
runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java
View File

@@ -101,10 +101,16 @@ public class BankPluginTest
assertTrue(bankPlugin.valueSearch(itemId, "ha 500k - 20.6m")); assertTrue(bankPlugin.valueSearch(itemId, "ha 500k - 20.6m"));
assertTrue(bankPlugin.valueSearch(itemId, "ha > 940k")); assertTrue(bankPlugin.valueSearch(itemId, "ha > 940k"));
assertTrue(bankPlugin.valueSearch(itemId, "qty=0"));
assertTrue(bankPlugin.valueSearch(itemId, "qty<600"));
assertFalse(bankPlugin.valueSearch(itemId, "<500k")); assertFalse(bankPlugin.valueSearch(itemId, "<500k"));
assertFalse(bankPlugin.valueSearch(itemId, "ha >2m")); assertFalse(bankPlugin.valueSearch(itemId, "ha >2m"));
assertFalse(bankPlugin.valueSearch(itemId, "ge > 0.02b")); assertFalse(bankPlugin.valueSearch(itemId, "ge > 0.02b"));
assertFalse(bankPlugin.valueSearch(itemId, "qty=1"));
assertFalse(bankPlugin.valueSearch(itemId, "qty>30"));
assertFalse(bankPlugin.valueSearch(itemId, "1000k")); assertFalse(bankPlugin.valueSearch(itemId, "1000k"));
} }