custom groovy class loader

Author: brachy84

examples/runConfig.json

@@ -1,18 +1,19 @@
 {
-  "packName": "PlaceHolder name",
-  "packId": "placeholdername",
+  "packName": "Technological Journey CEu",
+  "packId": "tjceu",
   "version": "1.0.0",
   "debug": true,
-  "classes": [
-    "classes/"
-  ],
   "loaders": {
     "preInit": [
+      "classes/",
       "preInit/"
     ],
-    "init": [],
+    "init": [
+      "init/"
+    ],
     "postInit": [
-      "postInit/"
+      "postInit/",
+      "recipes/"
     ]
   },
   "packmode": {

src/main/java/com/cleanroommc/groovyscript/GroovyScript.java

@@ -275,7 +275,7 @@ private static RunConfig createRunConfig(JsonObject json) {
         if (!Files.exists(main.toPath())) {
             try {
                 main.getParentFile().mkdirs();
-                Files.write(main.toPath(), "\nprintln('Hello World!')\n".getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+                Files.write(main.toPath(), "\nlog.info('Hello World!')\n".getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE, StandardOpenOption.WRITE);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }

src/main/java/com/cleanroommc/groovyscript/helper/GroovyHelper.java

@@ -24,7 +24,8 @@ public static LoadStage getLoadStage() {
     }
 
     public static boolean isReloading() {
-        return getLoadStage().isReloadable() && !ReloadableRegistryManager.isFirstLoad();
+        LoadStage loadStage = getLoadStage();
+        return loadStage != null && loadStage.isReloadable() && !ReloadableRegistryManager.isFirstLoad();
     }
 
     public static String getMinecraftVersion() {

src/main/java/com/cleanroommc/groovyscript/sandbox/CompiledClass.java

@@ -3,11 +3,13 @@
 import com.cleanroommc.groovyscript.api.GroovyLog;
 import groovy.lang.GroovyClassLoader;
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Map;
 
 class CompiledClass {
 
@@ -30,7 +32,8 @@ public void onCompile(byte[] data, Class<?> clazz, String basePath) {
 
     public void onCompile(Class<?> clazz, String basePath) {
         this.clazz = clazz;
-        this.name = clazz.getName();
+        if (!this.name.equals(clazz.getName())) throw new IllegalArgumentException();
+        //this.name = clazz.getName();
         if (this.data == null) {
             GroovyLog.get().errorMC("The class doesnt seem to be compiled yet. (" + name + ")");
             return;
@@ -55,9 +58,10 @@ protected void ensureLoaded(CachedClassLoader classLoader, String basePath) {
         }
     }
 
-    protected void ensureLoaded(GroovyClassLoader classLoader, String basePath) {
+    protected void ensureLoaded(GroovyClassLoader classLoader, Map<String, CompiledClass> cache, String basePath) {
         if (this.clazz == null) {
             this.clazz = classLoader.defineClass(this.name, this.data);
+            cache.put(this.name, this);
         }
     }
 
@@ -79,6 +83,11 @@ public void deleteCache(String cachePath) {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        if (this.clazz != null) {
+            InvokerHelper.removeClass(this.clazz);
+            this.clazz = null;
+        }
+        this.data = null;
     }
 
     protected File getDataFile(String basePath) {

src/main/java/com/cleanroommc/groovyscript/sandbox/CompiledScript.java

@@ -12,17 +12,24 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 class CompiledScript extends CompiledClass {
 
+    public static String classNameFromPath(String path) {
+        int i = path.lastIndexOf('.');
+        path = path.substring(0, i);
+        return path.replace('/', '.');
+    }
+
     final List<CompiledClass> innerClasses = new ArrayList<>();
     long lastEdited;
     List<String> preprocessors;
     boolean preprocessorCheckFailed;
     boolean requiresReload;
 
     public CompiledScript(String path, long lastEdited) {
-        this(path, null, lastEdited);
+        this(path, classNameFromPath(path), lastEdited);
     }
 
     public CompiledScript(String path, String name, long lastEdited) {
@@ -65,17 +72,17 @@ public void ensureLoaded(CachedClassLoader classLoader, String basePath) {
         super.ensureLoaded(classLoader, basePath);
     }
 
-    public void ensureLoaded(GroovyClassLoader classLoader, String basePath) {
+    public void ensureLoaded(GroovyClassLoader classLoader, Map<String, CompiledClass> cache, String basePath) {
         for (CompiledClass comp : this.innerClasses) {
             if (comp.clazz == null) {
                 if (comp.readData(basePath)) {
-                    comp.ensureLoaded(classLoader, basePath);
+                    comp.ensureLoaded(classLoader, cache, basePath);
                 } else {
                     GroovyLog.get().error("Error loading inner class {} for class {}", comp.name, this.name);
                 }
             }
         }
-        super.ensureLoaded(classLoader, basePath);
+        super.ensureLoaded(classLoader, cache, basePath);
     }
 
     public @NotNull JsonObject toJson() {