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

externals: move injector assurance to Plugin class

Browse Source
This commit is contained in:
zeruth
2021-02-04 02:30:24 -05:00
parent 8c72f10b65
commit 023a80cf69
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
View File

@@ -27,6 +27,7 @@ package net.runelite.client.plugins;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Module; import com.google.inject.Module;
import net.runelite.client.RuneLite;
public abstract class Plugin implements Module public abstract class Plugin implements Module
{ {
@@ -49,8 +50,20 @@ public abstract class Plugin implements Module
{ {
} }
// This should never be null when we are using it
public final Injector getInjector() public final Injector getInjector()
{ {
if (injector == null)
{
Module pluginModule = (Binder binder) ->
{
binder.bind((Class<Plugin>) this.getClass()).toInstance(this);
binder.install(this);
};
Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule);
pluginInjector.injectMembers(this);
injector = pluginInjector;
}
return injector; return injector;
} }

35
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
View File

@@ -165,20 +165,7 @@ public class PluginManager
try try
{ {
Injector injector = plugin.getInjector(); Injector injector = plugin.getInjector();
if (injector == null)
{
// Create injector for the module
Module pluginModule = (Binder binder) ->
{
// Since the plugin itself is a module, it won't bind itself, so we'll bind it here
binder.bind((Class<Plugin>) plugin.getClass()).toInstance(plugin);
binder.install(plugin);
};
Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule);
pluginInjector.injectMembers(plugin);
plugin.injector = pluginInjector;
injector = pluginInjector;
}
for (Key<?> key : injector.getBindings().keySet()) for (Key<?> key : injector.getBindings().keySet())
{ {
Class<?> type = key.getTypeLiteral().getRawType(); Class<?> type = key.getTypeLiteral().getRawType();
@@ -208,25 +195,7 @@ public class PluginManager
plugins = getPlugins(); plugins = getPlugins();
} }
plugins.forEach(pl -> plugins.forEach(pl ->
{ injectors.add(pl.getInjector()));
//TODO: Not sure why this is necessary but it is. The Injector isn't null when its handed off from our ExternalPluginManager.
// Hopefully we can figure out the root cause of the underlying issue.
if (pl.injector == null)
{
// Create injector for the module
Module pluginModule = (Binder binder) ->
{
// Since the plugin itself is a module, it won't bind itself, so we'll bind it here
binder.bind((Class<Plugin>) pl.getClass()).toInstance(pl);
binder.install(pl);
};
Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule);
pluginInjector.injectMembers(pl);
pl.injector = pluginInjector;
}
injectors.add(pl.getInjector());
});
List<Config> list = new ArrayList<>(); List<Config> list = new ArrayList<>();
for (Injector injector : injectors) for (Injector injector : injectors)