From c597c55c2cc90dfb6d713a584a1b76e8b070ee07 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 23 Apr 2025 14:21:09 +0200
Subject: [PATCH 01/31] replace rhino scripting engine with kotlin scripting

---
 build.gradle                                  |   2 -
 core/src/main/java/com/volmit/iris/Iris.java  |   2 +
 .../com/volmit/iris/core/loader/IrisData.java |   4 +-
 .../core/loader/ScriptResourceLoader.java     |  12 +-
 .../volmit/iris/core/project/IrisProject.java |   2 +
 .../core/scripting/ExecutionEnvironment.java  | 160 ++++++++++++++++++
 .../iris/core/scripting/func/BiomeLookup.java |  10 ++
 .../com/volmit/iris/engine/IrisEngine.java    |   6 +-
 .../iris/engine/IrisExecutionEnvironment.java |  84 ---------
 .../volmit/iris/engine/framework/Engine.java  |   4 +-
 .../volmit/iris/engine/object/IrisEntity.java |   8 +-
 .../scripting/EngineExecutionEnvironment.java |  38 -----
 .../engine/scripting/IrisScriptingAPI.java    |  96 -----------
 core/src/main/resources/plugin.yml            |   2 -
 14 files changed, 188 insertions(+), 242 deletions(-)
 create mode 100644 core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
 create mode 100644 core/src/main/java/com/volmit/iris/core/scripting/func/BiomeLookup.java
 delete mode 100644 core/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java
 delete mode 100644 core/src/main/java/com/volmit/iris/engine/scripting/EngineExecutionEnvironment.java
 delete mode 100644 core/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java

diff --git a/build.gradle b/build.gradle
index ebe09d7d8..12a0751b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,8 +168,6 @@ allprojects {
         compileOnly 'com.google.code.gson:gson:2.10.1'
         compileOnly 'org.ow2.asm:asm:9.2'
         compileOnly 'com.google.guava:guava:33.0.0-jre'
-        compileOnly 'bsf:bsf:2.4.0'
-        compileOnly 'rhino:js:1.7R2'
         compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
         compileOnly 'org.apache.commons:commons-lang3:3.12.0'
         compileOnly 'com.github.oshi:oshi-core:6.6.5'
diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index 64fa8d4d3..0801c7a36 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -30,6 +30,7 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import com.volmit.iris.core.pregenerator.LazyPregenerator;
+import com.volmit.iris.core.scripting.ExecutionEnvironment;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.core.tools.IrisWorldCreator;
@@ -462,6 +463,7 @@ public class Iris extends VolmitPlugin implements Listener {
         compat = IrisCompat.configured(getDataFile("compat.json"));
         ServerConfigurator.configure();
         new IrisContextInjector();
+        ExecutionEnvironment.createSimple();
         IrisSafeguard.IrisSafeguardSystem();
         getSender().setTag(getTag());
         IrisSafeguard.earlySplash();
diff --git a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
index e51c93176..4215c9c30 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -252,10 +252,8 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
 
             if (engine != null && t.getPreprocessors().isNotEmpty()) {
                 synchronized (this) {
-                    engine.getExecution().getAPI().setPreprocessorObject(t);
-
                     for (String i : t.getPreprocessors()) {
-                        engine.getExecution().execute(i);
+                        engine.getExecution().preprocessObject(i, t);
                         Iris.debug("Loader<" + C.GREEN + t.getTypeName() + C.LIGHT_PURPLE + "> iprocess " + C.YELLOW + t.getLoadKey() + C.LIGHT_PURPLE + " in <rainbow>" + i);
                     }
                 }
diff --git a/core/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java b/core/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java
index 4c0a6a1de..793a0aa1b 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java
@@ -82,8 +82,8 @@ public class ScriptResourceLoader extends ResourceLoader<IrisScript> {
     private Set<String> getKeysInDirectory(File directory) {
         Set<String> keys = new HashSet<>();
         for (File file : directory.listFiles()) {
-            if (file.isFile() && file.getName().endsWith(".js")) {
-                keys.add(file.getName().replaceAll("\\Q.js\\E", ""));
+            if (file.isFile() && file.getName().endsWith(".kts")) {
+                keys.add(file.getName().replaceAll("\\Q.kts\\E", ""));
             } else if (file.isDirectory()) {
                 keys.addAll(getKeysInDirectory(file));
             }
@@ -127,12 +127,12 @@ public class ScriptResourceLoader extends ResourceLoader<IrisScript> {
     public File findFile(String name) {
         for (File i : getFolders(name)) {
             for (File j : i.listFiles()) {
-                if (j.isFile() && j.getName().endsWith(".js") && j.getName().split("\\Q.\\E")[0].equals(name)) {
+                if (j.isFile() && j.getName().endsWith(".kts") && j.getName().split("\\Q.\\E")[0].equals(name)) {
                     return j;
                 }
             }
 
-            File file = new File(i, name + ".js");
+            File file = new File(i, name + ".kts");
 
             if (file.exists()) {
                 return file;
@@ -147,12 +147,12 @@ public class ScriptResourceLoader extends ResourceLoader<IrisScript> {
     private IrisScript loadRaw(String name) {
         for (File i : getFolders(name)) {
             for (File j : i.listFiles()) {
-                if (j.isFile() && j.getName().endsWith(".js") && j.getName().split("\\Q.\\E")[0].equals(name)) {
+                if (j.isFile() && j.getName().endsWith(".kts") && j.getName().split("\\Q.\\E")[0].equals(name)) {
                     return loadFile(j, name);
                 }
             }
 
-            File file = new File(i, name + ".js");
+            File file = new File(i, name + ".kts");
 
             if (file.exists()) {
                 return loadFile(file, name);
diff --git a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
index d094c82ff..aa4ed4900 100644
--- a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -24,6 +24,7 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.loader.ResourceLoader;
+import com.volmit.iris.core.scripting.ExecutionEnvironment;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.*;
 import com.volmit.iris.engine.object.annotations.Snippet;
@@ -274,6 +275,7 @@ public class IrisProject {
             PrecisionStopwatch p = PrecisionStopwatch.start();
             JSONObject j = createCodeWorkspaceConfig();
             IO.writeAll(ws, j.toString(4));
+            ExecutionEnvironment.createPack(IrisData.get(path)).buildProject();
             p.end();
             return true;
         } catch (Throwable e) {
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
new file mode 100644
index 000000000..8389c8598
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -0,0 +1,160 @@
+package com.volmit.iris.core.scripting;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.loader.IrisRegistrant;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.io.IO;
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+
+@UtilityClass
+public class ExecutionEnvironment {
+    private static final String BASE_URL = "https://jitpack.io/com/github/VolmitSoftware/Iris-Scripts/%s/Iris-Scripts-%s-all.jar";
+    private static final Provider PROVIDER = ServiceLoader.load(Provider.class, buildLoader())
+            .findFirst()
+            .orElseThrow();
+
+    @NonNull
+    public static Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine) {
+        return PROVIDER.createEngine(engine);
+    }
+
+    @NonNull
+    public static Pack createPack(@NonNull IrisData data) {
+        return PROVIDER.createPack(data);
+    }
+
+    @NonNull
+    public static Simple createSimple() {
+        return PROVIDER.createSimple();
+    }
+
+    @SneakyThrows
+    private static URLClassLoader buildLoader() {
+        String version = "ac94c94427";
+        String url = BASE_URL.formatted(version, version);
+        String hash = IO.hash("Iris-Scripts.jar@" + version);
+        var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash);
+        var libsDir = new File(file.getParentFile(), "libs");
+
+        KList<String> libs = null;
+        if (!file.exists()) {
+            libsDir.mkdirs();
+
+            Iris.info("Downloading Script Engine...");
+            var tempFile = Iris.getNonCachedFile(UUID.randomUUID().toString(), url);
+            try (var jar = new JarFile(tempFile); var out = new JarOutputStream(new FileOutputStream(file)) ) {
+                libs = getLibraries(jar);
+                for (var it = jar.entries().asIterator(); it.hasNext(); ) {
+                    var entry = it.next();
+                    if (entry.isDirectory()) {
+                        out.putNextEntry(entry);
+                        out.closeEntry();
+                        continue;
+                    }
+
+                    try (var in = jar.getInputStream(entry)) {
+                        if (libs.contains(entry.getName())) {
+                            var target = new File(libsDir, entry.getName());
+                            target.getParentFile().mkdirs();
+                            Files.copy(in, target.toPath());
+                            continue;
+                        }
+                        out.putNextEntry(entry);
+                        IO.copy(in, out);
+                        out.closeEntry();
+                    }
+                }
+            }
+            IO.deleteUp(tempFile);
+            Iris.info("Downloaded Script Engine!");
+        }
+
+        if (libs == null) {
+            try (var jar = new JarFile(file)) {
+                libs = getLibraries(jar);
+            }
+        }
+        var urls = new URL[libs.size() + 1];
+        urls[0] = file.toURI().toURL();
+        for (int i = 0; i < libs.size(); i++) {
+            File lib = new File(libsDir, libs.get(i));
+            if (!lib.exists()) {
+                Iris.warn("Missing library: " + lib.getAbsolutePath());
+                continue;
+            }
+
+            urls[i + 1] = lib.toURI().toURL();
+        }
+        return new URLClassLoader(urls, Provider.class.getClassLoader());
+    }
+
+    private static KList<String> getLibraries(JarFile jar) throws IOException {
+        return new KList<>(jar.getManifest()
+                .getMainAttributes()
+                .getValue("Libraries")
+                .split(";"));
+    }
+
+    public interface Provider {
+        @NonNull
+        Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine);
+
+        @NonNull
+        Pack createPack(@NonNull IrisData data);
+
+        @NonNull
+        Simple createSimple();
+    }
+
+
+    public interface Simple {
+        void execute(@NonNull String script);
+
+        void execute(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
+
+        @Nullable
+        Object evaluate(@NonNull String script);
+
+        @Nullable
+        Object evaluate(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
+
+        default void close() {
+
+        }
+    }
+
+    public interface Pack extends Simple {
+        @NonNull
+        IrisData getData();
+
+        void buildProject();
+    }
+
+    public interface Engine extends Pack {
+        @NonNull
+        com.volmit.iris.engine.framework.Engine getEngine();
+
+        @Nullable
+        Object spawnMob(@NonNull String script, @NonNull Location location);
+
+        void postSpawnMob(@NonNull String script, @NonNull Location location, @NonNull Entity mob);
+
+        void preprocessObject(@NonNull String script, @NonNull IrisRegistrant object);
+    }
+}
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/func/BiomeLookup.java b/core/src/main/java/com/volmit/iris/core/scripting/func/BiomeLookup.java
new file mode 100644
index 000000000..d27247b1a
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/core/scripting/func/BiomeLookup.java
@@ -0,0 +1,10 @@
+package com.volmit.iris.core.scripting.func;
+
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.util.documentation.BlockCoordinates;
+
+@FunctionalInterface
+public interface BiomeLookup {
+    @BlockCoordinates
+    IrisBiome at(int x, int z);
+}
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 88c5fdc14..fc6d657c3 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -28,12 +28,12 @@ import com.volmit.iris.core.loader.ResourceLoader;
 import com.volmit.iris.core.nms.container.BlockPos;
 import com.volmit.iris.core.nms.container.Pair;
 import com.volmit.iris.core.project.IrisProject;
+import com.volmit.iris.core.scripting.ExecutionEnvironment;
 import com.volmit.iris.core.service.PreservationSVC;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.*;
 import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.util.atomics.AtomicRollingSequence;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.context.ChunkContext;
@@ -93,7 +93,7 @@ public class IrisEngine implements Engine {
     private CompletableFuture<Long> hash32;
     private EngineMode mode;
     private EngineEffects effects;
-    private EngineExecutionEnvironment execution;
+    private ExecutionEnvironment.Engine execution;
     private EngineWorldManager worldManager;
     private volatile int parallelism;
     private volatile int minHeight;
@@ -171,7 +171,7 @@ public class IrisEngine implements Engine {
             cacheId = RNG.r.nextInt();
             worldManager = new IrisWorldManager(this);
             complex = new IrisComplex(this);
-            execution = new IrisExecutionEnvironment(this);
+            execution = ExecutionEnvironment.createEngine(this);
             effects = new IrisEngineEffects(this);
             hash32 = new CompletableFuture<>();
             setupMode();
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java
deleted file mode 100644
index 51ca6d1f9..000000000
--- a/core/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine;
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisScript;
-import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
-import com.volmit.iris.engine.scripting.IrisScriptingAPI;
-import com.volmit.iris.util.format.C;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.apache.bsf.BSFException;
-import org.apache.bsf.BSFManager;
-import org.apache.bsf.engines.javascript.JavaScriptEngine;
-
-@Data
-@EqualsAndHashCode(exclude = "engine")
-@ToString(exclude = "engine")
-public class IrisExecutionEnvironment implements EngineExecutionEnvironment {
-    private final BSFManager manager;
-    private final Engine engine;
-    private final IrisScriptingAPI api;
-    private JavaScriptEngine javaScriptEngine;
-
-    public IrisExecutionEnvironment(Engine engine) {
-        this.engine = engine;
-        this.api = new IrisScriptingAPI(engine);
-        this.manager = new BSFManager();
-        this.manager.setClassLoader(Iris.class.getClassLoader());
-        try {
-            this.manager.declareBean("Iris", api, api.getClass());
-            this.javaScriptEngine = (JavaScriptEngine) this.manager.loadScriptingEngine("javascript");
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public IrisScriptingAPI getAPI() {
-        return api;
-    }
-
-    public void execute(String script) {
-        execute(getEngine().getData().getScriptLoader().load(script));
-    }
-
-    public void execute(IrisScript script) {
-        Iris.debug("Execute Script (void) " + C.DARK_GREEN + script.getLoadKey());
-        try {
-            javaScriptEngine.exec("", 0, 0, script);
-        } catch (BSFException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Object evaluate(String script) {
-        Iris.debug("Execute Script (for result) " + C.DARK_GREEN + script);
-        try {
-            return javaScriptEngine.eval("", 0, 0, getEngine().getData().getScriptLoader().load(script));
-        } catch (BSFException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-}
diff --git a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
index fe99a322d..e150636a3 100644
--- a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
@@ -29,13 +29,13 @@ import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.nms.container.BlockPos;
 import com.volmit.iris.core.nms.container.Pair;
 import com.volmit.iris.core.pregenerator.ChunkUpdater;
+import com.volmit.iris.core.scripting.ExecutionEnvironment;
 import com.volmit.iris.core.service.ExternalDataSVC;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
 import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.context.ChunkContext;
@@ -111,7 +111,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
 
     IrisContext getContext();
 
-    EngineExecutionEnvironment getExecution();
+    ExecutionEnvironment.Engine getExecution();
 
     double getMaxBiomeObjectDensity();
 
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisEntity.java b/core/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
index dfb2508d0..206291892 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
@@ -211,9 +211,8 @@ public class IrisEntity extends IrisRegistrant {
 
         if (!spawnerScript.isEmpty() && ee == null) {
             synchronized (this) {
-                gen.getExecution().getAPI().setLocation(at);
                 try {
-                    ee = (Entity) gen.getExecution().evaluate(spawnerScript);
+                    ee = (Entity) gen.getExecution().spawnMob(spawnerScript, at);
                 } catch (Throwable ex) {
                     Iris.error("You must return an Entity in your scripts to use entity scripts!");
                     ex.printStackTrace();
@@ -353,11 +352,8 @@ public class IrisEntity extends IrisRegistrant {
 
         if (postSpawnScripts.isNotEmpty()) {
             synchronized (this) {
-                gen.getExecution().getAPI().setLocation(at);
-                gen.getExecution().getAPI().setEntity(ee);
-
                 for (String i : postSpawnScripts) {
-                    gen.getExecution().execute(i);
+                    gen.getExecution().postSpawnMob(i, at, ee);
                 }
             }
         }
diff --git a/core/src/main/java/com/volmit/iris/engine/scripting/EngineExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/engine/scripting/EngineExecutionEnvironment.java
deleted file mode 100644
index 464feb77a..000000000
--- a/core/src/main/java/com/volmit/iris/engine/scripting/EngineExecutionEnvironment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.scripting;
-
-import com.volmit.iris.engine.framework.Engine;
-import org.apache.bsf.BSFManager;
-
-public interface EngineExecutionEnvironment {
-    Engine getEngine();
-
-    IrisScriptingAPI getAPI();
-
-    BSFManager getManager();
-
-    void execute(String script);
-
-    Object evaluate(String script);
-
-    default void close() {
-
-    }
-}
diff --git a/core/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java b/core/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java
deleted file mode 100644
index ae613c48f..000000000
--- a/core/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.scripting;
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.engine.IrisComplex;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisExpression;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-
-@Data
-@EqualsAndHashCode(exclude = "engine")
-@ToString(exclude = "engine")
-public class IrisScriptingAPI {
-    private final Engine engine;
-    private IrisRegistrant preprocessorObject;
-    private double x = 0;
-    private double y = 0;
-    private double z = 0;
-    private Location location;
-    private Entity entity;
-
-    public IrisScriptingAPI(Engine engine) {
-        this.engine = engine;
-    }
-
-    public IrisData getData() {
-        return getEngine().getData();
-    }
-
-    public IrisComplex getComplex() {
-        return getEngine().getComplex();
-    }
-
-    public long getSeed() {
-        return getEngine().getSeedManager().getScript();
-    }
-
-    public double expression(String expressionName, double x, double y, double z) {
-        IrisExpression expression = getData().getExpressionLoader().load(expressionName);
-        return expression.evaluate(getComplex().getRng(), x, y, z);
-    }
-
-    public double expression(String expressionName, double x, double z) {
-        IrisExpression expression = getData().getExpressionLoader().load(expressionName);
-        return expression.evaluate(getComplex().getRng(), x, z);
-    }
-
-    public IrisBiome getBiomeAt(int x, int z) {
-        return getEngine().getSurfaceBiome(x, z);
-    }
-
-    public IrisDimension getDimension() {
-        return getEngine().getDimension();
-    }
-
-    public void info(String log) {
-        Iris.info(log);
-    }
-
-    public void debug(String log) {
-        Iris.debug(log);
-    }
-
-    public void warn(String log) {
-        Iris.warn(log);
-    }
-
-    public void error(String log) {
-        Iris.error(log);
-    }
-}
diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
index 7ff73ff7e..cedb75c1e 100644
--- a/core/src/main/resources/plugin.yml
+++ b/core/src/main/resources/plugin.yml
@@ -16,8 +16,6 @@ libraries:
   - org.zeroturnaround:zt-zip:1.14
   - it.unimi.dsi:fastutil:8.5.6
   - org.ow2.asm:asm:9.2
-  - rhino:js:1.7R2
-  - bsf:bsf:2.4.0
   - org.lz4:lz4-java:1.8.0
   - com.github.oshi:oshi-core:6.6.5
 commands:

From 0a2f35dd8d31968d78c8d51535892380dc40072a Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 23 Apr 2025 21:24:14 +0200
Subject: [PATCH 02/31] update the scripting engine and fix cached file
 extension

---
 .../com/volmit/iris/core/scripting/ExecutionEnvironment.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index 8389c8598..c01655449 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -46,10 +46,10 @@ public class ExecutionEnvironment {
 
     @SneakyThrows
     private static URLClassLoader buildLoader() {
-        String version = "ac94c94427";
+        String version = "46d271c6ce";
         String url = BASE_URL.formatted(version, version);
         String hash = IO.hash("Iris-Scripts.jar@" + version);
-        var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash);
+        var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");
         var libsDir = new File(file.getParentFile(), "libs");
 
         KList<String> libs = null;

From e72abc8c394a383ac8df8d339655ca512d82c32e Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Thu, 24 Apr 2025 16:00:23 +0200
Subject: [PATCH 03/31] generate json schemas for intelij

---
 build.gradle                                  |  1 +
 .../volmit/iris/core/project/IrisProject.java | 70 ++++++++++++++++++-
 .../iris/core/project/SchemaBuilder.java      | 49 ++++++++-----
 .../core/scripting/ExecutionEnvironment.java  | 15 +++-
 .../main/java/com/volmit/iris/util/io/IO.java | 24 +++++++
 core/src/main/resources/plugin.yml            |  2 +
 6 files changed, 139 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 12a0751b8..02c63f997 100644
--- a/build.gradle
+++ b/build.gradle
@@ -171,6 +171,7 @@ allprojects {
         compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
         compileOnly 'org.apache.commons:commons-lang3:3.12.0'
         compileOnly 'com.github.oshi:oshi-core:6.6.5'
+        compileOnly 'org.dom4j:dom4j:2.1.4'
     }
 
     /**
diff --git a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
index aa4ed4900..803057318 100644
--- a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -50,6 +50,8 @@ import lombok.Data;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.World;
+import org.dom4j.Document;
+import org.dom4j.Element;
 import org.zeroturnaround.zip.ZipUtil;
 
 import java.awt.*;
@@ -275,7 +277,6 @@ public class IrisProject {
             PrecisionStopwatch p = PrecisionStopwatch.start();
             JSONObject j = createCodeWorkspaceConfig();
             IO.writeAll(ws, j.toString(4));
-            ExecutionEnvironment.createPack(IrisData.get(path)).buildProject();
             p.end();
             return true;
         } catch (Throwable e) {
@@ -361,6 +362,73 @@ public class IrisProject {
         settings.put("json.schemas", schemas);
         ws.put("settings", settings);
 
+        ExecutionEnvironment.createSimple().configureProject(path);
+        File schemasFile = new File(path, ".idea" + File.separator + "jsonSchemas.xml");
+        Document doc = IO.read(schemasFile);
+        Element mappings = (Element) doc.selectSingleNode("//component[@name='JsonSchemaMappingsProjectConfiguration']");
+        if (mappings == null) {
+            mappings = doc.getRootElement()
+                    .addElement("component")
+                    .addAttribute("name", "JsonSchemaMappingsProjectConfiguration");
+        }
+
+        Element state = (Element) mappings.selectSingleNode("state");
+        if (state == null) state = mappings.addElement("state");
+
+        Element map = (Element) state.selectSingleNode("map");
+        if (map == null) map = state.addElement("map");
+        var schemaMap = new KMap<String, String>();
+        schemas.forEach(element -> {
+            if (!(element instanceof JSONObject obj))
+                return;
+
+            String url = obj.getString("url");
+            String dir = obj.getJSONArray("fileMatch").getString(0);
+            schemaMap.put(url, dir.substring(1, dir.indexOf("/*")));
+        });
+
+        map.selectNodes("entry/value/SchemaInfo/option[@name='relativePathToSchema']")
+                .stream()
+                .map(node -> node.valueOf("@value"))
+                .forEach(schemaMap::remove);
+
+        var ideaSchemas = map;
+        schemaMap.forEach((url, dir) -> {
+            var genName = UUID.randomUUID().toString();
+
+            var info = ideaSchemas.addElement("entry")
+                    .addAttribute("key", genName)
+                    .addElement("value")
+                    .addElement("SchemaInfo");
+            info.addElement("option")
+                    .addAttribute("name", "generatedName")
+                    .addAttribute("value", genName);
+            info.addElement("option")
+                    .addAttribute("name", "name")
+                    .addAttribute("value", dir);
+            info.addElement("option")
+                    .addAttribute("name", "relativePathToSchema")
+                    .addAttribute("value", url);
+
+
+            var item = info.addElement("option")
+                    .addAttribute("name", "patterns")
+                    .addElement("list")
+                    .addElement("Item");
+            item.addElement("option")
+                    .addAttribute("name", "directory")
+                    .addAttribute("value", "true");
+            item.addElement("option")
+                    .addAttribute("name", "path")
+                    .addAttribute("value", dir);
+            item.addElement("option")
+                    .addAttribute("name", "mappingKind")
+                    .addAttribute("value", "Directory");
+        });
+        if (!schemaMap.isEmpty()) {
+            IO.write(schemasFile, doc);
+        }
+
         return ws;
     }
 
diff --git a/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java b/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
index 398d1630b..6f69bf223 100644
--- a/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
+++ b/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
@@ -108,7 +108,9 @@ public class SchemaBuilder {
     private JSONObject buildProperties(Class<?> c) {
         JSONObject o = new JSONObject();
         JSONObject properties = new JSONObject();
-        o.put("description", getDescription(c));
+        String desc = getDescription(c);
+        o.put("description", desc);
+        o.put("x-intellij-html-description", desc.replace("\n", "<br>"));
         o.put("type", getType(c));
         JSONArray required = new JSONArray();
 
@@ -506,16 +508,18 @@ public class SchemaBuilder {
         }
 
         KList<String> d = new KList<>();
-        d.add(k.getName());
-        d.add(getFieldDescription(k));
-        d.add("   ");
-        d.add(fancyType);
-        d.add(getDescription(k.getType()));
+        d.add("<h>" + k.getName() + "</h>");
+        d.add(getFieldDescription(k) + "<hr></hr>");
+        d.add("<h>" + fancyType + "</h>");
+        String typeDesc = getDescription(k.getType());
+        boolean present = !typeDesc.isBlank();
+        if (present) d.add(typeDesc);
 
         if (k.getType().isAnnotationPresent(Snippet.class)) {
             String sm = k.getType().getDeclaredAnnotation(Snippet.class).value();
-            d.add("    ");
+            if (present) d.add("    ");
             d.add("You can instead specify \"snippet/" + sm + "/some-name.json\" to use a snippet file instead of specifying it here.");
+            present = false;
         }
 
         try {
@@ -523,15 +527,13 @@ public class SchemaBuilder {
             Object value = k.get(cl.newInstance());
 
             if (value != null) {
+                if (present) d.add("    ");
                 if (value instanceof List) {
-                    d.add("    ");
-                    d.add("* Default Value is an empty list");
+                    d.add(SYMBOL_LIMIT__N + " Default Value is an empty list");
                 } else if (!cl.isPrimitive() && !(value instanceof Number) && !(value instanceof String) && !(cl.isEnum()) && !OldEnum.isOldEnum(cl)) {
-                    d.add("    ");
-                    d.add("* Default Value is a default object (create this object to see default properties)");
+                    d.add(SYMBOL_LIMIT__N + " Default Value is a default object (create this object to see default properties)");
                 } else {
-                    d.add("    ");
-                    d.add("* Default Value is " + value);
+                    d.add(SYMBOL_LIMIT__N + " Default Value is " + value);
                 }
             }
         } catch (Throwable ignored) {
@@ -539,8 +541,14 @@ public class SchemaBuilder {
         }
 
         description.forEach((g) -> d.add(g.trim()));
+        String desc = d.toString("\n")
+                .replace("<hr></hr>", "\n")
+                .replace("<h>", "")
+                .replace("</h>", "");
+        String hDesc = d.toString("<br>");
         prop.put("type", type);
-        prop.put("description", d.toString("\n"));
+        prop.put("description", desc);
+        prop.put("x-intellij-html-description", hDesc);
 
         if (k.getType().isAnnotationPresent(Snippet.class)) {
             JSONObject anyOf = new JSONObject();
@@ -560,10 +568,13 @@ public class SchemaBuilder {
 
             arr.put(prop);
             arr.put(str);
-            prop.put("description", d.toString("\n"));
-            str.put("description", d.toString("\n"));
+            prop.put("description", desc);
+            prop.put("x-intellij-html-description", hDesc);
+            str.put("description", desc);
+            str.put("x-intellij-html-description", hDesc);
             anyOf.put("anyOf", arr);
-            anyOf.put("description", d.toString("\n"));
+            anyOf.put("description", desc);
+            anyOf.put("x-intellij-html-description", hDesc);
             anyOf.put("!required", k.isAnnotationPresent(Required.class));
 
             return anyOf;
@@ -592,7 +603,9 @@ public class SchemaBuilder {
                     String name = function.apply(gg);
                     j.put("const", name);
                     Desc dd = type.getField(name).getAnnotation(Desc.class);
-                    j.put("description", dd == null ? ("No Description for " + name) : dd.value());
+                    String desc = dd == null ? ("No Description for " + name) : dd.value();
+                    j.put("description", desc);
+                    j.put("x-intellij-html-description", desc.replace("\n", "<br>"));
                     a.put(j);
                 } catch (Throwable e) {
                     Iris.reportError(e);
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index c01655449..21ee80219 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -10,6 +10,7 @@ import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.dom4j.Document;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -46,7 +47,7 @@ public class ExecutionEnvironment {
 
     @SneakyThrows
     private static URLClassLoader buildLoader() {
-        String version = "46d271c6ce";
+        String version = "868b3b9910";
         String url = BASE_URL.formatted(version, version);
         String hash = IO.hash("Iris-Scripts.jar@" + version);
         var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");
@@ -124,6 +125,16 @@ public class ExecutionEnvironment {
 
 
     public interface Simple {
+        default void configureProject(@NonNull File projectDir) {
+            var workspaceFile = new File(projectDir, ".idea" + File.separator + "workspace.xml");
+            var workspaceDoc = IO.read(workspaceFile);
+            if (configureProject(projectDir, workspaceDoc)) {
+                IO.write(workspaceFile, workspaceDoc);
+            }
+        }
+
+        boolean configureProject(@NonNull File projectDir, @NonNull Document workspace);
+
         void execute(@NonNull String script);
 
         void execute(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
@@ -142,8 +153,6 @@ public class ExecutionEnvironment {
     public interface Pack extends Simple {
         @NonNull
         IrisData getData();
-
-        void buildProject();
     }
 
     public interface Engine extends Pack {
diff --git a/core/src/main/java/com/volmit/iris/util/io/IO.java b/core/src/main/java/com/volmit/iris/util/io/IO.java
index a8f718885..f18b157fd 100644
--- a/core/src/main/java/com/volmit/iris/util/io/IO.java
+++ b/core/src/main/java/com/volmit/iris/util/io/IO.java
@@ -20,6 +20,12 @@ package com.volmit.iris.util.io;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.format.Form;
+import lombok.SneakyThrows;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -1602,4 +1608,22 @@ public class IO {
         int ch2 = input2.read();
         return (ch2 == -1);
     }
+
+    @SneakyThrows
+    public static void write(File file, Document doc) {
+        file.getParentFile().mkdirs();
+        try (var writer = new FileWriter(file)) {
+            new XMLWriter(writer, OutputFormat.createPrettyPrint())
+                    .write(doc);
+        }
+    }
+
+    @SneakyThrows
+    public static Document read(File file) {
+        if (file.exists()) return new SAXReader().read(file);
+        var doc = DocumentHelper.createDocument();
+        doc.addElement("project")
+                .addAttribute("version", "4");
+        return doc;
+    }
 }
diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
index cedb75c1e..f3b1cfa8c 100644
--- a/core/src/main/resources/plugin.yml
+++ b/core/src/main/resources/plugin.yml
@@ -18,6 +18,8 @@ libraries:
   - org.ow2.asm:asm:9.2
   - org.lz4:lz4-java:1.8.0
   - com.github.oshi:oshi-core:6.6.5
+  - org.dom4j:dom4j:2.1.4
+  - jaxen:jaxen:1.1.6
 commands:
   iris:
     aliases: [ ir, irs ]

From 8eb35aa8be13974f5abe3968e47e359bf7c14295 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 28 Apr 2025 21:24:54 +0200
Subject: [PATCH 04/31] update Script Engine to b5e2cc6e

---
 .../core/scripting/ExecutionEnvironment.java  | 76 ++-----------------
 1 file changed, 6 insertions(+), 70 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index 21ee80219..fe96cd995 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -3,25 +3,20 @@ package com.volmit.iris.core.scripting;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.io.IO;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.dom4j.Document;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.util.*;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
 
 @UtilityClass
 public class ExecutionEnvironment {
@@ -47,69 +42,18 @@ public class ExecutionEnvironment {
 
     @SneakyThrows
     private static URLClassLoader buildLoader() {
-        String version = "868b3b9910";
+        String version = "b5e2cc6e";
         String url = BASE_URL.formatted(version, version);
         String hash = IO.hash("Iris-Scripts.jar@" + version);
         var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");
-        var libsDir = new File(file.getParentFile(), "libs");
-
-        KList<String> libs = null;
         if (!file.exists()) {
-            libsDir.mkdirs();
-
             Iris.info("Downloading Script Engine...");
-            var tempFile = Iris.getNonCachedFile(UUID.randomUUID().toString(), url);
-            try (var jar = new JarFile(tempFile); var out = new JarOutputStream(new FileOutputStream(file)) ) {
-                libs = getLibraries(jar);
-                for (var it = jar.entries().asIterator(); it.hasNext(); ) {
-                    var entry = it.next();
-                    if (entry.isDirectory()) {
-                        out.putNextEntry(entry);
-                        out.closeEntry();
-                        continue;
-                    }
-
-                    try (var in = jar.getInputStream(entry)) {
-                        if (libs.contains(entry.getName())) {
-                            var target = new File(libsDir, entry.getName());
-                            target.getParentFile().mkdirs();
-                            Files.copy(in, target.toPath());
-                            continue;
-                        }
-                        out.putNextEntry(entry);
-                        IO.copy(in, out);
-                        out.closeEntry();
-                    }
-                }
+            try (var stream = URI.create(url).toURL().openStream()) {
+                Files.copy(stream, file.toPath());
             }
-            IO.deleteUp(tempFile);
             Iris.info("Downloaded Script Engine!");
         }
-
-        if (libs == null) {
-            try (var jar = new JarFile(file)) {
-                libs = getLibraries(jar);
-            }
-        }
-        var urls = new URL[libs.size() + 1];
-        urls[0] = file.toURI().toURL();
-        for (int i = 0; i < libs.size(); i++) {
-            File lib = new File(libsDir, libs.get(i));
-            if (!lib.exists()) {
-                Iris.warn("Missing library: " + lib.getAbsolutePath());
-                continue;
-            }
-
-            urls[i + 1] = lib.toURI().toURL();
-        }
-        return new URLClassLoader(urls, Provider.class.getClassLoader());
-    }
-
-    private static KList<String> getLibraries(JarFile jar) throws IOException {
-        return new KList<>(jar.getManifest()
-                .getMainAttributes()
-                .getValue("Libraries")
-                .split(";"));
+        return new URLClassLoader(new URL[]{file.toURI().toURL()}, Provider.class.getClassLoader());
     }
 
     public interface Provider {
@@ -125,15 +69,7 @@ public class ExecutionEnvironment {
 
 
     public interface Simple {
-        default void configureProject(@NonNull File projectDir) {
-            var workspaceFile = new File(projectDir, ".idea" + File.separator + "workspace.xml");
-            var workspaceDoc = IO.read(workspaceFile);
-            if (configureProject(projectDir, workspaceDoc)) {
-                IO.write(workspaceFile, workspaceDoc);
-            }
-        }
-
-        boolean configureProject(@NonNull File projectDir, @NonNull Document workspace);
+        void configureProject(@NonNull File projectDir);
 
         void execute(@NonNull String script);
 

From 5958bcb22e47f022878fe8fa34051e776341da22 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 28 Apr 2025 21:40:44 +0200
Subject: [PATCH 05/31] update Script Engine to 41396a77d5

---
 .../com/volmit/iris/core/scripting/ExecutionEnvironment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index fe96cd995..5b9dd6022 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -42,7 +42,7 @@ public class ExecutionEnvironment {
 
     @SneakyThrows
     private static URLClassLoader buildLoader() {
-        String version = "b5e2cc6e";
+        String version = "41396a77d5";
         String url = BASE_URL.formatted(version, version);
         String hash = IO.hash("Iris-Scripts.jar@" + version);
         var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");

From b6f9f68b9ffa22dc44c096e0b5a16cc6604b72cc Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 16 Jun 2025 22:43:26 +0200
Subject: [PATCH 06/31] add global preprocessor setting

---
 .../com/volmit/iris/core/loader/IrisData.java | 14 ++++++++--
 .../iris/engine/object/IrisDimension.java     | 17 +++++++++++
 .../iris/engine/object/IrisPreProcessors.java | 25 +++++++++++++++++
 .../functions/ResourceLoadersFunction.java    | 28 +++++++++++++++++++
 4 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 core/src/main/java/com/volmit/iris/engine/object/IrisPreProcessors.java
 create mode 100644 core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ResourceLoadersFunction.java

diff --git a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
index 404958e79..87a45076b 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -250,9 +250,19 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
                 }
             }
 
-            if (engine != null && t.getPreprocessors().isNotEmpty()) {
+            if (engine == null) return;
+            var global = engine.getDimension().getPreProcessors(t.getFolderName());
+            var local = t.getPreprocessors();
+            if ((global != null && global.isNotEmpty()) || local.isNotEmpty()) {
                 synchronized (this) {
-                    for (String i : t.getPreprocessors()) {
+                    if (global != null) {
+                        for (String i : global) {
+                            engine.getExecution().preprocessObject(i, t);
+                            Iris.debug("Loader<" + C.GREEN + t.getTypeName() + C.LIGHT_PURPLE + "> iprocess " + C.YELLOW + t.getLoadKey() + C.LIGHT_PURPLE + " in <rainbow>" + i);
+                        }
+                    }
+
+                    for (String i : local) {
                         engine.getExecution().preprocessObject(i, t);
                         Iris.debug("Loader<" + C.GREEN + t.getTypeName() + C.LIGHT_PURPLE + "> iprocess " + C.YELLOW + t.getLoadKey() + C.LIGHT_PURPLE + " in <rainbow>" + i);
                     }
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index f2c5b724c..a765e167a 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -28,6 +28,7 @@ import com.volmit.iris.core.nms.datapack.IDataFixer;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.io.IO;
@@ -66,6 +67,7 @@ public class IrisDimension extends IrisRegistrant {
     private final transient AtomicCache<Double> rad = new AtomicCache<>();
     private final transient AtomicCache<Boolean> featuresUsed = new AtomicCache<>();
     private final transient AtomicCache<KList<Position2>> strongholdsCache = new AtomicCache<>();
+    private final transient AtomicCache<KMap<String, KList<String>>> cachedPreProcessors = new AtomicCache<>();
     @MinNumber(2)
     @Required
     @Desc("The human readable name of this dimension")
@@ -244,6 +246,10 @@ public class IrisDimension extends IrisRegistrant {
     @MaxNumber(318)
     @Desc("The Subterrain Fluid Layer Height")
     private int caveLavaHeight = 8;
+    @MinNumber(1)
+    @Desc("A list of globally applied pre-processors")
+    @ArrayType(type = IrisPreProcessors.class)
+    private KList<IrisPreProcessors> globalPreProcessors = new KList<>();
 
     public int getMaxHeight() {
         return (int) getDimensionHeight().getMax();
@@ -362,6 +368,17 @@ public class IrisDimension extends IrisRegistrant {
         return r;
     }
 
+    public KList<String> getPreProcessors(String type) {
+        return cachedPreProcessors.aquire(() -> {
+            KMap<String, KList<String>> preProcessors = new KMap<>();
+            for (var entry : globalPreProcessors) {
+                preProcessors.computeIfAbsent(entry.getType(), k -> new KList<>())
+                        .addAll(entry.getScripts());
+            }
+            return preProcessors;
+        }).get(type);
+    }
+
     public IrisGeneratorStyle getBiomeStyle(InferredType type) {
         switch (type) {
             case CAVE:
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisPreProcessors.java b/core/src/main/java/com/volmit/iris/engine/object/IrisPreProcessors.java
new file mode 100644
index 000000000..fb62a9d78
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisPreProcessors.java
@@ -0,0 +1,25 @@
+package com.volmit.iris.engine.object;
+
+import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.annotations.functions.ResourceLoadersFunction;
+import com.volmit.iris.util.collection.KList;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Desc("Represents global preprocessors")
+public class IrisPreProcessors {
+    @Required
+    @Desc("The preprocessor type")
+    @RegistryListFunction(ResourceLoadersFunction.class)
+    private String type = "dimension";
+
+    @Required
+    @Desc("The preprocessor scripts")
+    @RegistryListResource(IrisScript.class)
+    @ArrayType(type = String.class, min = 1)
+    private KList<String> scripts = new KList<>();
+}
diff --git a/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ResourceLoadersFunction.java b/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ResourceLoadersFunction.java
new file mode 100644
index 000000000..943a96113
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ResourceLoadersFunction.java
@@ -0,0 +1,28 @@
+package com.volmit.iris.engine.object.annotations.functions;
+
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.loader.ResourceLoader;
+import com.volmit.iris.engine.framework.ListFunction;
+import com.volmit.iris.util.collection.KList;
+
+public class ResourceLoadersFunction implements ListFunction<KList<String>> {
+    @Override
+    public String key() {
+        return "resource-loader";
+    }
+
+    @Override
+    public String fancyName() {
+        return "Resource Loader";
+    }
+
+    @Override
+    public KList<String> apply(IrisData data) {
+        return data.getLoaders()
+                .values()
+                .stream()
+                .filter(rl -> ResourceLoader.class.equals(rl.getClass()))
+                .map(ResourceLoader::getFolderName)
+                .collect(KList.collector());
+    }
+}

From 2929a1f0a771df7f5198de6bbabbd36e500f26a2 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 16 Jun 2025 22:44:15 +0200
Subject: [PATCH 07/31] update Script Engine to e08b6f893e

---
 .../com/volmit/iris/core/scripting/ExecutionEnvironment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index 5b9dd6022..6620880db 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -42,7 +42,7 @@ public class ExecutionEnvironment {
 
     @SneakyThrows
     private static URLClassLoader buildLoader() {
-        String version = "41396a77d5";
+        String version = "e08b6f893e";
         String url = BASE_URL.formatted(version, version);
         String hash = IO.hash("Iris-Scripts.jar@" + version);
         var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");

From c35c858eee697ff0d5cdef85e3b21b093f894c46 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 7 Jul 2025 21:06:36 +0200
Subject: [PATCH 08/31] add scripts for engine setup

---
 core/src/main/java/com/volmit/iris/engine/IrisEngine.java     | 1 +
 .../java/com/volmit/iris/engine/object/IrisDimension.java     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 00232dcc1..9839a7ff6 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -173,6 +173,7 @@ public class IrisEngine implements Engine {
             effects = new IrisEngineEffects(this);
             hash32 = new CompletableFuture<>();
             setupMode();
+            getDimension().getSetupScripts().forEach(execution::execute);
             J.a(this::computeBiomeMaxes);
             J.a(() -> {
                 File[] roots = getData().getLoaders()
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index a765e167a..e2ac178b9 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -250,6 +250,10 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("A list of globally applied pre-processors")
     @ArrayType(type = IrisPreProcessors.class)
     private KList<IrisPreProcessors> globalPreProcessors = new KList<>();
+    @Desc("A list of scripts executed on engine setup")
+    @RegistryListResource(IrisScript.class)
+    @ArrayType(type = String.class, min = 1)
+    private KList<String> setupScripts = new KList<>();
 
     public int getMaxHeight() {
         return (int) getDimensionHeight().getMax();

From 50db1d11a7750b474d01117e0d638db4cdea7b6d Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 8 Jul 2025 12:30:21 +0200
Subject: [PATCH 09/31] move script engine libraries into the iris plugin
 folder

---
 build.gradle.kts                              |  4 ++-
 .../core/scripting/ExecutionEnvironment.java  | 34 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d3cfd5fee..4ae285a40 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -63,7 +63,8 @@ val serverMinHeap = "2G"
 val serverMaxHeap = "8G"
 //Valid values are: none, truecolor, indexed256, indexed16, indexed8
 val color = "truecolor"
-val errorReporting = false
+val errorReporting = findProperty("errorReporting") as Boolean? ?: false
+val scriptVersion = findProperty("scriptVersion") as String? ?: "master-SNAPSHOT"
 
 val nmsBindings = mapOf(
         "v1_21_R5" to "1.21.7-R0.1-SNAPSHOT",
@@ -110,6 +111,7 @@ nmsBindings.forEach { key, value ->
         systemProperty("net.kyori.ansi.colorLevel", color)
         systemProperty("com.mojang.eula.agree", true)
         systemProperty("iris.suppressReporting", !errorReporting)
+        systemProperty("iris.scriptVersion", scriptVersion)
         jvmArgs("-javaagent:${project(":core:agent").tasks.jar.flatMap { it.archiveFile }.get().asFile.absolutePath}")
     }
 }
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index 6620880db..2b6ab34b6 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -15,15 +15,20 @@ import java.io.File;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.Files;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Path;
 import java.util.*;
 
 @UtilityClass
 public class ExecutionEnvironment {
-    private static final String BASE_URL = "https://jitpack.io/com/github/VolmitSoftware/Iris-Scripts/%s/Iris-Scripts-%s-all.jar";
+    private static final String VERSION = System.getProperty("iris.scriptVersion", "e08b6f893e");
+    private static final String BASE_URL = "https://jitpack.io/com/github/VolmitSoftware/Iris-Scripts/" + VERSION + "/Iris-Scripts-" + VERSION + "-all.jar";
     private static final Provider PROVIDER = ServiceLoader.load(Provider.class, buildLoader())
             .findFirst()
-            .orElseThrow();
+            .orElseThrow()
+            .init(Iris.instance.getDataFolder("cache", "libraries").toPath());
 
     @NonNull
     public static Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine) {
@@ -42,21 +47,24 @@ public class ExecutionEnvironment {
 
     @SneakyThrows
     private static URLClassLoader buildLoader() {
-        String version = "e08b6f893e";
-        String url = BASE_URL.formatted(version, version);
-        String hash = IO.hash("Iris-Scripts.jar@" + version);
-        var file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");
-        if (!file.exists()) {
-            Iris.info("Downloading Script Engine...");
-            try (var stream = URI.create(url).toURL().openStream()) {
-                Files.copy(stream, file.toPath());
+        try (HttpClient client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.ALWAYS).build()) {
+            var resolved = client.send(HttpRequest.newBuilder(URI.create(BASE_URL)).build(), HttpResponse.BodyHandlers.discarding())
+                    .request();
+            String hash = IO.hash(resolved.uri().getPath());
+            File file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                Iris.info("Downloading Script Engine...");
+                client.send(resolved, HttpResponse.BodyHandlers.ofFile(file.toPath()));
+                Iris.info("Downloaded Script Engine!");
             }
-            Iris.info("Downloaded Script Engine!");
+            return new URLClassLoader(new URL[]{file.toURI().toURL()}, Provider.class.getClassLoader());
         }
-        return new URLClassLoader(new URL[]{file.toURI().toURL()}, Provider.class.getClassLoader());
     }
 
     public interface Provider {
+        Provider init(Path localRepository);
+
         @NonNull
         Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine);
 

From c01a7def5d831ca77421063a2afeac8b7c62e342 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 8 Jul 2025 15:37:14 +0200
Subject: [PATCH 10/31] add iris data setup hook

---
 .../main/java/com/volmit/iris/core/loader/IrisData.java   | 8 ++++++++
 .../java/com/volmit/iris/core/loader/ResourceLoader.java  | 6 +++++-
 .../volmit/iris/core/scripting/ExecutionEnvironment.java  | 2 +-
 core/src/main/java/com/volmit/iris/engine/IrisEngine.java | 2 +-
 .../java/com/volmit/iris/engine/object/IrisDimension.java | 6 +++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
index 34d67ec83..10dc795a6 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -24,6 +24,7 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.scripting.ExecutionEnvironment;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.*;
@@ -54,6 +55,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
     private static final KMap<File, IrisData> dataLoaders = new KMap<>();
     private final File dataFolder;
     private final int id;
+    private final ExecutionEnvironment.Pack environment;
     private boolean closed = false;
     private ResourceLoader<IrisBiome> biomeLoader;
     private ResourceLoader<IrisLootTable> lootLoader;
@@ -87,6 +89,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
         this.engine = null;
         this.dataFolder = dataFolder;
         this.id = RNG.r.imax();
+        this.environment = ExecutionEnvironment.createPack(this);
         hotloaded();
     }
 
@@ -319,6 +322,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
     }
 
     public synchronized void hotloaded() {
+        environment.close();
         possibleSnippets = new KMap<>();
         builder = new GsonBuilder()
                 .addDeserializationExclusionStrategy(this)
@@ -359,6 +363,10 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
         }
 
         gson = builder.create();
+        dimensionLoader.streamAll()
+                .map(IrisDimension::getDataScripts)
+                .flatMap(KList::stream)
+                .forEach(environment::execute);
     }
 
     public void dump() {
diff --git a/core/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java b/core/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
index a9b468e57..0f804e4e2 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
@@ -44,8 +44,8 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import java.io.*;
+import java.util.Arrays;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -216,6 +216,10 @@ public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
         return j;
     }
 
+    public Stream<T> streamAll() {
+        return streamAll(Arrays.stream(getPossibleKeys()));
+    }
+
     public Stream<T> streamAll(Stream<String> s) {
         return s.map(this::load);
     }
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index 2b6ab34b6..b484242bf 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -23,7 +23,7 @@ import java.util.*;
 
 @UtilityClass
 public class ExecutionEnvironment {
-    private static final String VERSION = System.getProperty("iris.scriptVersion", "e08b6f893e");
+    private static final String VERSION = System.getProperty("iris.scriptVersion", "master-ffbf167eba-1");
     private static final String BASE_URL = "https://jitpack.io/com/github/VolmitSoftware/Iris-Scripts/" + VERSION + "/Iris-Scripts-" + VERSION + "-all.jar";
     private static final Provider PROVIDER = ServiceLoader.load(Provider.class, buildLoader())
             .findFirst()
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 9839a7ff6..3289c64d8 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -173,7 +173,7 @@ public class IrisEngine implements Engine {
             effects = new IrisEngineEffects(this);
             hash32 = new CompletableFuture<>();
             setupMode();
-            getDimension().getSetupScripts().forEach(execution::execute);
+            getDimension().getEngineScripts().forEach(execution::execute);
             J.a(this::computeBiomeMaxes);
             J.a(() -> {
                 File[] roots = getData().getLoaders()
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index c82a175ea..791a602e1 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -247,7 +247,11 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("A list of scripts executed on engine setup")
     @RegistryListResource(IrisScript.class)
     @ArrayType(type = String.class, min = 1)
-    private KList<String> setupScripts = new KList<>();
+    private KList<String> engineScripts = new KList<>();
+    @Desc("A list of scripts executed on data setup")
+    @RegistryListResource(IrisScript.class)
+    @ArrayType(type = String.class, min = 1)
+    private KList<String> dataScripts = new KList<>();
 
     public int getMaxHeight() {
         return (int) getDimensionHeight().getMax();

From 0a30881f87e284aff00eb1cc97cf9805274d6aab Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 8 Jul 2025 16:08:30 +0200
Subject: [PATCH 11/31] add jaxen to runtime dependencies

---
 core/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 912dfbaba..f375accfb 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -85,6 +85,7 @@ dependencies {
     dynamic("net.bytebuddy:byte-buddy:1.17.5")
     dynamic("net.bytebuddy:byte-buddy-agent:1.17.5")
     dynamic("org.dom4j:dom4j:2.1.4")
+    dynamic("jaxen:jaxen:1.1.6")
 }
 
 java {

From 4b0766c097dd3649682018f8e513247d98bb1808 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 9 Jul 2025 14:24:24 +0200
Subject: [PATCH 12/31] remove bfs

---
 gradle/libs.versions.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a474aec14..5ac9ac2c0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,8 +32,6 @@ lru = "1.4.2" # https://central.sonatype.com/artifact/com.googlecode.concurrentl
 zip = "1.17" # https://central.sonatype.com/artifact/org.zeroturnaround/zt-zip
 gson = "2.13.1" # https://central.sonatype.com/artifact/com.google.code.gson/gson
 asm = "9.8" # https://central.sonatype.com/artifact/org.ow2.asm/asm
-bsf = "2.4.0" # https://central.sonatype.com/artifact/bsf/bsf
-rhino = "1.7R2" # https://central.sonatype.com/artifact/rhino/js
 caffeine = "3.2.1" # https://central.sonatype.com/artifact/com.github.ben-manes.caffeine/caffeine
 byte-buddy = "1.17.6" # https://central.sonatype.com/artifact/net.bytebuddy/byte-buddy
 dom4j = "2.2.0" # https://central.sonatype.com/artifact/org.dom4j/dom4j

From 1bc6192c8b41d8065956afa9eb2429cdfd33736e Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 9 Jul 2025 15:16:11 +0200
Subject: [PATCH 13/31] merge kts engine into this codebase

---
 core/build.gradle.kts                         |  13 ++
 core/src/main/java/com/volmit/iris/Iris.java  |   9 +-
 .../core/scripting/ExecutionEnvironment.java  |  56 +-------
 .../com/volmit/iris/util/misc/SlimJar.java    |  37 +++++
 .../core/scripting/kotlin/base/DataScript.kt  |  15 ++
 .../scripting/kotlin/base/EngineScript.kt     |  25 ++++
 .../kotlin/base/MobSpawningScript.kt          |  15 ++
 .../kotlin/base/PostMobSpawningScript.kt      |  15 ++
 .../kotlin/base/PreprocessorScript.kt         |  15 ++
 .../scripting/kotlin/base/SimpleScript.kt     |  40 ++++++
 .../environment/IrisExecutionEnvironment.kt   |  45 ++++++
 .../IrisPackExecutionEnvironment.kt           |  35 +++++
 .../IrisSimpleExecutionEnvironment.kt         | 135 ++++++++++++++++++
 .../scripting/kotlin/runner/CachedScript.kt   |  64 +++++++++
 .../core/scripting/kotlin/runner/Script.kt    |   8 ++
 .../scripting/kotlin/runner/ScriptRunner.kt   |  53 +++++++
 .../core/scripting/kotlin/runner/Utils.kt     |  54 +++++++
 ...iris.core.scripting.kotlin.base.DataScript |   0
 ...is.core.scripting.kotlin.base.EngineScript |   0
 ...re.scripting.kotlin.base.MobSpawningScript |   0
 ...cripting.kotlin.base.PostMobSpawningScript |   0
 ...e.scripting.kotlin.base.PreprocessorScript |   0
 ...is.core.scripting.kotlin.base.SimpleScript |   0
 gradle/libs.versions.toml                     |  14 ++
 24 files changed, 591 insertions(+), 57 deletions(-)
 create mode 100644 core/src/main/java/com/volmit/iris/util/misc/SlimJar.java
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/DataScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/EngineScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/MobSpawningScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PostMobSpawningScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PreprocessorScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Script.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.DataScript
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.EngineScript
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.MobSpawningScript
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.PostMobSpawningScript
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.PreprocessorScript
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.SimpleScript

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 0abad7812..da7b101bd 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -26,6 +26,8 @@ plugins {
     alias(libs.plugins.shadow)
     alias(libs.plugins.sentry)
     alias(libs.plugins.slimjar)
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.lombok)
 }
 
 val apiVersion = "1.19"
@@ -91,6 +93,14 @@ dependencies {
     slim(libs.byteBuddy.agent)
     slim(libs.dom4j)
     slim(libs.jaxen)
+
+    // Script Engine
+    slim(libs.kotlin.stdlib)
+    slim(libs.kotlin.coroutines)
+    slim(libs.kotlin.scripting.common)
+    slim(libs.kotlin.scripting.jvm)
+    slim(libs.kotlin.scripting.jvm.host)
+    slim(libs.kotlin.scripting.dependencies.maven)
 }
 
 java {
@@ -117,6 +127,9 @@ slimJar {
     relocate("net.kyori", "$lib.kyori")
     relocate("org.bstats", "$lib.metrics")
     relocate("io.sentry", "$lib.sentry")
+    relocate("org.apache.maven", "$lib.maven")
+    relocate("org.codehaus.plexus", "$lib.plexus")
+    relocate("org.eclipse.sisu", "$lib.sisu")
 }
 
 tasks {
diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index cfd03f730..8da92f0c4 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -53,6 +53,7 @@ import com.volmit.iris.util.io.JarScanner;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.misc.Bindings;
+import com.volmit.iris.util.misc.SlimJar;
 import com.volmit.iris.util.misc.getHardware;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.IrisService;
@@ -438,13 +439,7 @@ public class Iris extends VolmitPlugin implements Listener {
     }
 
     public Iris() {
-        ApplicationBuilder.appending("Iris")
-                .downloadDirectoryPath(getDataFolder("cache", "libraries").toPath())
-                .logger((message, args) -> {
-                    if (!message.startsWith("Loaded library ")) return;
-                    getLogger().info(message.formatted(args));
-                })
-                .build();
+        SlimJar.load(getDataFolder("cache", "libraries"));
     }
 
     private void enable() {
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index b484242bf..7e903a218 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -1,81 +1,37 @@
 package com.volmit.iris.core.scripting;
 
-import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.util.io.IO;
+import com.volmit.iris.core.scripting.kotlin.environment.IrisExecutionEnvironment;
+import com.volmit.iris.core.scripting.kotlin.environment.IrisPackExecutionEnvironment;
+import com.volmit.iris.core.scripting.kotlin.environment.IrisSimpleExecutionEnvironment;
 import lombok.NonNull;
-import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.file.Path;
 import java.util.*;
 
 @UtilityClass
 public class ExecutionEnvironment {
-    private static final String VERSION = System.getProperty("iris.scriptVersion", "master-ffbf167eba-1");
-    private static final String BASE_URL = "https://jitpack.io/com/github/VolmitSoftware/Iris-Scripts/" + VERSION + "/Iris-Scripts-" + VERSION + "-all.jar";
-    private static final Provider PROVIDER = ServiceLoader.load(Provider.class, buildLoader())
-            .findFirst()
-            .orElseThrow()
-            .init(Iris.instance.getDataFolder("cache", "libraries").toPath());
 
     @NonNull
     public static Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine) {
-        return PROVIDER.createEngine(engine);
+        return new IrisExecutionEnvironment(engine);
     }
 
     @NonNull
     public static Pack createPack(@NonNull IrisData data) {
-        return PROVIDER.createPack(data);
+        return new IrisPackExecutionEnvironment(data);
     }
 
     @NonNull
     public static Simple createSimple() {
-        return PROVIDER.createSimple();
+        return new IrisSimpleExecutionEnvironment();
     }
 
-    @SneakyThrows
-    private static URLClassLoader buildLoader() {
-        try (HttpClient client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.ALWAYS).build()) {
-            var resolved = client.send(HttpRequest.newBuilder(URI.create(BASE_URL)).build(), HttpResponse.BodyHandlers.discarding())
-                    .request();
-            String hash = IO.hash(resolved.uri().getPath());
-            File file = Iris.instance.getDataFile("cache", hash.substring(0, 2), hash.substring(3, 5), hash + ".jar");
-            if (!file.exists()) {
-                file.getParentFile().mkdirs();
-                Iris.info("Downloading Script Engine...");
-                client.send(resolved, HttpResponse.BodyHandlers.ofFile(file.toPath()));
-                Iris.info("Downloaded Script Engine!");
-            }
-            return new URLClassLoader(new URL[]{file.toURI().toURL()}, Provider.class.getClassLoader());
-        }
-    }
-
-    public interface Provider {
-        Provider init(Path localRepository);
-
-        @NonNull
-        Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine);
-
-        @NonNull
-        Pack createPack(@NonNull IrisData data);
-
-        @NonNull
-        Simple createSimple();
-    }
-
-
     public interface Simple {
         void configureProject(@NonNull File projectDir);
 
diff --git a/core/src/main/java/com/volmit/iris/util/misc/SlimJar.java b/core/src/main/java/com/volmit/iris/util/misc/SlimJar.java
new file mode 100644
index 000000000..bbd5ee878
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/util/misc/SlimJar.java
@@ -0,0 +1,37 @@
+package com.volmit.iris.util.misc;
+
+import io.github.slimjar.app.builder.ApplicationBuilder;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Logger;
+
+public class SlimJar {
+    private static final Logger LOGGER = Logger.getLogger("Iris");
+    private static final ReentrantLock lock = new ReentrantLock();
+    private static final AtomicBoolean loaded = new AtomicBoolean();
+
+    public static void load(@Nullable File localRepository) {
+        if (loaded.get()) return;
+        lock.lock();
+
+        try {
+            if (loaded.getAndSet(true)) return;
+            if (localRepository == null) {
+                localRepository = new File(".iris/libraries");
+            }
+
+            ApplicationBuilder.appending("Iris")
+                    .downloadDirectoryPath(localRepository.toPath())
+                    .logger((message, args) -> {
+                        if (!message.startsWith("Loaded library ")) return;
+                        LOGGER.info(message.formatted(args));
+                    })
+                    .build();
+        } finally {
+            lock.unlock();
+        }
+    }
+}
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/DataScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/DataScript.kt
new file mode 100644
index 000000000..1a180701c
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/DataScript.kt
@@ -0,0 +1,15 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import com.volmit.iris.core.loader.IrisData
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.providedProperties
+
+@KotlinScript(fileExtension = "data.kts", compilationConfiguration = DataScriptDefinition::class)
+abstract class DataScript
+
+object DataScriptDefinition : ScriptCompilationConfiguration(listOf(SimpleScriptDefinition), {
+    providedProperties("data" to IrisData::class)
+}) {
+    private fun readResolve(): Any = DataScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/EngineScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/EngineScript.kt
new file mode 100644
index 000000000..768f2a9d3
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/EngineScript.kt
@@ -0,0 +1,25 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import com.volmit.iris.core.scripting.func.BiomeLookup
+import com.volmit.iris.engine.IrisComplex
+import com.volmit.iris.engine.framework.Engine
+import com.volmit.iris.engine.`object`.IrisDimension
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.providedProperties
+
+@KotlinScript(fileExtension = "engine.kts", compilationConfiguration = EngineScriptDefinition::class)
+abstract class EngineScript
+
+object EngineScriptDefinition : ScriptCompilationConfiguration(listOf(DataScriptDefinition), {
+    providedProperties(
+        "engine" to Engine::class,
+        "complex" to IrisComplex::class,
+        "seed" to Long::class,
+        "dimension" to IrisDimension::class,
+        "biome" to BiomeLookup::class,
+    )
+}) {
+
+    private fun readResolve(): Any = EngineScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/MobSpawningScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/MobSpawningScript.kt
new file mode 100644
index 000000000..f9add58dc
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/MobSpawningScript.kt
@@ -0,0 +1,15 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import org.bukkit.Location
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.providedProperties
+
+@KotlinScript(fileExtension = "spawn.kts", compilationConfiguration = MobSpawningScriptDefinition::class)
+abstract class MobSpawningScript
+
+object MobSpawningScriptDefinition : ScriptCompilationConfiguration(listOf(EngineScriptDefinition), {
+    providedProperties("location" to Location::class)
+}) {
+    private fun readResolve(): Any = MobSpawningScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PostMobSpawningScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PostMobSpawningScript.kt
new file mode 100644
index 000000000..02b485bed
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PostMobSpawningScript.kt
@@ -0,0 +1,15 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import org.bukkit.entity.Entity
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.providedProperties
+
+@KotlinScript(fileExtension = "postspawn.kts", compilationConfiguration = PostMobSpawningScriptDefinition::class)
+abstract class PostMobSpawningScript
+
+object PostMobSpawningScriptDefinition : ScriptCompilationConfiguration(listOf(MobSpawningScriptDefinition), {
+    providedProperties("entity" to Entity::class)
+}) {
+    private fun readResolve(): Any = PostMobSpawningScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PreprocessorScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PreprocessorScript.kt
new file mode 100644
index 000000000..f594649e1
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PreprocessorScript.kt
@@ -0,0 +1,15 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import com.volmit.iris.core.loader.IrisRegistrant
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.providedProperties
+
+@KotlinScript(fileExtension = "proc.kts", compilationConfiguration = PreprocessorScriptDefinition::class)
+abstract class PreprocessorScript
+
+object PreprocessorScriptDefinition : ScriptCompilationConfiguration(listOf(EngineScriptDefinition), {
+    providedProperties("object" to IrisRegistrant::class)
+}) {
+    private fun readResolve(): Any = PreprocessorScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
new file mode 100644
index 000000000..5adbbaf8c
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
@@ -0,0 +1,40 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import com.volmit.iris.core.scripting.kotlin.runner.configureMavenDepsOnAnnotations
+import com.volmit.iris.util.misc.SlimJar
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.defaultImports
+import kotlin.script.experimental.api.isStandalone
+import kotlin.script.experimental.api.refineConfiguration
+import kotlin.script.experimental.dependencies.DependsOn
+import kotlin.script.experimental.dependencies.Repository
+import kotlin.script.experimental.jvm.dependenciesFromClassContext
+import kotlin.script.experimental.jvm.jvm
+
+@KotlinScript(fileExtension = "simple.kts", compilationConfiguration = SimpleScriptDefinition::class)
+abstract class SimpleScript
+
+object SimpleScriptDefinition : ScriptCompilationConfiguration({
+    SlimJar.load(null)
+
+    isStandalone(false)
+    defaultImports(
+        "kotlin.script.experimental.dependencies.DependsOn",
+        "kotlin.script.experimental.dependencies.Repository",
+        "com.volmit.iris.Iris.info",
+        "com.volmit.iris.Iris.debug",
+        "com.volmit.iris.Iris.warn",
+        "com.volmit.iris.Iris.error"
+    )
+
+    jvm {
+        dependenciesFromClassContext(SimpleScript::class, wholeClasspath = true)
+    }
+
+    refineConfiguration {
+        onAnnotations(DependsOn::class, Repository::class, handler = ::configureMavenDepsOnAnnotations)
+    }
+}) {
+    private fun readResolve(): Any = SimpleScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
new file mode 100644
index 000000000..df13c7ad4
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
@@ -0,0 +1,45 @@
+package com.volmit.iris.core.scripting.kotlin.environment
+
+import com.volmit.iris.core.loader.IrisRegistrant
+import com.volmit.iris.core.scripting.ExecutionEnvironment
+import com.volmit.iris.core.scripting.func.BiomeLookup
+import com.volmit.iris.core.scripting.kotlin.base.EngineScript
+import com.volmit.iris.core.scripting.kotlin.base.MobSpawningScript
+import com.volmit.iris.core.scripting.kotlin.base.PostMobSpawningScript
+import com.volmit.iris.core.scripting.kotlin.base.PreprocessorScript
+import com.volmit.iris.engine.framework.Engine
+import org.bukkit.Location
+import org.bukkit.entity.Entity
+
+data class IrisExecutionEnvironment(
+    private val engine: Engine
+) : IrisPackExecutionEnvironment(engine.data), ExecutionEnvironment.Engine {
+    override fun getEngine() = engine
+
+    override fun execute(script: String) =
+        execute(script, EngineScript::class.java, engine.parameters())
+
+    override fun evaluate(script: String) =
+        evaluate(script, EngineScript::class.java, engine.parameters())
+
+    override fun spawnMob(script: String, location: Location) =
+        evaluate(script, MobSpawningScript::class.java, engine.parameters("location" to location))
+
+    override fun postSpawnMob(script: String, location: Location, mob: Entity) =
+        execute(script, PostMobSpawningScript::class.java, engine.parameters("location" to location, "entity" to mob,))
+
+    override fun preprocessObject(script: String, `object`: IrisRegistrant) =
+        execute(script, PreprocessorScript::class.java, engine.parameters("object" to `object`))
+
+    private fun Engine.parameters(vararg values: Pair<String, Any?>): Map<String, Any?> {
+        return mapOf(
+            "data" to data,
+            "engine" to this,
+            "complex" to complex,
+            "seed" to seedManager.seed,
+            "dimension" to dimension,
+            "biome" to BiomeLookup(::getSurfaceBiome),
+            *values,
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
new file mode 100644
index 000000000..a69b9ea6a
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
@@ -0,0 +1,35 @@
+package com.volmit.iris.core.scripting.kotlin.environment
+
+import com.volmit.iris.core.loader.IrisData
+import com.volmit.iris.core.scripting.ExecutionEnvironment
+import com.volmit.iris.core.scripting.kotlin.base.DataScript
+import com.volmit.iris.core.scripting.kotlin.runner.Script
+import kotlin.reflect.KClass
+import kotlin.script.experimental.api.valueOrThrow
+
+open class IrisPackExecutionEnvironment(
+    private val data: IrisData
+) : IrisSimpleExecutionEnvironment(), ExecutionEnvironment.Pack {
+
+    override fun getData() = data
+
+    override fun compile(script: String, type: KClass<*>): Script {
+        val loaded = data.scriptLoader.load(script)
+        return compileCache.get(script)
+            .computeIfAbsent(type) { _ -> runner.compileText(type, loaded.source, script) }
+            .valueOrThrow()
+    }
+
+    override fun execute(script: String) =
+        execute(script, DataScript::class.java, data.parameters())
+
+    override fun evaluate(script: String) =
+        evaluate(script, DataScript::class.java, data.parameters())
+
+    private fun IrisData.parameters(vararg values: Pair<String, Any?>): Map<String, Any?> {
+        return mapOf(
+            "data" to this,
+            *values,
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
new file mode 100644
index 000000000..014d440f4
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
@@ -0,0 +1,135 @@
+package com.volmit.iris.core.scripting.kotlin.environment
+
+import com.volmit.iris.Iris
+import com.volmit.iris.core.IrisSettings
+import com.volmit.iris.core.scripting.ExecutionEnvironment
+import com.volmit.iris.core.scripting.kotlin.base.*
+import com.volmit.iris.core.scripting.kotlin.runner.Script
+import com.volmit.iris.core.scripting.kotlin.runner.ScriptRunner
+import com.volmit.iris.core.scripting.kotlin.runner.classpath
+import com.volmit.iris.core.scripting.kotlin.runner.valueOrNull
+import com.volmit.iris.util.collection.KMap
+import com.volmit.iris.util.data.KCache
+import com.volmit.iris.util.format.C
+import java.io.File
+import kotlin.reflect.KClass
+import kotlin.script.experimental.api.ResultWithDiagnostics
+import kotlin.script.experimental.api.valueOrThrow
+import kotlin.text.split
+
+open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
+    protected val compileCache = KCache<String, KMap<KClass<*>, ResultWithDiagnostics<Script>>>({ _ -> KMap() }, IrisSettings.get().performance.cacheSize.toLong())
+    protected val runner = ScriptRunner()
+
+    override fun execute(
+        script: String
+    ) = execute(script, SimpleScript::class.java, null)
+
+    override fun execute(
+        script: String,
+        type: Class<*>,
+        vars: Map<String, Any?>?
+    ) {
+        Iris.debug("Execute Script (void) " + C.DARK_GREEN + script)
+        evaluate0(script, type.kotlin, vars)
+    }
+
+    override fun evaluate(
+        script: String
+    ): Any? = evaluate(script, SimpleScript::class.java, null)
+
+    override fun evaluate(
+        script: String,
+        type: Class<*>,
+        vars: Map<String, Any?>?
+    ): Any? {
+        Iris.debug("Execute Script (for result) " + C.DARK_GREEN + script)
+        return evaluate0(script, type.kotlin, vars)
+    }
+
+    override fun close() {
+        compileCache.invalidate()
+        runner.clearConfigurations()
+    }
+
+    protected open fun compile(script: String, type: KClass<*>) =
+        compileCache.get(script)
+            .computeIfAbsent(type) { _ -> runner.compileText(type, script) }
+            .valueOrThrow()
+
+    private fun evaluate0(name: String, type: KClass<*>, properties: Map<String, Any?>? = null): Any? {
+        val current = Thread.currentThread()
+        val loader = current.contextClassLoader
+        current.contextClassLoader = this.javaClass.classLoader
+        try {
+            return compile(name, type)
+                .evaluate(properties)
+                .valueOrThrow()
+                .valueOrNull()
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
+        current.contextClassLoader = loader
+
+        return null
+    }
+
+    override fun configureProject(projectDir: File) {
+        projectDir.mkdirs()
+        val libs = javaClass.classLoader.parent.classpath
+            .sortedBy { it.absolutePath }
+            .toMutableList()
+        libs.add(codeSource)
+        libs.removeIf { libs.count { f -> f.name == it.name } > 1 }
+
+        File(projectDir, "build.gradle.kts")
+            .updateClasspath(libs)
+    }
+
+    companion object {
+        private const val CLASSPATH = "val classpath = files("
+        private val codeSource = File(IrisSimpleExecutionEnvironment::class.java.protectionDomain.codeSource.location.toURI())
+
+        private fun File.updateClasspath(classpath: List<File>) {
+            val test = if (exists()) readLines() else BASE_GRADLE
+            writeText(test.updateClasspath(classpath))
+        }
+
+        private fun List<String>.updateClasspath(classpath: List<File>): String {
+            val classpath = classpath.joinToString(",", CLASSPATH, ")") { "\"${it.escapedPath}\"" }
+            val index = indexOfFirst { it.startsWith(CLASSPATH) }
+            if (index == -1) {
+                return "$classpath\n${joinToString("\n")}"
+            }
+
+            val mod = toMutableList()
+            mod[index] = classpath
+            return mod.joinToString("\n")
+        }
+
+        private val File.escapedPath
+            get() = absolutePath.replace("\\", "\\\\").replace("\"", "\\\"")
+
+        private val BASE_GRADLE = """
+            val classpath = files()
+            
+            plugins {
+                kotlin("jvm") version("2.1.20")
+            }
+
+            repositories {
+                mavenCentral()
+            }
+
+            val script by configurations.creating
+            configurations.compileOnly { extendsFrom(script) }
+            configurations.kotlinScriptDef { extendsFrom(script) }
+            configurations.kotlinScriptDefExtensions { extendsFrom(script) }
+            configurations.kotlinCompilerClasspath { extendsFrom(script) }
+            configurations.kotlinCompilerPluginClasspath { extendsFrom(script) }
+
+            dependencies {
+                add("script", classpath)
+            }""".trimIndent().split("\n")
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt
new file mode 100644
index 000000000..290ea6c33
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt
@@ -0,0 +1,64 @@
+package com.volmit.iris.core.scripting.kotlin.runner
+
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
+import kotlin.reflect.KClass
+import kotlin.script.experimental.api.*
+import kotlin.script.experimental.host.ScriptingHostConfiguration
+import kotlin.script.experimental.host.createEvaluationConfigurationFromTemplate
+import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
+
+data class CachedScript(
+    private val base: CompiledScript,
+    private val host: BasicJvmScriptingHost,
+    private val hostConfig: ScriptingHostConfiguration
+) : Script, CompiledScript {
+    private val scripts = base.otherScripts.map { CachedScript(it, host, hostConfig) }
+    private val evalConfig = createEvaluationConfiguration()
+
+    @Volatile
+    private var value: ResultWithDiagnostics<KClass<*>>? = null
+
+    override val otherScripts: List<CompiledScript>
+        get() = scripts
+
+    override val sourceLocationId: String?
+        get() = base.sourceLocationId
+
+    override val compilationConfiguration: ScriptCompilationConfiguration
+        get() = base.compilationConfiguration
+
+    override val resultField: Pair<String, KotlinType>?
+        get() = base.resultField
+
+
+    override suspend fun getClass(scriptEvaluationConfiguration: ScriptEvaluationConfiguration?) = value ?: run {
+        val cached = base.getClass(scriptEvaluationConfiguration)
+        updater.set(this, cached)
+        return cached
+    }
+
+    override fun evaluate(properties: Map<String, Any?>?) = host.runInCoroutineContext {
+        host.evaluator.invoke(this, createEvaluationConfiguration(properties))
+    }
+
+    private fun createEvaluationConfiguration(properties: Map<String, Any?>?): ScriptEvaluationConfiguration {
+        if (properties == null || properties.isEmpty())
+            return evalConfig
+
+        return evalConfig.with {
+            providedProperties(properties)
+        }
+    }
+
+    private fun createEvaluationConfiguration(): ScriptEvaluationConfiguration {
+        val type = compilationConfiguration[ScriptCompilationConfiguration.baseClass]?.fromClass!!
+        return createEvaluationConfigurationFromTemplate(
+            KotlinType(type),
+            hostConfig,
+            type)
+    }
+
+    companion object {
+        private val updater = AtomicReferenceFieldUpdater.newUpdater(CachedScript::class.java, ResultWithDiagnostics::class.java, "value")
+    }
+}
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Script.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Script.kt
new file mode 100644
index 000000000..fdb0dce03
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Script.kt
@@ -0,0 +1,8 @@
+package com.volmit.iris.core.scripting.kotlin.runner
+
+import kotlin.script.experimental.api.EvaluationResult
+import kotlin.script.experimental.api.ResultWithDiagnostics
+
+interface Script {
+    fun evaluate(properties: Map<String, Any?>?): ResultWithDiagnostics<EvaluationResult>
+}
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
new file mode 100644
index 000000000..22fbe7670
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
@@ -0,0 +1,53 @@
+package com.volmit.iris.core.scripting.kotlin.runner
+
+import com.volmit.iris.core.scripting.kotlin.base.EngineScript
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.reflect.KClass
+import kotlin.script.experimental.api.*
+import kotlin.script.experimental.dependencies.DependsOn
+import kotlin.script.experimental.dependencies.Repository
+import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
+import kotlin.script.experimental.host.toScriptSource
+import kotlin.script.experimental.host.withDefaultsFrom
+import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
+import kotlin.script.experimental.jvm.dependenciesFromClassContext
+import kotlin.script.experimental.jvm.jvm
+import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
+
+class ScriptRunner(
+    private val host: BasicJvmScriptingHost
+) {
+    constructor() : this(BasicJvmScriptingHost())
+
+    private val configs = ConcurrentHashMap<KClass<*>, ScriptCompilationConfiguration>()
+    private val hostConfig = host.baseHostConfiguration.withDefaultsFrom(defaultJvmScriptingHostConfiguration)
+
+    fun compileText(type: KClass<*>, raw: String, name: String? = null) = compile(type, raw.toScriptSource(name))
+
+    fun clearConfigurations() = configs.clear()
+
+    private fun compile(
+        type: KClass<*>,
+        code: SourceCode
+    ): ResultWithDiagnostics<Script> = host.runInCoroutineContext {
+        host.compiler(code, configs.computeIfAbsent(type, ::createConfig))
+            .map { CachedScript(it, host, hostConfig) }
+    }
+
+    private fun createConfig(type: KClass<*>) = createCompilationConfigurationFromTemplate(
+        KotlinType(type),
+        hostConfig,
+        type
+    ) {
+        if (EngineScript::class.java.isAssignableFrom(type.java))
+            return@createCompilationConfigurationFromTemplate
+
+        jvm {
+            dependenciesFromClassContext(type, wholeClasspath = true)
+        }
+
+        refineConfiguration {
+            onAnnotations(DependsOn::class, Repository::class, handler = ::configureMavenDepsOnAnnotations)
+        }
+    }
+}
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
new file mode 100644
index 000000000..4449c4f13
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
@@ -0,0 +1,54 @@
+package com.volmit.iris.core.scripting.kotlin.runner
+
+import kotlinx.coroutines.runBlocking
+import java.io.File
+import kotlin.script.experimental.api.*
+import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
+import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
+import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
+import kotlin.script.experimental.dependencies.resolveFromScriptSourceAnnotations
+import kotlin.script.experimental.jvm.updateClasspath
+import kotlin.script.experimental.jvm.util.classpathFromClassloader
+
+internal fun <T, R> ResultWithDiagnostics<T>.map(transformer: (T) -> R): ResultWithDiagnostics<R> = when (this) {
+    is ResultWithDiagnostics.Success -> ResultWithDiagnostics.Success(transformer(value), reports)
+    is ResultWithDiagnostics.Failure -> this
+}
+
+internal fun EvaluationResult.valueOrNull() = returnValue.valueOrNull()
+internal fun ResultValue.valueOrNull(): Any? =
+    when (this) {
+        is ResultValue.Value -> value
+        else -> null
+    }
+
+
+internal val resolver = CompoundDependenciesResolver(FileSystemDependenciesResolver(), MavenDependenciesResolver())
+internal fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> {
+    val annotations = context.collectedData?.get(ScriptCollectedData.collectedAnnotations)?.takeIf { it.isNotEmpty() }
+        ?: return context.compilationConfiguration.asSuccess()
+    return runBlocking {
+        resolver.resolveFromScriptSourceAnnotations(annotations)
+    }.onSuccess {
+        context.compilationConfiguration.with {
+            updateClasspath(it)
+        }.asSuccess()
+    }
+}
+
+internal fun Collection<File>.format(projectDir: File): Collection<String> {
+    val projectDir = projectDir.absolutePath
+    val home = File(System.getProperty("user.home")).absolutePath
+    return map { format(it, projectDir, home) }.toSet()
+}
+
+internal val ClassLoader.classpath get() = classpathFromClassloader(this) ?: emptyList()
+
+private fun format(file: File, projectDir: String, home: String): String {
+    val path = file.absolutePath
+    return when {
+        path.startsWith(projectDir) -> $$"$PROJECT_DIR$/$${path.substring(projectDir.length + 1)}"
+        path.startsWith(home) -> $$"$USER_HOME$/$${path.substring(home.length + 1)}"
+        else -> path
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.DataScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.DataScript
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.EngineScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.EngineScript
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.MobSpawningScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.MobSpawningScript
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.PostMobSpawningScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.PostMobSpawningScript
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.PreprocessorScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.PreprocessorScript
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.SimpleScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.SimpleScript
new file mode 100644
index 000000000..e69de29bb
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ac9ac2c0..36226306e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,6 +37,10 @@ byte-buddy = "1.17.6" # https://central.sonatype.com/artifact/net.bytebuddy/byte
 dom4j = "2.2.0" # https://central.sonatype.com/artifact/org.dom4j/dom4j
 jaxen = "2.0.0" # https://central.sonatype.com/artifact/jaxen/jaxen
 
+# Script Engine
+kotlin = "2.2.0"
+kotlin-coroutines = "1.10.2"
+
 # Third Party Integrations
 nexo = "1.8.0" # https://repo.nexomc.com/#/releases/com/nexomc/nexo
 itemsadder = "4.0.10" # https://github.com/LoneDev6/API-ItemsAdder
@@ -82,6 +86,14 @@ byteBuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "by
 dom4j = { module = "org.dom4j:dom4j", version.ref = "dom4j" }
 jaxen = { module = "jaxen:jaxen", version.ref = "jaxen" }
 
+# Script Engine
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-scripting-common = { module = "org.jetbrains.kotlin:kotlin-scripting-common", version.ref = "kotlin" }
+kotlin-scripting-jvm = { module = "org.jetbrains.kotlin:kotlin-scripting-jvm", version.ref = "kotlin" }
+kotlin-scripting-jvm-host = { module = "org.jetbrains.kotlin:kotlin-scripting-jvm-host", version.ref = "kotlin" }
+kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines"}
+kotlin-scripting-dependencies-maven = { module = "org.jetbrains.kotlin:kotlin-scripting-dependencies-maven", version.ref = "kotlin"}
+
 # Third Party Integrations
 nexo = { module = "com.nexomc:nexo", version.ref = "nexo" }
 itemsadder = { module = "dev.lone:api-itemsadder", version.ref = "itemsadder" }
@@ -100,3 +112,5 @@ slimjar = { id = "de.crazydev22.slimjar", version.ref = "slimjar" }
 download = { id = "de.undercouch.download", version.ref = "download" }
 runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
 sentry = { id = "io.sentry.jvm.gradle", version.ref = "sentryPlugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-lombok = { id = "org.jetbrains.kotlin.plugin.lombok", version.ref = "kotlin" }

From c5416f54fa5877a60cc80d85d8d9665b105f9621 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 9 Jul 2025 23:40:04 +0200
Subject: [PATCH 14/31] add script hook for custom noise

---
 .../core/scripting/ExecutionEnvironment.java  |  4 ++
 .../engine/object/IrisGeneratorStyle.java     | 44 ++++++++-----------
 .../core/scripting/kotlin/base/NoiseScript.kt | 16 +++++++
 .../IrisPackExecutionEnvironment.kt           |  5 +++
 ...ris.core.scripting.kotlin.base.NoiseScript |  0
 5 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/NoiseScript.kt
 create mode 100644 core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.NoiseScript

diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
index 7e903a218..67939a2e6 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
@@ -5,6 +5,7 @@ import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.scripting.kotlin.environment.IrisExecutionEnvironment;
 import com.volmit.iris.core.scripting.kotlin.environment.IrisPackExecutionEnvironment;
 import com.volmit.iris.core.scripting.kotlin.environment.IrisSimpleExecutionEnvironment;
+import com.volmit.iris.util.math.RNG;
 import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
@@ -53,6 +54,9 @@ public class ExecutionEnvironment {
     public interface Pack extends Simple {
         @NonNull
         IrisData getData();
+
+        @Nullable
+        Object createNoise(@NonNull String script, @NonNull RNG rng);
     }
 
     public interface Engine extends Pack {
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java b/core/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
index 1c1da694b..7f7ae9f47 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java
@@ -18,6 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
@@ -25,6 +26,7 @@ import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
 import com.volmit.iris.util.noise.ExpressionNoise;
 import com.volmit.iris.util.noise.ImageNoise;
+import com.volmit.iris.util.noise.NoiseGenerator;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -56,6 +58,9 @@ public class IrisGeneratorStyle {
     private String expression = null;
     @Desc("Use an Image map instead of a generated value")
     private IrisImageMap imageMap = null;
+    @Desc("Instead of using the style property, use a custom noise generator to represent this style.")
+    @RegistryListResource(IrisScript.class)
+    private String script = null;
     @MinNumber(0.00001)
     @Desc("The Output multiplier. Only used if parent is fracture.")
     private double multiplier = 1;
@@ -93,40 +98,27 @@ public class IrisGeneratorStyle {
     public CNG createNoCache(RNG rng, IrisData data, boolean actuallyCached) {
         String cacheKey = hash() + "";
 
+        CNG cng = null;
         if (getExpression() != null) {
             IrisExpression e = data.getExpressionLoader().load(getExpression());
-
             if (e != null) {
-                CNG cng = new CNG(rng, new ExpressionNoise(rng, e), 1D, 1)
-                        .bake().scale(1D / zoom).pow(exponent).bake();
-                cng.setTrueFracturing(axialFracturing);
-
-                if (fracture != null) {
-                    cng.fractureWith(fracture.create(rng.nextParallelRNG(2934), data), fracture.getMultiplier());
-                }
-
-                if (cellularFrequency > 0) {
-                    return cng.cellularize(rng.nextParallelRNG(884466), cellularFrequency).scale(1D / cellularZoom).bake();
-                }
-
-                return cng;
+                cng = new CNG(rng, new ExpressionNoise(rng, e), 1D, 1).bake();
             }
         } else if (getImageMap() != null) {
-            CNG cng = new CNG(rng, new ImageNoise(data, getImageMap()), 1D, 1).bake().scale(1D / zoom).pow(exponent).bake();
-            cng.setTrueFracturing(axialFracturing);
-
-            if (fracture != null) {
-                cng.fractureWith(fracture.create(rng.nextParallelRNG(2934), data), fracture.getMultiplier());
+            cng = new CNG(rng, new ImageNoise(data, getImageMap()), 1D, 1).bake();
+        } else if (getScript() != null) {
+            Object result = data.getEnvironment().createNoise(getScript(), rng);
+            if (result == null) Iris.warn("Failed to create noise from script: " + getScript());
+            if (result instanceof NoiseGenerator generator) {
+                cng = new CNG(rng, generator, 1D, 1).bake();
             }
-
-            if (cellularFrequency > 0) {
-                return cng.cellularize(rng.nextParallelRNG(884466), cellularFrequency).scale(1D / cellularZoom).bake();
-            }
-
-            return cng;
         }
 
-        CNG cng = style.create(rng).bake().scale(1D / zoom).pow(exponent).bake();
+        if (cng == null) {
+            cng = style.create(rng).bake();
+        }
+
+        cng = cng.scale(1D / zoom).pow(exponent).bake();
         cng.setTrueFracturing(axialFracturing);
 
         if (fracture != null) {
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/NoiseScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/NoiseScript.kt
new file mode 100644
index 000000000..c8a7056fa
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/NoiseScript.kt
@@ -0,0 +1,16 @@
+package com.volmit.iris.core.scripting.kotlin.base
+
+import com.volmit.iris.util.math.RNG
+import kotlin.script.experimental.annotations.KotlinScript
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.providedProperties
+
+@KotlinScript(fileExtension = "noise.kts", compilationConfiguration = NoiseScriptDefinition::class)
+abstract class NoiseScript
+
+object NoiseScriptDefinition : ScriptCompilationConfiguration(listOf(DataScriptDefinition), {
+    providedProperties("rng" to RNG::class)
+}) {
+
+    private fun readResolve(): Any = NoiseScriptDefinition
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
index a69b9ea6a..c901ffc97 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
@@ -3,7 +3,9 @@ package com.volmit.iris.core.scripting.kotlin.environment
 import com.volmit.iris.core.loader.IrisData
 import com.volmit.iris.core.scripting.ExecutionEnvironment
 import com.volmit.iris.core.scripting.kotlin.base.DataScript
+import com.volmit.iris.core.scripting.kotlin.base.NoiseScript
 import com.volmit.iris.core.scripting.kotlin.runner.Script
+import com.volmit.iris.util.math.RNG
 import kotlin.reflect.KClass
 import kotlin.script.experimental.api.valueOrThrow
 
@@ -26,6 +28,9 @@ open class IrisPackExecutionEnvironment(
     override fun evaluate(script: String) =
         evaluate(script, DataScript::class.java, data.parameters())
 
+    override fun createNoise(script: String, rng: RNG) =
+        evaluate(script, NoiseScript::class.java, data.parameters("rng" to rng))
+
     private fun IrisData.parameters(vararg values: Pair<String, Any?>): Map<String, Any?> {
         return mapOf(
             "data" to this,
diff --git a/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.NoiseScript b/core/src/main/resources/META-INF/kotlin/script/templates/com.volmit.iris.core.scripting.kotlin.base.NoiseScript
new file mode 100644
index 000000000..e69de29bb

From 11cfd85f6ae487b964b82015c30ed5dd19e86a8f Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Thu, 10 Jul 2025 16:11:02 +0200
Subject: [PATCH 15/31] allow creation of custom mantle flags for custom mantle
 components

---
 .../com/volmit/iris/core/loader/IrisData.java |  3 +
 .../iris/core/pregenerator/ChunkUpdater.java  |  2 +-
 .../com/volmit/iris/engine/IrisEngine.java    |  2 +-
 .../volmit/iris/engine/IrisEngineMantle.java  |  2 +-
 .../volmit/iris/engine/IrisWorldManager.java  |  2 +-
 .../volmit/iris/engine/framework/Engine.java  |  2 +-
 .../iris/engine/mantle/ComponentFlag.java     |  4 +-
 .../iris/engine/mantle/EngineMantle.java      |  2 +-
 .../engine/mantle/IrisMantleComponent.java    |  2 +-
 .../iris/engine/mantle/MantleComponent.java   |  2 +-
 .../components/MantleCarvingComponent.java    |  6 +-
 .../components/MantleFluidBodyComponent.java  |  6 +-
 .../components/MantleJigsawComponent.java     |  6 +-
 .../components/MantleObjectComponent.java     |  6 +-
 .../engine/modifier/IrisCustomModifier.java   |  2 +-
 .../iris/engine/object/IrisDimension.java     |  7 ++-
 .../functions/ComponentFlagFunction.java      |  2 +-
 .../com/volmit/iris/util/mantle/Mantle.java   |  1 +
 .../volmit/iris/util/mantle/MantleChunk.java  | 40 ++++++++-----
 .../volmit/iris/util/mantle/MantleFlag.java   | 44 --------------
 .../iris/util/mantle/TectonicPlate.java       |  2 +-
 .../iris/util/mantle/flag/CustomFlag.java     | 28 +++++++++
 .../iris/util/mantle/flag/MantleFlag.java     | 57 +++++++++++++++++++
 .../util/mantle/flag/MantleFlagAdapter.java   | 31 ++++++++++
 .../iris/util/mantle/flag/ReservedFlag.java   | 25 ++++++++
 .../util/parallel/AtomicBooleanArray.java     | 50 ++++++++++++++++
 .../core/nms/v1_20_R1/IrisChunkGenerator.java |  2 +-
 .../core/nms/v1_20_R2/IrisChunkGenerator.java |  2 +-
 .../core/nms/v1_20_R3/IrisChunkGenerator.java |  4 +-
 .../core/nms/v1_20_R4/IrisChunkGenerator.java |  2 +-
 .../core/nms/v1_21_R1/IrisChunkGenerator.java |  2 +-
 .../core/nms/v1_21_R2/IrisChunkGenerator.java |  2 +-
 .../core/nms/v1_21_R3/IrisChunkGenerator.java |  4 +-
 .../core/nms/v1_21_R4/IrisChunkGenerator.java |  2 +-
 .../core/nms/v1_21_R5/IrisChunkGenerator.java |  2 +-
 35 files changed, 259 insertions(+), 99 deletions(-)
 delete mode 100644 core/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
 create mode 100644 core/src/main/java/com/volmit/iris/util/mantle/flag/CustomFlag.java
 create mode 100644 core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
 create mode 100644 core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
 create mode 100644 core/src/main/java/com/volmit/iris/util/mantle/flag/ReservedFlag.java
 create mode 100644 core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java

diff --git a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
index 10dc795a6..bd17e6ceb 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -34,6 +34,8 @@ import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.context.IrisContext;
 import com.volmit.iris.util.format.C;
+import com.volmit.iris.util.mantle.flag.MantleFlagAdapter;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
@@ -329,6 +331,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
                 .addSerializationExclusionStrategy(this)
                 .setLenient()
                 .registerTypeAdapterFactory(this)
+                .registerTypeAdapter(MantleFlag.class, new MantleFlagAdapter())
                 .setPrettyPrinting();
         loaders.clear();
         File packs = dataFolder;
diff --git a/core/src/main/java/com/volmit/iris/core/pregenerator/ChunkUpdater.java b/core/src/main/java/com/volmit/iris/core/pregenerator/ChunkUpdater.java
index 572ce98d4..bb5bea83b 100644
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/ChunkUpdater.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/ChunkUpdater.java
@@ -8,7 +8,7 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RollingSequence;
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 3289c64d8..9d537232d 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -43,7 +43,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.MatterStructurePOI;
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java
index e58324ad7..10d12aa9d 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java
@@ -31,7 +31,7 @@ import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import lombok.*;
 
 import java.io.File;
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
index 95ba698c9..e44ac8700 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
@@ -29,7 +29,7 @@ import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
diff --git a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
index 6343df022..15c63933f 100644
--- a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
@@ -48,7 +48,7 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.function.Function2;
 import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.BlockPosition;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.Position2;
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/ComponentFlag.java b/core/src/main/java/com/volmit/iris/engine/mantle/ComponentFlag.java
index 1c7fe20b2..0ed617a7d 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/ComponentFlag.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/ComponentFlag.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.engine.mantle;
 
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.ReservedFlag;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,5 +10,5 @@ import java.lang.annotation.Target;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ComponentFlag {
-    MantleFlag value();
+    ReservedFlag value();
 }
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
index d37814e0c..695bc8b16 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
@@ -40,7 +40,7 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.mantle.MantleChunk;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.matter.*;
 import com.volmit.iris.util.matter.slices.UpdateMatter;
 import com.volmit.iris.util.parallel.BurstExecutor;
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java b/core/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java
index cfe72ae39..ec99fd32c 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/IrisMantleComponent.java
@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.mantle;
 
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java b/core/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java
index 64c69d5c6..43a61c65c 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java
@@ -24,7 +24,7 @@ import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.context.ChunkContext;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java
index eca862c79..19bd89b32 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java
@@ -28,17 +28,17 @@ import com.volmit.iris.engine.object.IrisCarving;
 import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.context.ChunkContext;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.ReservedFlag;
 import com.volmit.iris.util.math.RNG;
 import lombok.Getter;
 
 @Getter
-@ComponentFlag(MantleFlag.CARVED)
+@ComponentFlag(ReservedFlag.CARVED)
 public class MantleCarvingComponent extends IrisMantleComponent {
     private final int radius = computeRadius();
 
     public MantleCarvingComponent(EngineMantle engineMantle) {
-        super(engineMantle, MantleFlag.CARVED, 0);
+        super(engineMantle, ReservedFlag.CARVED, 0);
     }
 
     @Override
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleFluidBodyComponent.java b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleFluidBodyComponent.java
index 15389715e..dcfe9653d 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleFluidBodyComponent.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleFluidBodyComponent.java
@@ -28,17 +28,17 @@ import com.volmit.iris.engine.object.IrisFluidBodies;
 import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.context.ChunkContext;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.ReservedFlag;
 import com.volmit.iris.util.math.RNG;
 import lombok.Getter;
 
 @Getter
-@ComponentFlag(MantleFlag.FLUID_BODIES)
+@ComponentFlag(ReservedFlag.FLUID_BODIES)
 public class MantleFluidBodyComponent extends IrisMantleComponent {
     private final int radius = computeRadius();
 
     public MantleFluidBodyComponent(EngineMantle engineMantle) {
-        super(engineMantle, MantleFlag.FLUID_BODIES, 0);
+        super(engineMantle, ReservedFlag.FLUID_BODIES, 0);
     }
 
     @Override
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java
index e5f551872..22d31800e 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java
@@ -30,7 +30,7 @@ import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.context.ChunkContext;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.ReservedFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.slices.container.JigsawStructuresContainer;
@@ -40,14 +40,14 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-@ComponentFlag(MantleFlag.JIGSAW)
+@ComponentFlag(ReservedFlag.JIGSAW)
 public class MantleJigsawComponent extends IrisMantleComponent {
     @Getter
     private final int radius = computeRadius();
     private final CNG cng;
 
     public MantleJigsawComponent(EngineMantle engineMantle) {
-        super(engineMantle, MantleFlag.JIGSAW, 1);
+        super(engineMantle, ReservedFlag.JIGSAW, 1);
         cng = NoiseStyle.STATIC.create(new RNG(jigsaw()));
     }
 
diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
index a4ca6dd7a..bc48a9969 100644
--- a/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
@@ -33,7 +33,7 @@ import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.ReservedFlag;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.MatterStructurePOI;
 import com.volmit.iris.util.noise.CNG;
@@ -48,12 +48,12 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Getter
-@ComponentFlag(MantleFlag.OBJECT)
+@ComponentFlag(ReservedFlag.OBJECT)
 public class MantleObjectComponent extends IrisMantleComponent {
     private final int radius = computeRadius();
 
     public MantleObjectComponent(EngineMantle engineMantle) {
-        super(engineMantle, MantleFlag.OBJECT, 1);
+        super(engineMantle, ReservedFlag.OBJECT, 1);
     }
 
     @Override
diff --git a/core/src/main/java/com/volmit/iris/engine/modifier/IrisCustomModifier.java b/core/src/main/java/com/volmit/iris/engine/modifier/IrisCustomModifier.java
index 161600101..eca550cd2 100644
--- a/core/src/main/java/com/volmit/iris/engine/modifier/IrisCustomModifier.java
+++ b/core/src/main/java/com/volmit/iris/engine/modifier/IrisCustomModifier.java
@@ -5,7 +5,7 @@ import com.volmit.iris.engine.framework.EngineAssignedModifier;
 import com.volmit.iris.util.context.ChunkContext;
 import com.volmit.iris.util.data.IrisCustomData;
 import com.volmit.iris.util.hunk.Hunk;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
 import org.bukkit.block.data.BlockData;
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index 44dc73f3b..0688f3ea9 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -35,7 +35,8 @@ import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
+import com.volmit.iris.util.mantle.flag.ReservedFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
@@ -243,9 +244,9 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("The Subterrain Fluid Layer Height")
     private int caveLavaHeight = 8;
     @RegistryListFunction(ComponentFlagFunction.class)
-    @ArrayType(type = MantleFlag.class)
+    @ArrayType(type = ReservedFlag.class)
     @Desc("Collection of disabled components")
-    private KList<MantleFlag> disabledComponents = new KList<>();
+    private KList<ReservedFlag> disabledComponents = new KList<>();
     @Desc("A list of globally applied pre-processors")
     @ArrayType(type = IrisPreProcessors.class)
     private KList<IrisPreProcessors> globalPreProcessors = new KList<>();
diff --git a/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ComponentFlagFunction.java b/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ComponentFlagFunction.java
index 7a0c01755..fb8738ffe 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ComponentFlagFunction.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/annotations/functions/ComponentFlagFunction.java
@@ -6,7 +6,7 @@ import com.volmit.iris.engine.framework.ListFunction;
 import com.volmit.iris.engine.mantle.ComponentFlag;
 import com.volmit.iris.engine.mantle.MantleComponent;
 import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
index 6e1e56e54..ef6fb0cd7 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
@@ -35,6 +35,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.function.Consumer4;
 import com.volmit.iris.util.io.IO;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.MatterSlice;
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
index ae4fd1701..86c810331 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
@@ -23,9 +23,11 @@ import com.volmit.iris.util.data.Varint;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.function.Consumer4;
 import com.volmit.iris.util.io.CountingDataInputStream;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.matter.IrisMatter;
 import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.MatterSlice;
+import com.volmit.iris.util.parallel.AtomicBooleanArray;
 import lombok.Getter;
 
 import java.io.ByteArrayOutputStream;
@@ -33,7 +35,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicIntegerArray;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
 /**
@@ -45,7 +46,7 @@ public class MantleChunk {
     private final int x;
     @Getter
     private final int z;
-    private final AtomicIntegerArray flags;
+    private final AtomicBooleanArray flags;
     private final AtomicReferenceArray<Matter> sections;
     private final Semaphore ref = new Semaphore(Integer.MAX_VALUE, true);
     private final AtomicBoolean closed = new AtomicBoolean(false);
@@ -58,13 +59,9 @@ public class MantleChunk {
     @ChunkCoordinates
     public MantleChunk(int sectionHeight, int x, int z) {
         sections = new AtomicReferenceArray<>(sectionHeight);
-        flags = new AtomicIntegerArray(MantleFlag.values().length);
+        flags = new AtomicBooleanArray(MantleFlag.MAX_ORDINAL + 1);
         this.x = x;
         this.z = z;
-
-        for (int i = 0; i < flags.length(); i++) {
-            flags.set(i, 0);
-        }
     }
 
     /**
@@ -78,10 +75,20 @@ public class MantleChunk {
     public MantleChunk(int version, int sectionHeight, CountingDataInputStream din) throws IOException {
         this(sectionHeight, din.readByte(), din.readByte());
         int s = din.readByte();
-        int l = version < 0 ? flags.length() : Varint.readUnsignedVarInt(din);
+        int l = version < 0 ? MantleFlag.RESERVED_FLAGS : Varint.readUnsignedVarInt(din);
 
-        for (int i = 0; i < flags.length() && i < l; i++) {
-            flags.set(i, din.readBoolean() ? 1 : 0);
+        if (version >= 1) {
+            int count = Math.ceilDiv(flags.length(), Byte.SIZE);
+            for (int i = 0; i < count;) {
+                byte f = din.readByte();
+                for (int j = 0; j < Byte.SIZE && i < flags.length(); j++, i++) {
+                    flags.set(i, (f & (1 << j)) != 0);
+                }
+            }
+        } else {
+            for (int i = 0; i < flags.length() && i < l; i++) {
+                flags.set(i, din.readBoolean());
+            }
         }
 
         for (int i = 0; i < s; i++) {
@@ -132,7 +139,7 @@ public class MantleChunk {
 
     public void flag(MantleFlag flag, boolean f) {
         if (closed.get()) throw new IllegalStateException("Chunk is closed!");
-        flags.set(flag.ordinal(), f ? 1 : 0);
+        flags.set(flag.ordinal(), f);
     }
 
     public void raiseFlag(MantleFlag flag, Runnable r) {
@@ -144,7 +151,7 @@ public class MantleChunk {
     }
 
     public boolean isFlagged(MantleFlag flag) {
-        return flags.get(flag.ordinal()) == 1;
+        return flags.get(flag.ordinal());
     }
 
     /**
@@ -218,8 +225,13 @@ public class MantleChunk {
         dos.writeByte(sections.length());
         Varint.writeUnsignedVarInt(flags.length(), dos);
 
-        for (int i = 0; i < flags.length(); i++) {
-            dos.writeBoolean(flags.get(i) == 1);
+        int count = Math.ceilDiv(flags.length(), Byte.SIZE);
+        for (int i = 0; i < count;) {
+            int f = 0;
+            for (int j = 0; j < Byte.SIZE && i < flags.length(); j++, i++) {
+                f |= flags.get(i) ? (1 << j) : 0;
+            }
+            dos.write(f);
         }
 
         var bytes = new ByteArrayOutputStream(8192);
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java b/core/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
deleted file mode 100644
index 81c4a8504..000000000
--- a/core/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.util.mantle;
-
-import com.volmit.iris.util.collection.StateList;
-
-public enum MantleFlag {
-    OBJECT,
-    UPDATE,
-    JIGSAW,
-    FEATURE,
-    INITIAL_SPAWNED,
-    REAL,
-    CARVED,
-    FLUID_BODIES,
-    INITIAL_SPAWNED_MARKER,
-    CLEANED,
-    PLANNED,
-    ETCHED,
-    TILE,
-    CUSTOM,
-    DISCOVERED,
-    CUSTOM_ACTIVE;
-
-    static StateList getStateList() {
-        return new StateList(MantleFlag.values());
-    }
-}
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java b/core/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java
index 101019023..9e343402b 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java
@@ -48,7 +48,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 public class TectonicPlate {
     private static final ThreadLocal<Boolean> errors = ThreadLocal.withInitial(() -> false);
     public static final int MISSING = -1;
-    public static final int CURRENT = 0;
+    public static final int CURRENT = 1;
 
     private final int sectionHeight;
     private final AtomicReferenceArray<MantleChunk> chunks;
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/CustomFlag.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/CustomFlag.java
new file mode 100644
index 000000000..5b239e1a1
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/CustomFlag.java
@@ -0,0 +1,28 @@
+package com.volmit.iris.util.mantle.flag;
+
+import org.jetbrains.annotations.NotNull;
+
+record CustomFlag(String name, int ordinal) implements MantleFlag {
+
+    @Override
+    public @NotNull String toString() {
+        return name;
+    }
+
+    @Override
+    public boolean isCustom() {
+        return false;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (!(object instanceof CustomFlag that))
+            return false;
+        return ordinal == that.ordinal;
+    }
+
+    @Override
+    public int hashCode() {
+        return ordinal;
+    }
+}
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
new file mode 100644
index 000000000..4e5b86c25
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
@@ -0,0 +1,57 @@
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.util.mantle.flag;
+
+import org.jetbrains.annotations.Contract;
+
+public sealed interface MantleFlag permits CustomFlag, ReservedFlag {
+    int MIN_ORDINAL = 64;
+    int MAX_ORDINAL = 255;
+
+    MantleFlag OBJECT = ReservedFlag.OBJECT;
+    MantleFlag UPDATE = ReservedFlag.UPDATE;
+    MantleFlag JIGSAW = ReservedFlag.JIGSAW;
+    MantleFlag FEATURE = ReservedFlag.FEATURE;
+    MantleFlag INITIAL_SPAWNED = ReservedFlag.INITIAL_SPAWNED;
+    MantleFlag REAL = ReservedFlag.REAL;
+    MantleFlag CARVED = ReservedFlag.CARVED;
+    MantleFlag FLUID_BODIES = ReservedFlag.FLUID_BODIES;
+    MantleFlag INITIAL_SPAWNED_MARKER = ReservedFlag.INITIAL_SPAWNED_MARKER;
+    MantleFlag CLEANED = ReservedFlag.CLEANED;
+    MantleFlag PLANNED = ReservedFlag.PLANNED;
+    MantleFlag ETCHED = ReservedFlag.ETCHED;
+    MantleFlag TILE = ReservedFlag.TILE;
+    MantleFlag CUSTOM = ReservedFlag.CUSTOM;
+    MantleFlag DISCOVERED = ReservedFlag.DISCOVERED;
+    MantleFlag CUSTOM_ACTIVE = ReservedFlag.CUSTOM_ACTIVE;
+
+    int RESERVED_FLAGS = ReservedFlag.values().length;
+
+    String name();
+    int ordinal();
+
+    boolean isCustom();
+
+    @Contract(value = "_ -> new", pure = true)
+    static MantleFlag of(int ordinal) {
+        if (ordinal < MIN_ORDINAL || ordinal > MAX_ORDINAL)
+            throw new IllegalArgumentException("Ordinal must be between " + MIN_ORDINAL + " and " + MAX_ORDINAL);
+        return new CustomFlag("custom:"+ordinal, ordinal);
+    }
+}
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
new file mode 100644
index 000000000..12f889211
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
@@ -0,0 +1,31 @@
+package com.volmit.iris.util.mantle.flag;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+
+public class MantleFlagAdapter extends TypeAdapter<MantleFlag> {
+    private static final String CUSTOM = "custom:";
+    private static final int CUSTOM_LENGTH = CUSTOM.length();
+
+    @Override
+    public void write(JsonWriter out, MantleFlag value) throws IOException {
+        if (value == null) out.nullValue();
+        else out.value(value.toString());
+    }
+
+    @Override
+    public MantleFlag read(JsonReader in) throws IOException {
+        if (in.peek() == JsonToken.NULL) {
+            in.nextNull();
+            return null;
+        }
+        String s = in.nextString();
+        if (s.startsWith(CUSTOM) && s.length() > CUSTOM_LENGTH)
+            return MantleFlag.of(Integer.parseInt(s.substring(CUSTOM_LENGTH)));
+        return ReservedFlag.valueOf(s);
+    }
+}
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/ReservedFlag.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/ReservedFlag.java
new file mode 100644
index 000000000..c6ea07b64
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/ReservedFlag.java
@@ -0,0 +1,25 @@
+package com.volmit.iris.util.mantle.flag;
+
+public enum ReservedFlag implements MantleFlag {
+    OBJECT,
+    UPDATE,
+    JIGSAW,
+    FEATURE,
+    INITIAL_SPAWNED,
+    REAL,
+    CARVED,
+    FLUID_BODIES,
+    INITIAL_SPAWNED_MARKER,
+    CLEANED,
+    PLANNED,
+    ETCHED,
+    TILE,
+    CUSTOM,
+    DISCOVERED,
+    CUSTOM_ACTIVE;
+
+    @Override
+    public boolean isCustom() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java b/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java
new file mode 100644
index 000000000..e85bd40fb
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java
@@ -0,0 +1,50 @@
+package com.volmit.iris.util.parallel;
+
+import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
+public class AtomicBooleanArray implements Serializable {
+    private static final VarHandle AA = MethodHandles.arrayElementVarHandle(boolean[].class);
+    private final boolean[] array;
+
+    public AtomicBooleanArray(int length) {
+        array = new boolean[length];
+    }
+
+    public final int length() {
+        return array.length;
+    }
+
+    public final boolean get(int index) {
+        return (boolean) AA.getVolatile(array, index);
+    }
+
+    public final void set(int index, boolean newValue) {
+        AA.setVolatile(array, index, newValue);
+    }
+
+    public final boolean compareAndSet(int index, boolean expectedValue, boolean newValue) {
+        return (boolean) AA.compareAndSet(array, index, expectedValue, newValue);
+    }
+
+    public final boolean weakCompareAndSet(int index, boolean expectedValue, boolean newValue) {
+        return (boolean) AA.weakCompareAndSetPlain(array, index, expectedValue, newValue);
+    }
+
+    @Override
+    public String toString() {
+        int iMax = array.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(get(i));
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(',').append(' ');
+        }
+    }
+}
diff --git a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/IrisChunkGenerator.java b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/IrisChunkGenerator.java
index bebaf4f36..ab6208ae2 100644
--- a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/IrisChunkGenerator.java
+++ b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.BlockPos;
diff --git a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/IrisChunkGenerator.java b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/IrisChunkGenerator.java
index e2dae5081..abe671586 100644
--- a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/IrisChunkGenerator.java
+++ b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.BlockPos;
diff --git a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/IrisChunkGenerator.java b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/IrisChunkGenerator.java
index 957901b41..5587599e8 100644
--- a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/IrisChunkGenerator.java
+++ b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/IrisChunkGenerator.java
@@ -11,10 +11,9 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
-import com.volmit.iris.util.scheduling.S;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
@@ -28,7 +27,6 @@ import net.minecraft.tags.StructureTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.util.random.WeightedRandomList;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.item.EnderEyeItem;
 import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.NoiseColumn;
 import net.minecraft.world.level.StructureManager;
diff --git a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/IrisChunkGenerator.java b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/IrisChunkGenerator.java
index 728638cc3..f8af4ad86 100644
--- a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/IrisChunkGenerator.java
+++ b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.BlockPos;
diff --git a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/IrisChunkGenerator.java b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/IrisChunkGenerator.java
index 046c6a283..b9d4dc4d5 100644
--- a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/IrisChunkGenerator.java
+++ b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.BlockPos;
diff --git a/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/IrisChunkGenerator.java b/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/IrisChunkGenerator.java
index a2d273393..4b6abd4c1 100644
--- a/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/IrisChunkGenerator.java
+++ b/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.BlockPos;
diff --git a/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/IrisChunkGenerator.java b/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/IrisChunkGenerator.java
index ef96101ac..a26bb67cc 100644
--- a/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/IrisChunkGenerator.java
+++ b/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.*;
@@ -24,7 +24,6 @@ import net.minecraft.tags.StructureTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.util.random.WeightedRandomList;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.item.EnderEyeItem;
 import net.minecraft.world.level.*;
 import net.minecraft.world.level.biome.*;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -33,7 +32,6 @@ import net.minecraft.world.level.chunk.ChunkGeneratorStructureState;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.RandomState;
 import net.minecraft.world.level.levelgen.blending.Blender;
-import net.minecraft.world.level.levelgen.structure.BuiltinStructures;
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.levelgen.structure.StructureSet;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
diff --git a/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/IrisChunkGenerator.java b/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/IrisChunkGenerator.java
index 28513cd77..11621ad98 100644
--- a/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/IrisChunkGenerator.java
+++ b/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.*;
diff --git a/nms/v1_21_R5/src/main/java/com/volmit/iris/core/nms/v1_21_R5/IrisChunkGenerator.java b/nms/v1_21_R5/src/main/java/com/volmit/iris/core/nms/v1_21_R5/IrisChunkGenerator.java
index c156c09df..740511f77 100644
--- a/nms/v1_21_R5/src/main/java/com/volmit/iris/core/nms/v1_21_R5/IrisChunkGenerator.java
+++ b/nms/v1_21_R5/src/main/java/com/volmit/iris/core/nms/v1_21_R5/IrisChunkGenerator.java
@@ -11,7 +11,7 @@ import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.mantle.MantleFlag;
+import com.volmit.iris.util.mantle.flag.MantleFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.reflect.WrappedField;
 import net.minecraft.core.*;

From 6964b99744535e995cd4990fffddb75ee3bb9f90 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Thu, 10 Jul 2025 16:41:46 +0200
Subject: [PATCH 16/31] fix reading custom mantle flags from json

---
 .../java/com/volmit/iris/engine/object/IrisDimension.java    | 5 ++---
 .../java/com/volmit/iris/util/mantle/flag/MantleFlag.java    | 2 +-
 .../com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index 0688f3ea9..704d0b014 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -36,7 +36,6 @@ import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.mantle.flag.MantleFlag;
-import com.volmit.iris.util.mantle.flag.ReservedFlag;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
@@ -244,9 +243,9 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("The Subterrain Fluid Layer Height")
     private int caveLavaHeight = 8;
     @RegistryListFunction(ComponentFlagFunction.class)
-    @ArrayType(type = ReservedFlag.class)
+    @ArrayType(type = String.class)
     @Desc("Collection of disabled components")
-    private KList<ReservedFlag> disabledComponents = new KList<>();
+    private KList<MantleFlag> disabledComponents = new KList<>();
     @Desc("A list of globally applied pre-processors")
     @ArrayType(type = IrisPreProcessors.class)
     private KList<IrisPreProcessors> globalPreProcessors = new KList<>();
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
index 4e5b86c25..965bf6780 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
@@ -52,6 +52,6 @@ public sealed interface MantleFlag permits CustomFlag, ReservedFlag {
     static MantleFlag of(int ordinal) {
         if (ordinal < MIN_ORDINAL || ordinal > MAX_ORDINAL)
             throw new IllegalArgumentException("Ordinal must be between " + MIN_ORDINAL + " and " + MAX_ORDINAL);
-        return new CustomFlag("custom:"+ordinal, ordinal);
+        return new CustomFlag("CUSTOM:"+ordinal, ordinal);
     }
 }
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
index 12f889211..c56916df8 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
@@ -8,7 +8,7 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 
 public class MantleFlagAdapter extends TypeAdapter<MantleFlag> {
-    private static final String CUSTOM = "custom:";
+    private static final String CUSTOM = "CUSTOM:";
     private static final int CUSTOM_LENGTH = CUSTOM.length();
 
     @Override

From 8f5f44bc96e4c3b4fe39aa61fba146c416ca9ff4 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Thu, 10 Jul 2025 18:24:50 +0200
Subject: [PATCH 17/31] open vscode after studio world was created

---
 .../volmit/iris/core/project/IrisProject.java | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
index 2ba5e1ee4..e708e07ed 100644
--- a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -220,24 +220,15 @@ public class IrisProject {
             close();
         }
 
-        boolean hasError = false;
-
-        if (hasError) {
-            return;
-        }
-
-        IrisDimension d = IrisData.loadAnyDimension(getName());
-        if (d == null) {
-            sender.sendMessage("Can't find dimension: " + getName());
-            return;
-        } else if (sender.isPlayer()) {
-            sender.player().setGameMode(GameMode.SPECTATOR);
-        }
-
-        openVSCode(sender);
-
-
         J.a(() -> {
+            IrisDimension d = IrisData.loadAnyDimension(getName());
+            if (d == null) {
+                sender.sendMessage("Can't find dimension: " + getName());
+                return;
+            } else if (sender.isPlayer()) {
+                sender.player().setGameMode(GameMode.SPECTATOR);
+            }
+
             try {
                 activeProvider = (PlatformChunkGenerator) IrisToolbelt.createWorld()
                         .seed(seed)
@@ -250,6 +241,8 @@ public class IrisProject {
             } catch (IrisException e) {
                 e.printStackTrace();
             }
+
+            openVSCode(sender);
         });
     }
 

From 3d2392843a19cc9bf827912fa293cc6dc17cad01 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Sat, 12 Jul 2025 14:18:35 +0200
Subject: [PATCH 18/31] update maven core to fix dependency resolution issues

---
 core/build.gradle.kts                                      | 6 +++++-
 .../java/com/volmit/iris/core/link/MythicMobsLink.java     | 2 +-
 .../iris/core/pregenerator/cache/PregenCacheImpl.java      | 2 --
 .../com/volmit/iris/engine/framework/PlacedObject.java     | 3 +--
 .../volmit/iris/core/scripting/kotlin/base/SimpleScript.kt | 3 ---
 .../kotlin/environment/IrisSimpleExecutionEnvironment.kt   | 7 ++-----
 gradle/libs.versions.toml                                  | 6 ++++--
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index da7b101bd..ebe1d866d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -100,7 +100,11 @@ dependencies {
     slim(libs.kotlin.scripting.common)
     slim(libs.kotlin.scripting.jvm)
     slim(libs.kotlin.scripting.jvm.host)
-    slim(libs.kotlin.scripting.dependencies.maven)
+    slim(libs.kotlin.scripting.dependencies.maven) {
+        constraints {
+            slim(libs.mavenCore)
+        }
+    }
 }
 
 java {
diff --git a/core/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java b/core/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java
index 052952346..e8a55209a 100644
--- a/core/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java
+++ b/core/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java
@@ -36,8 +36,8 @@ import org.bukkit.entity.Entity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.*;
 
 public class MythicMobsLink {
diff --git a/core/src/main/java/com/volmit/iris/core/pregenerator/cache/PregenCacheImpl.java b/core/src/main/java/com/volmit/iris/core/pregenerator/cache/PregenCacheImpl.java
index b9a3de943..f1e065fa2 100644
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/cache/PregenCacheImpl.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/cache/PregenCacheImpl.java
@@ -14,12 +14,10 @@ import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;
 import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.concurrent.NotThreadSafe;
 import java.io.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-@NotThreadSafe
 @RequiredArgsConstructor
 class PregenCacheImpl implements PregenCache {
     private static final int SIZE = 32;
diff --git a/core/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java b/core/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java
index e96155572..31cdf1b59 100644
--- a/core/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java
@@ -22,8 +22,7 @@ import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.engine.object.IrisObjectPlacement;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Data
 @AllArgsConstructor
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
index 5adbbaf8c..da2f1ef53 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
@@ -1,7 +1,6 @@
 package com.volmit.iris.core.scripting.kotlin.base
 
 import com.volmit.iris.core.scripting.kotlin.runner.configureMavenDepsOnAnnotations
-import com.volmit.iris.util.misc.SlimJar
 import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.ScriptCompilationConfiguration
 import kotlin.script.experimental.api.defaultImports
@@ -16,8 +15,6 @@ import kotlin.script.experimental.jvm.jvm
 abstract class SimpleScript
 
 object SimpleScriptDefinition : ScriptCompilationConfiguration({
-    SlimJar.load(null)
-
     isStandalone(false)
     defaultImports(
         "kotlin.script.experimental.dependencies.DependsOn",
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
index 014d440f4..5d9ff96ae 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
@@ -76,11 +76,9 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
 
     override fun configureProject(projectDir: File) {
         projectDir.mkdirs()
-        val libs = javaClass.classLoader.parent.classpath
+        val libs = javaClass.classLoader.classpath
             .sortedBy { it.absolutePath }
             .toMutableList()
-        libs.add(codeSource)
-        libs.removeIf { libs.count { f -> f.name == it.name } > 1 }
 
         File(projectDir, "build.gradle.kts")
             .updateClasspath(libs)
@@ -88,7 +86,6 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
 
     companion object {
         private const val CLASSPATH = "val classpath = files("
-        private val codeSource = File(IrisSimpleExecutionEnvironment::class.java.protectionDomain.codeSource.location.toURI())
 
         private fun File.updateClasspath(classpath: List<File>) {
             val test = if (exists()) readLines() else BASE_GRADLE
@@ -129,7 +126,7 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
             configurations.kotlinCompilerPluginClasspath { extendsFrom(script) }
 
             dependencies {
-                add("script", classpath)
+                script(classpath)
             }""".trimIndent().split("\n")
     }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 36226306e..fc05f9be2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,6 +40,7 @@ jaxen = "2.0.0" # https://central.sonatype.com/artifact/jaxen/jaxen
 # Script Engine
 kotlin = "2.2.0"
 kotlin-coroutines = "1.10.2"
+maven-core = "3.9.10"
 
 # Third Party Integrations
 nexo = "1.8.0" # https://repo.nexomc.com/#/releases/com/nexomc/nexo
@@ -91,8 +92,9 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.re
 kotlin-scripting-common = { module = "org.jetbrains.kotlin:kotlin-scripting-common", version.ref = "kotlin" }
 kotlin-scripting-jvm = { module = "org.jetbrains.kotlin:kotlin-scripting-jvm", version.ref = "kotlin" }
 kotlin-scripting-jvm-host = { module = "org.jetbrains.kotlin:kotlin-scripting-jvm-host", version.ref = "kotlin" }
-kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines"}
-kotlin-scripting-dependencies-maven = { module = "org.jetbrains.kotlin:kotlin-scripting-dependencies-maven", version.ref = "kotlin"}
+kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
+kotlin-scripting-dependencies-maven = { module = "org.jetbrains.kotlin:kotlin-scripting-dependencies-maven", version.ref = "kotlin" }
+mavenCore = { module = "org.apache.maven:maven-core", version.ref = "maven-core" }
 
 # Third Party Integrations
 nexo = { module = "com.nexomc:nexo", version.ref = "nexo" }

From 8ddc8abdb9ac19b7c53de7aff3d8b5477b7cc5dc Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 30 Jul 2025 16:54:19 +0200
Subject: [PATCH 19/31] fix resolving dependencies in scripts

---
 core/build.gradle.kts                                |  2 ++
 .../com/volmit/iris/core/commands/CommandStudio.java |  5 +----
 .../com/volmit/iris/util/mantle/MantleChunk.java     |  8 ++++++++
 .../iris/core/scripting/kotlin/base/SimpleScript.kt  |  1 +
 .../environment/IrisPackExecutionEnvironment.kt      |  4 ++--
 .../environment/IrisSimpleExecutionEnvironment.kt    | 12 +++++++-----
 .../iris/core/scripting/kotlin/runner/Utils.kt       |  5 +++++
 gradle/libs.versions.toml                            |  2 +-
 8 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index bb6a059df..b9d95c58f 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -136,6 +136,8 @@ slimJar {
     relocate("org.apache.maven", "$lib.maven")
     relocate("org.codehaus.plexus", "$lib.plexus")
     relocate("org.eclipse.sisu", "$lib.sisu")
+    relocate("org.eclipse.aether", "$lib.aether")
+    relocate("com.google.inject", "$lib.guice")
 }
 
 tasks {
diff --git a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
index d6261ee23..7c0bba906 100644
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
@@ -47,7 +47,6 @@ import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONArray;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.mantle.MantleChunk;
-import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
@@ -218,9 +217,7 @@ public class CommandStudio implements DecreeExecutor {
                 int sections = mantle.getWorldHeight() >> 4;
                 chunkMap.forEach((pos, chunk) -> {
                     var c = mantle.getChunk(pos.getX(), pos.getZ());
-                    for (MantleFlag flag : MantleFlag.values()) {
-                        c.flag(flag, chunk.isFlagged(flag));
-                    }
+                    c.copyFlags(chunk);
                     c.clear();
                     for (int y = 0; y < sections; y++) {
                         var slice = chunk.get(y);
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
index 7d1dfc062..ff69c9d9f 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
@@ -144,6 +144,14 @@ public class MantleChunk {
         ref.release();
     }
 
+    public void copyFlags(MantleChunk chunk) {
+        use();
+        for (int i = 0; i < flags.length(); i++) {
+            flags.set(i, chunk.flags.get(i));
+        }
+        release();
+    }
+
     public void flag(MantleFlag flag, boolean f) {
         if (closed.get()) throw new IllegalStateException("Chunk is closed!");
         flags.set(flag.ordinal(), f);
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
index da2f1ef53..4e5203763 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
@@ -26,6 +26,7 @@ object SimpleScriptDefinition : ScriptCompilationConfiguration({
     )
 
     jvm {
+        dependenciesFromClassContext(KotlinScript::class, wholeClasspath = true)
         dependenciesFromClassContext(SimpleScript::class, wholeClasspath = true)
     }
 
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
index c901ffc97..7eeb7ed23 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
@@ -5,9 +5,9 @@ import com.volmit.iris.core.scripting.ExecutionEnvironment
 import com.volmit.iris.core.scripting.kotlin.base.DataScript
 import com.volmit.iris.core.scripting.kotlin.base.NoiseScript
 import com.volmit.iris.core.scripting.kotlin.runner.Script
+import com.volmit.iris.core.scripting.kotlin.runner.valueOrThrow
 import com.volmit.iris.util.math.RNG
 import kotlin.reflect.KClass
-import kotlin.script.experimental.api.valueOrThrow
 
 open class IrisPackExecutionEnvironment(
     private val data: IrisData
@@ -19,7 +19,7 @@ open class IrisPackExecutionEnvironment(
         val loaded = data.scriptLoader.load(script)
         return compileCache.get(script)
             .computeIfAbsent(type) { _ -> runner.compileText(type, loaded.source, script) }
-            .valueOrThrow()
+            .valueOrThrow("Failed to compile script $script")
     }
 
     override fun execute(script: String) =
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
index 5d9ff96ae..1641bdbe6 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
@@ -8,13 +8,14 @@ import com.volmit.iris.core.scripting.kotlin.runner.Script
 import com.volmit.iris.core.scripting.kotlin.runner.ScriptRunner
 import com.volmit.iris.core.scripting.kotlin.runner.classpath
 import com.volmit.iris.core.scripting.kotlin.runner.valueOrNull
+import com.volmit.iris.core.scripting.kotlin.runner.valueOrThrow
 import com.volmit.iris.util.collection.KMap
 import com.volmit.iris.util.data.KCache
 import com.volmit.iris.util.format.C
 import java.io.File
 import kotlin.reflect.KClass
+import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.ResultWithDiagnostics
-import kotlin.script.experimental.api.valueOrThrow
 import kotlin.text.split
 
 open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
@@ -55,7 +56,7 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
     protected open fun compile(script: String, type: KClass<*>) =
         compileCache.get(script)
             .computeIfAbsent(type) { _ -> runner.compileText(type, script) }
-            .valueOrThrow()
+            .valueOrThrow("Failed to compile script")
 
     private fun evaluate0(name: String, type: KClass<*>, properties: Map<String, Any?>? = null): Any? {
         val current = Thread.currentThread()
@@ -64,7 +65,7 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
         try {
             return compile(name, type)
                 .evaluate(properties)
-                .valueOrThrow()
+                .valueOrThrow("Failed to evaluate script")
                 .valueOrNull()
         } catch (e: Throwable) {
             e.printStackTrace()
@@ -76,7 +77,8 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
 
     override fun configureProject(projectDir: File) {
         projectDir.mkdirs()
-        val libs = javaClass.classLoader.classpath
+        val libs = listOf(javaClass.classLoader.classpath, KotlinScript::class.java.classLoader.classpath)
+            .flatMap { it }
             .sortedBy { it.absolutePath }
             .toMutableList()
 
@@ -111,7 +113,7 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
             val classpath = files()
             
             plugins {
-                kotlin("jvm") version("2.1.20")
+                kotlin("jvm") version("2.2.0")
             }
 
             repositories {
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
index 4449c4f13..d3fae9699 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
@@ -2,6 +2,7 @@ package com.volmit.iris.core.scripting.kotlin.runner
 
 import kotlinx.coroutines.runBlocking
 import java.io.File
+import java.lang.RuntimeException
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
 import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
@@ -51,4 +52,8 @@ private fun format(file: File, projectDir: String, home: String): String {
         path.startsWith(home) -> $$"$USER_HOME$/$${path.substring(home.length + 1)}"
         else -> path
     }
+}
+
+fun <R> ResultWithDiagnostics<R>.valueOrThrow(message: CharSequence): R = valueOr {
+    throw RuntimeException(it.reports.joinToString("\n", "$message\n") { r -> r.render(withStackTrace = true) })
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b2b3b82c5..4b12ffb07 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 [versions]
 # Plugins
 shadow = "9.0.0-rc1" # https://plugins.gradle.org/plugin/com.gradleup.shadow
-slimjar = "2.1.2" # https://plugins.gradle.org/plugin/de.crazydev22.slimjar
+slimjar = "2.1.4" # https://plugins.gradle.org/plugin/de.crazydev22.slimjar
 download = "5.6.0" # https://plugins.gradle.org/plugin/de.undercouch.download
 runPaper = "2.3.1" # https://plugins.gradle.org/plugin/xyz.jpenilla.run-paper
 sentryPlugin = "5.8.0" # https://github.com/getsentry/sentry-android-gradle-plugin

From 67f456cf531d97bd6bc1b46204df6aa8b1a47dfe Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Thu, 31 Jul 2025 00:16:23 +0200
Subject: [PATCH 20/31] cleanup script engine

---
 core/src/main/java/com/volmit/iris/Iris.java  |  2 -
 .../com/volmit/iris/core/loader/IrisData.java |  6 +-
 .../volmit/iris/core/project/IrisProject.java |  4 +-
 .../core/scripting/ExecutionEnvironment.java  | 73 -------------------
 .../environment/EngineEnvironment.java        | 25 +++++++
 .../environment/PackEnvironment.java          | 19 +++++
 .../environment/SimpleEnvironment.java        | 30 ++++++++
 .../com/volmit/iris/engine/IrisEngine.java    |  6 +-
 .../volmit/iris/engine/framework/Engine.java  |  4 +-
 .../scripting/kotlin/base/SimpleScript.kt     |  4 +-
 .../environment/IrisExecutionEnvironment.kt   |  6 +-
 .../IrisPackExecutionEnvironment.kt           |  6 +-
 .../IrisSimpleExecutionEnvironment.kt         | 12 +--
 .../kotlin/runner/FileDependenciesResolver.kt | 65 +++++++++++++++++
 .../scripting/kotlin/runner/ScriptRunner.kt   | 25 +++++--
 .../core/scripting/kotlin/runner/Utils.kt     | 26 ++-----
 16 files changed, 191 insertions(+), 122 deletions(-)
 delete mode 100644 core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
 create mode 100644 core/src/main/java/com/volmit/iris/core/scripting/environment/EngineEnvironment.java
 create mode 100644 core/src/main/java/com/volmit/iris/core/scripting/environment/PackEnvironment.java
 create mode 100644 core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt

diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index c137a7f63..178c2e35f 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -30,7 +30,6 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import com.volmit.iris.core.pregenerator.LazyPregenerator;
-import com.volmit.iris.core.scripting.ExecutionEnvironment;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.EnginePanic;
@@ -447,7 +446,6 @@ public class Iris extends VolmitPlugin implements Listener {
         IO.delete(new File("iris"));
         compat = IrisCompat.configured(getDataFile("compat.json"));
         ServerConfigurator.configure();
-        ExecutionEnvironment.createSimple();
         IrisSafeguard.IrisSafeguardSystem();
         getSender().setTag(getTag());
         IrisSafeguard.splash(true);
diff --git a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
index bd17e6ceb..e06fa1f16 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -24,7 +24,7 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.scripting.ExecutionEnvironment;
+import com.volmit.iris.core.scripting.environment.PackEnvironment;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.*;
@@ -57,7 +57,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
     private static final KMap<File, IrisData> dataLoaders = new KMap<>();
     private final File dataFolder;
     private final int id;
-    private final ExecutionEnvironment.Pack environment;
+    private final PackEnvironment environment;
     private boolean closed = false;
     private ResourceLoader<IrisBiome> biomeLoader;
     private ResourceLoader<IrisLootTable> lootLoader;
@@ -91,7 +91,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
         this.engine = null;
         this.dataFolder = dataFolder;
         this.id = RNG.r.imax();
-        this.environment = ExecutionEnvironment.createPack(this);
+        this.environment = PackEnvironment.create(this);
         hotloaded();
     }
 
diff --git a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
index e708e07ed..b5009d840 100644
--- a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -24,7 +24,7 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.loader.ResourceLoader;
-import com.volmit.iris.core.scripting.ExecutionEnvironment;
+import com.volmit.iris.core.scripting.environment.SimpleEnvironment;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.*;
 import com.volmit.iris.engine.object.annotations.Snippet;
@@ -355,7 +355,7 @@ public class IrisProject {
         settings.put("json.schemas", schemas);
         ws.put("settings", settings);
 
-        ExecutionEnvironment.createSimple().configureProject(path);
+        SimpleEnvironment.create().configureProject(path);
         File schemasFile = new File(path, ".idea" + File.separator + "jsonSchemas.xml");
         Document doc = IO.read(schemasFile);
         Element mappings = (Element) doc.selectSingleNode("//component[@name='JsonSchemaMappingsProjectConfiguration']");
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
deleted file mode 100644
index 67939a2e6..000000000
--- a/core/src/main/java/com/volmit/iris/core/scripting/ExecutionEnvironment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.volmit.iris.core.scripting;
-
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.core.scripting.kotlin.environment.IrisExecutionEnvironment;
-import com.volmit.iris.core.scripting.kotlin.environment.IrisPackExecutionEnvironment;
-import com.volmit.iris.core.scripting.kotlin.environment.IrisSimpleExecutionEnvironment;
-import com.volmit.iris.util.math.RNG;
-import lombok.NonNull;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.util.*;
-
-@UtilityClass
-public class ExecutionEnvironment {
-
-    @NonNull
-    public static Engine createEngine(@NonNull com.volmit.iris.engine.framework.Engine engine) {
-        return new IrisExecutionEnvironment(engine);
-    }
-
-    @NonNull
-    public static Pack createPack(@NonNull IrisData data) {
-        return new IrisPackExecutionEnvironment(data);
-    }
-
-    @NonNull
-    public static Simple createSimple() {
-        return new IrisSimpleExecutionEnvironment();
-    }
-
-    public interface Simple {
-        void configureProject(@NonNull File projectDir);
-
-        void execute(@NonNull String script);
-
-        void execute(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
-
-        @Nullable
-        Object evaluate(@NonNull String script);
-
-        @Nullable
-        Object evaluate(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
-
-        default void close() {
-
-        }
-    }
-
-    public interface Pack extends Simple {
-        @NonNull
-        IrisData getData();
-
-        @Nullable
-        Object createNoise(@NonNull String script, @NonNull RNG rng);
-    }
-
-    public interface Engine extends Pack {
-        @NonNull
-        com.volmit.iris.engine.framework.Engine getEngine();
-
-        @Nullable
-        Object spawnMob(@NonNull String script, @NonNull Location location);
-
-        void postSpawnMob(@NonNull String script, @NonNull Location location, @NonNull Entity mob);
-
-        void preprocessObject(@NonNull String script, @NonNull IrisRegistrant object);
-    }
-}
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/environment/EngineEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/environment/EngineEnvironment.java
new file mode 100644
index 000000000..64507eeb8
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/core/scripting/environment/EngineEnvironment.java
@@ -0,0 +1,25 @@
+package com.volmit.iris.core.scripting.environment;
+
+import com.volmit.iris.core.loader.IrisRegistrant;
+import com.volmit.iris.core.scripting.kotlin.environment.IrisExecutionEnvironment;
+import com.volmit.iris.engine.framework.Engine;
+import lombok.NonNull;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.Nullable;
+
+public interface EngineEnvironment extends PackEnvironment {
+    static EngineEnvironment create(@NonNull Engine engine) {
+        return new IrisExecutionEnvironment(engine);
+    }
+
+    @NonNull
+    Engine getEngine();
+
+    @Nullable
+    Object spawnMob(@NonNull String script, @NonNull Location location);
+
+    void postSpawnMob(@NonNull String script, @NonNull Location location, @NonNull Entity mob);
+
+    void preprocessObject(@NonNull String script, @NonNull IrisRegistrant object);
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/environment/PackEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/environment/PackEnvironment.java
new file mode 100644
index 000000000..c5dbccf22
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/core/scripting/environment/PackEnvironment.java
@@ -0,0 +1,19 @@
+package com.volmit.iris.core.scripting.environment;
+
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.scripting.kotlin.environment.IrisPackExecutionEnvironment;
+import com.volmit.iris.util.math.RNG;
+import lombok.NonNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface PackEnvironment extends SimpleEnvironment {
+    static PackEnvironment create(@NonNull IrisData data) {
+        return new IrisPackExecutionEnvironment(data);
+    }
+
+    @NonNull
+    IrisData getData();
+
+    @Nullable
+    Object createNoise(@NonNull String script, @NonNull RNG rng);
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java
new file mode 100644
index 000000000..2c07c0d81
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java
@@ -0,0 +1,30 @@
+package com.volmit.iris.core.scripting.environment;
+
+import com.volmit.iris.core.scripting.kotlin.environment.IrisSimpleExecutionEnvironment;
+import lombok.NonNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.Map;
+
+public interface SimpleEnvironment {
+    static SimpleEnvironment create() {
+        return new IrisSimpleExecutionEnvironment();
+    }
+
+    void configureProject(@NonNull File projectDir);
+
+    void execute(@NonNull String script);
+
+    void execute(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
+
+    @Nullable
+    Object evaluate(@NonNull String script);
+
+    @Nullable
+    Object evaluate(@NonNull String script, @NonNull Class<?> type, @Nullable Map<@NonNull String, Object> vars);
+
+    default void close() {
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 08e5e1fd4..1b9cec579 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -28,7 +28,7 @@ import com.volmit.iris.core.loader.ResourceLoader;
 import com.volmit.iris.core.nms.container.BlockPos;
 import com.volmit.iris.core.nms.container.Pair;
 import com.volmit.iris.core.project.IrisProject;
-import com.volmit.iris.core.scripting.ExecutionEnvironment;
+import com.volmit.iris.core.scripting.environment.EngineEnvironment;
 import com.volmit.iris.core.service.PreservationSVC;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.*;
@@ -94,7 +94,7 @@ public class IrisEngine implements Engine {
     private CompletableFuture<Long> hash32;
     private EngineMode mode;
     private EngineEffects effects;
-    private ExecutionEnvironment.Engine execution;
+    private EngineEnvironment execution;
     private EngineWorldManager worldManager;
     private volatile int parallelism;
     private boolean failing;
@@ -170,7 +170,7 @@ public class IrisEngine implements Engine {
             cacheId = RNG.r.nextInt();
             worldManager = new IrisWorldManager(this);
             complex = new IrisComplex(this);
-            execution = ExecutionEnvironment.createEngine(this);
+            execution = EngineEnvironment.create(this);
             effects = new IrisEngineEffects(this);
             hash32 = new CompletableFuture<>();
             setupMode();
diff --git a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
index 43aff4987..1df252cfa 100644
--- a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
@@ -29,7 +29,7 @@ import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.nms.container.BlockPos;
 import com.volmit.iris.core.nms.container.Pair;
 import com.volmit.iris.core.pregenerator.ChunkUpdater;
-import com.volmit.iris.core.scripting.ExecutionEnvironment;
+import com.volmit.iris.core.scripting.environment.EngineEnvironment;
 import com.volmit.iris.core.service.ExternalDataSVC;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
@@ -110,7 +110,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
 
     IrisContext getContext();
 
-    ExecutionEnvironment.Engine getExecution();
+    EngineEnvironment getExecution();
 
     double getMaxBiomeObjectDensity();
 
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
index 4e5203763..a2ddcb728 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
@@ -17,8 +17,8 @@ abstract class SimpleScript
 object SimpleScriptDefinition : ScriptCompilationConfiguration({
     isStandalone(false)
     defaultImports(
-        "kotlin.script.experimental.dependencies.DependsOn",
-        "kotlin.script.experimental.dependencies.Repository",
+        DependsOn::class.qualifiedName!!,
+        Repository::class.qualifiedName!!,
         "com.volmit.iris.Iris.info",
         "com.volmit.iris.Iris.debug",
         "com.volmit.iris.Iris.warn",
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
index df13c7ad4..edaba44e5 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
@@ -1,7 +1,7 @@
 package com.volmit.iris.core.scripting.kotlin.environment
 
 import com.volmit.iris.core.loader.IrisRegistrant
-import com.volmit.iris.core.scripting.ExecutionEnvironment
+import com.volmit.iris.core.scripting.environment.EngineEnvironment
 import com.volmit.iris.core.scripting.func.BiomeLookup
 import com.volmit.iris.core.scripting.kotlin.base.EngineScript
 import com.volmit.iris.core.scripting.kotlin.base.MobSpawningScript
@@ -13,7 +13,7 @@ import org.bukkit.entity.Entity
 
 data class IrisExecutionEnvironment(
     private val engine: Engine
-) : IrisPackExecutionEnvironment(engine.data), ExecutionEnvironment.Engine {
+) : IrisPackExecutionEnvironment(engine.data), EngineEnvironment {
     override fun getEngine() = engine
 
     override fun execute(script: String) =
@@ -26,7 +26,7 @@ data class IrisExecutionEnvironment(
         evaluate(script, MobSpawningScript::class.java, engine.parameters("location" to location))
 
     override fun postSpawnMob(script: String, location: Location, mob: Entity) =
-        execute(script, PostMobSpawningScript::class.java, engine.parameters("location" to location, "entity" to mob,))
+        execute(script, PostMobSpawningScript::class.java, engine.parameters("location" to location, "entity" to mob))
 
     override fun preprocessObject(script: String, `object`: IrisRegistrant) =
         execute(script, PreprocessorScript::class.java, engine.parameters("object" to `object`))
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
index 7eeb7ed23..86832c963 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisPackExecutionEnvironment.kt
@@ -1,7 +1,7 @@
 package com.volmit.iris.core.scripting.kotlin.environment
 
 import com.volmit.iris.core.loader.IrisData
-import com.volmit.iris.core.scripting.ExecutionEnvironment
+import com.volmit.iris.core.scripting.environment.PackEnvironment
 import com.volmit.iris.core.scripting.kotlin.base.DataScript
 import com.volmit.iris.core.scripting.kotlin.base.NoiseScript
 import com.volmit.iris.core.scripting.kotlin.runner.Script
@@ -11,14 +11,14 @@ import kotlin.reflect.KClass
 
 open class IrisPackExecutionEnvironment(
     private val data: IrisData
-) : IrisSimpleExecutionEnvironment(), ExecutionEnvironment.Pack {
+) : IrisSimpleExecutionEnvironment(data.dataFolder), PackEnvironment {
 
     override fun getData() = data
 
     override fun compile(script: String, type: KClass<*>): Script {
         val loaded = data.scriptLoader.load(script)
         return compileCache.get(script)
-            .computeIfAbsent(type) { _ -> runner.compileText(type, loaded.source, script) }
+            .computeIfAbsent(type) { _ -> runner.compile(type, loaded.loadFile, loaded.source) }
             .valueOrThrow("Failed to compile script $script")
     }
 
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
index 1641bdbe6..2bb96e768 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
@@ -2,7 +2,7 @@ package com.volmit.iris.core.scripting.kotlin.environment
 
 import com.volmit.iris.Iris
 import com.volmit.iris.core.IrisSettings
-import com.volmit.iris.core.scripting.ExecutionEnvironment
+import com.volmit.iris.core.scripting.environment.SimpleEnvironment
 import com.volmit.iris.core.scripting.kotlin.base.*
 import com.volmit.iris.core.scripting.kotlin.runner.Script
 import com.volmit.iris.core.scripting.kotlin.runner.ScriptRunner
@@ -18,9 +18,11 @@ import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.ResultWithDiagnostics
 import kotlin.text.split
 
-open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
+open class IrisSimpleExecutionEnvironment(
+    baseDir: File = File(".").absoluteFile
+) : SimpleEnvironment {
     protected val compileCache = KCache<String, KMap<KClass<*>, ResultWithDiagnostics<Script>>>({ _ -> KMap() }, IrisSettings.get().performance.cacheSize.toLong())
-    protected val runner = ScriptRunner()
+    protected val runner = ScriptRunner(baseDir)
 
     override fun execute(
         script: String
@@ -50,12 +52,12 @@ open class IrisSimpleExecutionEnvironment : ExecutionEnvironment.Simple {
 
     override fun close() {
         compileCache.invalidate()
-        runner.clearConfigurations()
+        runner.clear()
     }
 
     protected open fun compile(script: String, type: KClass<*>) =
         compileCache.get(script)
-            .computeIfAbsent(type) { _ -> runner.compileText(type, script) }
+            .computeIfAbsent(type) { _ -> runner.compile(type, script) }
             .valueOrThrow("Failed to compile script")
 
     private fun evaluate0(name: String, type: KClass<*>, properties: Map<String, Any?>? = null): Any? {
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
new file mode 100644
index 000000000..e49952fda
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
@@ -0,0 +1,65 @@
+package com.volmit.iris.core.scripting.kotlin.runner
+
+import java.io.File
+import java.util.Collections.synchronizedList
+import kotlin.script.experimental.api.ResultWithDiagnostics
+import kotlin.script.experimental.api.SourceCode
+import kotlin.script.experimental.api.asSuccess
+import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
+import kotlin.script.experimental.dependencies.RepositoryCoordinates
+import kotlin.script.experimental.dependencies.impl.makeResolveFailureResult
+import kotlin.script.experimental.dependencies.impl.toRepositoryUrlOrNull
+
+class FileDependenciesResolver(
+    private val baseDir: File,
+) : ExternalDependenciesResolver {
+    private val localRepos = synchronizedList(arrayListOf(baseDir))
+
+    private fun String.toRepositoryFileOrNull(): File? =
+        File(baseDir, this).takeIf { it.exists() && it.isDirectory }
+
+    private fun RepositoryCoordinates.toFilePath() =
+        (this.toRepositoryUrlOrNull()?.takeIf { it.protocol == "file" }?.path ?: string).toRepositoryFileOrNull()
+
+    override fun addRepository(
+        repositoryCoordinates: RepositoryCoordinates,
+        options: ExternalDependenciesResolver.Options,
+        sourceCodeLocation: SourceCode.LocationWithId?
+    ): ResultWithDiagnostics<Boolean> {
+        if (!acceptsRepository(repositoryCoordinates)) return false.asSuccess()
+
+        val repoDir = repositoryCoordinates.toFilePath()
+            ?: return makeResolveFailureResult("Invalid repository location: '${repositoryCoordinates}'", sourceCodeLocation)
+
+        localRepos.add(repoDir)
+
+        return true.asSuccess()
+    }
+
+    override suspend fun resolve(
+        artifactCoordinates: String,
+        options: ExternalDependenciesResolver.Options,
+        sourceCodeLocation: SourceCode.LocationWithId?
+    ): ResultWithDiagnostics<List<File>> {
+        if (!acceptsArtifact(artifactCoordinates)) throw IllegalArgumentException("Path is invalid")
+
+        val messages = mutableListOf<String>()
+
+        for (repo in localRepos) {
+            // TODO: add coordinates and wildcard matching
+            val file = File(repo, artifactCoordinates)
+            when {
+                !file.exists() -> messages.add("File '$file' not found")
+                !file.isFile && !file.isDirectory -> messages.add("Path '$file' is neither file nor directory")
+                else -> return ResultWithDiagnostics.Success(listOf(file))
+            }
+        }
+        return makeResolveFailureResult(messages.joinToString("; "), sourceCodeLocation)
+    }
+
+    override fun acceptsArtifact(artifactCoordinates: String) =
+        !artifactCoordinates.isBlank() // TODO: make check stronger, e.g. using NIO's Path
+
+    override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates): Boolean = repositoryCoordinates.toFilePath() != null
+
+}
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
index 22fbe7670..644c96bf1 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
@@ -1,11 +1,14 @@
 package com.volmit.iris.core.scripting.kotlin.runner
 
-import com.volmit.iris.core.scripting.kotlin.base.EngineScript
+import com.volmit.iris.core.scripting.kotlin.base.SimpleScript
+import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.reflect.KClass
+import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.dependencies.DependsOn
 import kotlin.script.experimental.dependencies.Repository
+import kotlin.script.experimental.host.FileScriptSource
 import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
 import kotlin.script.experimental.host.toScriptSource
 import kotlin.script.experimental.host.withDefaultsFrom
@@ -15,16 +18,22 @@ import kotlin.script.experimental.jvm.jvm
 import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
 
 class ScriptRunner(
-    private val host: BasicJvmScriptingHost
+    private val host: BasicJvmScriptingHost,
+    private val baseDir: File
 ) {
-    constructor() : this(BasicJvmScriptingHost())
+    constructor(baseDir: File) : this(BasicJvmScriptingHost(), baseDir)
 
     private val configs = ConcurrentHashMap<KClass<*>, ScriptCompilationConfiguration>()
     private val hostConfig = host.baseHostConfiguration.withDefaultsFrom(defaultJvmScriptingHostConfiguration)
+    private var resolver = createResolver(baseDir)
 
-    fun compileText(type: KClass<*>, raw: String, name: String? = null) = compile(type, raw.toScriptSource(name))
+    fun compile(type: KClass<*>, raw: String, name: String? = null) = compile(type, raw.toScriptSource(name))
+    fun compile(type: KClass<*>, file: File, preloaded: String? = null) = compile(type, FileScriptSource(file, preloaded))
 
-    fun clearConfigurations() = configs.clear()
+    fun clear() {
+        configs.clear()
+        resolver = createResolver(baseDir)
+    }
 
     private fun compile(
         type: KClass<*>,
@@ -39,11 +48,15 @@ class ScriptRunner(
         hostConfig,
         type
     ) {
-        if (EngineScript::class.java.isAssignableFrom(type.java))
+        dependencyResolver(resolver)
+        
+        if (SimpleScript::class.java.isAssignableFrom(type.java))
             return@createCompilationConfigurationFromTemplate
 
         jvm {
             dependenciesFromClassContext(type, wholeClasspath = true)
+            dependenciesFromClassContext(this::class, wholeClasspath = true)
+            dependenciesFromClassContext(KotlinScript::class, wholeClasspath = true)
         }
 
         refineConfiguration {
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
index d3fae9699..cd93e56d8 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
@@ -2,7 +2,6 @@ package com.volmit.iris.core.scripting.kotlin.runner
 
 import kotlinx.coroutines.runBlocking
 import java.io.File
-import java.lang.RuntimeException
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
 import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
@@ -10,6 +9,7 @@ import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
 import kotlin.script.experimental.dependencies.resolveFromScriptSourceAnnotations
 import kotlin.script.experimental.jvm.updateClasspath
 import kotlin.script.experimental.jvm.util.classpathFromClassloader
+import kotlin.script.experimental.util.PropertiesCollection
 
 internal fun <T, R> ResultWithDiagnostics<T>.map(transformer: (T) -> R): ResultWithDiagnostics<R> = when (this) {
     is ResultWithDiagnostics.Success -> ResultWithDiagnostics.Success(transformer(value), reports)
@@ -23,11 +23,14 @@ internal fun ResultValue.valueOrNull(): Any? =
         else -> null
     }
 
+internal fun createResolver(baseDir: File = File(".").normalize()) = CompoundDependenciesResolver(FileDependenciesResolver(baseDir), MavenDependenciesResolver())
 
-internal val resolver = CompoundDependenciesResolver(FileSystemDependenciesResolver(), MavenDependenciesResolver())
+private val resolver = createResolver()
 internal fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> {
     val annotations = context.collectedData?.get(ScriptCollectedData.collectedAnnotations)?.takeIf { it.isNotEmpty() }
         ?: return context.compilationConfiguration.asSuccess()
+
+    val resolver = context.compilationConfiguration[ScriptCompilationConfiguration.dependencyResolver] ?: resolver
     return runBlocking {
         resolver.resolveFromScriptSourceAnnotations(annotations)
     }.onSuccess {
@@ -37,23 +40,10 @@ internal fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinem
     }
 }
 
-internal fun Collection<File>.format(projectDir: File): Collection<String> {
-    val projectDir = projectDir.absolutePath
-    val home = File(System.getProperty("user.home")).absolutePath
-    return map { format(it, projectDir, home) }.toSet()
-}
-
 internal val ClassLoader.classpath get() = classpathFromClassloader(this) ?: emptyList()
 
-private fun format(file: File, projectDir: String, home: String): String {
-    val path = file.absolutePath
-    return when {
-        path.startsWith(projectDir) -> $$"$PROJECT_DIR$/$${path.substring(projectDir.length + 1)}"
-        path.startsWith(home) -> $$"$USER_HOME$/$${path.substring(home.length + 1)}"
-        else -> path
-    }
-}
-
 fun <R> ResultWithDiagnostics<R>.valueOrThrow(message: CharSequence): R = valueOr {
     throw RuntimeException(it.reports.joinToString("\n", "$message\n") { r -> r.render(withStackTrace = true) })
-}
\ No newline at end of file
+}
+
+val ScriptCompilationConfigurationKeys.dependencyResolver by PropertiesCollection.key(resolver)
\ No newline at end of file

From 96efc15c36d3066e7f512f63016b328989f9750e Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Thu, 31 Jul 2025 17:08:50 +0200
Subject: [PATCH 21/31] fix local dependencies not resolving properly

---
 .../kotlin/runner/FileDependenciesResolver.kt |  6 ++---
 .../scripting/kotlin/runner/ScriptRunner.kt   |  1 +
 .../core/scripting/kotlin/runner/Utils.kt     | 24 ++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
index e49952fda..82cfdba21 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
@@ -1,7 +1,7 @@
 package com.volmit.iris.core.scripting.kotlin.runner
 
 import java.io.File
-import java.util.Collections.synchronizedList
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.script.experimental.api.ResultWithDiagnostics
 import kotlin.script.experimental.api.SourceCode
 import kotlin.script.experimental.api.asSuccess
@@ -13,7 +13,7 @@ import kotlin.script.experimental.dependencies.impl.toRepositoryUrlOrNull
 class FileDependenciesResolver(
     private val baseDir: File,
 ) : ExternalDependenciesResolver {
-    private val localRepos = synchronizedList(arrayListOf(baseDir))
+    private val localRepos = ConcurrentHashMap.newKeySet<File>(1).also { it.add(baseDir) }
 
     private fun String.toRepositoryFileOrNull(): File? =
         File(baseDir, this).takeIf { it.exists() && it.isDirectory }
@@ -62,4 +62,4 @@ class FileDependenciesResolver(
 
     override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates): Boolean = repositoryCoordinates.toFilePath() != null
 
-}
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
index 644c96bf1..887d346b4 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
@@ -49,6 +49,7 @@ class ScriptRunner(
         type
     ) {
         dependencyResolver(resolver)
+        packDirectory(baseDir)
         
         if (SimpleScript::class.java.isAssignableFrom(type.java))
             return@createCompilationConfigurationFromTemplate
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
index cd93e56d8..dd329b6dd 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
@@ -4,7 +4,7 @@ import kotlinx.coroutines.runBlocking
 import java.io.File
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
-import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
+import kotlin.script.experimental.dependencies.addRepository
 import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
 import kotlin.script.experimental.dependencies.resolveFromScriptSourceAnnotations
 import kotlin.script.experimental.jvm.updateClasspath
@@ -23,7 +23,8 @@ internal fun ResultValue.valueOrNull(): Any? =
         else -> null
     }
 
-internal fun createResolver(baseDir: File = File(".").normalize()) = CompoundDependenciesResolver(FileDependenciesResolver(baseDir), MavenDependenciesResolver())
+private val workDir = File(".").normalize()
+internal fun createResolver(baseDir: File = workDir) = CompoundDependenciesResolver(FileDependenciesResolver(baseDir), MavenDependenciesResolver())
 
 private val resolver = createResolver()
 internal fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> {
@@ -31,7 +32,23 @@ internal fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinem
         ?: return context.compilationConfiguration.asSuccess()
 
     val resolver = context.compilationConfiguration[ScriptCompilationConfiguration.dependencyResolver] ?: resolver
+    val packDirectory = context.compilationConfiguration[ScriptCompilationConfiguration.packDirectory] ?: context.script.locationId?.let(::File)?.takeIf { it.exists() }?.run {
+        val parts = normalize().absolutePath.split(File.separatorChar)
+
+        var packDir: File? = null
+        for (i in parts.size - 1 downTo 1) {
+            if (parts[i] != "scripts") continue
+            val pack = File(parts.subList(0, i).joinToString(File.separator))
+            if (!File(pack, "dimensions${File.separator}${parts[i - 1]}.json").exists())
+                continue
+            packDir = pack
+            break
+        }
+        packDir
+    } ?: workDir
+
     return runBlocking {
+        resolver.addRepository(packDirectory.toURI().toURL().toString())
         resolver.resolveFromScriptSourceAnnotations(annotations)
     }.onSuccess {
         context.compilationConfiguration.with {
@@ -46,4 +63,5 @@ fun <R> ResultWithDiagnostics<R>.valueOrThrow(message: CharSequence): R = valueO
     throw RuntimeException(it.reports.joinToString("\n", "$message\n") { r -> r.render(withStackTrace = true) })
 }
 
-val ScriptCompilationConfigurationKeys.dependencyResolver by PropertiesCollection.key(resolver)
\ No newline at end of file
+val ScriptCompilationConfigurationKeys.dependencyResolver by PropertiesCollection.key(resolver)
+val ScriptCompilationConfigurationKeys.packDirectory by PropertiesCollection.key<File>()
\ No newline at end of file

From 05193bd0d91783f242a3db63e7d33c9f0bfbff7a Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Fri, 1 Aug 2025 04:51:58 +0200
Subject: [PATCH 22/31] make depencency resolvers more predictable

---
 .../core/scripting/kotlin/runner/Utils.kt     |  56 +++++---
 .../resolver/CompoundDependenciesResolver.kt  | 120 ++++++++++++++++++
 .../runner/resolver/DependenciesResolver.kt   |   8 ++
 .../FileDependenciesResolver.kt               |   8 +-
 .../LocalMavenDependenciesResolver.kt         |  85 +++++++++++++
 5 files changed, 254 insertions(+), 23 deletions(-)
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/DependenciesResolver.kt
 rename core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/{ => resolver}/FileDependenciesResolver.kt (94%)
 create mode 100644 core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt

diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
index dd329b6dd..926ecf2b9 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
@@ -1,11 +1,9 @@
 package com.volmit.iris.core.scripting.kotlin.runner
 
+import com.volmit.iris.core.scripting.kotlin.runner.resolver.CompoundDependenciesResolver
 import kotlinx.coroutines.runBlocking
 import java.io.File
 import kotlin.script.experimental.api.*
-import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
-import kotlin.script.experimental.dependencies.addRepository
-import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
 import kotlin.script.experimental.dependencies.resolveFromScriptSourceAnnotations
 import kotlin.script.experimental.jvm.updateClasspath
 import kotlin.script.experimental.jvm.util.classpathFromClassloader
@@ -24,37 +22,45 @@ internal fun ResultValue.valueOrNull(): Any? =
     }
 
 private val workDir = File(".").normalize()
-internal fun createResolver(baseDir: File = workDir) = CompoundDependenciesResolver(FileDependenciesResolver(baseDir), MavenDependenciesResolver())
+internal fun createResolver(baseDir: File = workDir) = CompoundDependenciesResolver(baseDir)
 
 private val resolver = createResolver()
 internal fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> {
     val annotations = context.collectedData?.get(ScriptCollectedData.collectedAnnotations)?.takeIf { it.isNotEmpty() }
         ?: return context.compilationConfiguration.asSuccess()
 
+    val reports = mutableListOf<ScriptDiagnostic>()
     val resolver = context.compilationConfiguration[ScriptCompilationConfiguration.dependencyResolver] ?: resolver
-    val packDirectory = context.compilationConfiguration[ScriptCompilationConfiguration.packDirectory] ?: context.script.locationId?.let(::File)?.takeIf { it.exists() }?.run {
-        val parts = normalize().absolutePath.split(File.separatorChar)
-
-        var packDir: File? = null
-        for (i in parts.size - 1 downTo 1) {
-            if (parts[i] != "scripts") continue
-            val pack = File(parts.subList(0, i).joinToString(File.separator))
-            if (!File(pack, "dimensions${File.separator}${parts[i - 1]}.json").exists())
-                continue
-            packDir = pack
-            break
-        }
-        packDir
-    } ?: workDir
+    context.compilationConfiguration[ScriptCompilationConfiguration.packDirectory]
+        ?.addPack(resolver)
+        ?: context.script.locationId
+            ?.let(::File)
+            ?.takeIf { it.exists() }
+            ?.run {
+                val location = SourceCode.LocationWithId(context.script.locationId!!, SourceCode.Location(SourceCode.Position(0, 0)))
+                val parts = normalize().absolutePath.split(File.separatorChar)
+                for (i in parts.size - 1 downTo 1) {
+                    if (parts[i] != "scripts") continue
+                    val pack = File(parts.subList(0, i).joinToString(File.separator))
+                    if (!File(pack, "dimensions${File.separator}${parts[i - 1]}.json").exists())
+                        continue
+                    pack.addPack(resolver)
+                    reports.add(ScriptDiagnostic(
+                        ScriptDiagnostic.unspecifiedInfo,
+                        "Adding pack \"$pack\"",
+                        ScriptDiagnostic.Severity.INFO,
+                        location
+                    ))
+                }
+            }
 
     return runBlocking {
-        resolver.addRepository(packDirectory.toURI().toURL().toString())
         resolver.resolveFromScriptSourceAnnotations(annotations)
     }.onSuccess {
         context.compilationConfiguration.with {
             updateClasspath(it)
         }.asSuccess()
-    }
+    }.appendReports(reports)
 }
 
 internal val ClassLoader.classpath get() = classpathFromClassloader(this) ?: emptyList()
@@ -64,4 +70,12 @@ fun <R> ResultWithDiagnostics<R>.valueOrThrow(message: CharSequence): R = valueO
 }
 
 val ScriptCompilationConfigurationKeys.dependencyResolver by PropertiesCollection.key(resolver)
-val ScriptCompilationConfigurationKeys.packDirectory by PropertiesCollection.key<File>()
\ No newline at end of file
+val ScriptCompilationConfigurationKeys.packDirectory by PropertiesCollection.key<File>()
+
+private fun File.addPack(resolver: CompoundDependenciesResolver) = resolver.addPack(this)
+private fun <R> ResultWithDiagnostics<R>.appendReports(reports : Collection<ScriptDiagnostic>) =
+    if (reports.isEmpty()) this
+    else when (this) {
+        is ResultWithDiagnostics.Success -> ResultWithDiagnostics.Success(value, this.reports + reports)
+        is ResultWithDiagnostics.Failure -> ResultWithDiagnostics.Failure(this.reports + reports)
+    }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt
new file mode 100644
index 000000000..37098e9bb
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt
@@ -0,0 +1,120 @@
+package com.volmit.iris.core.scripting.kotlin.runner.resolver
+
+import java.io.File
+import kotlin.collections.component1
+import kotlin.collections.component2
+import kotlin.collections.iterator
+import kotlin.collections.set
+import kotlin.script.experimental.api.IterableResultsCollector
+import kotlin.script.experimental.api.ResultWithDiagnostics
+import kotlin.script.experimental.api.ScriptDiagnostic
+import kotlin.script.experimental.api.SourceCode
+import kotlin.script.experimental.api.asErrorDiagnostics
+import kotlin.script.experimental.api.asSuccess
+import kotlin.script.experimental.dependencies.ArtifactWithLocation
+import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
+import kotlin.script.experimental.dependencies.RepositoryCoordinates
+import kotlin.script.experimental.dependencies.impl.makeResolveFailureResult
+
+class CompoundDependenciesResolver(
+    private val baseDir: File
+) : DependenciesResolver {
+    private val resolvers = listOf(FileDependenciesResolver(baseDir), LocalMavenDependenciesResolver())
+
+    override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates): Boolean {
+        return resolvers.any { it.acceptsRepository(repositoryCoordinates) }
+    }
+
+    override fun acceptsArtifact(artifactCoordinates: String): Boolean {
+        return resolvers.any { it.acceptsArtifact(artifactCoordinates) }
+    }
+
+    override fun addRepository(
+        repositoryCoordinates: RepositoryCoordinates,
+        options: ExternalDependenciesResolver.Options,
+        sourceCodeLocation: SourceCode.LocationWithId?
+    ): ResultWithDiagnostics<Boolean> {
+        var success = false
+        var repositoryAdded = false
+        val reports = mutableListOf<ScriptDiagnostic>()
+
+        for (resolver in resolvers) {
+            when (val result = resolver.addRepository(repositoryCoordinates, options, sourceCodeLocation)) {
+                is ResultWithDiagnostics.Success -> {
+                    success = true
+                    repositoryAdded = repositoryAdded || result.value
+                    reports.addAll(result.reports)
+                }
+                is ResultWithDiagnostics.Failure -> reports.addAll(result.reports)
+            }
+        }
+
+        return when {
+            success -> repositoryAdded.asSuccess(reports)
+            reports.isEmpty() -> makeResolveFailureResult(
+                "No dependency resolver found that recognizes the repository coordinates '$repositoryCoordinates'",
+                sourceCodeLocation
+            )
+            else -> ResultWithDiagnostics.Failure(reports)
+        }
+    }
+
+    override suspend fun resolve(
+        artifactsWithLocations: List<ArtifactWithLocation>,
+        options: ExternalDependenciesResolver.Options
+    ): ResultWithDiagnostics<List<File>> {
+        val resultsCollector = IterableResultsCollector<File>()
+
+        val artifactToResolverIndex = mutableMapOf<ArtifactWithLocation, Int>().apply {
+            for (artifactWithLocation in artifactsWithLocations) {
+                put(artifactWithLocation, -1)
+            }
+        }
+
+        while (artifactToResolverIndex.isNotEmpty()) {
+            val resolverGroups = mutableMapOf<Int, MutableList<ArtifactWithLocation>>()
+
+            for ((artifactWithLocation, resolverIndex) in artifactToResolverIndex) {
+                val (artifact, sourceCodeLocation) = artifactWithLocation
+
+                var currentIndex = resolverIndex + 1
+                while (currentIndex < resolvers.size) {
+                    if (resolvers[currentIndex].acceptsArtifact(artifact)) break
+                    ++currentIndex
+                }
+                if (currentIndex == resolvers.size) {
+                    if (resolverIndex == -1) {
+                        resultsCollector.addDiagnostic(
+                            "No suitable dependency resolver found for artifact '$artifact'"
+                                .asErrorDiagnostics(locationWithId = sourceCodeLocation)
+                        )
+                    }
+                } else {
+                    resolverGroups
+                        .getOrPut(currentIndex) { mutableListOf() }
+                        .add(artifactWithLocation)
+                }
+            }
+
+            artifactToResolverIndex.clear()
+            for ((resolverIndex, artifacts) in resolverGroups) {
+                val resolver = resolvers[resolverIndex]
+                val resolveResult = resolver.resolve(artifacts, options)
+                resultsCollector.add(resolveResult)
+                if (resolveResult.reports.isNotEmpty()) {
+                    for (artifact in artifacts) {
+                        artifactToResolverIndex[artifact] = resolverIndex
+                    }
+                }
+            }
+        }
+
+        return resultsCollector.getResult()
+    }
+
+    override fun addPack(directory: File) {
+        if (!directory.normalize().absolutePath.startsWith(baseDir.normalize().absolutePath))
+            return
+        resolvers.forEach { it.addPack(directory) }
+    }
+}
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/DependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/DependenciesResolver.kt
new file mode 100644
index 000000000..c6ee1e29c
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/DependenciesResolver.kt
@@ -0,0 +1,8 @@
+package com.volmit.iris.core.scripting.kotlin.runner.resolver
+
+import java.io.File
+import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
+
+interface DependenciesResolver : ExternalDependenciesResolver {
+    fun addPack(directory: File)
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/FileDependenciesResolver.kt
similarity index 94%
rename from core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
rename to core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/FileDependenciesResolver.kt
index 82cfdba21..ea9dac401 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/FileDependenciesResolver.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/FileDependenciesResolver.kt
@@ -1,4 +1,4 @@
-package com.volmit.iris.core.scripting.kotlin.runner
+package com.volmit.iris.core.scripting.kotlin.runner.resolver
 
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
@@ -12,7 +12,7 @@ import kotlin.script.experimental.dependencies.impl.toRepositoryUrlOrNull
 
 class FileDependenciesResolver(
     private val baseDir: File,
-) : ExternalDependenciesResolver {
+) : DependenciesResolver {
     private val localRepos = ConcurrentHashMap.newKeySet<File>(1).also { it.add(baseDir) }
 
     private fun String.toRepositoryFileOrNull(): File? =
@@ -62,4 +62,8 @@ class FileDependenciesResolver(
 
     override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates): Boolean = repositoryCoordinates.toFilePath() != null
 
+    override fun addPack(directory: File) {
+        localRepos.add(directory)
+    }
+
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt
new file mode 100644
index 000000000..c24ed18d3
--- /dev/null
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt
@@ -0,0 +1,85 @@
+package com.volmit.iris.core.scripting.kotlin.runner.resolver
+
+import com.volmit.iris.util.io.IO
+import org.dom4j.Document
+import org.dom4j.DocumentFactory
+import org.dom4j.io.SAXReader
+import java.io.File
+import kotlin.script.experimental.api.ResultWithDiagnostics
+import kotlin.script.experimental.api.SourceCode
+import kotlin.script.experimental.dependencies.ArtifactWithLocation
+import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
+import kotlin.script.experimental.dependencies.RepositoryCoordinates
+import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
+
+class LocalMavenDependenciesResolver : DependenciesResolver {
+    private lateinit var localRepo: File
+    private val maven = MavenDependenciesResolver(true)
+
+    override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates) = maven.acceptsRepository(repositoryCoordinates)
+    override fun acceptsArtifact(artifactCoordinates: String) = maven.acceptsArtifact(artifactCoordinates)
+
+    override fun addRepository(
+        repositoryCoordinates: RepositoryCoordinates,
+        options: ExternalDependenciesResolver.Options,
+        sourceCodeLocation: SourceCode.LocationWithId?
+    ) = maven.addRepository(repositoryCoordinates, options, sourceCodeLocation)
+
+    override suspend fun resolve(
+        artifactsWithLocations: List<ArtifactWithLocation>,
+        options: ExternalDependenciesResolver.Options
+    ): ResultWithDiagnostics<List<File>> {
+        val userOld: String? = System.getProperty("org.apache.maven.user-settings")
+        val globalOld: String? = System.getProperty("org.apache.maven.global-settings")
+
+        try {
+            System.setProperty("org.apache.maven.user-settings", createSettings(userOld))
+            System.clearProperty("org.apache.maven.global-settings")
+
+            return maven.resolve(artifactsWithLocations, options)
+        } finally {
+            setProperty("org.apache.maven.user-settings", userOld)
+            setProperty("org.apache.maven.global-settings", globalOld)
+        }
+    }
+
+    private fun createSettings(user: String?): String {
+        val settingsFile = File(localRepo, "settings.xml")
+        val document = readSettings(user)
+        val node = document.selectSingleNode("//localRepository")
+            ?: document.rootElement.addElement("localRepository")
+
+        if (node.text != localRepo.absolutePath) {
+            node.text = localRepo.absolutePath
+
+            IO.write(settingsFile, document)
+        }
+        return settingsFile.absolutePath
+    }
+
+    private fun readSettings(user: String?): Document {
+        val baseFile = user?.let(::File)?.takeIf { it.exists() } ?: File(
+            System.getProperty("user.home"),
+            ".m2/settings.xml"
+        ).takeIf { it.exists() }?.let { return SAXReader().read(it) }
+        return if (baseFile != null) SAXReader().read(baseFile) else DocumentFactory.getInstance().createDocument().also {
+            it.addElement("settings")
+                .addAttribute("xmlns", "http://maven.apache.org/SETTINGS/1.0.0")
+                .addAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
+                .addAttribute("xsi:schemaLocation", "http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd")
+        }
+    }
+
+    private fun setProperty(name: String, value: String?) {
+        when(value) {
+            null -> System.clearProperty(name)
+            else -> System.setProperty(name, value)
+        }
+    }
+
+    override fun addPack(directory: File) {
+        if (!::localRepo.isInitialized) {
+            localRepo = directory.resolve(".libs")
+        }
+    }
+}
\ No newline at end of file

From a82882c1c1a8858b3b087d3af80cf1f47fdf238c Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Fri, 1 Aug 2025 12:35:08 +0200
Subject: [PATCH 23/31] move local maven repo into iris directory

---
 .../kotlin/runner/resolver/LocalMavenDependenciesResolver.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt
index c24ed18d3..a5ac11d2b 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/LocalMavenDependenciesResolver.kt
@@ -79,7 +79,7 @@ class LocalMavenDependenciesResolver : DependenciesResolver {
 
     override fun addPack(directory: File) {
         if (!::localRepo.isInitialized) {
-            localRepo = directory.resolve(".libs")
+            localRepo = directory.resolve(".iris/m2")
         }
     }
 }
\ No newline at end of file

From 2885a39299eb7c05944d63b88bca9ad3df495784 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Sat, 9 Aug 2025 00:00:31 +0200
Subject: [PATCH 24/31] cleanup script engine

---
 .../core/scripting/kotlin/base/SimpleScript.kt |  2 --
 .../scripting/kotlin/runner/CachedScript.kt    | 18 +++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
index a2ddcb728..d97732c31 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/SimpleScript.kt
@@ -4,7 +4,6 @@ import com.volmit.iris.core.scripting.kotlin.runner.configureMavenDepsOnAnnotati
 import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.ScriptCompilationConfiguration
 import kotlin.script.experimental.api.defaultImports
-import kotlin.script.experimental.api.isStandalone
 import kotlin.script.experimental.api.refineConfiguration
 import kotlin.script.experimental.dependencies.DependsOn
 import kotlin.script.experimental.dependencies.Repository
@@ -15,7 +14,6 @@ import kotlin.script.experimental.jvm.jvm
 abstract class SimpleScript
 
 object SimpleScriptDefinition : ScriptCompilationConfiguration({
-    isStandalone(false)
     defaultImports(
         DependsOn::class.qualifiedName!!,
         Repository::class.qualifiedName!!,
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt
index 290ea6c33..c30df1f35 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/CachedScript.kt
@@ -1,6 +1,6 @@
 package com.volmit.iris.core.scripting.kotlin.runner
 
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
+import java.util.concurrent.locks.ReentrantLock
 import kotlin.reflect.KClass
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -14,6 +14,7 @@ data class CachedScript(
 ) : Script, CompiledScript {
     private val scripts = base.otherScripts.map { CachedScript(it, host, hostConfig) }
     private val evalConfig = createEvaluationConfiguration()
+    private val lock = ReentrantLock()
 
     @Volatile
     private var value: ResultWithDiagnostics<KClass<*>>? = null
@@ -32,13 +33,16 @@ data class CachedScript(
 
 
     override suspend fun getClass(scriptEvaluationConfiguration: ScriptEvaluationConfiguration?) = value ?: run {
-        val cached = base.getClass(scriptEvaluationConfiguration)
-        updater.set(this, cached)
-        return cached
+        lock.lock()
+        try {
+            value ?: base.getClass(scriptEvaluationConfiguration).also { value = it }
+        } finally {
+            lock.unlock()
+        }
     }
 
     override fun evaluate(properties: Map<String, Any?>?) = host.runInCoroutineContext {
-        host.evaluator.invoke(this, createEvaluationConfiguration(properties))
+        host.evaluator(this, createEvaluationConfiguration(properties))
     }
 
     private fun createEvaluationConfiguration(properties: Map<String, Any?>?): ScriptEvaluationConfiguration {
@@ -57,8 +61,4 @@ data class CachedScript(
             hostConfig,
             type)
     }
-
-    companion object {
-        private val updater = AtomicReferenceFieldUpdater.newUpdater(CachedScript::class.java, ResultWithDiagnostics::class.java, "value")
-    }
 }

From 4a26b8b34f3de6545d67b87a86a9b5455ebc6854 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 2 Sep 2025 21:57:34 +0200
Subject: [PATCH 25/31] fix compile

---
 .../java/com/volmit/iris/core/commands/CommandStudio.java   | 2 +-
 .../iris/core/pregenerator/methods/AsyncPregenMethod.java   | 2 +-
 .../main/java/com/volmit/iris/util/parallel/MultiBurst.java | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
index d3509cb9e..452b41a1d 100644
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
@@ -367,7 +367,7 @@ public class CommandStudio implements DecreeExecutor {
         var sender = sender();
         int d = radius * 2;
         KMap<String, KList<Position2>> data = new KMap<>();
-        var multiBurst = new MultiBurst("Distance Sampler", Thread.MIN_PRIORITY);
+        var multiBurst = new MultiBurst("Distance Sampler");
         var executor = multiBurst.burst(radius * radius);
 
         sender.sendMessage(C.GRAY + "Generating data...");
diff --git a/core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java b/core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
index 0dcfffcfc..7e92807bf 100644
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
@@ -192,7 +192,7 @@ public class AsyncPregenMethod implements PregeneratorMethod {
     private class ServiceExecutor implements Executor {
         private final ExecutorService service = IrisSettings.get().getPregen().isUseVirtualThreads() ?
                 Executors.newVirtualThreadPerTaskExecutor() :
-                new MultiBurst("Iris Async Pregen", Thread.MIN_PRIORITY);
+                new MultiBurst("Iris Async Pregen");
 
         public void generate(int x, int z, PregenListener listener) {
             service.submit(() -> {
diff --git a/core/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java b/core/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java
index 3762d9ecd..32ab14103 100644
--- a/core/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java
+++ b/core/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java
@@ -42,7 +42,11 @@ public class MultiBurst implements ExecutorService {
     private ExecutorService service;
 
     public MultiBurst() {
-        this("Iris", Thread.MIN_PRIORITY, () -> IrisSettings.get().getConcurrency().getParallelism());
+        this("Iris");
+    }
+
+    public MultiBurst(String name) {
+        this(name, Thread.MIN_PRIORITY, () -> IrisSettings.get().getConcurrency().getParallelism());
     }
 
     public MultiBurst(String name, IntSupplier parallelism) {

From d1c307865de484198efce54b99a573396782404d Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 2 Sep 2025 22:05:11 +0200
Subject: [PATCH 26/31] properly generate gradle wrapper for kts tab completion

---
 .../com/volmit/iris/core/project/Gradle.java  | 104 ++++++++++++++++++
 .../volmit/iris/core/project/IrisProject.java |   1 +
 2 files changed, 105 insertions(+)
 create mode 100644 core/src/main/java/com/volmit/iris/core/project/Gradle.java

diff --git a/core/src/main/java/com/volmit/iris/core/project/Gradle.java b/core/src/main/java/com/volmit/iris/core/project/Gradle.java
new file mode 100644
index 000000000..c28b28ca4
--- /dev/null
+++ b/core/src/main/java/com/volmit/iris/core/project/Gradle.java
@@ -0,0 +1,104 @@
+package com.volmit.iris.core.project;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.util.io.IO;
+import org.zeroturnaround.zip.ZipUtil;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.Scanner;
+
+public class Gradle {
+    private static final boolean WINDOWS = System.getProperty("os.name").toLowerCase().contains("win");
+    private static final String[] ENVIRONMENT = createEnvironment();
+    private static final String VERSION = "8.14.2";
+    private static final String DISTRIBUTION_URL = "https://services.gradle.org/distributions/gradle-" + VERSION + "-bin.zip";
+    private static final String HASH = IO.hash(DISTRIBUTION_URL);
+
+    public static synchronized void wrapper(File projectDir) {
+        try {
+            File settings = new File(projectDir, "settings.gradle.kts");
+            if (!settings.exists()) settings.createNewFile();
+            runGradle(projectDir, "wrapper");
+        } catch (Throwable e) {
+            Iris.error("Failed to install gradle wrapper!");
+            e.printStackTrace();
+            Iris.reportError(e);
+        }
+    }
+
+    public static void runGradle(File projectDir, String... args) throws IOException, InterruptedException {
+        File gradle = downloadGradle(false);
+        String[] cmd = new String[args.length + 1];
+        cmd[0] = gradle.getAbsolutePath();
+        System.arraycopy(args, 0, cmd, 1, args.length);
+        var process = Runtime.getRuntime().exec(cmd, ENVIRONMENT, projectDir);
+        attach(process.getInputStream());
+        attach(process.getErrorStream());
+        var code = process.waitFor();
+        if (code == 0) return;
+        throw new RuntimeException("Gradle exited with code " + code);
+    }
+
+    private static synchronized File downloadGradle(boolean force) {
+        var folder = Iris.instance.getDataFolder("cache", HASH.substring(0, 2), HASH);
+        if (force) {
+            IO.delete(folder);
+            folder.mkdirs();
+        }
+
+        var bin = new File(folder, "gradle-" + VERSION + "/bin/gradle" + (WINDOWS ? ".bat" : ""));
+        if (bin.exists()) {
+            bin.setExecutable(true);
+            return bin;
+        }
+
+        try (var input = new BufferedInputStream(URI.create(DISTRIBUTION_URL).toURL().openStream())) {
+            ZipUtil.unpack(input, folder);
+        } catch (Throwable e) {
+            throw new RuntimeException("Failed to download gradle", e);
+        }
+
+        bin.setExecutable(true);
+        return bin;
+    }
+
+    private static String[] createEnvironment() {
+        var env = new HashMap<>(System.getenv());
+        env.put("JAVA_HOME", findJavaHome());
+        return env.entrySet()
+                .stream()
+                .map(e -> e.getKey() + "=" + e.getValue())
+                .toArray(String[]::new);
+    }
+
+    private static String findJavaHome() {
+        String javaHome = System.getProperty("java.home");
+        if (javaHome != null && new File(javaHome + "/bin/java" + (WINDOWS ? ".exe" : "")).exists()) {
+            return javaHome;
+        }
+
+        return ProcessHandle.current()
+                .info()
+                .command()
+                .map(s -> new File(s).getAbsoluteFile().getParentFile().getParentFile())
+                .flatMap(f -> f.exists() ? Optional.of(f.getAbsolutePath()) : Optional.empty())
+                .orElseThrow(() -> new RuntimeException("Failed to find java home, please set java.home system property"));
+    }
+
+    private static void attach(InputStream stream) {
+        Thread.ofVirtual().start(() -> {
+            try (var in = new Scanner(stream)) {
+                while (in.hasNextLine()) {
+                    String line = in.nextLine();
+                    Iris.debug("[GRADLE] " + line);
+                }
+            }
+        });
+    }
+}
diff --git a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
index b5009d840..8c2f17252 100644
--- a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -421,6 +421,7 @@ public class IrisProject {
         if (!schemaMap.isEmpty()) {
             IO.write(schemasFile, doc);
         }
+        Gradle.wrapper(path);
 
         return ws;
     }

From eb184983de8a875a27fdf69eccf8e9a2f2575a15 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 2 Sep 2025 22:09:32 +0200
Subject: [PATCH 27/31] fix json property description on vscode

---
 .../main/java/com/volmit/iris/core/project/SchemaBuilder.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java b/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
index 1ae05d724..1570ca6d8 100644
--- a/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
+++ b/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
@@ -569,7 +569,7 @@ public class SchemaBuilder {
                 .replace("</h>", "");
         String hDesc = d.toString("<br>");
         prop.put("type", type);
-        prop.put("description", d.toString("\n"));
+        prop.put("description", desc);
         prop.put("x-intellij-html-description", hDesc);
         return buildSnippet(prop, k.getType());
     }

From 176d3a5f9f762a10ec22831ef855075feb7a9a1d Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Tue, 2 Sep 2025 22:14:59 +0200
Subject: [PATCH 28/31] remove old system property

---
 build.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a0ecc6a7a..682335c2a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -63,7 +63,6 @@ val serverMaxHeap = "8G"
 //Valid values are: none, truecolor, indexed256, indexed16, indexed8
 val color = "truecolor"
 val errorReporting = findProperty("errorReporting") as Boolean? ?: false
-val scriptVersion = findProperty("scriptVersion") as String? ?: "master-SNAPSHOT"
 
 val nmsBindings = mapOf(
         "v1_21_R5" to "1.21.7-R0.1-SNAPSHOT",
@@ -110,7 +109,6 @@ nmsBindings.forEach { key, value ->
         systemProperty("net.kyori.ansi.colorLevel", color)
         systemProperty("com.mojang.eula.agree", true)
         systemProperty("iris.suppressReporting", !errorReporting)
-        systemProperty("iris.scriptVersion", scriptVersion)
         jvmArgs("-javaagent:${project(":core:agent").tasks.jar.flatMap { it.archiveFile }.get().asFile.absolutePath}")
     }
 }

From f63cabd8b8761b1c734273373185c99485fe6cf9 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 3 Sep 2025 12:56:02 +0200
Subject: [PATCH 29/31] fix mantle flag serialization

---
 .../main/java/com/volmit/iris/util/mantle/MantleChunk.java | 7 +++----
 .../com/volmit/iris/util/parallel/AtomicBooleanArray.java  | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
index 78dcf2434..01153403c 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
@@ -87,8 +87,7 @@ public class MantleChunk {
         int l = version < 0 ? MantleFlag.RESERVED_FLAGS : Varint.readUnsignedVarInt(din);
 
         if (version >= 1) {
-            int count = Math.ceilDiv(flags.length(), Byte.SIZE);
-            for (int i = 0; i < count;) {
+            for (int i = 0; i < l;) {
                 byte f = din.readByte();
                 for (int j = 0; j < Byte.SIZE && i < flags.length(); j++, i++) {
                     flags.set(i, (f & (1 << j)) != 0);
@@ -267,9 +266,9 @@ public class MantleChunk {
         dos.writeByte(x);
         dos.writeByte(z);
         dos.writeByte(sections.length());
-        Varint.writeUnsignedVarInt(flags.length(), dos);
+        Varint.writeUnsignedVarInt(Math.ceilDiv(flags.length(), Byte.SIZE), dos);
 
-        int count = Math.ceilDiv(flags.length(), Byte.SIZE);
+        int count = flags.length();
         for (int i = 0; i < count;) {
             int f = 0;
             for (int j = 0; j < Byte.SIZE && i < flags.length(); j++, i++) {
diff --git a/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java b/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java
index e85bd40fb..5d2603a85 100644
--- a/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java
+++ b/core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java
@@ -28,10 +28,6 @@ public class AtomicBooleanArray implements Serializable {
         return (boolean) AA.compareAndSet(array, index, expectedValue, newValue);
     }
 
-    public final boolean weakCompareAndSet(int index, boolean expectedValue, boolean newValue) {
-        return (boolean) AA.weakCompareAndSetPlain(array, index, expectedValue, newValue);
-    }
-
     @Override
     public String toString() {
         int iMax = array.length - 1;

From 1e148d8fcddf58ef286e4381ab7f7cc66205462e Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 3 Sep 2025 13:32:08 +0200
Subject: [PATCH 30/31] minor code cleanup

---
 .../src/main/java/com/volmit/iris/core/loader/IrisData.java | 1 +
 .../main/java/com/volmit/iris/core/project/IrisProject.java | 2 +-
 .../iris/core/scripting/environment/SimpleEnvironment.java  | 6 +++++-
 .../kotlin/environment/IrisSimpleExecutionEnvironment.kt    | 6 +++---
 .../iris/core/scripting/kotlin/runner/ScriptRunner.kt       | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
index 5edd4ba9f..1bfcd1ba2 100644
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -284,6 +284,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
     public void close() {
         closed = true;
         dump();
+        dataLoaders.remove(dataFolder);
     }
 
     public IrisData copy() {
diff --git a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
index 8c2f17252..716173bd6 100644
--- a/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
+++ b/core/src/main/java/com/volmit/iris/core/project/IrisProject.java
@@ -355,7 +355,7 @@ public class IrisProject {
         settings.put("json.schemas", schemas);
         ws.put("settings", settings);
 
-        SimpleEnvironment.create().configureProject(path);
+        dm.getEnvironment().configureProject();
         File schemasFile = new File(path, ".idea" + File.separator + "jsonSchemas.xml");
         Document doc = IO.read(schemasFile);
         Element mappings = (Element) doc.selectSingleNode("//component[@name='JsonSchemaMappingsProjectConfiguration']");
diff --git a/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java b/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java
index 2c07c0d81..4eb7e0ce8 100644
--- a/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java
+++ b/core/src/main/java/com/volmit/iris/core/scripting/environment/SimpleEnvironment.java
@@ -12,7 +12,11 @@ public interface SimpleEnvironment {
         return new IrisSimpleExecutionEnvironment();
     }
 
-    void configureProject(@NonNull File projectDir);
+    static SimpleEnvironment create(@NonNull File projectDir) {
+        return new IrisSimpleExecutionEnvironment(projectDir);
+    }
+
+    void configureProject();
 
     void execute(@NonNull String script);
 
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
index 2bb96e768..bcc955954 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
@@ -77,14 +77,14 @@ open class IrisSimpleExecutionEnvironment(
         return null
     }
 
-    override fun configureProject(projectDir: File) {
-        projectDir.mkdirs()
+    override fun configureProject() {
+        runner.baseDir.mkdirs()
         val libs = listOf(javaClass.classLoader.classpath, KotlinScript::class.java.classLoader.classpath)
             .flatMap { it }
             .sortedBy { it.absolutePath }
             .toMutableList()
 
-        File(projectDir, "build.gradle.kts")
+        File(runner.baseDir, "build.gradle.kts")
             .updateClasspath(libs)
     }
 
diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
index 887d346b4..04b3b535d 100644
--- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
+++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/ScriptRunner.kt
@@ -19,7 +19,7 @@ import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
 
 class ScriptRunner(
     private val host: BasicJvmScriptingHost,
-    private val baseDir: File
+    val baseDir: File
 ) {
     constructor(baseDir: File) : this(BasicJvmScriptingHost(), baseDir)
 

From 1aa64c9a02a93b23d3da226782f99c9f9fb7de87 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 3 Sep 2025 17:02:39 +0200
Subject: [PATCH 31/31] add hook for custom engine modes

---
 .../com/volmit/iris/engine/IrisEngine.java     |  2 +-
 .../iris/engine/object/IrisDimensionMode.java  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 1b9cec579..d35dd3311 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -200,7 +200,7 @@ public class IrisEngine implements Engine {
             mode.close();
         }
 
-        mode = getDimension().getMode().getType().create(this);
+        mode = getDimension().getMode().create(this);
     }
 
     @Override
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimensionMode.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimensionMode.java
index ccf3c49b1..07b0e252b 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimensionMode.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimensionMode.java
@@ -18,7 +18,10 @@
 
 package com.volmit.iris.engine.object;
 
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineMode;
 import com.volmit.iris.engine.object.annotations.Desc;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Snippet;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -35,4 +38,19 @@ public class IrisDimensionMode {
     @Desc("The dimension type")
     private IrisDimensionModeType type = IrisDimensionModeType.OVERWORLD;
 
+    @RegistryListResource(IrisScript.class)
+    @Desc("The script to create the dimension mode instead of using provided types")
+    private String script;
+
+    public EngineMode create(Engine engine) {
+        if (script == null) {
+            return type.create(engine);
+        }
+        Object result = engine.getExecution().evaluate(script);
+        if (result instanceof EngineMode) {
+            return (EngineMode) result;
+        }
+
+        throw new IllegalStateException("The script '" + script + "' did not return an engine mode!");
+    }
 }