client: Initialize managers to make them subscribe to events (#1044)
This commit is contained in:
committed by
Kyleeld
parent
a0711cb3df
commit
3fd290b2a8
@@ -48,9 +48,15 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import net.runelite.api.Client;
|
import net.runelite.api.Client;
|
||||||
import net.runelite.client.account.SessionManager;
|
import net.runelite.client.account.SessionManager;
|
||||||
import net.runelite.client.chat.ChatMessageManager;
|
import net.runelite.client.chat.ChatMessageManager;
|
||||||
|
import net.runelite.client.chat.CommandManager;
|
||||||
import net.runelite.client.config.ConfigManager;
|
import net.runelite.client.config.ConfigManager;
|
||||||
import net.runelite.client.discord.DiscordService;
|
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.graphics.ModelOutlineRenderer;
|
||||||
|
import net.runelite.client.menus.MenuManager;
|
||||||
import net.runelite.client.plugins.Plugin;
|
import net.runelite.client.plugins.Plugin;
|
||||||
import net.runelite.client.plugins.PluginInstantiationException;
|
import net.runelite.client.plugins.PluginInstantiationException;
|
||||||
import net.runelite.client.plugins.PluginManager;
|
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.rs.ClientUpdateCheckMode;
|
||||||
import net.runelite.client.task.Scheduler;
|
import net.runelite.client.task.Scheduler;
|
||||||
import net.runelite.client.ui.ClientUI;
|
import net.runelite.client.ui.ClientUI;
|
||||||
|
import net.runelite.client.ui.DrawManager;
|
||||||
import net.runelite.client.ui.RuneLiteSplashScreen;
|
import net.runelite.client.ui.RuneLiteSplashScreen;
|
||||||
import net.runelite.client.ui.overlay.OverlayManager;
|
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.WidgetOverlay;
|
||||||
import net.runelite.client.ui.overlay.arrow.ArrowMinimapOverlay;
|
import net.runelite.client.ui.overlay.arrow.ArrowMinimapOverlay;
|
||||||
import net.runelite.client.ui.overlay.arrow.ArrowWorldOverlay;
|
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.infobox.InfoBoxOverlay;
|
||||||
import net.runelite.client.ui.overlay.tooltip.TooltipOverlay;
|
import net.runelite.client.ui.overlay.tooltip.TooltipOverlay;
|
||||||
import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay;
|
import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay;
|
||||||
|
import net.runelite.client.ws.PartyService;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
@Singleton
|
@Singleton
|
||||||
@@ -89,6 +99,9 @@ public class RuneLite
|
|||||||
@Inject
|
@Inject
|
||||||
private ConfigManager configManager;
|
private ConfigManager configManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private DrawManager drawManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private SessionManager sessionManager;
|
private SessionManager sessionManager;
|
||||||
|
|
||||||
@@ -101,12 +114,33 @@ public class RuneLite
|
|||||||
@Inject
|
@Inject
|
||||||
private ClientUI clientUI;
|
private ClientUI clientUI;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private InfoBoxManager infoBoxManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private OverlayManager overlayManager;
|
private OverlayManager overlayManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private PartyService partyService;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<ItemManager> itemManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<OverlayRenderer> overlayRenderer;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<ClanManager> clanManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private Provider<ChatMessageManager> chatMessageManager;
|
private Provider<ChatMessageManager> chatMessageManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<MenuManager> menuManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<CommandManager> commandManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private Provider<InfoBoxOverlay> infoBoxOverlay;
|
private Provider<InfoBoxOverlay> infoBoxOverlay;
|
||||||
|
|
||||||
@@ -122,6 +156,12 @@ public class RuneLite
|
|||||||
@Inject
|
@Inject
|
||||||
private Provider<ArrowMinimapOverlay> arrowMinimapOverlay;
|
private Provider<ArrowMinimapOverlay> arrowMinimapOverlay;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<LootManager> lootManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private Provider<ChatboxPanelManager> chatboxPanelManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@Nullable
|
@Nullable
|
||||||
private Client client;
|
private Client client;
|
||||||
@@ -166,7 +206,7 @@ public class RuneLite
|
|||||||
if (options.has("proxy"))
|
if (options.has("proxy"))
|
||||||
{
|
{
|
||||||
String[] proxy = options.valueOf(proxyInfo).split(":");
|
String[] proxy = options.valueOf(proxyInfo).split(":");
|
||||||
|
|
||||||
if (proxy.length >= 2)
|
if (proxy.length >= 2)
|
||||||
{
|
{
|
||||||
System.setProperty("socksProxyHost", proxy[0]);
|
System.setProperty("socksProxyHost", proxy[0]);
|
||||||
@@ -312,6 +352,15 @@ public class RuneLite
|
|||||||
// Initialize chat colors
|
// Initialize chat colors
|
||||||
chatMessageManager.get().loadColors();
|
chatMessageManager.get().loadColors();
|
||||||
|
|
||||||
|
overlayRenderer.get();
|
||||||
|
clanManager.get();
|
||||||
|
itemManager.get();
|
||||||
|
menuManager.get();
|
||||||
|
chatMessageManager.get();
|
||||||
|
commandManager.get();
|
||||||
|
lootManager.get();
|
||||||
|
chatboxPanelManager.get();
|
||||||
|
|
||||||
// Add core overlays
|
// Add core overlays
|
||||||
WidgetOverlay.createOverlays(client).forEach(overlayManager::add);
|
WidgetOverlay.createOverlays(client).forEach(overlayManager::add);
|
||||||
overlayManager.add(infoBoxOverlay.get());
|
overlayManager.add(infoBoxOverlay.get());
|
||||||
|
|||||||
Reference in New Issue
Block a user