added reload api

groovier-minecraft · Jan 5, 2025 · fbe40d2 · fbe40d2
1 parent dca141e
commit fbe40d2
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 10 deletions.
diff --git a/groovier-engine/pom.xml b/groovier-engine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>groovier</artifactId>
         <groupId>org.groovier</groupId>
-        <version>0.0.54-SNAPSHOT</version>
+        <version>0.0.55-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/groovier-engine/src/main/java/com/ericlam/mc/groovier/ScriptManager.java b/groovier-engine/src/main/java/com/ericlam/mc/groovier/ScriptManager.java
@@ -0,0 +1,24 @@
+package com.ericlam.mc.groovier;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * script manager
+ */
+public interface ScriptManager {
+
+    /**
+     * reload all scripts
+     * @return future
+     */
+    CompletableFuture<Void> reloadAllScripts();
+
+    /**
+     * reload a specific script loader
+     * @param loader script loader class
+     * @return future
+     */
+    CompletableFuture<Void> reloadScript(Class<? extends ScriptLoader> loader);
+
+
+}
diff --git a/groovier-plugin/pom.xml b/groovier-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>groovier</artifactId>
         <groupId>org.groovier</groupId>
-        <version>0.0.54-SNAPSHOT</version>
+        <version>0.0.55-SNAPSHOT</version>
     </parent>
 
 

diff --git a/groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierCore.java b/groovier-plugin/src/main/groovy/com/ericlam/mc/groovier/GroovierCore.java
@@ -37,6 +37,7 @@ public GroovierCore() {
         this.addScriptLoader(EventScriptsManager.class);
         this.addScriptLoader(ArgumentScriptManager.class);
         this.addScriptLoader(LifeCycleScriptsManager.class);
+        this.bindType(ScriptManager.class, GroovierScriptLoader.class);
         this.bindProvider(ArgumentParser.class, ArgumentParserProvider.class);
         this.bindProvider(ServiceInjector.class, ServiceInjectorProvider.class);
         this.bindProvider(GroovierLifeCycle.class, GroovierLifeCycleProvider.class);

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
@@ -3,10 +3,12 @@ package com.ericlam.mc.groovier
 import com.ericlam.mc.groovier.scriptloaders.GroovierLifeCycle
 
 import javax.inject.Inject
+import javax.inject.Singleton
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.atomic.AtomicBoolean
 
-class GroovierScriptLoader {
+@Singleton
+class GroovierScriptLoader implements ScriptManager {
 
     private final AtomicBoolean reloading = new AtomicBoolean(false)
     private final List<ScriptLoader> loaders
@@ -29,7 +31,7 @@ class GroovierScriptLoader {
         classLoader.addClasspath(plugin.pluginFolder.path)
     }
 
-    CompletableFuture<Void> loadAllScripts() {
+    CompletableFuture<Void> loadAllScripts(List<ScriptLoader> loaders = this.loaders) {
         CompletableFuture<Void> future = new CompletableFuture<>()
         plugin.runAsyncTask {
             try {
@@ -62,7 +64,7 @@ class GroovierScriptLoader {
         return future
     }
 
-    void unloadAllScripts() {
+    void unloadAllScripts(List<ScriptLoader> loaders = this.loaders) {
         lifeCycle.onScriptUnload()
         loaders.each { loader ->
             plugin.logger.info("Unloading ${loader.class.simpleName}")
@@ -72,12 +74,17 @@ class GroovierScriptLoader {
         classLoader.clearCache()
     }
 
-    CompletableFuture<Void> reloadAllScripts() {
+    CompletableFuture<Void> reloadAllScripts(List<ScriptLoader> loaders = this.loaders) {
         if (!reloading.compareAndSet(false, true)) {
             return CompletableFuture.failedFuture(new ScriptLoadingException())
         }
-        this.unloadAllScripts()
-        return this.loadAllScripts().thenRun { reloading.set(false) }
+        this.unloadAllScripts(loaders)
+        return this.loadAllScripts(loaders).thenRun { reloading.set(false) }
+    }
+
+    @Override
+    CompletableFuture<Void> reloadScript(Class<? extends ScriptLoader> loader) {
+        return this.reloadAllScripts(this.loaders.findAll { loader.isAssignableFrom(it.class) })
     }
 
 }
diff --git a/groovier-scripts/pom.xml b/groovier-scripts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>groovier</artifactId>
         <groupId>org.groovier</groupId>
-        <version>0.0.54-SNAPSHOT</version>
+        <version>0.0.55-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.groovier</groupId>
     <artifactId>groovier</artifactId>
-    <version>0.0.54-SNAPSHOT</version>
+    <version>0.0.55-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Groovier</name>