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

bank value plugin: make calculator more testable

Browse Source
This commit is contained in:
Adam
2018-04-15 19:47:52 -04:00
parent 21680650a7
commit 10e7d6bb9c
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,15 +32,13 @@ import java.util.concurrent.CompletableFuture;
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.ItemComposition; import net.runelite.api.ItemComposition;
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.queries.BankItemQuery;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.util.QueryRunner;
import net.runelite.http.api.item.ItemPrice; import net.runelite.http.api.item.ItemPrice;
@Slf4j @Slf4j
@@ -48,7 +46,7 @@ class BankCalculation
{ {
private static final float HIGH_ALCHEMY_CONSTANT = 0.6f; private static final float HIGH_ALCHEMY_CONSTANT = 0.6f;
private final Client client; private final QueryRunner queryRunner;
private final BankValueConfig config; private final BankValueConfig config;
private final ItemManager itemManager; private final ItemManager itemManager;
@@ -65,9 +63,9 @@ class BankCalculation
private boolean finished; private boolean finished;
@Inject @Inject
BankCalculation(Client client, ItemManager itemManager, BankValueConfig config) BankCalculation(QueryRunner queryRunner, ItemManager itemManager, BankValueConfig config)
{ {
this.client = client; this.queryRunner = queryRunner;
this.itemManager = itemManager; this.itemManager = itemManager;
this.config = config; this.config = config;
} }
@@ -77,17 +75,7 @@ class BankCalculation
*/ */
void calculate() void calculate()
{ {
Widget widgetBankTitleBar = client.getWidget(WidgetInfo.BANK_TITLE_BAR); WidgetItem[] widgetItems = queryRunner.runQuery(new BankItemQuery());
// Don't update on a search because rs seems to constantly update the title
if (widgetBankTitleBar == null ||
widgetBankTitleBar.isHidden() ||
widgetBankTitleBar.getText().contains("Showing"))
{
return;
}
WidgetItem[] widgetItems = new BankItemQuery().result(client);
if (widgetItems.length == 0 || !isBankDifferent(widgetItems)) if (widgetItems.length == 0 || !isBankDifferent(widgetItems))
{ {

15
runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java
View File

@@ -71,10 +71,23 @@ public class BankValuePlugin extends Plugin
} }
bankTitle.save(); bankTitle.save();
bankCalculation.calculate(); calculate(widgetBankTitleBar);
if (bankCalculation.isFinished()) if (bankCalculation.isFinished())
{ {
bankTitle.update(bankCalculation.getGePrice(), bankCalculation.getHaPrice()); bankTitle.update(bankCalculation.getGePrice(), bankCalculation.getHaPrice());
} }
} }
private void calculate(Widget bankTitleBar)
{
// Don't update on a search because rs seems to constantly update the title
if (bankTitleBar == null ||
bankTitleBar.isHidden() ||
bankTitleBar.getText().contains("Showing"))
{
return;
}
bankCalculation.calculate();
}
} }