testing item container fixes

Ethan-Vann · Aug 17, 2023 · 5bf5468 · 5bf5468
1 parent 52d41a1
commit 5bf5468
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/src/main/java/com/example/EthanApiPlugin/Collections/Bank.java b/src/main/java/com/example/EthanApiPlugin/Collections/Bank.java
@@ -1,29 +1,49 @@
 package com.example.EthanApiPlugin.Collections;
 
 import com.example.EthanApiPlugin.Collections.query.ItemQuery;
+import com.example.EthanApiPlugin.EthanApiPlugin;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.InventoryID;
+import net.runelite.api.Item;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.RuneLite;
 import net.runelite.client.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
 public class Bank {
     static Client client = RuneLite.getInjector().getInstance(Client.class);
     static List<Widget> bankItems = new ArrayList<>();
     boolean bankUpdate = true;
     static int lastUpdateTick = 0;
+
     public static ItemQuery search() {
         if (lastUpdateTick < client.getTickCount()) {
-            bankItems =
-                    Arrays.stream(client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER).getDynamicChildren()).filter(Objects::nonNull).filter(x -> x.getItemId() != 6512 && x.getItemId() != -1).collect(Collectors.toList());
+            Bank.bankItems.clear();
+            int i = 0;
+            for (Item item : client.getItemContainer(InventoryID.BANK).getItems()) {
+                try {
+                    if (item == null) {
+                        i++;
+                        continue;
+                    }
+                    if (EthanApiPlugin.itemDefs.get(item.getId()).getPlaceholderTemplateId() == 14401) {
+                        i++;
+                        continue;
+                    }
+                    Bank.bankItems.add(new BankItemWidget(EthanApiPlugin.itemDefs.get(item.getId()).getName(), item.getId(), item.getQuantity(), i));
+                } catch (NullPointerException | ExecutionException ex) {
+                    //todo fix this
+                }
+                i++;
+            }
             lastUpdateTick = client.getTickCount();
         }
         return new ItemQuery(bankItems.stream().filter(Objects::nonNull).collect(Collectors.toList()));