From 6aec578aa9f5fa50e8bbdb113d1ffb2b1c0484b6 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Mon, 26 Nov 2018 10:25:51 +0000
Subject: [PATCH] Change dev tools fonts to constant

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 .../client/plugins/devtools/DevToolsOverlay.java   | 14 ++++++--------
 .../client/plugins/devtools/DevToolsPlugin.java    | 10 ----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
index 07eaec5f68..d0132fea4c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
@@ -58,6 +58,7 @@ import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.api.widgets.WidgetItem;
+import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -67,9 +68,10 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 
 public class DevToolsOverlay extends Overlay
 {
-	public static final int ITEM_EMPTY = 6512;
-	public static final int ITEM_FILLED = 20594;
+	private static final int ITEM_EMPTY = 6512;
+	private static final int ITEM_FILLED = 20594;
 
+	private static final Font FONT = FontManager.getRunescapeFont().deriveFont(Font.BOLD, 16);
 	private static final Color RED = new Color(221, 44, 0);
 	private static final Color GREEN = new Color(0, 200, 83);
 	private static final Color ORANGE = new Color(255, 109, 0);
@@ -87,7 +89,7 @@ public class DevToolsOverlay extends Overlay
 	private final TooltipManager toolTipManager;
 
 	@Inject
-	public DevToolsOverlay(Client client, DevToolsPlugin plugin, TooltipManager toolTipManager)
+	private DevToolsOverlay(Client client, DevToolsPlugin plugin, TooltipManager toolTipManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ALWAYS_ON_TOP);
@@ -99,11 +101,7 @@ public class DevToolsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		Font font = plugin.getFont();
-		if (font != null)
-		{
-			graphics.setFont(font);
-		}
+		graphics.setFont(FONT);
 
 		if (plugin.isTogglePlayers())
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
index ba4c396090..8ad4bb8f56 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
@@ -54,7 +54,6 @@ import net.runelite.client.config.ConfigManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.ClientToolbar;
-import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.JagexColors;
 import net.runelite.client.ui.NavigationButton;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -123,7 +122,6 @@ public class DevToolsPlugin extends Plugin
 	Widget currentWidget;
 	int itemIndex = -1;
 
-	private Font font;
 	private NavigationButton navButton;
 
 	@Provides
@@ -153,9 +151,6 @@ public class DevToolsPlugin extends Plugin
 			.build();
 
 		clientToolbar.addNavigation(navButton);
-
-		font = FontManager.getRunescapeFont()
-			.deriveFont(Font.BOLD, 16);
 	}
 
 	@Override
@@ -322,11 +317,6 @@ public class DevToolsPlugin extends Plugin
 		}
 	}
 
-	Font getFont()
-	{
-		return font;
-	}
-
 	void togglePlayers()
 	{
 		togglePlayers = !togglePlayers;