From 2944e5b3349cf316a8f1baf0345afeb6402827c5 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 22 Jun 2018 10:46:38 +0200 Subject: [PATCH] Move updateNpcs call to mixins Signed-off-by: Tomas Slusny --- .../src/main/java/net/runelite/client/callback/Hooks.java | 3 +-- .../src/main/java/net/runelite/client/callback/Hooks.java | 5 +++++ .../src/main/java/net/runelite/mixins/RSClientMixin.java | 8 ++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 8fb6147d8c..2f2a32a28d 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -47,7 +47,6 @@ import net.runelite.api.KeyFocusListener; import net.runelite.api.MainBufferProvider; import net.runelite.api.MenuAction; import net.runelite.api.MessageNode; -import net.runelite.api.PacketBuffer; import net.runelite.api.Projectile; import net.runelite.api.Region; import net.runelite.api.RenderOverview; @@ -441,7 +440,7 @@ public class Hooks eventBus.post(setMessage); } - public static void onNpcUpdate(boolean var0, PacketBuffer var1) + public static void updateNpcs() { // The NPC update event seem to run every server tick, // but having the game tick event after all packets diff --git a/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java index cf90c14151..f84b121474 100644 --- a/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java @@ -104,6 +104,11 @@ public class Hooks throw new RuntimeException(); } + public static void updateNpcs() + { + throw new RuntimeException(); + } + public static boolean menuActionHook(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7) { throw new RuntimeException(); 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 8905b8bde6..8a7122dcca 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -49,6 +49,7 @@ import static net.runelite.api.MenuAction.PLAYER_THIRD_OPTION; import net.runelite.api.MenuEntry; import net.runelite.api.NPC; import net.runelite.api.Node; +import net.runelite.api.PacketBuffer; import static net.runelite.api.Perspective.LOCAL_TILE_SIZE; import net.runelite.api.Player; import net.runelite.api.Point; @@ -1026,4 +1027,11 @@ public abstract class RSClientMixin implements RSClient event.setMenuEntries(getMenuEntries()); eventBus.post(event); } + + @Inject + @MethodHook("updateNpcs") + public static void updateNpcs(boolean var0, PacketBuffer var1) + { + Hooks.updateNpcs(); + } } \ No newline at end of file