update

Author: reallyGoodBaker

src/main/java/top/rgb39/ecs/executor/RuntimeChain.java

@@ -2,10 +2,16 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import javax.annotation.Nullable;
+
 import top.rgb39.ecs.arch.App;
 
 public class RuntimeChain {
     private Map<String, SystemChain> sysChains = new HashMap<>();
+
+    @Nullable
     private String currentSchedule = null;
 
     public void setSystemChain(String runtimeLabel, SystemChain sysChain) {
@@ -28,16 +34,27 @@ public String[] getScheduleSequence() {
         return (String[]) this.sysChains.keySet().toArray(new String[0]);
     }
 
-    public void scheduleOnce(App app) {
-        String[] scheduleSeq = getScheduleSequence();
-        for (int i = 0; i < scheduleSeq.length; i++) {
-            currentSchedule = scheduleSeq[i];
-            SystemChain sysChain = this.sysChains.get(scheduleSeq[i]);
-            sysChain.run(app);
-        }
+    public CompletableFuture<?> scheduleOnce(App app) {
+        return CompletableFuture.runAsync(() -> {
+            String[] scheduleSeq = getScheduleSequence();
+            var futureList = new CompletableFuture[scheduleSeq.length];
+
+            for (int i = 0; i < scheduleSeq.length; i++) {
+                currentSchedule = scheduleSeq[i];
+                SystemChain sysChain = this.sysChains.get(scheduleSeq[i]);
+                futureList[i] = sysChain.run(app);
+            }
+
+            CompletableFuture.allOf(futureList).join();
+            currentSchedule = null;
+        });
     }
 
     public String current() {
         return currentSchedule;
     }
+
+    public boolean idle() {
+        return currentSchedule == null;
+    }
 }

src/main/java/top/rgb39/ecs/executor/SystemChain.java

@@ -23,18 +23,20 @@ public void runWithOnlyReflects(App app) {
             ParameterImplementor implementor = new ParameterImplementor(method.getParameters());
             implementor.matchArgumentsOnlyReflect(app);
             try {
-                implementor.invoke(SystenInstanceRecord.getInstance(method.getDeclaringClass()), method);
+                implementor.invoke(SystemInstanceRecord.getInstance(method.getDeclaringClass()), method);
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
     }
 
-    public void run(App app) {
+    public CompletableFuture<?> run(App app) {
         if (Objects.isNull(app.table)) {
-            return;
+            return CompletableFuture.completedFuture(null);
         }
 
+        List<CompletableFuture<?>> futureList = new ArrayList<>();
+
         for (Method system : this.systems) {
             SystemConfig sysConfig = configRecord.get(system);
 
@@ -48,23 +50,26 @@ public void run(App app) {
                 implementor.matchArguments(app, row.getRowId());
                 try {
                     if (sysConfig.asynchronous()) {
-                        CompletableFuture.supplyAsync(() -> {
+                        var future = CompletableFuture.supplyAsync(() -> {
                             try {
-                                return implementor.invoke(SystenInstanceRecord.getInstance(system.getDeclaringClass()), system);
+                                return implementor.invoke(SystemInstanceRecord.getInstance(system.getDeclaringClass()), system);
                             } catch (Exception e) {
                                 e.printStackTrace();
                                 return null;
                             }
                         });
+
+                        futureList.add(future);
                     } else {
-                        implementor.invoke(SystenInstanceRecord.getInstance(system.getDeclaringClass()), system);
+                        implementor.invoke(SystemInstanceRecord.getInstance(system.getDeclaringClass()), system);
                     }
-                    Logger.info("tick", FontColors.GREEN, "system: " + system.getName());
                 } catch (Exception e) {
                     Logger.info("tick", FontColors.RED, "system failed: " + system.getName());
                 }
             }
         }
+
+        return CompletableFuture.allOf(futureList.toArray(new CompletableFuture[0]));
     }
 
     public void addSystem(Method system) {

…9/ecs/executor/SystenInstanceRecord.java …9/ecs/executor/SystemInstanceRecord.javasrc/main/java/top/rgb39/ecs/executor/SystenInstanceRecord.java renamed to src/main/java/top/rgb39/ecs/executor/SystemInstanceRecord.java src/main/java/top/rgb39/ecs/executor/SystenInstanceRecord.java renamed to src/main/java/top/rgb39/ecs/executor/SystemInstanceRecord.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-public class SystenInstanceRecord {
+public class SystemInstanceRecord {
     private static Map<Class<?>, Object> instRecord = new HashMap<>();
 
     public static void setInst(Class<?> clazz, Object instance) {

src/main/java/top/rgb39/ecs/plugin/Events.java

@@ -17,7 +17,7 @@
 import top.rgb39.ecs.executor.ParameterMatcher;
 import top.rgb39.ecs.executor.RuntimeLabel;
 import top.rgb39.ecs.executor.SystemConfig;
-import top.rgb39.ecs.executor.SystenInstanceRecord;
+import top.rgb39.ecs.executor.SystemInstanceRecord;
 
 public class Events implements Plugin, ParameterMatcher {
 
@@ -27,7 +27,7 @@ public class Events implements Plugin, ParameterMatcher {
     @Override
     public void build(App app) {
         ParameterImplementor.registerMatcher(this);
-        SystenInstanceRecord.setInst(Events.class, this);
+        SystemInstanceRecord.setInst(Events.class, this);
         try {
             app.addSystem(
                 Events.class.getDeclaredMethod("fireEvents"),