runelite-api: add ItemContainer

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -246,4 +246,11 @@ public interface Client extends GameEngine
 	 * @param lowMemory if we are running in low memory mode or not
 	 */
 	void changeMemoryMode(boolean lowMemory);
-}
+
+	/**
+	 * Get the item container for an inventory
+	 * @param inventory
+	 * @return
+	 */
+	ItemContainer getItemContainer(InventoryID inventory);
+}

runelite-api/src/main/java/net/runelite/api/ItemContainer.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016-2018, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.api;
+
+public interface ItemContainer
+{
+	/**
+	 * Get the items from the container
+	 * @return
+	 */
+	Item[] getItems();
+}

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -29,6 +29,7 @@ import java.util.List;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.GameState;
 import net.runelite.api.IndexedSprite;
+import net.runelite.api.InventoryID;
 import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
@@ -55,7 +56,9 @@ import net.runelite.api.widgets.WidgetInfo;
 import static net.runelite.client.callback.Hooks.eventBus;
 import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSDeque;
+import net.runelite.rs.api.RSHashTable;
 import net.runelite.rs.api.RSIndexedSprite;
+import net.runelite.rs.api.RSItemContainer;
 import net.runelite.rs.api.RSWidget;
 
 @Mixin(RSClient.class)
@@ -406,6 +409,14 @@ public abstract class RSClientMixin implements RSClient
 		setOcLowDetail(lowMemory);
 	}
 
+	@Inject
+	@Override
+	public RSItemContainer getItemContainer(InventoryID inventory)
+	{
+		RSHashTable itemContainers = getItemContainers();
+		return (RSItemContainer) itemContainers.get(inventory.getId());
+	}
+
 	@FieldHook("skillExperiences")
 	@Inject
 	public static void experiencedChanged(int idx)

runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016-2018, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.mixins;
+
+import net.runelite.api.Item;
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.api.mixins.Shadow;
+import net.runelite.rs.api.RSClient;
+import net.runelite.rs.api.RSItem;
+import net.runelite.rs.api.RSItemContainer;
+
+@Mixin(RSItemContainer.class)
+public abstract class RSItemContainerMixin implements RSItemContainer
+{
+	@Shadow("clientInstance")
+	private static RSClient client;
+
+	@Inject
+	@Override
+	public Item[] getItems()
+	{
+		int[] itemIds = getItemIds();
+		int[] stackSizes = getStackSizes();
+		Item[] items = new Item[itemIds.length];
+
+		for (int i = 0; i < itemIds.length; ++i)
+		{
+			RSItem item = client.createItem();
+			item.setId(itemIds[i]);
+			item.setQuantity(stackSizes[i]);
+			items[i] = item;
+		}
+
+		return items;
+	}
+
+}

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -432,4 +432,7 @@ public interface RSClient extends RSGameEngine, Client
 
 	@Import("ocLowDetail")
 	void setOcLowDetail(boolean lowDetail);
-}
+
+	@Construct
+	RSItem createItem();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java

@@ -29,6 +29,9 @@ import net.runelite.mapping.Import;
 
 public interface RSHashTable extends HashTable
 {
+	@Import("get")
+	RSNode get(long value);
+
 	@Import("size")
 	int getSize();
 

runescape-api/src/main/java/net/runelite/rs/api/RSItem.java

@@ -33,7 +33,13 @@ public interface RSItem extends RSRenderable, Item
 	@Override
 	int getId();
 
+	@Import("id")
+	void setId(int id);
+
 	@Import("quantity")
 	@Override
 	int getQuantity();
+
+	@Import("quantity")
+	void setQuantity(int quantity);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java

@@ -24,9 +24,10 @@
  */
 package net.runelite.rs.api;
 
+import net.runelite.api.ItemContainer;
 import net.runelite.mapping.Import;
 
-public interface RSItemContainer extends RSNode
+public interface RSItemContainer extends RSNode, ItemContainer
 {
 	@Import("itemIds")
 	int[] getItemIds();