ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: remove geometry test (not worth cpu time), handle plugins out of package

Browse Source
This commit is contained in:
TheRealNull
2020-12-24 15:18:04 -05:00
parent cc026314ac
commit 7e4976b6af
5 changed files with 95 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -30,6 +30,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.openosrs.client.PluginManager;
import java.io.File;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
@@ -68,7 +69,6 @@ import net.runelite.client.game.ItemManager;
import net.runelite.client.game.LootManager;
import net.runelite.client.game.chatbox.ChatboxPanelManager;
import net.runelite.client.menus.MenuManager;
import net.runelite.client.plugins.PluginManager;
import net.runelite.client.rs.ClientLoader;
import net.runelite.client.rs.ClientUpdateCheckMode;
import net.runelite.client.ui.ClientUI;
@@ -107,7 +107,7 @@ public class RuneLite
private static Injector injector;
@Inject
private PluginManager pluginManager;
private net.runelite.client.plugins.PluginManager pluginManager;
@Inject
private ExternalPluginManager externalPluginManager;
@@ -377,6 +377,9 @@ public class RuneLite
overlayManager.add(tooltipOverlay.get());
}
//Load OPRS plugins
PluginManager.loadPlugins();
// Start plugins
pluginManager.startPlugins();

4
runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java
View File

@@ -76,7 +76,7 @@ import okhttp3.Response;
public class ExternalPluginManager
{
private static final String PLUGIN_LIST_KEY = "externalPlugins";
private static Class<? extends Plugin>[] builtinExternals = null;
public static Class<? extends Plugin>[] builtinExternals = null;
@Inject
@Named("safeMode")
@@ -85,7 +85,7 @@ public class ExternalPluginManager
private final ConfigManager configManager;
private final ExternalPluginClient externalPluginClient;
private final ScheduledExecutorService executor;
private final PluginManager pluginManager;
public static PluginManager pluginManager;
private final EventBus eventBus;
private final OkHttpClient okHttpClient;