From 211bae77971ff293d845023e83c54d53e3ebd2a0 Mon Sep 17 00:00:00 2001 From: therealunull Date: Tue, 15 Dec 2020 01:14:44 -0500 Subject: [PATCH] fix drawAfterWidgets --- .../src/main/java/com/openosrs/injector/Injection.java | 2 +- .../main/java/net/runelite/api/hooks/Callbacks.java | 2 -- .../main/java/net/runelite/client/callback/Hooks.java | 10 +++------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java b/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java index 76d58daa86..307697b1df 100644 --- a/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java +++ b/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java @@ -67,7 +67,7 @@ public class Injection extends InjectData implements InjectTaskHandler inject(new RSApiInjector(this)); - //inject(new DrawAfterWidgets(this)); + inject(new DrawAfterWidgets(this)); inject(new ScriptVM(this)); diff --git a/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java b/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java index 51faedb49b..8521576a65 100644 --- a/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java +++ b/runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java @@ -70,8 +70,6 @@ public interface Callbacks */ void drawAboveOverheads(); - void drawAfterWidgets(); - /** * Client top-most draw method, rendering over top of most of game interfaces. * 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 9165d9cdc7..b46944ce17 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 @@ -93,11 +93,8 @@ public class Hooks implements Callbacks private static final Injector injector = RuneLite.getInjector(); private static final Client client = injector.getInstance(Client.class); - @Inject - private OverlayRenderer renderer; - - @Inject - private OverlayManager overlayManager; + public static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class); + private static final OverlayManager overlayManager = injector.getInstance(OverlayManager.class); @Inject private EventBus eventBus; @@ -453,8 +450,7 @@ public class Hooks implements Callbacks } } - @Override - public void drawAfterWidgets() + public static void drawAfterWidgets() { MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider(); Graphics2D graphics2d = getGraphics(bufferProvider);