Fix issue #16

When the group storage is open a different inventory id used.
This fixes validating items in the wrong inventory container.

CHANGELOG.md

@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Fix issue [#13](https://github.com/elgbar/instant-inventory/pull/13), incompatibility with customized shift-clicking
   from the Menu Swapper plugin
+* Fix issue [#16](https://github.com/elgbar/instant-inventory/pull/16), depositing into the group ironman storage does
+  not work correctly
 
 ---
 

src/main/java/no/elg/ii/InstantInventoryPlugin.java

@@ -37,7 +37,6 @@
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.events.GameStateChanged;
@@ -104,13 +103,12 @@ protected void shutDown() {
   @Subscribe(priority = Integer.MAX_VALUE)
   public void onGameTick(GameTick event) {
     clientThread.invokeLater(() -> {
-      ItemContainer itemContainer = client.getItemContainer(InventoryID.INVENTORY);
-      if (itemContainer == null) {
-        return;
-      }
-      for (int index = 0; index < INVENTORY_SIZE; index++) {
-        Item item = itemContainer.getItem(index);
-        inventoryState.validateState(index, item);
+      ItemContainer itemContainer = inventoryService.getCurrentInventoryContainer();
+      if (itemContainer != null) {
+        for (int index = 0; index < INVENTORY_SIZE; index++) {
+          Item item = itemContainer.getItem(index);
+          inventoryState.validateState(index, item);
+        }
       }
     });
   }

src/main/java/no/elg/ii/inventory/InventoryService.java

@@ -28,16 +28,20 @@
 package no.elg.ii.inventory;
 
 import static no.elg.ii.util.IndexedWidget.indexWidget;
+import static no.elg.ii.util.InventoryUtil.GROUP_ITEM_CONTAINER;
 import static no.elg.ii.util.InventoryUtil.INVENTORY_ITEMS_CONTAINERS;
 
 import com.google.common.collect.Streams;
 import com.google.inject.Singleton;
 import java.util.Arrays;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
+import net.runelite.api.InventoryID;
+import net.runelite.api.ItemContainer;
 import net.runelite.api.events.BeforeRender;
 import net.runelite.api.widgets.Widget;
 import net.runelite.client.eventbus.Subscribe;
@@ -58,6 +62,18 @@ public class InventoryService {
   @Inject
   private WidgetService widgetService;
 
+  @Nullable
+  public ItemContainer getCurrentInventoryContainer() {
+    Widget widget = client.getWidget(GROUP_ITEM_CONTAINER);
+    InventoryID itemContainer;
+    if (widget != null && !widget.isHidden()) {
+      itemContainer = InventoryID.GROUP_STORAGE_INV;
+    } else {
+      itemContainer = InventoryID.INVENTORY;
+    }
+    return client.getItemContainer(itemContainer);
+  }
+
   @Nonnull
   private Stream<Widget> getOpenWidgetItemContainer() {
     return INVENTORY_ITEMS_CONTAINERS.stream()