fix script cache not working

CleanroomMC · Oct 6, 2024 · a0b95a0 · a0b95a0
1 parent 9e6f64c
commit a0b95a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/cleanroommc/groovyscript/core/mixin/groovy/ModuleNodeMixin.java b/src/main/java/com/cleanroommc/groovyscript/core/mixin/groovy/ModuleNodeMixin.java
@@ -32,10 +32,10 @@ public void init(SourceUnit context, CallbackInfo ci) {
             // can happen with traits
             return;
         }
-        int i = rel.lastIndexOf(File.separatorChar);
+        int i = rel.lastIndexOf('/');
         if (i >= 0) {
             // inject correct package declaration into script
-            String packageName = rel.substring(0, i).replace(File.separatorChar, '.') + '.';
+            String packageName = rel.substring(0, i).replace('/', '.') + '.';
             this.packageNode = new PackageNode(packageName);
         }
     }

diff --git a/src/main/java/com/cleanroommc/groovyscript/sandbox/GroovyScriptSandbox.java b/src/main/java/com/cleanroommc/groovyscript/sandbox/GroovyScriptSandbox.java
@@ -271,9 +271,10 @@ public Class<?> onRecompileClass(URL source, String className) {
 
     @Override
     protected Class<?> loadScriptClass(GroovyScriptEngine engine, File file) {
-        File relativeFile = this.scriptRoot.toPath().relativize(file.toPath()).toFile();
+        String relativeFileName = FileUtil.relativize(this.scriptRoot.getPath(), file.getPath());
+        File relativeFile = new File(relativeFileName);
         long lastModified = file.lastModified();
-        CompiledScript comp = this.index.get(relativeFile.toString());
+        CompiledScript comp = this.index.get(relativeFileName);
 
         if (ENABLE_CACHE && comp != null && lastModified <= comp.lastEdited && comp.clazz == null && comp.readData(this.cacheRoot.getPath())) {
             // class is not loaded, but the cached class bytes are still valid
@@ -285,8 +286,8 @@ protected Class<?> loadScriptClass(GroovyScriptEngine engine, File file) {
         } else if (!ENABLE_CACHE || (comp == null || comp.clazz == null || lastModified > comp.lastEdited)) {
             // class is not loaded and class bytes don't exist yet or script has been edited
             if (comp == null) {
-                comp = new CompiledScript(relativeFile.toString(), 0);
-                this.index.put(relativeFile.toString(), comp);
+                comp = new CompiledScript(relativeFileName, 0);
+                this.index.put(relativeFileName, comp);
             }
             if (lastModified > comp.lastEdited || comp.preprocessors == null) {
                 // recompile preprocessors if there is no data or script was edited
@@ -303,7 +304,7 @@ protected Class<?> loadScriptClass(GroovyScriptEngine engine, File file) {
             Class<?> clazz = super.loadScriptClass(engine, relativeFile);
             if (comp.clazz == null) {
                 // should not happen
-                GroovyLog.get().errorMC("Class for {} was loaded, but didn't receive class created callback!", relativeFile);
+                GroovyLog.get().errorMC("Class for {} was loaded, but didn't receive class created callback!", relativeFileName);
                 if (ENABLE_CACHE) comp.clazz = clazz;
             }
         } else {