diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 699ae802c8..a20781c0b4 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/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); -} \ No newline at end of file + + /** + * Get the item container for an inventory + * @param inventory + * @return + */ + ItemContainer getItemContainer(InventoryID inventory); +} diff --git a/runelite-api/src/main/java/net/runelite/api/ItemContainer.java b/runelite-api/src/main/java/net/runelite/api/ItemContainer.java new file mode 100644 index 0000000000..7b11726384 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/ItemContainer.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016-2018, Adam + * 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(); +} diff --git a/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java index f5ae5cf2ae..4571d4694b 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Devin French + * Copyright (c) 2016-2018, Adam * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,67 +25,22 @@ package net.runelite.api.queries; import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; +import net.runelite.api.InventoryID; +import net.runelite.api.Item; +import net.runelite.api.ItemContainer; +import net.runelite.api.Query; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Objects; - -public class InventoryItemQuery extends WidgetItemQuery +public class InventoryItemQuery extends Query { - private static final WidgetInfo[] INVENTORY_WIDGET_INFOS = - { - WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER, - WidgetInfo.INVENTORY - }; - @Override - public WidgetItem[] result(Client client) + public Item[] result(Client client) { - Collection widgetItems = getInventoryItems(client); - if (widgetItems != null) + ItemContainer container = client.getItemContainer(InventoryID.INVENTORY); + if (container == null) { - return widgetItems.stream() - .filter(Objects::nonNull) - .filter(predicate) - .toArray(WidgetItem[]::new); + return null; } - return new WidgetItem[0]; + return container.getItems(); } - private Collection getInventoryItems(Client client) - { - Collection widgetItems = new ArrayList<>(); - for (WidgetInfo widgetInfo : INVENTORY_WIDGET_INFOS) - { - Widget inventory = client.getWidget(widgetInfo); - if (inventory == null || inventory.isHidden()) - { - continue; - } - if (widgetInfo == WidgetInfo.INVENTORY) - { - widgetItems.addAll(inventory.getWidgetItems()); - break; - } - else - { - Widget[] children = inventory.getDynamicChildren(); - for (int i = 0; i < children.length; i++) - { - // set bounds to same size as default inventory - Rectangle bounds = children[i].getBounds(); - bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - widgetItems.add(new WidgetItem(children[i].getItemId(), children[i].getItemQuantity(), i, bounds)); - } - break; - } - } - return widgetItems; - } } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java new file mode 100644 index 0000000000..3afe23c619 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2017, Devin French + * 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.queries; + +import net.runelite.api.Client; +import net.runelite.api.widgets.Widget; +import net.runelite.api.widgets.WidgetInfo; +import net.runelite.api.widgets.WidgetItem; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Objects; + +public class InventoryWidgetItemQuery extends WidgetItemQuery +{ + private static final WidgetInfo[] INVENTORY_WIDGET_INFOS = + { + WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER, + WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER, + WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER, + WidgetInfo.INVENTORY + }; + + @Override + public WidgetItem[] result(Client client) + { + Collection widgetItems = getInventoryItems(client); + if (widgetItems != null) + { + return widgetItems.stream() + .filter(Objects::nonNull) + .filter(predicate) + .toArray(WidgetItem[]::new); + } + return new WidgetItem[0]; + } + + private Collection getInventoryItems(Client client) + { + Collection widgetItems = new ArrayList<>(); + for (WidgetInfo widgetInfo : INVENTORY_WIDGET_INFOS) + { + Widget inventory = client.getWidget(widgetInfo); + if (inventory == null || inventory.isHidden()) + { + continue; + } + if (widgetInfo == WidgetInfo.INVENTORY) + { + widgetItems.addAll(inventory.getWidgetItems()); + break; + } + else + { + Widget[] children = inventory.getDynamicChildren(); + for (int i = 0; i < children.length; i++) + { + // set bounds to same size as default inventory + Rectangle bounds = children[i].getBounds(); + bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); + widgetItems.add(new WidgetItem(children[i].getItemId(), children[i].getItemQuantity(), i, bounds)); + } + break; + } + } + return widgetItems; + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java index 706a5adbe0..d89e8cb886 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java @@ -34,7 +34,7 @@ import java.util.Collection; import javax.inject.Inject; import net.runelite.api.Query; import net.runelite.api.queries.EquipmentItemQuery; -import net.runelite.api.queries.InventoryItemQuery; +import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; @@ -87,7 +87,7 @@ class JewelleryCountOverlay extends Overlay private Collection getJewelleryWidgetItems() { - Query inventoryQuery = new InventoryItemQuery(); + Query inventoryQuery = new InventoryWidgetItemQuery(); WidgetItem[] inventoryWidgetItems = queryRunner.runQuery(inventoryQuery); Query equipmentQuery = new EquipmentItemQuery().slotEquals( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java index 4227b5bb43..2b92e58ba0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java @@ -37,7 +37,7 @@ import java.util.Collection; import javax.inject.Inject; import net.runelite.api.Query; import net.runelite.api.queries.EquipmentItemQuery; -import net.runelite.api.queries.InventoryItemQuery; +import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; @@ -88,7 +88,7 @@ public class BindNeckOverlay extends Overlay private Collection getNecklaceWidgetItems() { - Query inventoryQuery = new InventoryItemQuery() + Query inventoryQuery = new InventoryWidgetItemQuery() .idEquals(BINDING_NECKLACE); WidgetItem[] inventoryWidgetItems = queryRunner.runQuery(inventoryQuery); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java index 2c53687663..d141764e15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java @@ -33,7 +33,7 @@ import net.runelite.api.Client; import net.runelite.api.ItemID; import net.runelite.api.Query; import net.runelite.api.Varbits; -import net.runelite.api.queries.InventoryItemQuery; +import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; @@ -69,7 +69,7 @@ public class RunecraftOverlay extends Overlay return null; } - Query query = new InventoryItemQuery(); + Query query = new InventoryWidgetItemQuery(); WidgetItem[] widgetItems = queryRunner.runQuery(query); graphics.setFont(FontManager.getRunescapeSmallFont()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index d257dbea77..494320aeb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -34,7 +34,7 @@ import net.runelite.api.ItemID; import net.runelite.api.Point; import net.runelite.api.Query; import net.runelite.api.Varbits; -import net.runelite.api.queries.InventoryItemQuery; +import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; @@ -80,7 +80,7 @@ public class RunepouchOverlay extends Overlay return null; } - Query query = new InventoryItemQuery().idEquals(ItemID.RUNE_POUCH); + Query query = new InventoryWidgetItemQuery().idEquals(ItemID.RUNE_POUCH); WidgetItem[] items = queryRunner.runQuery(query); if (items.length == 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java index 3f9b357dd2..93ac5bec68 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java @@ -37,7 +37,7 @@ import javax.inject.Inject; import net.runelite.api.ItemID; import net.runelite.api.Query; import net.runelite.api.queries.EquipmentItemQuery; -import net.runelite.api.queries.InventoryItemQuery; +import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; @@ -133,7 +133,7 @@ class SlayerOverlay extends Overlay private Collection getSlayerWidgetItems() { - Query inventoryQuery = new InventoryItemQuery(); + Query inventoryQuery = new InventoryWidgetItemQuery(); WidgetItem[] inventoryWidgetItems = queryRunner.runQuery(inventoryQuery); Query equipmentQuery = new EquipmentItemQuery().slotEquals(WidgetInfo.EQUIPMENT_HELMET, WidgetInfo.EQUIPMENT_RING); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 7ecf4e9e67..1f7b0869d3 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/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) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java new file mode 100644 index 0000000000..21658aec88 --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2016-2018, Adam + * 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; + } + +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 7fce392ead..ef27c10987 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/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); -} \ No newline at end of file + + @Construct + RSItem createItem(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java index cbbce495af..a2403b7026 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java +++ b/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(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java index 7fc0b1efc8..9cd5604d70 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java +++ b/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); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java index 9c878489a2..d84a50971b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java +++ b/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();