From e16132a61664bedcfe9b8109de0066d99d426606 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 25 Oct 2021 00:51:12 +0200 Subject: [PATCH] Revert "project: Revert these changes until mixins / injector parts are done" This reverts commit 353a12ccb699dfb35c4e0bd7fa447eb677ab9dbc. --- .../src/main/java/net/runelite/api/HashTable.java | 11 +---------- .../plugins/timetracking/farming/FarmingTracker.java | 10 ++++++---- .../net/runelite/client/util/GameEventManager.java | 10 ++-------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/HashTable.java b/runelite-api/src/main/java/net/runelite/api/HashTable.java index b1c23931b5..737e466a40 100644 --- a/runelite-api/src/main/java/net/runelite/api/HashTable.java +++ b/runelite-api/src/main/java/net/runelite/api/HashTable.java @@ -1,12 +1,10 @@ package net.runelite.api; -import java.util.Collection; - /** * A data structure that uses a hash function to compute an index into an * array of buckets from which node objects can be quickly obtained. */ -public interface HashTable +public interface HashTable extends Iterable { /** * Gets a node by its hash value. @@ -15,11 +13,4 @@ public interface HashTable * @return the associated node */ T get(long value); - - /** - * Gets a collection of all nodes stored in this table. - * - * @return the nodes stored - */ - Collection getNodes(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java index 4a381220b2..965ad11b59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java @@ -40,6 +40,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Varbits; +import net.runelite.api.WidgetNode; import net.runelite.api.coords.WorldPoint; import net.runelite.api.vars.Autoweed; import net.runelite.api.widgets.WidgetModalMode; @@ -101,11 +102,12 @@ public class FarmingTracker boolean changed = false; //Varbits don't get sent when a modal widget is open so just return - if (client.getComponentTable().getNodes() - .stream() - .anyMatch(widgetNode -> widgetNode.getModalMode() != WidgetModalMode.NON_MODAL)) + for (WidgetNode widgetNode : client.getComponentTable()) { - return false; + if (widgetNode.getModalMode() != WidgetModalMode.NON_MODAL) + { + return false; + } } { diff --git a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java index a06a5bb4af..7e3fb7efe4 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java +++ b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java @@ -33,7 +33,6 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.GameState; -import net.runelite.api.InventoryID; import net.runelite.api.ItemContainer; import net.runelite.api.NPC; import net.runelite.api.Node; @@ -112,14 +111,9 @@ public class GameEventManager eventBus.register(subscriber); - for (final InventoryID inventory : InventoryID.values()) + for (final ItemContainer itemContainer : client.getItemContainers()) { - final ItemContainer itemContainer = client.getItemContainer(inventory); - - if (itemContainer != null) - { - eventBus.post(new ItemContainerChanged(inventory.getId(), itemContainer)); - } + eventBus.post(new ItemContainerChanged(itemContainer.getId(), itemContainer)); } for (NPC npc : client.getCachedNPCs())