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

plugin manager: register plugins with immediate event bus

Browse Source
This commit is contained in:
Adam
2018-07-11 18:04:56 -04:00
parent ceb62ab8dc
commit 0469cfcc61
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.inject.Named;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import lombok.Setter; import lombok.Setter;
@@ -81,6 +82,10 @@ public class PluginManager
@Inject @Inject
EventBus eventBus; EventBus eventBus;
@Inject
@Named("Immediate EventBus")
EventBus immediateEventBus;
@Inject @Inject
Scheduler scheduler; Scheduler scheduler;
@@ -316,6 +321,7 @@ public class PluginManager
log.debug("Plugin {} is now running", plugin.getClass().getSimpleName()); log.debug("Plugin {} is now running", plugin.getClass().getSimpleName());
regionTileManager.simulateObjectSpawns(plugin); regionTileManager.simulateObjectSpawns(plugin);
eventBus.register(plugin); eventBus.register(plugin);
immediateEventBus.register(plugin);
schedule(plugin); schedule(plugin);
eventBus.post(new PluginChanged(plugin, true)); eventBus.post(new PluginChanged(plugin, true));
} }
@@ -340,6 +346,7 @@ public class PluginManager
{ {
unschedule(plugin); unschedule(plugin);
eventBus.unregister(plugin); eventBus.unregister(plugin);
immediateEventBus.unregister(plugin);
// plugins always stop in the event thread // plugins always stop in the event thread
SwingUtilities.invokeAndWait(() -> SwingUtilities.invokeAndWait(() ->