Merge pull request #1123 from chsami/microbotplugin-refactor

Microbot Plugin refactor

Author: gmason0

runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java

@@ -55,6 +55,7 @@
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.menus.MenuManager;
 import net.runelite.client.plugins.PluginManager;
+import net.runelite.client.plugins.microbot.Microbot;
 import net.runelite.client.task.Scheduler;
 import net.runelite.client.util.DeferredEventBus;
 import net.runelite.client.util.ExecutorServiceExceptionLogger;
@@ -147,6 +148,8 @@ else if (entry.getValue() instanceof Boolean)
 		bind(EventBus.class)
 				.annotatedWith(Names.named("Deferred EventBus"))
 				.to(DeferredEventBus.class);
+
+		requestStaticInjection(Microbot.class);
 	}
 
 	@Provides

runelite-client/src/main/java/net/runelite/client/plugins/microbot/GeoffPlugins/construction2/Construction2Plugin.java

@@ -49,10 +49,6 @@ Construction2Config provideConfig(ConfigManager configManager) {
     @Override
     protected void startUp() throws AWTException {
         Microbot.pauseAllScripts = false;
-        Microbot.setClient(client);
-        Microbot.setClientThread(clientThread);
-        Microbot.setNotifier(notifier);
-        Microbot.setMouse(new VirtualMouse());
         if (overlayManager != null) {
             overlayManager.add(construction2Overlay);
         }

runelite-client/src/main/java/net/runelite/client/plugins/microbot/GeoffPlugins/lunarplankmake/LunarPlankMakePlugin.java

@@ -40,7 +40,6 @@ LunarPlankMakeConfig provideConfig(ConfigManager configManager) {
 
     @Override
     protected void startUp() throws AWTException {
-        Microbot.setMouse(new VirtualMouse());
         log.info("Starting up LunarPlankMakePlugin");
         if (overlayManager != null) {
             overlayManager.add(LunarPlankMakeOverlay);