Reload fix

examples/assets/placeholdername/blockstates/dragon_egg.json → examples/assets/groovyscriptdev/blockstates/dragon_egg.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "normal": {
-      "model": "placeholdername:dragon_egg"
+      "model": "groovyscriptdev:dragon_egg"
     }
   }
 }

examples/assets/groovyscriptdev/blockstates/dragon_egg_lamp.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "normal": {
+      "model": "groovyscriptdev:dragon_egg_lamp"
+    }
+  }
+}

examples/assets/groovyscriptdev/blockstates/generic_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "normal": {
+      "model": "groovyscriptdev:generic_block"
+    }
+  }
+}

examples/assets/placeholdername/models/block/dragon_egg_lamp.json → examples/assets/groovyscriptdev/models/block/dragon_egg_lamp.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/dragon_egg",
   "textures": {
-    "all": "placeholdername:blocks/dragon_egg_lamp"
+    "all": "groovyscriptdev:blocks/dragon_egg_lamp"
   }
 }

examples/assets/placeholdername/models/block/generic_block.json → examples/assets/groovyscriptdev/models/block/generic_block.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "placeholdername:blocks/generic_block"
+    "all": "groovyscriptdev:blocks/generic_block"
   }
 }

examples/assets/placeholdername/models/item/clay_2.json → examples/assets/groovyscriptdev/models/item/clay_2.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "placeholdername:items/clay_2"
+    "layer0": "groovyscriptdev:items/clay_2"
   }
 }

examples/assets/placeholdername/models/item/clay_3.json → examples/assets/groovyscriptdev/models/item/clay_3.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "placeholdername:items/clay_3"
+    "layer0": "groovyscriptdev:items/clay_3"
   }
 }

examples/assets/groovyscriptdev/models/item/dragon_egg_lamp.json

@@ -0,0 +1,3 @@
+{
+  "parent": "groovyscriptdev:block/dragon_egg_lamp"
+}

examples/assets/groovyscriptdev/models/item/generic_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "groovyscriptdev:block/generic_block"
+}

examples/assets/groovyscriptdev/models/item/heartofauniverse.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "groovyscriptdev:items/heartofauniverse"
+  }
+}

examples/assets/placeholdername/models/item/prodigy_stick.json → examples/assets/groovyscriptdev/models/item/prodigy_stick.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "placeholdername:items/prodigy_stick"
+    "layer0": "groovyscriptdev:items/prodigy_stick"
   }
 }

examples/assets/placeholdername/models/item/snack.json → examples/assets/groovyscriptdev/models/item/snack.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "placeholdername:items/snack"
+    "layer0": "groovyscriptdev:items/snack"
   }
 }

examples/postInit/betterwithaddons.groovy

@@ -103,6 +103,31 @@ mods.betterwithaddons.lure_tree.recipeBuilder()
 
 mods.betterwithaddons.lure_tree.addBlacklist(entity('minecraft:chicken'))
 
+// Packing:
+// Converts an input itemstack in the form of a EntityItems into an IBlockState after a piston extends if the piston and
+// location the EntityItems are in are fully surrounded by solid blocks.
+
+mods.betterwithaddons.packing.removeByInput(item('minecraft:clay_ball'))
+mods.betterwithaddons.packing.removeByOutput(blockstate('minecraft:gravel'))
+// mods.betterwithaddons.packing.removeAll()
+
+mods.betterwithaddons.packing.recipeBuilder()
+    .input(item('minecraft:gold_ingot'))
+    .compress(blockstate('minecraft:clay'))
+    .register()
+
+mods.betterwithaddons.packing.recipeBuilder()
+    .input(item('minecraft:clay') * 10)
+    .compress(blockstate('minecraft:diamond_block'))
+    .register()
+
+mods.betterwithaddons.packing.recipeBuilder()
+    .input(item('minecraft:diamond'))
+    .compress(blockstate('minecraft:dirt'))
+    .jeiOutput(item('minecraft:diamond') * 64)
+    .register()
+
+
 // Rotting Food:
 // Converts an input item into an output itemstack after the given time has passed. Has the ability to customize the
 // terminology used to indicate the age.

examples/postInit/thebetweenlands.groovy

@@ -206,4 +206,3 @@ mods.thebetweenlands.steeping_pot.recipeBuilder()
 
 
 mods.thebetweenlands.steeping_pot.addAcceptedItem(item('minecraft:gold_block'))
-

examples/runConfig.json

@@ -1,18 +1,19 @@
 {
-  "packName": "PlaceHolder name",
-  "packId": "placeholdername",
+  "packName": "GroovyScript Dev",
+  "packId": "groovyscriptdev",
   "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

@@ -261,7 +261,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/command/GSCommand.java

@@ -102,7 +102,7 @@ public GSCommand() {
         }));
 
         addSubcommand(new SimpleCommand("deleteScriptCache", (server, sender, args) -> {
-            if (GroovyScript.getSandbox().deleteScriptCache()) {
+            if (GroovyScript.getSandbox().getEngine().deleteScriptCache()) {
                 sender.sendMessage(new TextComponentString("Deleted groovy script cache").setStyle(StyleConstant.getSuccessStyle()));
             } else {
                 sender.sendMessage(new TextComponentString("An error occurred while deleting groovy script cache").setStyle(StyleConstant.getErrorStyle()));

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

@@ -1,12 +1,15 @@
 package com.cleanroommc.groovyscript.sandbox;
 
 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 {
 
@@ -29,12 +32,13 @@ 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;
         }
-        if (!GroovyScriptSandbox.ENABLE_CACHE) return;
+        if (!CustomGroovyScriptEngine.ENABLE_CACHE) return;
         try {
             File file = getDataFile(basePath);
             file.getParentFile().mkdirs();
@@ -47,14 +51,15 @@ public void onCompile(Class<?> clazz, String basePath) {
         }
     }
 
-    protected void ensureLoaded(CachedClassLoader 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);
         }
     }
 
     public boolean readData(String basePath) {
-        if (this.data != null && GroovyScriptSandbox.ENABLE_CACHE) return true;
+        if (this.data != null && CustomGroovyScriptEngine.ENABLE_CACHE) return true;
         File file = getDataFile(basePath);
         if (!file.exists()) return false;
         try {
@@ -71,6 +76,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) {