From 27173d90b5cf9736ddb4f1071e1d6b2f508930ac Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Wed, 27 May 2020 14:47:10 -0400
Subject: [PATCH] hooks: remove remaining static callbacks

---
 .../net/runelite/api/hooks/Callbacks.java     |  2 +
 .../net/runelite/client/callback/Hooks.java   | 62 ++++---------------
 2 files changed, 13 insertions(+), 51 deletions(-)

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 b6960d761f..07d00487bc 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,6 +70,8 @@ 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 f4a963035a..d7e353df4c 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
@@ -24,7 +24,6 @@
  */
 package net.runelite.client.callback;
 
-import com.google.inject.Injector;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -40,27 +39,22 @@ import java.awt.image.VolatileImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.BufferProvider;
 import net.runelite.api.Client;
 import net.runelite.api.MainBufferProvider;
 import net.runelite.api.NullItemID;
 import net.runelite.api.RenderOverview;
-import net.runelite.api.Renderable;
 import net.runelite.api.Skill;
 import net.runelite.api.WorldMapManager;
-import net.runelite.api.events.BeforeMenuRender;
 import net.runelite.api.events.BeforeRender;
 import net.runelite.api.events.FakeXpDrop;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.api.hooks.Callbacks;
-import net.runelite.api.hooks.DrawCallbacks;
 import net.runelite.api.widgets.Widget;
 import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.Notifier;
-import net.runelite.client.RuneLite;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
@@ -87,14 +81,18 @@ public class Hooks implements Callbacks
 {
 	private static final long CHECK = RSTimeUnit.GAME_TICKS.getDuration().toNanos(); // ns - how often to run checks
 
-	private static final Injector injector = RuneLite.getInjector();
-	private static final Client client = injector.getInstance(Client.class);
-	private static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class);
-	private static final OverlayManager overlayManager = injector.getInstance(OverlayManager.class);
-
 	private static final GameTick GAME_TICK = new GameTick();
 	private static final BeforeRender BEFORE_RENDER = new BeforeRender();
 
+	@Inject
+	private Client client;
+
+	@Inject
+	private OverlayRenderer renderer;
+
+	@Inject
+	private OverlayManager overlayManager;
+
 	@Inject
 	private EventBus eventBus;
 
@@ -449,7 +447,8 @@ public class Hooks implements Callbacks
 		}
 	}
 
-	public static void drawAfterWidgets()
+	@Override
+	public void drawAfterWidgets()
 	{
 		MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider();
 		Graphics2D graphics2d = getGraphics(bufferProvider);
@@ -505,38 +504,6 @@ public class Hooks implements Callbacks
 		deferredEventBus.replay();
 	}
 
-	public static void renderDraw(Renderable renderable, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash)
-	{
-		DrawCallbacks drawCallbacks = client.getDrawCallbacks();
-		if (drawCallbacks != null)
-		{
-			drawCallbacks.draw(renderable, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash);
-		}
-		else
-		{
-			renderable.draw(orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash);
-		}
-	}
-
-	public static void clearColorBuffer(int x, int y, int width, int height, int color)
-	{
-		BufferProvider bp = client.getBufferProvider();
-		int canvasWidth = bp.getWidth();
-		int[] pixels = bp.getPixels();
-
-		int pixelPos = y * canvasWidth + x;
-		int pixelJump = canvasWidth - width;
-
-		for (int cy = y; cy < y + height; cy++)
-		{
-			for (int cx = x; cx < x + width; cx++)
-			{
-				pixels[pixelPos++] = 0;
-			}
-			pixelPos += pixelJump;
-		}
-	}
-
 	@Override
 	public void drawItem(int itemId, WidgetItem widgetItem)
 	{
@@ -547,13 +514,6 @@ public class Hooks implements Callbacks
 		}
 	}
 
-	public static boolean drawMenu()
-	{
-		BeforeMenuRender event = new BeforeMenuRender();
-		client.getCallbacks().post(event);
-		return event.isConsumed();
-	}
-
 	@Subscribe
 	public void onScriptCallbackEvent(ScriptCallbackEvent scriptCallbackEvent)
 	{