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

externalpluginmanager: chain child injectors for plugin dependencies

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-30 06:56:43 +02:00
parent 5d52bf4110
commit aa2c24f6d0
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
View File

@@ -560,21 +560,39 @@ public class ExternalPluginManager
try try
{ {
Module pluginModule = (Binder binder) -> Injector parent = RuneLite.getInjector();
if (deps.size() > 1)
{ {
binder.bind(clazz).toInstance(plugin); List<Module> modules = new ArrayList<>(deps.size());
binder.install(plugin);
for (Plugin p : deps) for (Plugin p : deps)
{ {
Module p2 = (Binder binder2) -> // Create a module for each dependency
Module module = (Binder binder) ->
{ {
binder2.bind((Class<Plugin>) p.getClass()).toInstance(p); binder.bind((Class<Plugin>) p.getClass()).toInstance(p);
binder2.install(p); binder.install(p);
}; };
binder.install(p2); modules.add(module);
} }
// Create a parent injector containing all of the dependencies
parent = parent.createChildInjector(modules);
}
else if (!deps.isEmpty())
{
// With only one dependency we can simply use its injector
parent = deps.get(0).injector;
}
// 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(clazz).toInstance(plugin);
binder.install(plugin);
}; };
Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule); Injector pluginInjector = parent.createChildInjector(pluginModule);
pluginInjector.injectMembers(plugin); pluginInjector.injectMembers(plugin);
plugin.injector = pluginInjector; plugin.injector = pluginInjector;