fix(import): Fixed import errors.

CarmJos · Feb 7, 2024 · f233f84 · f233f84
1 parent 2160ae8
commit f233f84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/cc/carm/app/easyupdater/Main.java b/src/main/java/cc/carm/app/easyupdater/Main.java
@@ -54,7 +54,7 @@ public static boolean isDebugging() {
     }
 
     private static <T> ActionResult executeAll(Map<String, T> tasks, ThrowableTask<T> executor) {
-        int i = 0, success = 0, failed = 0;
+        int i = 1, success = 0, failed = 0;
         for (Map.Entry<String, T> entry : tasks.entrySet()) {
             Logging.debug(" #" + i + " -> Executing " + entry.getKey());
             try {
@@ -65,6 +65,7 @@ private static <T> ActionResult executeAll(Map<String, T> tasks, ThrowableTask<T
                 e.printStackTrace();
                 failed++;
             }
+            i++;
         }
         return new ActionResult(success, failed);
     }

diff --git a/src/main/java/cc/carm/app/easyupdater/conf/UpdateConfig.java b/src/main/java/cc/carm/app/easyupdater/conf/UpdateConfig.java
@@ -33,6 +33,7 @@ public static UpdateConfig parse(Configuration conf) throws Exception {
         List<UpdateConfig> imports = new ArrayList<>();
         for (String path : conf.getStringList("imports")) {
             try {
+                Logging.debug("Importing config [" + path + "] ...");
                 UpdateConfig config = parse(path);
                 if (config != null) imports.add(config);
             } catch (Exception e) {
@@ -42,8 +43,8 @@ public static UpdateConfig parse(Configuration conf) throws Exception {
         }
 
         for (UpdateConfig config : imports) { // Put if not exists
-            transferActions.forEach(transferActions::putIfAbsent);
-            mixinActions.forEach(mixinActions::putIfAbsent);
+            config.transferActions.forEach(transferActions::putIfAbsent);
+            config.mixinActions.forEach(mixinActions::putIfAbsent);
         }
 
         return new UpdateConfig(transferActions, mixinActions);