Version 2.0.0

Major refactoring to Grand Exchange code, and some bug fixes.

- Refactored monolithic GrandExchangeHelper into separate classes.
- Made CachedWidget thread safe, to allow for static instances for better caching.
- Added widget filters to util/widget/filters package.
- Fixed price retrieval from OSRS API.
- Removed ScriptManifest from CustomBreakManager, this was causing SDN script to not start.

Author: Explv

AIO/src/org/aio/activities/grand_exchange/GEActivity.java

@@ -2,12 +2,15 @@
 
 import org.aio.activities.activity.Activity;
 import org.osbot.rs07.api.GrandExchange;
+import org.osbot.rs07.api.map.Area;
 
 public abstract class GEActivity extends Activity {
 
-    protected GrandExchange.Box box;
+    protected static final Area GRAND_EXCHANGE = new Area(3154, 3479, 3174, 3500);
 
-    public GEActivity() {
+    GrandExchange.Box box;
+
+    GEActivity() {
         super(null);
     }
 

AIO/src/org/aio/activities/grand_exchange/GEBuyActivity.java

@@ -1,54 +1,63 @@
 package org.aio.activities.grand_exchange;
 
-import org.aio.util.Sleep;
+import org.aio.activities.banking.ItemReqBanking;
+import org.aio.activities.grand_exchange.event.GrandExchangeBuyEvent;
+import org.aio.util.item_requirement.ItemReq;
 
 public class GEBuyActivity extends GEActivity {
 
-    private GrandExchangeHelper exchangeHelper;
     private final GEItem geItem;
+    private final ItemReq coinReq;
+
+    private ItemReqBanking itemReqBanking;
 
     public GEBuyActivity(final GEItem geItem) {
         this.geItem = geItem;
+
+        int coinsRequired = geItem.getPrice() * geItem.getQuantity();
+
+        coinReq = new ItemReq(
+                "Coins",
+                coinsRequired,
+                coinsRequired
+        ).setStackable();
+
+        itemReqBanking = new ItemReqBanking(coinReq);
     }
 
     @Override
     public void onStart() {
-        this.exchangeHelper = new GrandExchangeHelper();
-        this.exchangeHelper.exchangeContext(getBot());
+        itemReqBanking.exchangeContext(getBot());
     }
 
     @Override
     public void runActivity() throws InterruptedException {
         if (box != null) {
             return;
-        } else if(!exchangeHelper.playerIsAtGE()){
-            exchangeHelper.walkToGE();
-        } else if(getInventory().getAmount("Coins") < (geItem.getPrice() * geItem.getQuantity())) {
-            getCoins();
-        } else {
-            box = exchangeHelper.createBuyOffer(geItem.getName(), geItem.getPrice(), geItem.getQuantity());
         }
-    }
 
-    private void getCoins() throws InterruptedException {
-        if (!getBank().isOpen()) {
-            if (getBank().open()) {
-                Sleep.sleepUntil(() -> getBank().isOpen(), 5000);
+        if(!GRAND_EXCHANGE.contains(myPosition())){
+            getWalking().webWalk(GRAND_EXCHANGE);
+        } else if(!coinReq.hasRequirement(getInventory())) {
+            itemReqBanking.run();
+            if (itemReqBanking.hasFailed()) {
+                setFailed();
+            }
+        } else {
+            GrandExchangeBuyEvent buyEvent = new GrandExchangeBuyEvent(
+                    geItem.getName(),
+                    geItem.getPrice(),
+                    geItem.getQuantity()
+            );
+            execute(buyEvent);
+            if (buyEvent.hasFailed()) {
+                setFailed();
+            } else {
+                box = buyEvent.getBoxUsed();
             }
-        } else if (!getInventory().isEmpty()) {
-            getBank().depositAll();
-        } else if (getBank().getAmount("Coins") + getInventory().getAmount("Coins") >= (geItem.getPrice() * geItem.getQuantity())) {
-            withdrawRemaining("Coins", (geItem.getPrice() * geItem.getQuantity()));
-        } else{
-            setFailed();
         }
     }
 
-    private boolean withdrawRemaining(String itemName, int quantity) {
-        long invAmount = getInventory().getAmount(itemName);
-        return invAmount < quantity && getBank().withdraw(itemName, quantity - (int) invAmount);
-    }
-
     @Override
     public String toString() {
         return "Buying";

AIO/src/org/aio/activities/grand_exchange/GESellActivity.java

@@ -2,11 +2,11 @@
 
 import org.aio.activities.banking.DepositAllBanking;
 import org.aio.activities.banking.ItemReqBanking;
+import org.aio.activities.grand_exchange.event.GrandExchangeSellEvent;
 import org.aio.util.item_requirement.ItemReq;
 
 public class GESellActivity extends GEActivity {
 
-    private GrandExchangeHelper exchangeHelper;
     private final GEItem geItem;
     private DepositAllBanking depositAllBanking;
     private ItemReqBanking itemReqBanking;
@@ -20,8 +20,6 @@ public GESellActivity(final GEItem geItem) {
 
     @Override
     public void onStart() {
-        this.exchangeHelper = new GrandExchangeHelper();
-        this.exchangeHelper.exchangeContext(getBot());
         itemReqBanking.exchangeContext(getBot());
         depositAllBanking.exchangeContext(getBot());
     }
@@ -30,8 +28,10 @@ public void onStart() {
     public void runActivity() throws InterruptedException {
         if (box != null) {
             return;
-        } else if (!exchangeHelper.playerIsAtGE()) {
-            exchangeHelper.walkToGE();
+        }
+
+        if (!GRAND_EXCHANGE.contains(myPosition())) {
+            getWalking().webWalk(GRAND_EXCHANGE);
         } else if (!checkedBank && getInventory().getAmount(geItem.getName()) < geItem.getQuantity()) {
             if (!getInventory().isEmpty()) {
                 depositAllBanking.run();
@@ -44,7 +44,11 @@ public void runActivity() throws InterruptedException {
                 }
             }
         } else {
-            box = exchangeHelper.createSellOffer(geItem.getName(), geItem.getPrice(), geItem.getQuantity());
+            GrandExchangeSellEvent sellEvent = new GrandExchangeSellEvent(
+                    geItem.getName(), geItem.getPrice(), geItem.getQuantity()
+            );
+            execute(sellEvent);
+            box = sellEvent.getBoxUsed();
         }
     }