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 deleted file mode 100644 index 2a317d7e1c..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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.queries; - -import java.util.Arrays; -import java.util.Objects; -import lombok.RequiredArgsConstructor; -import net.runelite.api.Client; -import net.runelite.api.InventoryID; -import net.runelite.api.Item; -import net.runelite.api.ItemContainer; -import net.runelite.api.Query; - -/** - * Used for getting inventory items,deprecated as of existence of item container changed events - * - * @see net.runelite.api.events.ItemContainerChanged - */ -@Deprecated -@RequiredArgsConstructor -public class InventoryItemQuery extends Query -{ - private final InventoryID inventory; - - @Override - public Item[] result(Client client) - { - ItemContainer container = client.getItemContainer(inventory); - if (container == null) - { - return null; - } - return Arrays.stream(container.getItems()) - .filter(Objects::nonNull) - .filter(predicate) - .toArray(Item[]::new); - } - - public InventoryItemQuery idEquals(int... ids) - { - predicate = and(item -> - { - for (int id : ids) - { - if (item.getId() == id) - { - return true; - } - } - return false; - }); - return this; - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index 7786c76816..49cc67bc2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -24,11 +24,14 @@ */ package net.runelite.client.plugins.runecraft; +import com.google.common.collect.ImmutableList; import com.google.inject.Provides; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Stream; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; @@ -48,8 +51,8 @@ import net.runelite.api.events.DecorativeObjectDespawned; import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.queries.InventoryItemQuery; import net.runelite.api.queries.NPCQuery; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -72,6 +75,11 @@ public class RunecraftPlugin extends Plugin private static final String POUCH_DECAYED_NOTIFICATION_MESSAGE = "Your rune pouch has decayed."; private static final String POUCH_DECAYED_MESSAGE = "Your pouch has decayed through use."; private static final int DESTROY_ITEM_WIDGET_ID = WidgetInfo.DESTROY_ITEM_YES.getId(); + private static final List DEGRADED_POUCHES = ImmutableList.of( + ItemID.MEDIUM_POUCH_5511, + ItemID.LARGE_POUCH_5513, + ItemID.GIANT_POUCH_5515 + ); @Getter(AccessLevel.PACKAGE) private final Set abyssObjects = new HashSet<>(); @@ -233,29 +241,30 @@ public class RunecraftPlugin extends Plugin } @Subscribe - public void onGameTick(GameTick event) + public void onItemContainerChanged(ItemContainerChanged event) { - darkMage = null; - - if (!config.hightlightDarkMage()) + if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) { return; } - Query inventoryQuery = new InventoryItemQuery(InventoryID.INVENTORY).idEquals( - ItemID.MEDIUM_POUCH_5511, - ItemID.LARGE_POUCH_5513, - ItemID.GIANT_POUCH_5515 - ); + final Item[] items = event.getItemContainer().getItems(); + degradedPouchInInventory = Stream.of(items).anyMatch(i -> DEGRADED_POUCHES.contains(i.getId())); + } - Item[] items = queryRunner.runQuery(inventoryQuery); - degradedPouchInInventory = items != null && items.length > 0; + @Subscribe + public void onGameTick(GameTick event) + { + darkMage = null; - if (degradedPouchInInventory) + if (!config.hightlightDarkMage() + || !degradedPouchInInventory) { - Query darkMageQuery = new NPCQuery().idEquals(NpcID.DARK_MAGE); - NPC[] result = queryRunner.runQuery(darkMageQuery); - darkMage = result.length >= 1 ? result[0] : null; + return; } + + Query darkMageQuery = new NPCQuery().idEquals(NpcID.DARK_MAGE); + NPC[] result = queryRunner.runQuery(darkMageQuery); + darkMage = result.length >= 1 ? result[0] : null; } }