ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "project: Revert these changes until mixins / injector parts are done"

Browse Source 
This reverts commit 353a12ccb6.
This commit is contained in:
Owain van Brakel
2021-10-25 00:51:12 +02:00
parent 0a220102f1
commit e16132a616
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-api/src/main/java/net/runelite/api/HashTable.java
View File

@@ -1,12 +1,10 @@
package net.runelite.api; package net.runelite.api;
import java.util.Collection;
/** /**
* A data structure that uses a hash function to compute an index into an * 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. * array of buckets from which node objects can be quickly obtained.
*/ */
public interface HashTable<T extends Node> public interface HashTable<T extends Node> extends Iterable<T>
{ {
/** /**
* Gets a node by its hash value. * Gets a node by its hash value.
@@ -15,11 +13,4 @@ public interface HashTable<T extends Node>
* @return the associated node * @return the associated node
*/ */
T get(long value); T get(long value);
/**
* Gets a collection of all nodes stored in this table.
*
* @return the nodes stored
*/
Collection<T> getNodes();
} }

10
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
View File

@@ -40,6 +40,7 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.WidgetNode;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.vars.Autoweed; import net.runelite.api.vars.Autoweed;
import net.runelite.api.widgets.WidgetModalMode; import net.runelite.api.widgets.WidgetModalMode;
@@ -101,11 +102,12 @@ public class FarmingTracker
boolean changed = false; boolean changed = false;
//Varbits don't get sent when a modal widget is open so just return //Varbits don't get sent when a modal widget is open so just return
if (client.getComponentTable().getNodes() for (WidgetNode widgetNode : client.getComponentTable())
.stream()
.anyMatch(widgetNode -> widgetNode.getModalMode() != WidgetModalMode.NON_MODAL))
{ {
return false; if (widgetNode.getModalMode() != WidgetModalMode.NON_MODAL)
{
return false;
}
} }
{ {

10
runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java
View File

@@ -33,7 +33,6 @@ import javax.inject.Singleton;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Constants; import net.runelite.api.Constants;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.InventoryID;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.Node; import net.runelite.api.Node;
@@ -112,14 +111,9 @@ public class GameEventManager
eventBus.register(subscriber); eventBus.register(subscriber);
for (final InventoryID inventory : InventoryID.values()) for (final ItemContainer itemContainer : client.getItemContainers())
{ {
final ItemContainer itemContainer = client.getItemContainer(inventory); eventBus.post(new ItemContainerChanged(itemContainer.getId(), itemContainer));
if (itemContainer != null)
{
eventBus.post(new ItemContainerChanged(inventory.getId(), itemContainer));
}
} }
for (NPC npc : client.getCachedNPCs()) for (NPC npc : client.getCachedNPCs())