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

bank value: use ItemContainer instead of WidgetItemQuery

Browse Source
This commit is contained in:
trimbe
2019-01-04 22:03:10 -05:00
committed by Adam
parent ecd0f7dce3
commit 60aa135fe5
3 changed files with 100 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-api/src/main/java/net/runelite/api/Varbits.java
View File

@@ -437,7 +437,20 @@ public enum Varbits
/** /**
* Spell cooldowns * Spell cooldowns
*/ */
VENGEANCE_COOLDOWN(2451); VENGEANCE_COOLDOWN(2451),
/**
* Amount of items in each bank tab
*/
BANK_TAB_ONE_COUNT(4171),
BANK_TAB_TWO_COUNT(4172),
BANK_TAB_THREE_COUNT(4173),
BANK_TAB_FOUR_COUNT(4174),
BANK_TAB_FIVE_COUNT(4175),
BANK_TAB_SIX_COUNT(4176),
BANK_TAB_SEVEN_COUNT(4177),
BANK_TAB_EIGHT_COUNT(4178),
BANK_TAB_NINE_COUNT(4179);
/** /**
* The raw varbit ID. * The raw varbit ID.

78
runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankCalculation.java
View File

@@ -24,30 +24,45 @@
*/ */
package net.runelite.client.plugins.bankvalue; package net.runelite.client.plugins.bankvalue;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import static net.runelite.api.ItemID.COINS_995; import static net.runelite.api.ItemID.COINS_995;
import static net.runelite.api.ItemID.PLATINUM_TOKEN; import static net.runelite.api.ItemID.PLATINUM_TOKEN;
import net.runelite.api.queries.BankItemQuery; import net.runelite.api.Varbits;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.util.QueryRunner;
@Slf4j @Slf4j
class BankCalculation class BankCalculation
{ {
private static final float HIGH_ALCHEMY_CONSTANT = 0.6f; private static final float HIGH_ALCHEMY_CONSTANT = 0.6f;
private static final ImmutableList<Varbits> TAB_VARBITS = ImmutableList.of(
Varbits.BANK_TAB_ONE_COUNT,
Varbits.BANK_TAB_TWO_COUNT,
Varbits.BANK_TAB_THREE_COUNT,
Varbits.BANK_TAB_FOUR_COUNT,
Varbits.BANK_TAB_FIVE_COUNT,
Varbits.BANK_TAB_SIX_COUNT,
Varbits.BANK_TAB_SEVEN_COUNT,
Varbits.BANK_TAB_EIGHT_COUNT,
Varbits.BANK_TAB_NINE_COUNT
);
private final QueryRunner queryRunner;
private final BankValueConfig config; private final BankValueConfig config;
private final ItemManager itemManager; private final ItemManager itemManager;
private final Client client;
// Used to avoid extra calculation if the bank has not changed // Used to avoid extra calculation if the bank has not changed
private int itemsHash; private int itemsHash;
@@ -59,11 +74,11 @@ class BankCalculation
private long haPrice; private long haPrice;
@Inject @Inject
BankCalculation(QueryRunner queryRunner, ItemManager itemManager, BankValueConfig config) BankCalculation(ItemManager itemManager, BankValueConfig config, Client client)
{ {
this.queryRunner = queryRunner;
this.itemManager = itemManager; this.itemManager = itemManager;
this.config = config; this.config = config;
this.client = client;
} }
/** /**
@@ -71,9 +86,30 @@ class BankCalculation
*/ */
void calculate() void calculate()
{ {
WidgetItem[] widgetItems = queryRunner.runQuery(new BankItemQuery()); ItemContainer bankInventory = client.getItemContainer(InventoryID.BANK);
if (widgetItems.length == 0 || !isBankDifferent(widgetItems)) if (bankInventory == null)
{
return;
}
Item[] items = bankInventory.getItems();
int currentTab = client.getVar(Varbits.CURRENT_BANK_TAB);
if (currentTab > 0)
{
int startIndex = 0;
for (int i = currentTab - 1; i > 0; i--)
{
startIndex += client.getVar(TAB_VARBITS.get(i - 1));
}
int itemCount = client.getVar(TAB_VARBITS.get(currentTab - 1));
items = Arrays.copyOfRange(items, startIndex, startIndex + itemCount);
}
if (items.length == 0 || !isBankDifferent(items))
{ {
return; return;
} }
@@ -85,34 +121,34 @@ class BankCalculation
List<Integer> itemIds = new ArrayList<>(); List<Integer> itemIds = new ArrayList<>();
// Generate our lists (and do some quick price additions) // Generate our lists (and do some quick price additions)
for (WidgetItem widgetItem : widgetItems) for (Item item : items)
{ {
int quantity = widgetItem.getQuantity(); int quantity = item.getQuantity();
if (widgetItem.getId() <= 0 || quantity == 0) if (item.getId() <= 0 || quantity == 0)
{ {
continue; continue;
} }
if (widgetItem.getId() == COINS_995) if (item.getId() == COINS_995)
{ {
gePrice += quantity; gePrice += quantity;
haPrice += quantity; haPrice += quantity;
continue; continue;
} }
if (widgetItem.getId() == PLATINUM_TOKEN) if (item.getId() == PLATINUM_TOKEN)
{ {
gePrice += quantity * 1000L; gePrice += quantity * 1000L;
haPrice += quantity * 1000L; haPrice += quantity * 1000L;
continue; continue;
} }
final ItemComposition itemComposition = itemManager.getItemComposition(widgetItem.getId()); final ItemComposition itemComposition = itemManager.getItemComposition(item.getId());
if (config.showGE()) if (config.showGE())
{ {
itemIds.add(widgetItem.getId()); itemIds.add(item.getId());
} }
if (config.showHA()) if (config.showHA())
@@ -130,10 +166,10 @@ class BankCalculation
// Now do the calculations // Now do the calculations
if (config.showGE() && !itemIds.isEmpty()) if (config.showGE() && !itemIds.isEmpty())
{ {
for (WidgetItem widgetItem : widgetItems) for (Item item : items)
{ {
int itemId = widgetItem.getId(); int itemId = item.getId();
int quantity = widgetItem.getQuantity(); int quantity = item.getQuantity();
if (itemId <= 0 || quantity == 0 if (itemId <= 0 || quantity == 0
|| itemId == ItemID.COINS_995 || itemId == ItemID.PLATINUM_TOKEN) || itemId == ItemID.COINS_995 || itemId == ItemID.PLATINUM_TOKEN)
@@ -146,13 +182,13 @@ class BankCalculation
} }
} }
private boolean isBankDifferent(WidgetItem[] widgetItems) private boolean isBankDifferent(Item[] items)
{ {
Map<Integer, Integer> mapCheck = new HashMap<>(); Map<Integer, Integer> mapCheck = new HashMap<>();
for (WidgetItem widgetItem : widgetItems) for (Item item : items)
{ {
mapCheck.put(widgetItem.getId(), widgetItem.getQuantity()); mapCheck.put(item.getId(), item.getQuantity());
} }
int curHash = mapCheck.hashCode(); int curHash = mapCheck.hashCode();

43
runelite-client/src/test/java/net/runelite/client/plugins/bankvalue/BankCalculationTest.java
View File

@@ -30,7 +30,10 @@ import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule; import com.google.inject.testing.fieldbinder.BoundFieldModule;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import net.runelite.api.queries.BankItemQuery; import net.runelite.api.queries.BankItemQuery;
import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetItem;
@@ -53,10 +56,6 @@ public class BankCalculationTest
@Bind @Bind
private Client client; private Client client;
@Mock
@Bind
private QueryRunner queryRunner;
@Mock @Mock
@Bind @Bind
private ItemManager itemManager; private ItemManager itemManager;
@@ -80,21 +79,37 @@ public class BankCalculationTest
when(bankValueConfig.showHA()) when(bankValueConfig.showHA())
.thenReturn(true); .thenReturn(true);
WidgetItem[] widgetItems = ImmutableList.of( Item coins = mock(Item.class);
new WidgetItem(ItemID.COINS_995, Integer.MAX_VALUE, -1, null), when(coins.getId())
new WidgetItem(ItemID.ABYSSAL_WHIP, 1_000_000_000, -1, null) .thenReturn(ItemID.COINS_995);
).toArray(new WidgetItem[0]); when(coins.getQuantity())
.thenReturn(Integer.MAX_VALUE);
when(queryRunner.runQuery(any(BankItemQuery.class))) Item whip = mock(Item.class);
.thenReturn(widgetItems);
ItemComposition whip = mock(ItemComposition.class);
when(whip.getId()) when(whip.getId())
.thenReturn(ItemID.ABYSSAL_WHIP); .thenReturn(ItemID.ABYSSAL_WHIP);
when(whip.getPrice()) when(whip.getQuantity())
.thenReturn(1_000_000_000);
Item[] items = ImmutableList.of(
coins,
whip
).toArray(new Item[0]);
ItemContainer bankContainer = mock(ItemContainer.class);
when(bankContainer.getItems())
.thenReturn(items);
when(client.getItemContainer(InventoryID.BANK))
.thenReturn(bankContainer);
ItemComposition whipComp = mock(ItemComposition.class);
when(whipComp.getId())
.thenReturn(ItemID.ABYSSAL_WHIP);
when(whipComp.getPrice())
.thenReturn(7); // 7 * .6 = 4, 4 * 1m overflows .thenReturn(7); // 7 * .6 = 4, 4 * 1m overflows
when(itemManager.getItemComposition(ItemID.ABYSSAL_WHIP)) when(itemManager.getItemComposition(ItemID.ABYSSAL_WHIP))
.thenReturn(whip); .thenReturn(whipComp);
bankCalculation.calculate(); bankCalculation.calculate();