Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2020-02-21 02:08:47 +01:00
12 changed files with 311 additions and 25 deletions

View File

@@ -76,6 +76,7 @@ import net.runelite.api.events.ClientTick;
import net.runelite.api.events.DraggingWidgetChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GrandExchangeOfferChanged;
import net.runelite.api.events.GrandExchangeSearched;
import net.runelite.api.events.Menu;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuOpened;
@@ -1172,6 +1173,23 @@ public abstract class RSClientMixin implements RSClient
}
}
@Copy("findItemDefinitions")
public static void rs$findItemDefinitions(String var0, boolean var1)
{
throw new RuntimeException();
}
@Replace("findItemDefinitions")
public static void rl$findItemDefinitions(String var0, boolean var1)
{
GrandExchangeSearched event = new GrandExchangeSearched();
client.getCallbacks().post(GrandExchangeSearched.class, event);
if (!event.isConsumed())
{
rs$findItemDefinitions(var0, var1);
}
}
@Inject
@FieldHook("grandExchangeOffers")
public static void onGrandExchangeOffersChanged(int idx)