From 3fd290b2a88215f1af07ac9d9fefdda6869c55bc Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 19 Jul 2019 12:50:43 +0200 Subject: [PATCH] client: Initialize managers to make them subscribe to events (#1044) --- .../java/net/runelite/client/RuneLite.java | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index c77abcdb59..250b90f877 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -48,9 +48,15 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.client.account.SessionManager; import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.chat.CommandManager; import net.runelite.client.config.ConfigManager; import net.runelite.client.discord.DiscordService; +import net.runelite.client.game.ClanManager; +import net.runelite.client.game.ItemManager; +import net.runelite.client.game.LootManager; +import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.graphics.ModelOutlineRenderer; +import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginInstantiationException; import net.runelite.client.plugins.PluginManager; @@ -58,14 +64,18 @@ import net.runelite.client.rs.ClientLoader; import net.runelite.client.rs.ClientUpdateCheckMode; import net.runelite.client.task.Scheduler; import net.runelite.client.ui.ClientUI; +import net.runelite.client.ui.DrawManager; import net.runelite.client.ui.RuneLiteSplashScreen; import net.runelite.client.ui.overlay.OverlayManager; +import net.runelite.client.ui.overlay.OverlayRenderer; import net.runelite.client.ui.overlay.WidgetOverlay; import net.runelite.client.ui.overlay.arrow.ArrowMinimapOverlay; import net.runelite.client.ui.overlay.arrow.ArrowWorldOverlay; +import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay; import net.runelite.client.ui.overlay.tooltip.TooltipOverlay; import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay; +import net.runelite.client.ws.PartyService; import org.slf4j.LoggerFactory; @Singleton @@ -89,6 +99,9 @@ public class RuneLite @Inject private ConfigManager configManager; + @Inject + private DrawManager drawManager; + @Inject private SessionManager sessionManager; @@ -101,12 +114,33 @@ public class RuneLite @Inject private ClientUI clientUI; + @Inject + private InfoBoxManager infoBoxManager; + @Inject private OverlayManager overlayManager; + @Inject + private PartyService partyService; + + @Inject + private Provider itemManager; + + @Inject + private Provider overlayRenderer; + + @Inject + private Provider clanManager; + @Inject private Provider chatMessageManager; + @Inject + private Provider menuManager; + + @Inject + private Provider commandManager; + @Inject private Provider infoBoxOverlay; @@ -122,6 +156,12 @@ public class RuneLite @Inject private Provider arrowMinimapOverlay; + @Inject + private Provider lootManager; + + @Inject + private Provider chatboxPanelManager; + @Inject @Nullable private Client client; @@ -166,7 +206,7 @@ public class RuneLite if (options.has("proxy")) { String[] proxy = options.valueOf(proxyInfo).split(":"); - + if (proxy.length >= 2) { System.setProperty("socksProxyHost", proxy[0]); @@ -312,6 +352,15 @@ public class RuneLite // Initialize chat colors chatMessageManager.get().loadColors(); + overlayRenderer.get(); + clanManager.get(); + itemManager.get(); + menuManager.get(); + chatMessageManager.get(); + commandManager.get(); + lootManager.get(); + chatboxPanelManager.get(); + // Add core overlays WidgetOverlay.createOverlays(client).forEach(overlayManager::add); overlayManager.add(infoBoxOverlay.get());