fix groovy class loader not work if not using global

groovier-minecraft · Jun 19, 2022 · d9b6e89 · d9b6e89
1 parent 9eadf79
commit d9b6e89
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierModule.groovy b/groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierModule.groovy
@@ -15,13 +15,16 @@ class GroovierModule extends AbstractModule {
     private final Map<Class, Class> classMap = new HashMap<>()
     private final Map<Class, Class<Provider<?>>> providerMap = new HashMap<>();
 
+    private final GroovyClassLoader classLoader = new GroovyClassLoader(getClass().getClassLoader())
+
     private ScriptPlugin scriptPlugin
 
     @Override
     protected void configure() {
         if (scriptPlugin == null) {
             throw new IllegalStateException("scriptPluginClass is not set")
         }
+        bind(GroovyClassLoader.class).toInstance(classLoader)
         bind(ScriptCacheManager.class).to(GroovierCacheManager.class).in(Scopes.SINGLETON)
         bind(ScriptPlugin.class).toInstance(scriptPlugin)
         reloadableSet.forEach(reloadable -> {

diff --git a/groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierScriptLoader.groovy b/groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierScriptLoader.groovy
@@ -17,38 +17,37 @@ class GroovierScriptLoader {
 
     @Inject
     private ScriptPlugin plugin
-
     @Inject
     private GroovierLifeCycle lifeCycle
-
     @Inject
     private ScriptCacheManager cacheManager
+    @Inject
+    private GroovyClassLoader classLoader
 
     CompletableFuture<Void> loadAllScripts() {
-        try (def classLoader = new GroovyClassLoader(plugin.getClass().getClassLoader())) {
-            CompletableFuture<Void> future = new CompletableFuture<>()
-            CompletableFuture.runAsync(() -> {
-                var globalLibraries = new File(plugin.getPluginFolder(), "grapesConfig.groovy")
-                if (globalLibraries.exists()) {
-                    plugin.logger.info("loading global libraries...")
-                    classLoader.parseClass(globalLibraries)
-                    plugin.logger.info("global libraries loaded.")
-                }
-                loaders.forEach(loader -> {
-                    plugin.getLogger().info("Loading ${loader.class.simpleName}")
-                    loader.load(classLoader)
-                    plugin.getLogger().info("${loader.class.simpleName} loading completed.")
-                })
-                loaders.forEach(loader -> loader.afterLoad())
-                (cacheManager as GroovierCacheManager).flush()
-            }).thenAccept((v) -> {
-                plugin.runSyncTask(() -> {
-                    lifeCycle.onScriptLoad()
-                    future.complete(v)
-                })
+        CompletableFuture<Void> future = new CompletableFuture<>()
+        CompletableFuture.runAsync(() -> {
+            var globalLibraries = new File(plugin.getPluginFolder(), "grapesConfig.groovy")
+            if (globalLibraries.exists()) {
+                plugin.logger.info("loading global libraries...")
+                classLoader.parseClass(globalLibraries)
+                plugin.logger.info("global libraries loaded.")
+            }
+            loaders.forEach(loader -> {
+                plugin.getLogger().info("Loading ${loader.class.simpleName}")
+                loader.load(classLoader)
+                plugin.getLogger().info("${loader.class.simpleName} loading completed.")
             })
-            return future
-        }
+            loaders.forEach(loader -> loader.afterLoad())
+            ((GroovierCacheManager)cacheManager).flush()
+        }).thenAccept((v) -> {
+            plugin.logger.info("All Scripts loaded.")
+            plugin.runSyncTask(() -> {
+                lifeCycle.onScriptLoad()
+                future.complete(v)
+            })
+        })
+        return future
     }
 
     void unloadAllScripts() {

diff --git a/...ier-plugin/src/main/groovy/com/ericlam/mc/groovier/scriptloaders/GroovierLifeCycle.groovy b/...ier-plugin/src/main/groovy/com/ericlam/mc/groovier/scriptloaders/GroovierLifeCycle.groovy
@@ -1,7 +1,5 @@
 package com.ericlam.mc.groovier.scriptloaders
 
-import com.ericlam.mc.groovier.ScriptPlugin
-
 interface GroovierLifeCycle {
 
     void onEnable();