Merge pull request #1128 from VolmitSoftware/dev

3.5.1
v+
2026-01-04 15:41:30 +00:00 · 2025-01-04 09:57:30 -08:00 · 2025-01-02 23:21:32 +01:00 · 2025-01-02 23:15:27 +01:00 · 2025-01-02 19:37:22 +01:00 · 2025-01-02 14:38:45 +01:00
178 changed files with 12345 additions and 5122 deletions
--- a/README.md
+++ b/README.md
@@ -30,14 +30,11 @@ Consider supporting our development by buying Iris on spigot! We work hard to ma
        3. Add `export JAVA_HOME=$(/usr/libexec/java_home)` as a new line
        4. Use `CTRL + X`, then Press `Y`, Then `ENTER`
        5. Quit & Reopen Terminal and verify with `echo $JAVA_HOME`. It should print a directory
-3. If this is your first time building Iris for MC 1.18+ run `gradlew setup` inside the root Iris project folder.
-   Otherwise, skip this step. Grab a coffee, this may take up to 5 minutes depending on your cpu & internet connection.
-4. Once the project has setup, run `gradlew iris`
-5. The Iris jar will be placed in `Iris/build/Iris-XXX-XXX.jar` Enjoy! Consider supporting us by buying it on spigot!
+3. Once the project has setup, run `gradlew iris`
+4. The Iris jar will be placed in `Iris/build/Iris-XXX-XXX.jar` Enjoy! Consider supporting us by buying it on spigot!

 ### IDE Builds (for development)

-* Run `gradlew setup` any time you get dependency issues with craftbukkit
 * Configure ITJ Gradle to use JDK 17 (in settings, search for gradle)
 * Add a build line in the build.gradle for your own build task to directly compile Iris into your plugins folder if you
  prefer.
@@ -69,7 +66,6 @@ IrisAccess access=IrisToolbelt.createWorld() // If you like builders...
  .name("myWorld") // The world name
  .dimension("terrifyinghands")
  .seed(69133742) // The world seed
-  .headless(true)  // Headless make gen go fast
  .pregen(PregenTask // Define a pregen job to run
  .builder()
    .center(new Position2(0,0)) // REGION coords (1 region = 32x32 chunks)
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-import java.util.function.Consumer
-
 /*
 * Iris is a World Generator for Minecraft Bukkit Servers
 * Copyright (c) 2021 Arcane Arts (Volmit Software)
@@ -18,15 +16,23 @@ import java.util.function.Consumer
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

+buildscript() {
+    repositories {
+        maven { url 'https://jitpack.io'}
+    }
+    dependencies {
+        classpath 'com.github.VolmitSoftware:NMSTools:1.0.1'
+    }
+}
+
 plugins {
    id 'java'
    id 'java-library'
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "io.github.goooler.shadow" version "8.1.7"
    id "de.undercouch.download" version "5.0.1"
 }

-version '3.2.2-1.19.2-1.20.4'
-def specialSourceVersion = '1.11.0' //[NMS]
+version '3.5.1-1.19.2-1.21.3'

 // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
 // ======================== WINDOWS =============================
@@ -37,13 +43,19 @@ registerCustomOutputTask('Coco', 'D://mcsm/plugins')
 registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
 registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19.4/plugins')
 registerCustomOutputTask('CrazyDev22', 'C://Users/Julian/Desktop/server/plugins')
-registerCustomOutputTask('Pixel', 'C://Users/repix/Iris Dimension Engine/1.20.4 - Iris Development/plugins')
+registerCustomOutputTask('PixelFury', 'C://Users/repix/workplace/Iris/1.21.3 - Development-Public-v3/plugins')
+registerCustomOutputTask('PixelFuryDev', 'C://Users/repix/workplace/Iris/1.21 - Development-v3/plugins')
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
-registerCustomOutputTaskUnix('PsychoLT', '/Volumes/PRO-G40/Minecraft/MinecraftDevelopment/Server/plugins')
+registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Developer/RemoteGit/Server/plugins')
+registerCustomOutputTaskUnix('PixelMac', '/Users/test/Desktop/mcserver/plugins')
+registerCustomOutputTaskUnix('CrazyDev22LT', '/home/julian/Desktop/server/plugins')
 // ==============================================================

 def NMS_BINDINGS = Map.of(
+        "v1_21_R2", "1.21.3-R0.1-SNAPSHOT",
+        "v1_21_R1", "1.21.1-R0.1-SNAPSHOT",
+        "v1_20_R4", "1.20.6-R0.1-SNAPSHOT",
        "v1_20_R3", "1.20.4-R0.1-SNAPSHOT",
        "v1_20_R2", "1.20.2-R0.1-SNAPSHOT",
        "v1_20_R1", "1.20.1-R0.1-SNAPSHOT",
@@ -51,151 +63,40 @@ def NMS_BINDINGS = Map.of(
        "v1_19_R2", "1.19.3-R0.1-SNAPSHOT",
        "v1_19_R1", "1.19.2-R0.1-SNAPSHOT"
 )
-NMS_BINDINGS.each {
-    def key = it.key
-    def value = it.value
-    def nms =  value.split("-")[0];
-    project(":nms:${key}") {
-        apply plugin: 'java-library'
-        apply plugin: 'de.undercouch.download'
+def JVM_VERSION = Map.of()
+NMS_BINDINGS.each { nms ->
+    project(":nms:${nms.key}") {
+        apply plugin: 'java'
+        apply plugin: 'com.volmit.nmstools'
+
+        nmsTools {
+            it.jvm = JVM_VERSION.getOrDefault(nms.key, 21)
+            it.version = nms.value
+        }

        dependencies {
            implementation project(":core")
-            compileOnly "org.spigotmc:spigot-api:${value}"
-            compileOnly "org.bukkit:craftbukkit:${value}:remapped-mojang" //[NMS]
-        }
-        def buildToolsJar = new File(rootProject.buildDir, "tools/BuildTools.jar")
-        def specialSourceJar = new File(rootProject.buildDir, "tools/SpecialSource.jar")
-
-        def buildToolsFolder = new File(buildDir, "buildtools")
-        def specialSourceFolder = new File(buildDir, "specialsource")
-        def buildToolsHint = new File(buildDir, "buildtools/craftbukkit-" + nms + ".jar")
-
-        def outputJar = new File(buildDir, "libs/${key}.jar")
-        def ssiJar = new File(buildDir, "specialsource/${key}.jar")
-        def ssobfJar = new File(buildDir, "specialsource/${key}-rmo.jar")
-        def ssJar = new File(buildDir, "specialsource/${key}-rma.jar")
-
-        def homePath = System.properties['user.home']
-        def m2 = new File(homePath + "/.m2/repository")
-        def m2s = m2.getAbsolutePath();
-
-        // ======================== Building Mapped Jars =============================
-
-        ext {
-            executeBuildTools = new Runnable() {
-                @Override
-                void run() {
-                    //Download
-                    if (!buildToolsJar.exists()) {
-                        download.run {
-                            src 'https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar'
-                            dest buildToolsJar
-                        }
-                    }
-
-                    //Execute
-                    if (!buildToolsHint.exists()) {
-                        buildToolsFolder.mkdirs()
-                        project.javaexec {
-                            classpath = files(buildToolsJar)
-                            workingDir = buildToolsFolder
-                            args = [
-                                    "--rev",
-                                    nms,
-                                    "--compile",
-                                    "craftbukkit",
-                                    "--remap"
-                            ]
-                        }
-                    }
-                }
-            }
-        }
-        tasks.register("executeBuildTools") {
-            doLast {
-                property("executeBuildTools").run();
-            }
-        }
-
-        tasks.build.doLast {
-            //Download
-            if (!specialSourceJar.exists()) {
-                download.run {
-                    src 'https://repo.maven.apache.org/maven2/net/md-5/SpecialSource/' + specialSourceVersion + '/SpecialSource-'+specialSourceVersion+'-shaded.jar'
-                    dest specialSourceJar
-                }
-            }
-            specialSourceFolder.mkdirs();
-
-            //Copy
-            copy {
-                from outputJar
-                into specialSourceFolder
-            }
-
-            //obfuscate
-            javaexec {
-                workingDir = specialSourceFolder
-                classpath = files(specialSourceJar,
-                        new File(m2s + "/org/spigotmc/spigot/" + value + "/spigot-" + value + "-remapped-mojang.jar"))
-                mainClass = "net.md_5.specialsource.SpecialSource"
-                args = [
-                        "--live",
-                        "-i",
-                        ssiJar.getName(),
-                        "-o",
-                        ssobfJar.getName(),
-                        "-m",
-                        m2s + "/org/spigotmc/minecraft-server/" + value + "/minecraft-server-" + value + "-maps-mojang.txt",
-                        "--reverse",
-                ]
-            }
-
-            //remap
-            javaexec {
-                workingDir = specialSourceFolder
-                classpath = files(specialSourceJar,
-                        new File(m2s + "/org/spigotmc/spigot/" + value + "/spigot-" + value + "-remapped-obf.jar"))
-                mainClass = "net.md_5.specialsource.SpecialSource"
-                args = [
-                        "--live",
-                        "-i",
-                        ssobfJar.getName(),
-                        "-o",
-                        ssJar.getName(),
-                        "-m",
-                        m2s + "/org/spigotmc/minecraft-server/" + value + "/minecraft-server-" + value + "-maps-spigot.csrg"
-                ]
-            }
-            //copy
-            copy {
-                from ssJar
-                into outputJar.getParentFile()
-                rename {
-                    outputJar.getName()
-                }
-            }
        }
    }
 }

 shadowJar {
-    NMS_BINDINGS.each {dependsOn(":nms:${it.key}:build")}
+    NMS_BINDINGS.each {
+        dependsOn(":nms:${it.key}:remap")
+        from("${project(":nms:${it.key}").layout.buildDirectory.asFile.get()}/libs/${it.key}-mapped.jar")
+    }

    //minimize()
    append("plugin.yml")
    relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic'
    relocate 'io.papermc.lib', 'com.volmit.iris.util.paper'
    relocate 'net.kyori', 'com.volmit.iris.util.kyori'
+    relocate 'org.bstats', 'com.volmit.util.metrics'
    archiveFileName.set("Iris-${project.version}.jar")
 }

 dependencies {
    implementation project(':core')
-    NMS_BINDINGS.each {
-        implementation project(":nms:${it.key}")
-    }
 }

 configurations.configureEach {
@@ -207,50 +108,51 @@ allprojects {
    apply plugin: 'java'

    repositories {
-        mavenLocal {
-            content {
-                includeGroup("org.bukkit")
-                includeGroup("org.spigotmc")
-            }
-        }
        mavenCentral()
-        maven { url "https://repo.papermc.io/repository/maven-public/"}
+        maven { url "https://repo.papermc.io/repository/maven-public/" }
        maven { url "https://repo.codemc.org/repository/maven-public" }
        maven { url "https://mvn.lumine.io/repository/maven-public/" }
-        maven { url "https://jitpack.io"}
+        maven { url "https://jitpack.io" }

        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots" }
        maven { url "https://mvn.lumine.io/repository/maven/" }
        maven { url "https://repo.triumphteam.dev/snapshots" }
        maven { url "https://repo.mineinabyss.com/releases" }
        maven { url 'https://hub.jeff-media.com/nexus/repository/jeff-media-public/' }
+        maven { url "https://repo.nexomc.com/snapshots/" }
+        maven { url "https://libraries.minecraft.net" }
    }

    dependencies {
        // Provided or Classpath
-        compileOnly 'org.projectlombok:lombok:1.18.24'
-        annotationProcessor 'org.projectlombok:lombok:1.18.24'
+        compileOnly 'org.projectlombok:lombok:1.18.36'
+        annotationProcessor 'org.projectlombok:lombok:1.18.36'

        // Shaded
        implementation 'com.dfsek:Paralithic:0.4.0'
        implementation 'io.papermc:paperlib:1.0.5'
-        implementation "net.kyori:adventure-text-minimessage:4.13.1"
-        implementation 'net.kyori:adventure-platform-bukkit:4.3.2'
-        implementation 'net.kyori:adventure-api:4.13.1'
+        implementation "net.kyori:adventure-text-minimessage:4.17.0"
+        implementation 'net.kyori:adventure-platform-bukkit:4.3.4'
+        implementation 'net.kyori:adventure-api:4.17.0'
+        implementation 'org.bstats:bstats-bukkit:3.1.0'
+        //implementation 'org.bytedeco:javacpp:1.5.10'
+        //implementation 'org.bytedeco:cuda-platform:12.3-8.9-1.5.10'
        compileOnly 'io.lumine:Mythic-Dist:5.2.1'
+        compileOnly 'io.lumine:MythicCrucible-Dist:2.0.0'

        // Dynamically Loaded
        compileOnly 'io.timeandspace:smoothie-map:2.0.2'
        compileOnly 'it.unimi.dsi:fastutil:8.5.8'
        compileOnly 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
        compileOnly 'org.zeroturnaround:zt-zip:1.14'
-        compileOnly 'com.google.code.gson:gson:2.9.0'
+        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'
    }

    /**
@@ -260,20 +162,35 @@ allprojects {
        options.compilerArgs << '-parameters'
        options.encoding = "UTF-8"
    }
+
+    javadoc {
+        options.encoding = "UTF-8"
+        options.addStringOption('Xdoclint:none', '-quiet')
+    }
+
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        archiveClassifier.set('sources')
+        from sourceSets.main.allSource
+    }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        archiveClassifier.set('javadoc')
+        from javadoc.destinationDir
+    }
 }

-if (JavaVersion.current().toString() != "17") {
+if (JavaVersion.current().toString() != "21") {
    System.err.println()
    System.err.println("=========================================================================================================")
-    System.err.println("You must run gradle on Java 17. You are using " + JavaVersion.current())
+    System.err.println("You must run gradle on Java 21. You are using " + JavaVersion.current())
    System.err.println()
    System.err.println("=== For IDEs ===")
-    System.err.println("1. Configure the project for Java 17")
-    System.err.println("2. Configure the bundled gradle to use Java 17 in settings")
+    System.err.println("1. Configure the project for Java 21")
+    System.err.println("2. Configure the bundled gradle to use Java 21 in settings")
    System.err.println()
    System.err.println("=== For Command Line (gradlew) ===")
-    System.err.println("1. Install JDK 17 from https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html")
-    System.err.println("2. Set JAVA_HOME environment variable to the new jdk installation folder such as C:\\Program Files\\Java\\jdk-17.0.1")
+    System.err.println("1. Install JDK 21 from https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html")
+    System.err.println("2. Set JAVA_HOME environment variable to the new jdk installation folder such as C:\\Program Files\\Java\\jdk-21.0.4")
    System.err.println("3. Open a new command prompt window to get the new environment variables if need be.")
    System.err.println("=========================================================================================================")
    System.err.println()
@@ -282,33 +199,24 @@ if (JavaVersion.current().toString() != "17") {

 task iris(type: Copy) {
    group "iris"
-    from new File(buildDir, "libs/Iris-${version}.jar")
-    into buildDir
+    from new File(layout.buildDirectory.asFile.get(), "libs/Iris-${version}.jar")
+    into layout.buildDirectory.asFile.get()
    dependsOn(build)
 }

-task setup() {
+//    with classifier: 'javadoc' and 'sources'
+task irisDev(type: Copy) {
    group "iris"
-    dependsOn(clean)
-    NMS_BINDINGS.each {
-        dependsOn(":nms:${it.key}:clean");
-    }
-
-    doLast {
-        NMS_BINDINGS.each {
-            project(":nms:${it.key}").property("executeBuildTools").run();
-        }
+    from("core/build/libs/core-javadoc.jar", "core/build/libs/core-sources.jar")
+    rename { String fileName ->
+        fileName.replace("core", "Iris-${version}")
    }
+    into layout.buildDirectory.asFile.get()
+    dependsOn(iris)
+    dependsOn("core:sourcesJar")
+    dependsOn("core:javadocJar")
 }

-NMS_BINDINGS.keySet().forEach {
-    def nms = it
-    tasks.register("setup-${nms}") {
-        group "iris"
-        dependsOn(":nms:${nms}:clean")
-        dependsOn(":nms:${nms}:executeBuildTools")
-    }
-}

 def registerCustomOutputTask(name, path) {
    if (!System.properties['os.name'].toLowerCase().contains('windows')) {
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -19,7 +19,7 @@
 plugins {
    id 'java'
    id 'java-library'
-    id "io.freefair.lombok" version "6.3.0"
+    id "io.freefair.lombok" version "8.6"
 }

 def apiVersion = '1.19'
@@ -35,6 +35,7 @@ compileJava {

 repositories {
    maven { url 'https://nexus.phoenixdevt.fr/repository/maven-public/'}
+    maven { url 'https://repo.auxilor.io/repository/maven-public/' }
 }

 /**
@@ -61,14 +62,18 @@ dependencies {

    // Third Party Integrations
    compileOnly 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7'
-    compileOnly 'com.github.oraxen:oraxen:1.158.0'
+    compileOnly 'com.nexomc:nexo:0.6.0-dev.0'
    compileOnly 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
    compileOnly 'com.github.PlaceholderAPI:placeholderapi:2.11.3'
    compileOnly 'com.github.Ssomar-Developement:SCore:4.23.10.8'
    compileOnly 'net.Indyuce:MMOItems-API:6.9.5-SNAPSHOT'
+    compileOnly 'com.willfp:EcoItems:5.44.0'
    //implementation files('libs/CustomItems.jar')
 }

+java {
+    disableAutoTargetJvm()
+}

 /**
 * Gradle is weird sometimes, we need to delete the plugin yml from the build folder to actually filter properly.
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -40,6 +40,7 @@ import com.volmit.iris.engine.platform.BukkitChunkGenerator;
 import com.volmit.iris.engine.platform.DummyChunkGenerator;
 import com.volmit.iris.core.safeguard.IrisSafeguard;
 import com.volmit.iris.core.safeguard.UtilsSFG;
+import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.exceptions.IrisException;
@@ -55,7 +56,6 @@ import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.misc.getHardware;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.IrisService;
-import com.volmit.iris.util.plugin.Metrics;
 import com.volmit.iris.util.plugin.VolmitPlugin;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.reflect.ShadeFix;
@@ -63,13 +63,13 @@ import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.Queue;
 import com.volmit.iris.util.scheduling.ShurikenQueue;
 import io.papermc.lib.PaperLib;
-import lombok.Getter;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.WorldCreator;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.DrilldownPie;
+import org.bstats.charts.SimplePie;
+import org.bstats.charts.SingleLineChart;
+import org.bukkit.*;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -77,33 +77,31 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
+import org.bukkit.event.*;
 import org.bukkit.generator.BiomeProvider;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.IllegalPluginAccessException;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import oshi.SystemInfo;

 import java.io.*;
 import java.lang.annotation.Annotation;
-import java.lang.management.ManagementFactory;
-import java.lang.management.OperatingSystemMXBean;
+import java.math.RoundingMode;
 import java.net.URL;
-import java.util.Date;
-import java.util.Map;
+import java.text.NumberFormat;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;

 import static com.volmit.iris.core.safeguard.IrisSafeguard.*;
 import static com.volmit.iris.core.safeguard.ServerBootSFG.passedserversoftware;
-import static com.volmit.iris.util.misc.getHardware.getCPUModel;

@SuppressWarnings("CanBeFinal")
 public class Iris extends VolmitPlugin implements Listener {
-    public static final String OVERWORLD_TAG = "3800";
+    public static final String OVERWORLD_TAG = "31000";

    private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();

@@ -512,11 +510,10 @@ public class Iris extends VolmitPlugin implements Listener {
                    continue;
                }

-                Iris.info("2 World: %s | Generator: %s", s, generator);
-
-                if (Bukkit.getWorlds().stream().anyMatch(w -> w.getName().equals(s))) {
+                if (Bukkit.getWorld(s) != null)
                    continue;
-                }
+
+                Iris.info("Loading World: %s | Generator: %s", s, generator);

                Iris.info(C.LIGHT_PURPLE + "Preparing Spawn for " + s + "' using Iris:" + generator + "...");
                new WorldCreator(s)
@@ -664,7 +661,48 @@ public class Iris extends VolmitPlugin implements Listener {

    private void bstats() {
        if (IrisSettings.get().getGeneral().isPluginMetrics()) {
-            J.s(() -> new Metrics(Iris.instance, 8757));
+            J.s(() -> {
+                var metrics = new Metrics(Iris.instance, 24220);
+                metrics.addCustomChart(new SingleLineChart("custom_dimensions", () -> Bukkit.getWorlds()
+                        .stream()
+                        .filter(IrisToolbelt::isIrisWorld)
+                        .mapToInt(w -> 1)
+                        .sum()));
+
+                metrics.addCustomChart(new DrilldownPie("used_packs", () -> Bukkit.getWorlds().stream()
+                        .map(IrisToolbelt::access)
+                        .filter(Objects::nonNull)
+                        .map(PlatformChunkGenerator::getTarget)
+                        .collect(Collectors.toMap(target -> target.getDimension().getLoadKey(), target -> {
+                            int version = target.getDimension().getVersion();
+                            String checksum = IO.hashRecursive(target.getData().getDataFolder());
+
+                            return Map.of("v" + version + " (" + checksum + ")", 1);
+                        }, (a, b) -> {
+                            Map<String, Integer> merged = new HashMap<>(a);
+                            b.forEach((k, v) -> merged.merge(k, v, Integer::sum));
+                            return merged;
+                        }))));
+
+
+                var info = new SystemInfo().getHardware();
+                var cpu = info.getProcessor().getProcessorIdentifier();
+                var mem = info.getMemory();
+                metrics.addCustomChart(new SimplePie("cpu_model", cpu::getName));
+
+                var nf = NumberFormat.getInstance(Locale.ENGLISH);
+                nf.setMinimumFractionDigits(0);
+                nf.setMaximumFractionDigits(2);
+                nf.setRoundingMode(RoundingMode.HALF_UP);
+
+                metrics.addCustomChart(new DrilldownPie("memory", () -> {
+                    double total = mem.getTotal() * 1E-9;
+                    double alloc = Math.min(total, Runtime.getRuntime().maxMemory() * 1E-9);
+                    return Map.of(nf.format(alloc), Map.of(nf.format(total), 1));
+                }));
+
+                postShutdown.add(metrics::shutdown);
+            });
        }
    }

@@ -739,7 +777,7 @@ public class Iris extends VolmitPlugin implements Listener {
            service(StudioSVC.class).installIntoWorld(getSender(), dim.getLoadKey(), w.worldFolder());
        }

-        return new BukkitChunkGenerator(w, false, ff, dim.getLoadKey());
+        return new BukkitChunkGenerator(w, false, ff, dim.getLoadKey(), false);
    }

    public void splash() {
@@ -806,9 +844,6 @@ public class Iris extends VolmitPlugin implements Listener {
        } else {
            splash = splashstable;
        }
-        OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean();
-        String osArch = osBean.getArch();
-        String osName = osBean.getName();

        if (!passedserversoftware) {
            Iris.info("Server type & version: " + C.RED + Bukkit.getVersion());
@@ -821,37 +856,11 @@ public class Iris extends VolmitPlugin implements Listener {
                Iris.info(C.YELLOW + "Purpur is recommended to use with iris.");
            }
        }
-        Iris.info("Server OS: " + osName + " (" + osArch + ")");
-
-        try {
-            if (warningmode){
-                Iris.info("Server Cpu: " + C.GOLD + getCPUModel());
-            } else {
-            if(unstablemode){
-                Iris.info("Server Cpu: " + C.DARK_RED + getCPUModel());
-            } else {
-                if (getCPUModel().contains("Intel")) {
-                    Iris.info("Server Cpu: " + C.BLUE + getCPUModel());
-                }
-                if (getCPUModel().contains("Ryzen")) {
-                    Iris.info("Server Cpu: " + C.RED + getCPUModel());
-                }
-                if (!getCPUModel().contains("Ryzen") && !getCPUModel().contains("Intel")) {
-                    Iris.info("Server Cpu: " + C.GRAY + getCPUModel());
-                }
-            }
-            }
-        } catch (Exception e){
-            Iris.info("Server Cpu: " + C.DARK_RED + "Failed");
-        }
-
-        Iris.info("Process Threads: " +  Runtime.getRuntime().availableProcessors());
-        Iris.info("Process Memory: " + getHardware.getProcessMemory() + " MB");
-        Iris.info("Free DiskSpace: " + Form.ofSize(freeSpace.getFreeSpace(), 1024));
        if (getHardware.getProcessMemory() < 5999) {
            Iris.warn("6GB+ Ram is recommended");
+            Iris.warn("Process Memory: " + getHardware.getProcessMemory() + " MB");
        }
-        Iris.info("Bukkit version: " + Bukkit.getBukkitVersion());
+        Iris.info("Bukkit distro: " + Bukkit.getName());
        Iris.info("Custom Biomes: " + INMS.get().countCustomBiomes());
        setupChecks();
        printPacks();
--- a/core/src/main/java/com/volmit/iris/core/IrisSettings.java
+++ b/core/src/main/java/com/volmit/iris/core/IrisSettings.java
@@ -25,7 +25,9 @@ import com.volmit.iris.util.json.JSONException;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.ChronoLatch;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 import java.io.File;
 import java.io.IOException;
@@ -42,6 +44,7 @@ public class IrisSettings {
    private IrisSettingsConcurrency concurrency = new IrisSettingsConcurrency();
    private IrisSettingsStudio studio = new IrisSettingsStudio();
    private IrisSettingsPerformance performance = new IrisSettingsPerformance();
+    private IrisSettingsUpdater updater = new IrisSettingsUpdater();

    public static int getThreadCount(int c) {
        return switch (c) {
@@ -144,9 +147,33 @@ public class IrisSettings {
        public int scriptLoaderCacheSize = 512;
    }

+    @Data
+    public static class IrisSettingsUpdater {
+        public double threadMultiplier = 2;
+        public double chunkLoadSensitivity = 0.7;
+        public MsRange emptyMsRange = new MsRange(80, 100);
+        public MsRange defaultMsRange = new MsRange(20, 40);
+
+        public double getThreadMultiplier() {
+            return Math.min(Math.abs(threadMultiplier), 0.1);
+        }
+
+        public double getChunkLoadSensitivity() {
+            return Math.min(chunkLoadSensitivity, 0.9);
+        }
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class MsRange {
+        public int min = 20;
+        public int max = 40;
+    }
+
    @Data
    public static class IrisSettingsGeneral {
-        public boolean ignoreBootMode = false;
+        public boolean DoomsdayAnnihilationSelfDestructMode = false;
        public boolean commandSounds = true;
        public boolean debug = false;
        public boolean disableNMS = false;
@@ -171,13 +198,13 @@ public class IrisSettings {
    public static class IrisSettingsGUI {
        public boolean useServerLaunchedGuis = true;
        public boolean maximumPregenGuiFPS = false;
+        public boolean colorMode = true;
    }

    @Data
    public static class IrisSettingsGenerator {
        public String defaultWorldType = "overworld";
        public int maxBiomeChildDepth = 4;
-       // public boolean forceConvertTo320Height = false;
        public boolean preventLeafDecay = true;
    }

--- a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
+++ b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
@@ -21,6 +21,8 @@ package com.volmit.iris.core;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.core.nms.datapack.DataVersion;
+import com.volmit.iris.core.nms.datapack.IDataFixer;
 import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.object.IrisBiomeCustom;
 import com.volmit.iris.engine.object.IrisDimension;
@@ -56,7 +58,7 @@ public class ServerConfigurator {
    }

    private static void increaseKeepAliveSpigot() throws IOException, InvalidConfigurationException {
-        File spigotConfig = new File("config/spigot.yml");
+        File spigotConfig = new File("spigot.yml");
        FileConfiguration f = new YamlConfiguration();
        f.load(spigotConfig);
        long tt = f.getLong("settings.timeout-time");
@@ -91,8 +93,11 @@ public class ServerConfigurator {
        return worlds;
    }

-
    public static void installDataPacks(boolean fullInstall) {
+        installDataPacks(DataVersion.getDefault(), fullInstall);
+    }
+
+    public static void installDataPacks(IDataFixer fixer, boolean fullInstall) {
        Iris.info("Checking Data Packs...");
        File packs = new File("plugins/Iris/packs");
        double ultimateMaxHeight = 0;
@@ -137,7 +142,7 @@ public class ServerConfigurator {

                                Iris.verbose("  Checking Dimension " + dim.getLoadFile().getPath());
                                for (File dpack : getDatapacksFolder()) {
-                                    dim.installDataPack(() -> data, dpack, ultimateMaxHeight, ultimateMinHeight);
+                                    dim.installDataPack(fixer, () -> data, dpack, ultimateMaxHeight, ultimateMinHeight);
                                }
                            }
                        }
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
@@ -19,30 +19,27 @@
 package com.volmit.iris.core.commands;

 import com.volmit.iris.Iris;
+import com.volmit.iris.core.ServerConfigurator;
 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.nms.datapack.DataVersion;
 import com.volmit.iris.core.service.IrisEngineSVC;
 import com.volmit.iris.core.tools.IrisPackBenchmarking;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.mantle.components.MantleObjectComponent;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisCave;
 import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisEntity;
-import com.volmit.iris.util.data.Dimension;
 import com.volmit.iris.util.decree.DecreeExecutor;
 import com.volmit.iris.util.decree.DecreeOrigin;
 import com.volmit.iris.util.decree.annotations.Decree;
 import com.volmit.iris.util.decree.annotations.Param;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.io.CountingDataInputStream;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.mantle.TectonicPlate;
-import com.volmit.iris.util.math.Vector3d;
+import com.volmit.iris.util.nbt.mca.MCAFile;
+import com.volmit.iris.util.nbt.mca.MCAUtil;
+import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.VolmitSender;
-import io.lumine.mythic.bukkit.adapters.BukkitEntity;
 import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;
 import net.jpountz.lz4.LZ4FrameInputStream;
@@ -50,10 +47,7 @@ import net.jpountz.lz4.LZ4FrameOutputStream;
 import org.apache.commons.lang.RandomStringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
-import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.EntityType;

 import java.io.*;
 import java.net.InetAddress;
@@ -61,12 +55,14 @@ import java.net.NetworkInterface;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;

@Decree(name = "Developer", origin = DecreeOrigin.BOTH, description = "Iris World Manager", aliases = {"dev"})
 public class CommandDeveloper implements DecreeExecutor {
    private CommandTurboPregen turboPregen;
+    private CommandUpdater updater;

    @Decree(description = "Get Loaded TectonicPlates Count", origin = DecreeOrigin.BOTH, sync = true)
    public void EngineStatus() {
@@ -142,17 +138,35 @@ public class CommandDeveloper implements DecreeExecutor {

    @Decree(description = "Test")
    public void packBenchmark(
-            @Param(description = "The pack to bench", aliases = {"pack"})
-            IrisDimension dimension
+            @Param(description = "The pack to bench", aliases = {"pack"}, defaultValue = "overworld")
+            IrisDimension dimension,
+            @Param(description = "Radius in regions", defaultValue = "5")
+            int radius,
+            @Param(description = "Open GUI while benchmarking", defaultValue = "false")
+            boolean gui
    ) {
-        Iris.info("test");
-        IrisPackBenchmarking benchmark = new IrisPackBenchmarking(dimension, 1);
+        new IrisPackBenchmarking(dimension, radius, gui);
+    }

+    @Decree(description = "Upgrade to another Minecraft version")
+    public void upgrade(
+            @Param(description = "The version to upgrade to", defaultValue = "latest") DataVersion version) {
+        sender().sendMessage(C.GREEN + "Upgrading to " + version.getVersion() + "...");
+        ServerConfigurator.installDataPacks(version.get(), false);
+        sender().sendMessage(C.GREEN + "Done upgrading! You can now update your server version to " + version.getVersion());
    }

    @Decree(description = "test")
-    public void test() throws NoSuchFieldException, IllegalAccessException {
-        IrisEngineSVC.instance.engineStatus();
+    public void mca (
+            @Param(description = "String") String world) {
+        try {
+            File[] McaFiles = new File(world, "region").listFiles((dir, name) -> name.endsWith(".mca"));
+            for (File mca : McaFiles) {
+                MCAFile MCARegion = MCAUtil.read(mca);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }

    }

@@ -182,6 +196,23 @@ public class CommandDeveloper implements DecreeExecutor {

    }

+    @Decree
+    public void objects(@Param(defaultValue = "overworld") IrisDimension dimension) {
+        var loader = dimension.getLoader().getObjectLoader();
+        var sender = sender();
+        var keys = loader.getPossibleKeys();
+        var burst = MultiBurst.burst.burst(keys.length);
+        AtomicInteger failed = new AtomicInteger();
+        for (String key : keys) {
+            burst.queue(() -> {
+                if (loader.load(key) == null)
+                    failed.incrementAndGet();
+            });
+        }
+        burst.complete();
+        sender.sendMessage(C.RED + "Failed to load " + failed.get() + " of " + keys.length + " objects");
+    }
+
    @Decree(description = "Test", aliases = {"ip"})
    public void network() {
        try {
@@ -219,7 +250,7 @@ public class CommandDeveloper implements DecreeExecutor {
            VolmitSender sender = sender();
            service.submit(() -> {
                try {
-                    DataInputStream raw = new DataInputStream(new FileInputStream(file));
+                    CountingDataInputStream raw = CountingDataInputStream.wrap(new FileInputStream(file));
                    TectonicPlate plate = new TectonicPlate(height, raw);
                    raw.close();

@@ -238,7 +269,7 @@ public class CommandDeveloper implements DecreeExecutor {
                        if (size == 0)
                            size = tmp.length();
                        start = System.currentTimeMillis();
-                        DataInputStream din = createInput(tmp, algorithm);
+                        CountingDataInputStream din = createInput(tmp, algorithm);
                        new TectonicPlate(height, din);
                        din.close();
                        d2 += System.currentTimeMillis() - start;
@@ -258,10 +289,10 @@ public class CommandDeveloper implements DecreeExecutor {
        }
    }

-    private DataInputStream createInput(File file, String algorithm) throws Throwable {
+    private CountingDataInputStream createInput(File file, String algorithm) throws Throwable {
        FileInputStream in = new FileInputStream(file);

-        return new DataInputStream(switch (algorithm) {
+        return CountingDataInputStream.wrap(switch (algorithm) {
            case "gzip" -> new GZIPInputStream(in);
            case "lz4f" -> new LZ4FrameInputStream(in);
            case "lz4b" -> new LZ4BlockInputStream(in);
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandIris.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandIris.java
@@ -20,7 +20,10 @@ package com.volmit.iris.core.commands;

 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.ServerConfigurator;
 import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.nms.datapack.DataVersion;
+import com.volmit.iris.core.pregenerator.ChunkUpdater;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisBenchmarking;
 import com.volmit.iris.core.tools.IrisToolbelt;
@@ -30,12 +33,14 @@ import com.volmit.iris.core.safeguard.UtilsSFG;
 import com.volmit.iris.engine.object.IrisWorld;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;
 import com.volmit.iris.engine.platform.DummyChunkGenerator;
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.decree.DecreeExecutor;
 import com.volmit.iris.util.decree.DecreeOrigin;
 import com.volmit.iris.util.decree.annotations.Decree;
 import com.volmit.iris.util.decree.annotations.Param;
 import com.volmit.iris.util.decree.specialhandlers.NullablePlayerHandler;
 import com.volmit.iris.util.format.C;
+import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;
 import lombok.Getter;
@@ -75,9 +80,9 @@ public class CommandIris implements DecreeExecutor {
    private CommandWhat what;
    private CommandEdit edit;
    private CommandFind find;
+    private CommandSupport support;
    private CommandDeveloper developer;
    public static boolean worldCreation = false;
-    String WorldToLoad;
    String WorldEngine;
    String worldNameToCheck = "YourWorldName";
    VolmitSender sender = Iris.getSender();
@@ -89,7 +94,9 @@ public class CommandIris implements DecreeExecutor {
            @Param(aliases = "dimension", description = "The dimension type to create the world with", defaultValue = "default")
            IrisDimension type,
            @Param(description = "The seed to generate the world with", defaultValue = "1337")
-            long seed
+            long seed,
+            @Param(description = "If it should convert the dimension to match the vanilla height system.", defaultValue = "false")
+            boolean vanillaheight
    ) {
        if(sender() instanceof Player) {
            if (incompatibilities.get("Multiverse-Core")) {
@@ -133,6 +140,7 @@ public class CommandIris implements DecreeExecutor {
                    .seed(seed)
                    .sender(sender())
                    .studio(false)
+                    .smartVanillaHeight(vanillaheight)
                    .create();
        } catch (Throwable e) {
            sender().sendMessage(C.RED + "Exception raised during creation. See the console for more details.");
@@ -216,41 +224,41 @@ public class CommandIris implements DecreeExecutor {
        Iris.service(StudioSVC.class).open(sender(), 1337, "overworld");
    }

-    @Decree(description = "Check if iris has access to that specific world")
-    public void hasAccess(
-            @Param(description = "The world to access", aliases = {"world"})
-            World world
-    ) {
-        Engine engine = IrisToolbelt.access(world).getEngine();
-        if (engine != null) {
-            sender().sendMessage("Access granted successfully.");
-        } else {
-            sender().sendMessage(C.RED + "Failed to grant access.");
-        }
-    }
+    @Decree(description = "Check access of all worlds.", aliases = {"accesslist"})
+    public void worlds() {
+        KList<World> IrisWorlds = new KList<>();
+        KList<World> BukkitWorlds = new KList<>();

-    @Decree(description = "All Iris Worlds on the server.", aliases = {"worlds"})
-    public void irisworlds() {
-        List<World> IrisWorlds = new ArrayList<>();
-        for (World world : Bukkit.getWorlds()) {
+        for (World w : Bukkit.getServer().getWorlds()) {
            try {
-                if (IrisToolbelt.access(world).getEngine() != null) {
-                    IrisWorlds.add(world);
+                Engine engine = IrisToolbelt.access(w).getEngine();
+                if (engine != null) {
+                    IrisWorlds.add(w);
                }
            } catch (Exception e) {
-                // no
+                BukkitWorlds.add(w);
            }
        }
+
        if (sender().isPlayer()) {
-            sender.sendMessage(C.IRIS + "Iris Worlds:");
-            for (World world : IrisWorlds) {
-                sender.sendMessage(C.GREEN + "- " + world.getName());
+            sender().sendMessage(C.BLUE + "Iris Worlds: ");
+            for (World IrisWorld : IrisWorlds.copy()) {
+                sender().sendMessage(C.IRIS + "- " +IrisWorld.getName());
+            }
+            sender().sendMessage(C.GOLD + "Bukkit Worlds: ");
+            for (World BukkitWorld : BukkitWorlds.copy()) {
+                sender().sendMessage(C.GRAY + "- " +BukkitWorld.getName());
            }
        } else {
-            Iris.info(C.IRIS + "Iris Worlds:");
-            for (World world : IrisWorlds) {
-                sender.sendMessage(C.GREEN + "- " + world.getName());
+            Iris.info(C.BLUE + "Iris Worlds: ");
+            for (World IrisWorld : IrisWorlds.copy()) {
+                Iris.info(C.IRIS + "- " +IrisWorld.getName());
            }
+            Iris.info(C.GOLD + "Bukkit Worlds: ");
+            for (World BukkitWorld : BukkitWorlds.copy()) {
+                Iris.info(C.GRAY + "- " +BukkitWorld.getName());
+            }
+            
        }
    }

@@ -314,6 +322,24 @@ public class CommandIris implements DecreeExecutor {
        return dir.delete();
    }

+    @Decree(description = "Updates all chunk in the specified world")
+    public void updater(
+            @Param(description = "World to update chunks at")
+            World world
+    ) {
+        if (!IrisToolbelt.isIrisWorld(world)) {
+            sender().sendMessage(C.GOLD + "This is not an Iris world");
+            return;
+        }
+        ChunkUpdater updater = new ChunkUpdater(world);
+        if (sender().isPlayer()) {
+            sender().sendMessage(C.GREEN + "Updating " + world.getName() + " Total chunks: " + Form.f(updater.getChunks()));
+        } else {
+            Iris.info(C.GREEN + "Updating " + world.getName() + " Total chunks: " + Form.f(updater.getChunks()));
+        }
+        updater.start();
+    }
+
    @Decree(description = "Set aura spins")
    public void aura(
            @Param(description = "The h color value", defaultValue = "-20")
@@ -473,7 +499,7 @@ public class CommandIris implements DecreeExecutor {
            sender().sendMessage(C.YELLOW + world + " Doesnt exist on the server.");
            return;
        }
-        WorldToLoad = world;
+
        File BUKKIT_YML = new File("bukkit.yml");
        String pathtodim = world + File.separator +"iris"+File.separator +"pack"+File.separator +"dimensions"+File.separator;
        File directory = new File(Bukkit.getWorldContainer(), pathtodim);
@@ -509,9 +535,10 @@ public class CommandIris implements DecreeExecutor {
            } catch (IOException e) {
                Iris.error("Failed to update bukkit.yml!");
                e.printStackTrace();
+                return;
            }
        }
-        checkForBukkitWorlds();
+        checkForBukkitWorlds(world);
        sender().sendMessage(C.GREEN + world + " loaded successfully.");
    }
    @Decree(description = "Evacuate an iris world", origin = DecreeOrigin.PLAYER, sync = true)
@@ -532,7 +559,7 @@ public class CommandIris implements DecreeExecutor {
        File worldDirectory = new File(worldContainer, worldName);
        return worldDirectory.exists() && worldDirectory.isDirectory();
    }
-    private void checkForBukkitWorlds() {
+    private void checkForBukkitWorlds(String world) {
        FileConfiguration fc = new YamlConfiguration();
        try {
            fc.load(new File("bukkit.yml"));
@@ -541,9 +568,9 @@ public class CommandIris implements DecreeExecutor {
                return;
            }

-            List<String> worldsToLoad = Collections.singletonList(WorldToLoad);
+            List<String> worldsToLoad = Collections.singletonList(world);

-            for (String s : section.getKeys(false)) {
+             for (String s : section.getKeys(false)) {
                if (!worldsToLoad.contains(s)) {
                    continue;
                }
@@ -622,6 +649,6 @@ public class CommandIris implements DecreeExecutor {
            ff.mkdirs();
            service(StudioSVC.class).installIntoWorld(sender, dim.getLoadKey(), ff.getParentFile());
        }
-        return new BukkitChunkGenerator(w, false, ff, dim.getLoadKey());
+        return new BukkitChunkGenerator(w, false, ff, dim.getLoadKey(), false);
    }
 }
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandJigsaw.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandJigsaw.java
@@ -21,6 +21,7 @@ package com.volmit.iris.core.commands;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.engine.framework.placer.WorldObjectPlacer;
 import com.volmit.iris.engine.jigsaw.PlannedStructure;
 import com.volmit.iris.engine.object.IrisJigsawPiece;
 import com.volmit.iris.engine.object.IrisJigsawStructure;
@@ -34,6 +35,7 @@ import com.volmit.iris.util.decree.specialhandlers.ObjectHandler;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;

 import java.io.File;
@@ -55,9 +57,16 @@ public class CommandJigsaw implements DecreeExecutor {
            IrisJigsawStructure structure
    ) {
        PrecisionStopwatch p = PrecisionStopwatch.start();
-        PlannedStructure ps = new PlannedStructure(structure, new IrisPosition(player().getLocation()), new RNG());
-        sender().sendMessage(C.GREEN + "Generated " + ps.getPieces().size() + " pieces in " + Form.duration(p.getMilliseconds(), 2));
-        ps.place(world());
+        try {
+            var world = world();
+            WorldObjectPlacer placer = new WorldObjectPlacer(world);
+            PlannedStructure ps = new PlannedStructure(structure, new IrisPosition(player().getLocation().add(0, world.getMinHeight(), 0)), new RNG(), true);
+            VolmitSender sender = sender();
+            sender.sendMessage(C.GREEN + "Generated " + ps.getPieces().size() + " pieces in " + Form.duration(p.getMilliseconds(), 2));
+            ps.place(placer, failed -> sender.sendMessage(failed ? C.GREEN + "Placed the structure!" : C.RED + "Failed to place the structure!"));
+        } catch (IllegalArgumentException e) {
+            sender().sendMessage(C.RED + "Failed to place the structure: " + e.getMessage());
+        }
    }

    @Decree(description = "Create a jigsaw piece")
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandObject.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandObject.java
@@ -24,6 +24,7 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.ObjectSVC;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.service.WandSVC;
+import com.volmit.iris.core.tools.IrisConverter;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.data.Cuboid;
@@ -35,6 +36,7 @@ import com.volmit.iris.util.decree.specialhandlers.ObjectHandler;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.Direction;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.misc.E;
 import com.volmit.iris.util.scheduling.Queue;
 import org.bukkit.*;
 import org.bukkit.block.Block;
@@ -52,7 +54,7 @@ import java.util.*;
@Decree(name = "object", aliases = "o", origin = DecreeOrigin.PLAYER, studio = true, description = "Iris object manipulation")
 public class CommandObject implements DecreeExecutor {

-    private static final Set<Material> skipBlocks = Set.of(Material.GRASS, Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH,
+    private static final Set<Material> skipBlocks = Set.of(E.getOrDefault(Material.class, "GRASS", "SHORT_GRASS"), Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH,
            Material.POPPY, Material.DANDELION);

    public static IObjectPlacer createPlacer(World world, Map<Block, BlockData> futureBlockChanges) {
@@ -116,10 +118,8 @@ public class CommandObject implements DecreeExecutor {
            }

            @Override
-            public void setTile(int xx, int yy, int zz, TileData<? extends TileState> tile) {
-                BlockState state = world.getBlockAt(xx, yy, zz).getState();
-                tile.toBukkitTry(state);
-                state.update();
+            public void setTile(int xx, int yy, int zz, TileData tile) {
+                tile.toBukkitTry(world.getBlockAt(xx, yy, zz));
            }

            @Override
@@ -197,6 +197,30 @@ public class CommandObject implements DecreeExecutor {
        }
    }

+    @Decree(description = "Shrink an object to its minimum size")
+    public void shrink(@Param(description = "The object to shrink", customHandler = ObjectHandler.class) String object) {
+        IrisObject o = IrisData.loadAnyObject(object);
+        sender().sendMessage("Current Object Size: " + o.getW() + " * " + o.getH() + " * " + o.getD());
+        o.shrinkwrap();
+        sender().sendMessage("New Object Size: " + o.getW() + " * " + o.getH() + " * " + o.getD());
+        try {
+            o.write(o.getLoadFile());
+        } catch (IOException e) {
+            sender().sendMessage("Failed to save object " + o.getLoadFile() + ": " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    @Decree(description = "Convert .schem files in the 'convert' folder to .iob files.")
+    public void convert () {
+        try {
+            IrisConverter.convertSchematics(sender());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
    @Decree(description = "Get a powder that reveals objects", studio = true, aliases = "d")
    public void dust() {
        player().getInventory().addItem(WandSVC.createDust());
@@ -352,9 +376,11 @@ public class CommandObject implements DecreeExecutor {
            @Param(description = "The file to store it in, can use / for subfolders")
            String name,
            @Param(description = "Overwrite existing object files", defaultValue = "false", aliases = "force")
-            boolean overwrite
+            boolean overwrite,
+            @Param(description = "Use legacy TileState serialization if possible", defaultValue = "true")
+            boolean legacy
    ) {
-        IrisObject o = WandSVC.createSchematic(player());
+        IrisObject o = WandSVC.createSchematic(player(), legacy);

        if (o == null) {
            sender().sendMessage(C.YELLOW + "You need to hold your wand!");
@@ -368,7 +394,7 @@ public class CommandObject implements DecreeExecutor {
            return;
        }
        try {
-            o.write(file);
+            o.write(file, sender());
        } catch (IOException e) {
            sender().sendMessage(C.RED + "Failed to save object because of an IOException: " + e.getMessage());
            Iris.reportError(e);
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
@@ -26,7 +26,6 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.project.IrisProject;
 import com.volmit.iris.core.service.ConversionSVC;
 import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.core.tools.IrisConverter;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.*;
@@ -74,6 +73,7 @@ import java.nio.file.Files;
 import java.nio.file.attribute.FileTime;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
@@ -85,7 +85,7 @@ import java.util.function.Supplier;
 public class CommandStudio implements DecreeExecutor {
    private CommandFind find;
    private CommandEdit edit;
-    private CommandDeepSearch deepSearch;
+    //private CommandDeepSearch deepSearch;

    public static String hrf(Duration duration) {
        return duration.toString().substring(2).replaceAll("(\\d[HMS])(?!$)", "$1 ").toLowerCase();
@@ -302,7 +302,7 @@ public class CommandStudio implements DecreeExecutor {
        Inventory inv = Bukkit.createInventory(null, 27 * 2);

        try {
-            engine().addItems(true, inv, RNG.r, tables, InventorySlotType.STORAGE, player().getLocation().getBlockX(), player().getLocation().getBlockY(), player().getLocation().getBlockZ(), 1);
+            engine().addItems(true, inv, RNG.r, tables, InventorySlotType.STORAGE, player().getWorld(), player().getLocation().getBlockX(), player().getLocation().getBlockY(), player().getLocation().getBlockZ(), 1);
        } catch (Throwable e) {
            Iris.reportError(e);
            sender().sendMessage(C.RED + "Cannot add items to virtual inventory because of: " + e.getMessage());
@@ -325,13 +325,80 @@ public class CommandStudio implements DecreeExecutor {
                inv.clear();
            }

-            engine().addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, player().getLocation().getBlockX(), player().getLocation().getBlockY(), player().getLocation().getBlockZ(), 1);
+            engine().addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, player().getWorld(), player().getLocation().getBlockX(), player().getLocation().getBlockY(), player().getLocation().getBlockZ(), 1);
        }, 0, fast ? 5 : 35));

        sender().sendMessage(C.GREEN + "Opening inventory now!");
        player().openInventory(inv);
    }

+
+    @Decree(description = "Get all structures in a radius of chunks", aliases = "dist", origin = DecreeOrigin.PLAYER)
+    public void distances(@Param(description = "The radius in chunks") int radius) {
+        var engine = engine();
+        if (engine == null) {
+            sender().sendMessage(C.RED + "Only works in an Iris world!");
+            return;
+        }
+        var sender = sender();
+        int d = radius * 2;
+        KMap<String, KList<Position2>> data = new KMap<>();
+        var multiBurst = new MultiBurst("Distance Sampler", Thread.MIN_PRIORITY);
+        var executor = multiBurst.burst(radius * radius);
+
+        sender.sendMessage(C.GRAY + "Generating data...");
+        var loc = player().getLocation();
+        int totalTasks = d * d;
+        AtomicInteger completedTasks = new AtomicInteger(0);
+        int c = J.ar(() -> {
+            sender.sendProgress((double) completedTasks.get() / totalTasks, "Finding structures");
+        }, 0);
+
+        new Spiraler(d, d, (x, z) -> executor.queue(() -> {
+            var struct = engine.getStructureAt(x, z);
+            if (struct != null) {
+                data.computeIfAbsent(struct.getLoadKey(), (k) -> new KList<>()).add(new Position2(x, z));
+            }
+            completedTasks.incrementAndGet();
+        })).setOffset(loc.getBlockX(), loc.getBlockZ()).drain();
+
+        executor.complete();
+        multiBurst.close();
+        J.car(c);
+
+        for (var key : data.keySet()) {
+            var list = data.get(key);
+            KList<Long> distances = new KList<>(list.size() - 1);
+            for (int i = 0; i < list.size(); i++) {
+                var pos = list.get(i);
+                double dist = Integer.MAX_VALUE;
+                for (var p : list) {
+                    if (p.equals(pos)) continue;
+                    dist = Math.min(dist, Math.sqrt(Math.pow(pos.getX() - p.getX(), 2) + Math.pow(pos.getZ() - p.getZ(), 2)));
+                }
+                if (dist == Integer.MAX_VALUE) continue;
+                distances.add(Math.round(dist * 16));
+            }
+            long[] array = new long[distances.size()];
+            for (int i = 0; i < distances.size(); i++) {
+                array[i] = distances.get(i);
+            }
+            Arrays.sort(array);
+            long min = array.length > 0 ? array[0] : 0;
+            long max = array.length > 0 ? array[array.length - 1] : 0;
+            long sum = Arrays.stream(array).sum();
+            long avg = array.length > 0 ? Math.round(sum / (double) array.length) : 0;
+            String msg = "%s: %s => min: %s/max: %s -> avg: %s".formatted(key, list.size(), min, max, avg);
+            sender.sendMessage(msg);
+        }
+        if (data.isEmpty()) {
+            sender.sendMessage(C.RED + "No data found!");
+        } else {
+            sender.sendMessage(C.GREEN + "Done!");
+        }
+    }
+
+
    @Decree(description = "Render a world map (External GUI)", aliases = "render")
    public void map(
            @Param(name = "world", description = "The world to open the generator for", contextual = true)
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandSupport.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandSupport.java
@@ -0,0 +1,82 @@
+/*
+ * 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.core.commands;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.pregenerator.ChunkUpdater;
+import com.volmit.iris.core.service.IrisEngineSVC;
+import com.volmit.iris.core.tools.IrisPackBenchmarking;
+import com.volmit.iris.core.tools.IrisToolbelt;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.decree.DecreeExecutor;
+import com.volmit.iris.util.decree.DecreeOrigin;
+import com.volmit.iris.util.decree.annotations.Decree;
+import com.volmit.iris.util.decree.annotations.Param;
+import com.volmit.iris.util.format.C;
+import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.io.IO;
+import com.volmit.iris.util.mantle.TectonicPlate;
+import com.volmit.iris.util.misc.Hastebin;
+import com.volmit.iris.util.misc.Platform;
+import com.volmit.iris.util.misc.getHardware;
+import com.volmit.iris.util.nbt.mca.MCAFile;
+import com.volmit.iris.util.nbt.mca.MCAUtil;
+import com.volmit.iris.util.plugin.VolmitSender;
+import net.jpountz.lz4.LZ4BlockInputStream;
+import net.jpountz.lz4.LZ4BlockOutputStream;
+import net.jpountz.lz4.LZ4FrameInputStream;
+import net.jpountz.lz4.LZ4FrameOutputStream;
+import org.apache.commons.lang.RandomStringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import oshi.SystemInfo;
+
+import java.io.*;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+@Decree(name = "Support", origin = DecreeOrigin.BOTH, description = "Iris World Manager", aliases = {"support"})
+public class CommandSupport implements DecreeExecutor {
+
+    @Decree(description = "report")
+    public void report() {
+        try {
+            if (sender().isPlayer()) sender().sendMessage(C.GOLD + "Creating report..");
+            if (!sender().isPlayer()) Iris.info(C.GOLD + "Creating report..");
+            Hastebin.enviornment(sender());
+
+        } catch (Exception e) {
+            Iris.info(C.RED + "Something went wrong: ");
+            e.printStackTrace();
+        }
+    }
+
+
+}
+
+
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandUpdater.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandUpdater.java
@@ -0,0 +1,96 @@
+/*
+ * 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.core.commands;
+
+import org.bukkit.World;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.pregenerator.ChunkUpdater;
+import com.volmit.iris.core.tools.IrisToolbelt;
+import com.volmit.iris.util.decree.DecreeExecutor;
+import com.volmit.iris.util.decree.DecreeOrigin;
+import com.volmit.iris.util.decree.annotations.Decree;
+import com.volmit.iris.util.decree.annotations.Param;
+import com.volmit.iris.util.format.C;
+import com.volmit.iris.util.format.Form;
+
+@Decree(name = "updater", origin = DecreeOrigin.BOTH, description = "Iris World Updater")
+public class CommandUpdater implements DecreeExecutor {
+    private ChunkUpdater chunkUpdater;
+
+    @Decree(description = "Updates all chunk in the specified world")
+    public void start(
+            @Param(description = "World to update chunks at", contextual = true)
+            World world
+    ) {
+        if (!IrisToolbelt.isIrisWorld(world)) {
+            sender().sendMessage(C.GOLD + "This is not an Iris world");
+            return;
+        }
+        if (chunkUpdater != null) {
+            chunkUpdater.stop();
+        }
+
+        chunkUpdater = new ChunkUpdater(world);
+        if (sender().isPlayer()) {
+            sender().sendMessage(C.GREEN + "Updating " + world.getName()  + C.GRAY + " Total chunks: " + Form.f(chunkUpdater.getChunks()));
+        } else {
+            Iris.info(C.GREEN + "Updating " + world.getName() + C.GRAY + " Total chunks: " + Form.f(chunkUpdater.getChunks()));
+        }
+        chunkUpdater.start();
+    }
+
+    @Decree(description = "Pause the updater")
+    public void pause( ) {
+        if (chunkUpdater == null) {
+            sender().sendMessage(C.GOLD + "You cant pause something that doesnt exist?");
+            return;
+        }
+        boolean status = chunkUpdater.pause();
+        if (sender().isPlayer()) {
+            if (status) {
+                sender().sendMessage(C.IRIS + "Paused task for: " + C.GRAY + chunkUpdater.getName());
+            } else {
+                sender().sendMessage(C.IRIS + "Unpause task for: " + C.GRAY + chunkUpdater.getName());
+            }
+        } else {
+            if (status) {
+                Iris.info(C.IRIS + "Paused task for: " + C.GRAY + chunkUpdater.getName());
+            } else {
+                Iris.info(C.IRIS + "Unpause task for: " + C.GRAY + chunkUpdater.getName());
+            }
+        }
+    }
+
+    @Decree(description = "Stops the updater")
+    public void stop() {
+        if (chunkUpdater == null) {
+            sender().sendMessage(C.GOLD + "You cant stop something that doesnt exist?");
+            return;
+        }
+        if (sender().isPlayer()) {
+            sender().sendMessage("Stopping Updater for: " + C.GRAY + chunkUpdater.getName());
+        } else {
+            Iris.info("Stopping Updater for: " + C.GRAY + chunkUpdater.getName());
+        }
+        chunkUpdater.stop();
+    }
+}
+
+
--- a/core/src/main/java/com/volmit/iris/core/events/IrisLootEvent.java
+++ b/core/src/main/java/com/volmit/iris/core/events/IrisLootEvent.java
@@ -0,0 +1,113 @@
+package com.volmit.iris.core.events;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.object.InventorySlotType;
+import com.volmit.iris.engine.object.IrisLootTable;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.scheduling.J;
+import lombok.Getter;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.world.LootGenerateEvent;
+
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.loot.LootContext;
+import org.bukkit.loot.LootTable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+
+@Getter
+public class IrisLootEvent extends Event {
+    private static final HandlerList handlers = new HandlerList();
+    private static final LootTable EMPTY = new LootTable() {
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return new NamespacedKey(Iris.instance, "empty");
+        }
+
+        @NotNull
+        @Override
+        public Collection<ItemStack> populateLoot(@Nullable Random random, @NotNull LootContext context) {
+            return List.of();
+        }
+
+        @Override
+        public void fillInventory(@NotNull Inventory inventory, @Nullable Random random, @NotNull LootContext context) {
+        }
+    };
+
+    private final Engine engine;
+    private final Block block;
+    private final InventorySlotType slot;
+    private final KList<IrisLootTable> tables;
+
+    /**
+     * Constructor for IrisLootEvent with mode selection.
+     *
+     * @param engine The engine instance.
+     * @param block The block associated with the event.
+     * @param slot The inventory slot type.
+     * @param tables The list of IrisLootTables. (mutable*)
+     */
+    public IrisLootEvent(Engine engine, Block block, InventorySlotType slot, KList<IrisLootTable> tables) {
+        this.engine = engine;
+        this.block = block;
+        this.slot = slot;
+        this.tables = tables;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    /**
+     * Required method to get the HandlerList for this event.
+     *
+     * @return The HandlerList.
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Triggers the corresponding Bukkit loot event.
+     * This method integrates your custom IrisLootTables with Bukkit's LootGenerateEvent,
+     * allowing other plugins to modify or cancel the loot generation.
+     *
+     * @return true when the event was canceled
+     */
+    public static boolean callLootEvent(KList<ItemStack> loot, Inventory inv, World world, int x, int y, int z) {
+        InventoryHolder holder = inv.getHolder();
+        Location loc = new Location(world, x, y, z);
+        if (holder == null) {
+            holder = new InventoryHolder() {
+                @NotNull
+                @Override
+                public Inventory getInventory() {
+                    return inv;
+                }
+            };
+        }
+
+        LootContext context = new LootContext.Builder(loc).build();
+        LootGenerateEvent event = new LootGenerateEvent(world, null, holder, EMPTY, context, loot, true);
+        if (!Bukkit.isPrimaryThread()) {
+            Iris.warn("LootGenerateEvent was not called on the main thread, please report this issue.");
+            Thread.dumpStack();
+            J.sfut(() -> Bukkit.getPluginManager().callEvent(event)).join();
+        } else Bukkit.getPluginManager().callEvent(event);
+
+        return event.isCancelled();
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java
+++ b/core/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java
@@ -19,6 +19,7 @@
 package com.volmit.iris.core.gui;

 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.events.IrisEngineHotloadEvent;
 import com.volmit.iris.engine.object.NoiseStyle;
 import com.volmit.iris.util.collection.KList;
@@ -61,7 +62,7 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
    @SuppressWarnings("CanBeFinal")
    RollingSequence r = new RollingSequence(20);
    @SuppressWarnings("CanBeFinal")
-    boolean colorMode = true;
+    boolean colorMode = IrisSettings.get().getGui().colorMode;
    double scale = 1;
    CNG cng = NoiseStyle.STATIC.create(new RNG(RNG.r.nextLong()));
    @SuppressWarnings("CanBeFinal")
@@ -274,7 +275,8 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
                        n = n > 1 ? 1 : n < 0 ? 0 : n;

                        try {
-                            Color color = colorMode ? Color.getHSBColor((float) (n), 1f - (float) (n * n * n * n * n * n), 1f - (float) n) : Color.getHSBColor(0f, 0f, (float) n);
+                            //Color color = colorMode ? Color.getHSBColor((float) (n), 1f - (float) (n * n * n * n * n * n), 1f - (float) n) : Color.getHSBColor(0f, 0f, (float) n);
+                            Color color = colorMode ? Color.getHSBColor((float) (0.666f - n * 0.666f), 1f, (float) (1f - n * 0.8f)) : Color.getHSBColor(0f, 0f, (float) n);
                            int rgb = color.getRGB();
                            img.setRGB(xx, z, rgb);
                        } catch (Throwable ignored) {
--- a/core/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
+++ b/core/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
@@ -93,7 +93,12 @@ public class PregeneratorJob implements PregenListener {
            open();
        }

-        J.a(this.pregenerator::start, 20);
+        var t = new Thread(() -> {
+            J.sleep(1000);
+            this.pregenerator.start();
+        }, "Iris Pregenerator");
+        t.setPriority(Thread.MIN_PRIORITY);
+        t.start();
    }

    public static boolean shutdownInstance() {
--- a/core/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java
+++ b/core/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java
@@ -55,10 +55,10 @@ public class IrisRenderer {
                IrisBiome b = renderer.getBiome((int) Math.round(x), renderer.getMaxHeight() - 1, (int) Math.round(z));
                IrisBiomeGeneratorLink g = b.getGenerators().get(0);
                Color c;
-                if (g.getMax() <= 0) {
+                if (g.getMax(renderer) <= 0) {
                    // Max is below water level, so it is most likely an ocean biome
                    c = Color.BLUE;
-                } else if (g.getMin() < 0) {
+                } else if (g.getMin(renderer) < 0) {
                    // Min is below water level, but max is not, so it is most likely a shore biome
                    c = Color.YELLOW;
                } else {
--- a/core/src/main/java/com/volmit/iris/core/link/EcoItemsDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/EcoItemsDataProvider.java
@@ -0,0 +1,77 @@
+package com.volmit.iris.core.link;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.reflect.WrappedField;
+import com.willfp.ecoitems.items.EcoItem;
+import com.willfp.ecoitems.items.EcoItems;
+import org.bukkit.NamespacedKey;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.MissingResourceException;
+
+public class EcoItemsDataProvider extends ExternalDataProvider {
+    private WrappedField<EcoItem, ItemStack> itemStack;
+    private WrappedField<EcoItem, NamespacedKey> id;
+
+    public EcoItemsDataProvider() {
+        super("EcoItems");
+    }
+
+    @Override
+    public void init() {
+        Iris.info("Setting up EcoItems Link...");
+        itemStack = new WrappedField<>(EcoItem.class, "_itemStack");
+        if (this.itemStack.hasFailed()) {
+            Iris.error("Failed to set up EcoItems Link: Unable to fetch ItemStack field!");
+        }
+        id = new WrappedField<>(EcoItem.class, "id");
+        if (this.id.hasFailed()) {
+            Iris.error("Failed to set up EcoItems Link: Unable to fetch id field!");
+        }
+    }
+
+    @NotNull
+    @Override
+    public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
+        throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
+    }
+
+    @NotNull
+    @Override
+    public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
+        EcoItem item = EcoItems.INSTANCE.getByID(itemId.key());
+        if (item == null) throw new MissingResourceException("Failed to find Item!", itemId.namespace(), itemId.key());
+        return itemStack.get(item).clone();
+    }
+
+    @NotNull
+    @Override
+    public Identifier[] getBlockTypes() {
+        return new Identifier[0];
+    }
+
+    @NotNull
+    @Override
+    public Identifier[] getItemTypes() {
+        KList<Identifier> names = new KList<>();
+        for (EcoItem item : EcoItems.INSTANCE.values()) {
+            try {
+                Identifier key = Identifier.fromNamespacedKey(id.get(item));
+                if (getItemStack(key) != null)
+                    names.add(key);
+            } catch (MissingResourceException ignored) {
+            }
+        }
+
+        return names.toArray(new Identifier[0]);
+    }
+
+    @Override
+    public boolean isValidProvider(@NotNull Identifier id, boolean isItem) {
+        return id.namespace().equalsIgnoreCase("ecoitems") && isItem;
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/link/ExecutableItemsDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/ExecutableItemsDataProvider.java
@@ -3,8 +3,10 @@ package com.volmit.iris.core.link;
 import com.ssomar.score.api.executableitems.ExecutableItemsAPI;
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;

 import java.util.MissingResourceException;
 import java.util.Optional;
@@ -19,23 +21,27 @@ public class ExecutableItemsDataProvider extends ExternalDataProvider {
        Iris.info("Setting up ExecutableItems Link...");
    }

+    @NotNull
    @Override
-    public BlockData getBlockData(Identifier blockId) throws MissingResourceException {
+    public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
        throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
    }

+    @NotNull
    @Override
-    public ItemStack getItemStack(Identifier itemId) throws MissingResourceException {
+    public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
        return ExecutableItemsAPI.getExecutableItemsManager().getExecutableItem(itemId.key())
                .map(item -> item.buildItem(1, Optional.empty()))
                .orElseThrow(() -> new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key()));
    }

+    @NotNull
    @Override
    public Identifier[] getBlockTypes() {
        return new Identifier[0];
    }

+    @NotNull
    @Override
    public Identifier[] getItemTypes() {
        KList<Identifier> names = new KList<>();
@@ -52,7 +58,7 @@ public class ExecutableItemsDataProvider extends ExternalDataProvider {
    }

    @Override
-    public boolean isValidProvider(Identifier key, boolean isItem) {
+    public boolean isValidProvider(@NotNull Identifier key, boolean isItem) {
        return key.namespace().equalsIgnoreCase("executable_items") && isItem;
    }
 }
--- a/core/src/main/java/com/volmit/iris/core/link/ExternalDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/ExternalDataProvider.java
@@ -1,22 +1,29 @@
 package com.volmit.iris.core.link;

 import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.data.IrisBlockData;
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

 import java.util.MissingResourceException;

+@Getter
@RequiredArgsConstructor
 public abstract class ExternalDataProvider {

-    @Getter
+    @NonNull
    private final String pluginId;

+    @Nullable
    public Plugin getPlugin() {
        return Bukkit.getPluginManager().getPlugin(pluginId);
    }
@@ -27,14 +34,60 @@ public abstract class ExternalDataProvider {

    public abstract void init();

-    public abstract BlockData getBlockData(Identifier blockId) throws MissingResourceException;
+    /**
+     * @see ExternalDataProvider#getBlockData(Identifier, KMap)
+     */
+    @NotNull
+    public BlockData getBlockData(@NotNull Identifier blockId) throws MissingResourceException {
+        return getBlockData(blockId, new KMap<>());
+    }

-    public abstract ItemStack getItemStack(Identifier itemId) throws MissingResourceException;
-    public void processUpdate(Engine engine, Block block, Identifier blockId) {};
+    /**
+     * This method returns a {@link BlockData} corresponding to the blockID
+     * it is used in any place Iris accepts {@link BlockData}
+     *
+     * @param blockId The id of the block to get
+     * @param state The state of the block to get
+     * @return Corresponding {@link BlockData} to the blockId
+     *         may return {@link IrisBlockData} for blocks that need a world for placement
+     * @throws MissingResourceException when the blockId is invalid
+     */
+    @NotNull
+    public abstract BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException;

-    public abstract Identifier[] getBlockTypes();
+    /**
+     * @see ExternalDataProvider#getItemStack(Identifier)
+     */
+    @NotNull
+    public ItemStack getItemStack(@NotNull Identifier itemId) throws MissingResourceException {
+        return getItemStack(itemId, new KMap<>());
+    }

-    public abstract Identifier[] getItemTypes();
+    /**
+     * This method returns a {@link ItemStack} corresponding to the itemID
+     * it is used in loot tables
+     *
+     * @param itemId The id of the item to get
+     * @param customNbt Custom nbt to apply to the item
+     * @return Corresponding {@link ItemStack} to the itemId
+     * @throws MissingResourceException when the itemId is invalid
+     */
+    @NotNull
+    public abstract ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException;

-    public abstract boolean isValidProvider(Identifier id, boolean isItem);
+    /**
+     * This method is used for placing blocks that need to use the plugins api
+     * it will only be called when the {@link ExternalDataProvider#getBlockData(Identifier, KMap)} returned a {@link IrisBlockData}
+     *
+     * @param engine The engine of the world the block is being placed in
+     * @param block The block where the block should be placed
+     * @param blockId The blockId to place
+     */
+    public void processUpdate(@NotNull Engine engine, @NotNull Block block, @NotNull Identifier blockId) {}
+
+    public abstract @NotNull Identifier[] getBlockTypes();
+
+    public abstract @NotNull Identifier[] getItemTypes();
+
+    public abstract boolean isValidProvider(@NotNull Identifier id, boolean isItem);
 }
--- a/core/src/main/java/com/volmit/iris/core/link/HMCLeavesDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/HMCLeavesDataProvider.java
@@ -1,8 +1,11 @@
 package com.volmit.iris.core.link;

 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.service.ExternalDataSVC;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.IrisBlockData;
 import com.volmit.iris.util.reflect.WrappedField;
 import com.volmit.iris.util.reflect.WrappedReturningMethod;
@@ -13,6 +16,7 @@ import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Leaves;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;

 import java.util.Map;
 import java.util.MissingResourceException;
@@ -48,8 +52,9 @@ public class HMCLeavesDataProvider extends ExternalDataProvider {
 		}
 	}

+	@NotNull
 	@Override
-	public BlockData getBlockData(Identifier blockId) throws MissingResourceException {
+	public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
 		Object o = blockDataMap.get(blockId.key());
 		if (o == null)
 			throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
@@ -57,25 +62,34 @@ public class HMCLeavesDataProvider extends ExternalDataProvider {
 		if (material == null)
 			throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
 		BlockData blockData = Bukkit.createBlockData(material);
-		if (blockData instanceof Leaves leaves)
+		if (IrisSettings.get().getGenerator().preventLeafDecay && blockData instanceof Leaves leaves)
 			leaves.setPersistent(true);
-		return new IrisBlockData(blockData, blockId);
+		return new IrisBlockData(blockData, ExternalDataSVC.buildState(blockId, state));
 	}

+	@NotNull
 	@Override
-	public ItemStack getItemStack(Identifier itemId) throws MissingResourceException {
+	public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
 		if (!itemDataField.containsKey(itemId.key()))
 			throw new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key());
 		return itemDataField.get(itemId.key()).get();
 	}

 	@Override
-	public void processUpdate(Engine engine, Block block, Identifier blockId) {
-		Boolean result = setCustomBlock.invoke(apiInstance, new Object[]{block.getLocation(), blockId.key(), true});
+	public void processUpdate(@NotNull Engine engine, @NotNull Block block, @NotNull Identifier blockId) {
+		var pair = ExternalDataSVC.parseState(blockId);
+		blockId = pair.getA();
+		Boolean result = setCustomBlock.invoke(apiInstance, new Object[]{block.getLocation(), blockId.key(), false});
 		if (result == null || !result)
 			Iris.warn("Failed to set custom block! " + blockId.key() + " " + block.getX() + " " + block.getY() + " " + block.getZ());
+		else if (IrisSettings.get().getGenerator().preventLeafDecay) {
+			BlockData blockData = block.getBlockData();
+			if (blockData instanceof Leaves leaves)
+				leaves.setPersistent(true);
+		}
 	}

+	@NotNull
 	@Override
 	public Identifier[] getBlockTypes() {
 		KList<Identifier> names = new KList<>();
@@ -91,6 +105,7 @@ public class HMCLeavesDataProvider extends ExternalDataProvider {
 		return names.toArray(new Identifier[0]);
 	}

+	@NotNull
 	@Override
 	public Identifier[] getItemTypes() {
 		KList<Identifier> names = new KList<>();
@@ -107,7 +122,7 @@ public class HMCLeavesDataProvider extends ExternalDataProvider {
 	}

 	@Override
-	public boolean isValidProvider(Identifier id, boolean isItem) {
+	public boolean isValidProvider(@NotNull Identifier id, boolean isItem) {
 		return (isItem ? itemDataField.keySet() : blockDataMap.keySet()).contains(id.key());
 	}

--- a/core/src/main/java/com/volmit/iris/core/link/Identifier.java
+++ b/core/src/main/java/com/volmit/iris/core/link/Identifier.java
@@ -6,6 +6,10 @@ public record Identifier(String namespace, String key) {

    private static final String DEFAULT_NAMESPACE = "minecraft";

+    public static Identifier fromNamespacedKey(NamespacedKey key) {
+        return new Identifier(key.getNamespace(), key.getKey());
+    }
+
    public static Identifier fromString(String id) {
        String[] strings = id.split(":", 2);
        if (strings.length == 1) {
--- a/core/src/main/java/com/volmit/iris/core/link/ItemAdderDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/ItemAdderDataProvider.java
@@ -2,10 +2,12 @@ package com.volmit.iris.core.link;

 import com.volmit.iris.Iris;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import dev.lone.itemsadder.api.CustomBlock;
 import dev.lone.itemsadder.api.CustomStack;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;

 import java.util.MissingResourceException;

@@ -31,13 +33,15 @@ public class ItemAdderDataProvider extends ExternalDataProvider {
        }
    }

+    @NotNull
    @Override
-    public BlockData getBlockData(Identifier blockId) throws MissingResourceException {
+    public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
        return CustomBlock.getBaseBlockData(blockId.toString());
    }

+    @NotNull
    @Override
-    public ItemStack getItemStack(Identifier itemId) throws MissingResourceException {
+    public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
        CustomStack stack = CustomStack.getInstance(itemId.toString());
        if (stack == null) {
            throw new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key());
@@ -45,6 +49,7 @@ public class ItemAdderDataProvider extends ExternalDataProvider {
        return stack.getItemStack();
    }

+    @NotNull
    @Override
    public Identifier[] getBlockTypes() {
        KList<Identifier> keys = new KList<>();
@@ -54,6 +59,7 @@ public class ItemAdderDataProvider extends ExternalDataProvider {
        return keys.toArray(new Identifier[0]);
    }

+    @NotNull
    @Override
    public Identifier[] getItemTypes() {
        KList<Identifier> keys = new KList<>();
@@ -64,7 +70,7 @@ public class ItemAdderDataProvider extends ExternalDataProvider {
    }

    @Override
-    public boolean isValidProvider(Identifier id, boolean isItem) {
+    public boolean isValidProvider(@NotNull Identifier id, boolean isItem) {
        return isItem ? this.itemNamespaces.contains(id.namespace()) : this.blockNamespaces.contains(id.namespace());
    }
 }
--- a/core/src/main/java/com/volmit/iris/core/link/MMOItemsDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/MMOItemsDataProvider.java
@@ -2,13 +2,16 @@ package com.volmit.iris.core.link;

 import com.volmit.iris.Iris;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.scheduling.J;
 import net.Indyuce.mmoitems.MMOItems;
+import net.Indyuce.mmoitems.api.ItemTier;
 import net.Indyuce.mmoitems.api.Type;
 import net.Indyuce.mmoitems.api.block.CustomBlock;
 import org.bukkit.Bukkit;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;

 import java.util.MissingResourceException;
 import java.util.concurrent.CompletableFuture;
@@ -25,8 +28,9 @@ public class MMOItemsDataProvider extends ExternalDataProvider {
        Iris.info("Setting up MMOItems Link...");
    }

+    @NotNull
    @Override
-    public BlockData getBlockData(Identifier blockId) throws MissingResourceException {
+    public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
        int id = -1;
        try {
            id = Integer.parseInt(blockId.key());
@@ -36,13 +40,40 @@ public class MMOItemsDataProvider extends ExternalDataProvider {
        return block.getState().getBlockData();
    }

+    @NotNull
    @Override
-    public ItemStack getItemStack(Identifier itemId) throws MissingResourceException {
+    public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
        String[] parts = itemId.namespace().split("_", 2);
        if (parts.length != 2)
            throw new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key());
        CompletableFuture<ItemStack> future = new CompletableFuture<>();
-        Runnable run = () -> future.complete(api().getItem(parts[1], itemId.key()));
+        Runnable run = () -> {
+            try {
+                var type = api().getTypes().get(parts[1]);
+                int level = -1;
+                ItemTier tier = null;
+
+                if (customNbt != null) {
+                    level = (int) customNbt.getOrDefault("level", -1);
+                    tier = api().getTiers().get(String.valueOf(customNbt.get("tier")));
+                }
+
+                ItemStack itemStack;
+                if (type == null) {
+                    future.complete(null);
+                    return;
+                }
+
+                if (level != -1 && tier != null) {
+                    itemStack = api().getItem(type, itemId.key(), level, tier);
+                } else {
+                    itemStack = api().getItem(type, itemId.key());
+                }
+                future.complete(itemStack);
+            } catch (Throwable e) {
+                future.completeExceptionally(e);
+            }
+        };
        if (Bukkit.isPrimaryThread()) run.run();
        else J.s(run);
        ItemStack item = null;
@@ -54,6 +85,7 @@ public class MMOItemsDataProvider extends ExternalDataProvider {
        return item;
    }

+    @NotNull
    @Override
    public Identifier[] getBlockTypes() {
        KList<Identifier> names = new KList<>();
@@ -68,6 +100,7 @@ public class MMOItemsDataProvider extends ExternalDataProvider {
        return names.toArray(new Identifier[0]);
    }

+    @NotNull
    @Override
    public Identifier[] getItemTypes() {
        KList<Identifier> names = new KList<>();
@@ -96,7 +129,7 @@ public class MMOItemsDataProvider extends ExternalDataProvider {
    }

    @Override
-    public boolean isValidProvider(Identifier id, boolean isItem) {
+    public boolean isValidProvider(@NotNull Identifier id, boolean isItem) {
        return isItem ? id.namespace().split("_", 2).length == 2 : id.namespace().equals("mmoitems");
    }

--- a/core/src/main/java/com/volmit/iris/core/link/MythicCrucibleDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/MythicCrucibleDataProvider.java
@@ -0,0 +1,171 @@
+/*
+ * 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.core.link;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.core.nms.container.BiomeColor;
+import com.volmit.iris.core.service.ExternalDataSVC;
+import com.volmit.iris.engine.data.cache.Cache;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.data.IrisBlockData;
+import com.volmit.iris.util.math.RNG;
+import io.lumine.mythic.bukkit.BukkitAdapter;
+import io.lumine.mythic.bukkit.utils.serialize.Chroma;
+import io.lumine.mythiccrucible.MythicCrucible;
+import io.lumine.mythiccrucible.items.CrucibleItem;
+import io.lumine.mythiccrucible.items.ItemManager;
+import io.lumine.mythiccrucible.items.blocks.CustomBlockItemContext;
+import io.lumine.mythiccrucible.items.furniture.FurnitureItemContext;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.MissingResourceException;
+import java.util.Optional;
+
+public class MythicCrucibleDataProvider extends ExternalDataProvider {
+
+    private ItemManager itemManager;
+
+    public MythicCrucibleDataProvider() {
+        super("MythicCrucible");
+    }
+
+    @Override
+    public void init() {
+        Iris.info("Setting up MythicCrucible Link...");
+        try {
+            this.itemManager = MythicCrucible.inst().getItemManager();
+        } catch (Exception e) {
+            Iris.error("Failed to set up MythicCrucible Link: Unable to fetch MythicCrucible instance!");
+        }
+    }
+
+    @NotNull
+    @Override
+    public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
+        CrucibleItem crucibleItem = this.itemManager.getItem(blockId.key())
+                .orElseThrow(() -> new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key()));
+        CustomBlockItemContext blockItemContext = crucibleItem.getBlockData();
+        FurnitureItemContext furnitureItemContext = crucibleItem.getFurnitureData();
+        if (furnitureItemContext != null) {
+            return new IrisBlockData(B.getAir(), ExternalDataSVC.buildState(blockId, state));
+        } else if (blockItemContext != null) {
+            return blockItemContext.getBlockData();
+        }
+        throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
+    }
+
+    @NotNull
+    @Override
+    public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
+        Optional<CrucibleItem> opt = this.itemManager.getItem(itemId.key());
+        return BukkitAdapter.adapt(opt.orElseThrow(() ->
+                new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key()))
+                .getMythicItem()
+                .generateItemStack(1));
+    }
+
+    @NotNull
+    @Override
+    public Identifier[] getBlockTypes() {
+        KList<Identifier> names = new KList<>();
+        for (CrucibleItem item : this.itemManager.getItems()) {
+            if (item.getBlockData() == null) continue;
+            try {
+                Identifier key = new Identifier("crucible", item.getInternalName());
+                if (getBlockData(key) != null) {
+                    Iris.info("getBlockTypes: Block loaded '" + item.getInternalName() + "'");
+                    names.add(key);
+                }
+            } catch (MissingResourceException ignored) {}
+        }
+        return names.toArray(new Identifier[0]);
+    }
+
+    @NotNull
+    @Override
+    public Identifier[] getItemTypes() {
+        KList<Identifier> names = new KList<>();
+        for (CrucibleItem item : this.itemManager.getItems()) {
+            try {
+                Identifier key = new Identifier("crucible", item.getInternalName());
+                if (getItemStack(key) != null) {
+                    Iris.info("getItemTypes: Item loaded '" + item.getInternalName() + "'");
+                    names.add(key);
+                }
+            } catch (MissingResourceException ignored) {}
+        }
+        return names.toArray(new Identifier[0]);
+    }
+
+    @Override
+    public void processUpdate(@NotNull Engine engine, @NotNull Block block, @NotNull Identifier blockId) {
+        var pair = ExternalDataSVC.parseState(blockId);
+        var state = pair.getB();
+        blockId = pair.getA();
+
+        Optional<CrucibleItem> item = itemManager.getItem(blockId.key());
+        if (item.isEmpty()) return;
+        FurnitureItemContext furniture = item.get().getFurnitureData();
+        if (furniture == null) return;
+
+        float yaw = 0;
+        BlockFace face = BlockFace.NORTH;
+        long seed = engine.getSeedManager().getSeed() + Cache.key(block.getX(), block.getZ()) + block.getY();
+        RNG rng = new RNG(seed);
+        if ("true".equals(state.get("randomYaw"))) {
+            yaw = rng.f(0, 360);
+        } else if (state.containsKey("yaw")) {
+            yaw = Float.parseFloat(state.get("yaw"));
+        }
+        if ("true".equals(state.get("randomFace"))) {
+            BlockFace[] faces = BlockFace.values();
+            face = faces[rng.i(0, faces.length - 1)];
+        } else if (state.containsKey("face")) {
+            face = BlockFace.valueOf(state.get("face").toUpperCase());
+        }
+        if (face == BlockFace.SELF) {
+            face = BlockFace.NORTH;
+        }
+
+        BiomeColor type = null;
+        Chroma color = null;
+        try {
+            type = BiomeColor.valueOf(state.get("matchBiome").toUpperCase());
+        } catch (NullPointerException | IllegalArgumentException ignored) {}
+        if (type != null) {
+            var biomeColor = INMS.get().getBiomeColor(block.getLocation(), type);
+            if (biomeColor == null) return;
+            color = Chroma.of(biomeColor.getRGB());
+        }
+        furniture.place(block, face, yaw, color);
+    }
+
+    @Override
+    public boolean isValidProvider(@NotNull Identifier key, boolean isItem) {
+        return key.namespace().equalsIgnoreCase("crucible");
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/link/NexoDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/NexoDataProvider.java
@@ -0,0 +1,164 @@
+package com.volmit.iris.core.link;
+
+import com.nexomc.nexo.api.NexoBlocks;
+import com.nexomc.nexo.api.NexoFurniture;
+import com.nexomc.nexo.api.NexoItems;
+import com.nexomc.nexo.items.ItemBuilder;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.core.nms.container.BiomeColor;
+import com.volmit.iris.core.service.ExternalDataSVC;
+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.data.B;
+import com.volmit.iris.util.data.IrisBlockData;
+import com.volmit.iris.util.math.RNG;
+import org.bukkit.Color;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.MissingResourceException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class NexoDataProvider extends ExternalDataProvider {
+    private final AtomicBoolean failed = new AtomicBoolean(false);
+
+    public NexoDataProvider() {
+        super("Nexo");
+    }
+
+    @Override
+    public void init() {
+    }
+
+    @NotNull
+    @Override
+    public BlockData getBlockData(@NotNull Identifier blockId, @NotNull KMap<String, String> state) throws MissingResourceException {
+        if (!NexoItems.exists(blockId.key())) {
+            throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
+        }
+
+        Identifier blockState = ExternalDataSVC.buildState(blockId, state);
+        if (NexoBlocks.isCustomBlock(blockId.key())) {
+            BlockData data = NexoBlocks.blockData(blockId.key());
+            if (data == null)
+                throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
+            return new IrisBlockData(data, blockState);
+        } else if (NexoFurniture.isFurniture(blockId.key())) {
+            return new IrisBlockData(B.getAir(), blockState);
+        }
+
+        throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
+    }
+
+    @NotNull
+    @Override
+    public ItemStack getItemStack(@NotNull Identifier itemId, @NotNull KMap<String, Object> customNbt) throws MissingResourceException {
+        ItemBuilder builder = NexoItems.itemFromId(itemId.key());
+        if (builder == null) {
+            throw new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key());
+        }
+        return builder.build();
+    }
+
+    @Override
+    public void processUpdate(@NotNull Engine engine, @NotNull Block block, @NotNull Identifier blockId) {
+        var pair = ExternalDataSVC.parseState(blockId);
+        var state = pair.getB();
+        blockId = pair.getA();
+
+        if (NexoBlocks.isCustomBlock(blockId.key())) {
+            NexoBlocks.place(blockId.key(), block.getLocation());
+            return;
+        }
+
+        if (!NexoFurniture.isFurniture(blockId.key()))
+            return;
+
+        float yaw = 0;
+        BlockFace face = BlockFace.NORTH;
+
+        long seed = engine.getSeedManager().getSeed() + Cache.key(block.getX(), block.getZ()) + block.getY();
+        RNG rng = new RNG(seed);
+        if ("true".equals(state.get("randomYaw"))) {
+            yaw = rng.f(0, 360);
+        } else if (state.containsKey("yaw")) {
+            yaw = Float.parseFloat(state.get("yaw"));
+        }
+        if ("true".equals(state.get("randomFace"))) {
+            BlockFace[] faces = BlockFace.values();
+            face = faces[rng.i(0, faces.length - 1)];
+        } else if (state.containsKey("face")) {
+            face = BlockFace.valueOf(state.get("face").toUpperCase());
+        }
+        if (face == BlockFace.SELF) {
+            face = BlockFace.NORTH;
+        }
+        ItemDisplay display = NexoFurniture.place(blockId.key(), block.getLocation(), yaw, face);
+        if (display == null) return;
+        ItemStack itemStack = display.getItemStack();
+        if (itemStack == null) return;
+
+        BiomeColor type = null;
+        try {
+            type = BiomeColor.valueOf(state.get("matchBiome").toUpperCase());
+        } catch (NullPointerException | IllegalArgumentException ignored) {}
+
+        if (type != null) {
+            var biomeColor = INMS.get().getBiomeColor(block.getLocation(), type);
+            if (biomeColor == null) return;
+            var potionColor = Color.fromARGB(biomeColor.getAlpha(), biomeColor.getRed(), biomeColor.getGreen(), biomeColor.getBlue());
+            if (itemStack.getItemMeta() instanceof PotionMeta meta) {
+                meta.setColor(potionColor);
+                itemStack.setItemMeta(meta);
+            }
+        }
+        display.setItemStack(itemStack);
+    }
+
+    @NotNull
+    @Override
+    public Identifier[] getBlockTypes() {
+        return Arrays.stream(NexoItems.itemNames())
+                .map(i -> new Identifier("nexo", i))
+                .filter(i -> {
+                    try {
+                        return getBlockData(i) != null;
+                    } catch (MissingResourceException e) {
+                        return false;
+                    }
+                })
+                .toArray(Identifier[]::new);
+    }
+
+    @NotNull
+    @Override
+    public Identifier[] getItemTypes() {
+        return Arrays.stream(NexoItems.itemNames())
+                .map(i -> new Identifier("nexo", i))
+                .filter(i -> {
+                    try {
+                        return getItemStack(i) != null;
+                    } catch (MissingResourceException e) {
+                        return false;
+                    }
+                })
+                .toArray(Identifier[]::new);
+    }
+
+    @Override
+    public boolean isValidProvider(@NotNull Identifier id, boolean isItem) {
+        return "nexo".equalsIgnoreCase(id.namespace());
+    }
+
+    @Override
+    public boolean isReady() {
+        return super.isReady() && !failed.get();
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java
+++ b/core/src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java
@@ -1,151 +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.core.link;
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.data.IrisBlockData;
-import com.volmit.iris.util.reflect.WrappedField;
-import io.th0rgal.oraxen.api.OraxenItems;
-import io.th0rgal.oraxen.items.ItemBuilder;
-import io.th0rgal.oraxen.mechanics.Mechanic;
-import io.th0rgal.oraxen.mechanics.MechanicFactory;
-import io.th0rgal.oraxen.mechanics.MechanicsManager;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.block.BlockMechanic;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.block.BlockMechanicFactory;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.furniture.FurnitureFactory;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.furniture.FurnitureMechanic;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.noteblock.NoteBlockMechanicFactory;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.stringblock.StringBlockMechanicFactory;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.MultipleFacing;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Optional;
-
-public class OraxenDataProvider extends ExternalDataProvider {
-
-    private static final String FIELD_FACTORIES_MAP = "FACTORIES_BY_MECHANIC_ID";
-
-    private WrappedField<MechanicsManager, Map<String, MechanicFactory>> factories;
-
-    public OraxenDataProvider() {
-        super("Oraxen");
-    }
-
-    @Override
-    public void init() {
-        Iris.info("Setting up Oraxen Link...");
-        this.factories = new WrappedField<>(MechanicsManager.class, FIELD_FACTORIES_MAP);
-        if (this.factories.hasFailed()) {
-            Iris.error("Failed to set up Oraxen Link: Unable to fetch MechanicFactoriesMap!");
-        }
-    }
-
-    @Override
-    public BlockData getBlockData(Identifier blockId) throws MissingResourceException {
-        MechanicFactory factory = getFactory(blockId);
-        if (factory instanceof NoteBlockMechanicFactory f)
-            return f.createNoteBlockData(blockId.key());
-        else if (factory instanceof BlockMechanicFactory f) {
-            MultipleFacing newBlockData = (MultipleFacing) Bukkit.createBlockData(Material.MUSHROOM_STEM);
-            BlockMechanic.setBlockFacing(newBlockData, ((BlockMechanic) f.getMechanic(blockId.key())).getCustomVariation());
-            return newBlockData;
-        } else if (factory instanceof StringBlockMechanicFactory f) {
-            return f.createTripwireData(blockId.key());
-        } else if (factory instanceof FurnitureFactory) {
-            return new IrisBlockData(B.getAir(), blockId);
-        } else
-            throw new MissingResourceException("Failed to find BlockData!", blockId.namespace(), blockId.key());
-    }
-
-    @Override
-    public ItemStack getItemStack(Identifier itemId) throws MissingResourceException {
-        Optional<ItemBuilder> opt = OraxenItems.getOptionalItemById(itemId.key());
-        return opt.orElseThrow(() -> new MissingResourceException("Failed to find ItemData!", itemId.namespace(), itemId.key())).build();
-    }
-
-    @Override
-    public void processUpdate(Engine engine, Block block, Identifier blockId) {
-        Mechanic mechanic = getFactory(blockId).getMechanic(blockId.key());
-        if (mechanic instanceof FurnitureMechanic f) {
-            f.place(block.getLocation());
-        }
-    }
-
-    @Override
-    public Identifier[] getBlockTypes() {
-        KList<Identifier> names = new KList<>();
-        for (String name : OraxenItems.getItemNames()) {
-            try {
-                Identifier key = new Identifier("oraxen", name);
-                if (getBlockData(key) != null)
-                    names.add(key);
-            } catch (MissingResourceException ignored) {
-            }
-        }
-
-        return names.toArray(new Identifier[0]);
-    }
-
-    @Override
-    public Identifier[] getItemTypes() {
-        KList<Identifier> names = new KList<>();
-        for (String name : OraxenItems.getItemNames()) {
-            try {
-                Identifier key = new Identifier("oraxen", name);
-                if (getItemStack(key) != null)
-                    names.add(key);
-            } catch (MissingResourceException ignored) {
-            }
-        }
-
-        return names.toArray(new Identifier[0]);
-    }
-
-    @Override
-    public boolean isReady() {
-        if (super.isReady()) {
-            if (factories == null) {
-                this.factories = new WrappedField<>(MechanicsManager.class, FIELD_FACTORIES_MAP);
-            }
-            return super.isReady() && !factories.hasFailed();
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isValidProvider(Identifier key, boolean isItem) {
-        return key.namespace().equalsIgnoreCase("oraxen");
-    }
-
-    private MechanicFactory getFactory(Identifier key) throws MissingResourceException {
-        return factories.get().values().stream()
-                .filter(i -> i.getItems().contains(key.key()))
-                .findFirst()
-                .orElseThrow(() -> new MissingResourceException("Failed to find BlockData!", key.namespace(), key.key()));
-    }
-}
--- a/core/src/main/java/com/volmit/iris/core/link/WorldEditLink.java
+++ b/core/src/main/java/com/volmit/iris/core/link/WorldEditLink.java
@@ -1,12 +1,19 @@
 package com.volmit.iris.core.link;

+import com.volmit.iris.Iris;
+import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.util.data.Cuboid;
+import com.volmit.iris.util.data.KCache;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

+import java.lang.reflect.InvocationTargetException;
+import java.time.Duration;
+import java.util.UUID;
+
 public class WorldEditLink {
-    private static Boolean enabled = null;
+    private static final AtomicCache<Boolean> active = new AtomicCache<>();

    public static Cuboid getSelection(Player p) {
        if (!hasWorldEdit())
@@ -15,29 +22,38 @@ public class WorldEditLink {
        try {
            Object instance = Class.forName("com.sk89q.worldedit.WorldEdit").getDeclaredMethod("getInstance").invoke(null);
            Object sessionManager = instance.getClass().getDeclaredMethod("getSessionManager").invoke(instance);
-            Object player = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter").getDeclaredMethod("adapt", Player.class).invoke(null, p);
+            Class<?> bukkitAdapter = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter");
+            Object world = bukkitAdapter.getDeclaredMethod("adapt", World.class).invoke(null, p.getWorld());
+            Object player = bukkitAdapter.getDeclaredMethod("adapt", Player.class).invoke(null, p);
            Object localSession = sessionManager.getClass().getDeclaredMethod("getIfPresent", Class.forName("com.sk89q.worldedit.session.SessionOwner")).invoke(sessionManager, player);
-            Object world = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter").getDeclaredMethod("adapt", World.class).invoke(null, p.getWorld());
-            Object region = localSession.getClass().getDeclaredMethod("getSelection", world.getClass()).invoke(localSession, world);
+            if (localSession == null) return null;
+
+            Object region = null;
+            try {
+                region = localSession.getClass().getDeclaredMethod("getSelection", Class.forName("com.sk89q.worldedit.world.World")).invoke(localSession, world);
+            } catch (InvocationTargetException ignored) {}
+            if (region == null) return null;
+
            Object min = region.getClass().getDeclaredMethod("getMinimumPoint").invoke(region);
            Object max = region.getClass().getDeclaredMethod("getMaximumPoint").invoke(region);
            return new Cuboid(p.getWorld(),
-                    (int) min.getClass().getDeclaredMethod("getX").invoke(min),
-                    (int) min.getClass().getDeclaredMethod("getY").invoke(min),
-                    (int) min.getClass().getDeclaredMethod("getZ").invoke(min),
-                    (int) min.getClass().getDeclaredMethod("getX").invoke(max),
-                    (int) min.getClass().getDeclaredMethod("getY").invoke(max),
-                    (int) min.getClass().getDeclaredMethod("getZ").invoke(max)
+                    (int) min.getClass().getDeclaredMethod("x").invoke(min),
+                    (int) min.getClass().getDeclaredMethod("y").invoke(min),
+                    (int) min.getClass().getDeclaredMethod("z").invoke(min),
+                    (int) min.getClass().getDeclaredMethod("x").invoke(max),
+                    (int) min.getClass().getDeclaredMethod("y").invoke(max),
+                    (int) min.getClass().getDeclaredMethod("z").invoke(max)
            );
-        } catch (Throwable ignored) {
-
+        } catch (Throwable e) {
+            Iris.error("Could not get selection");
+            e.printStackTrace();
+            active.reset();
+            active.aquire(() -> false);
        }
        return null;
    }

    public static boolean hasWorldEdit() {
-        if (enabled == null)
-            enabled = Bukkit.getPluginManager().isPluginEnabled("WorldEdit");
-        return enabled;
+        return active.aquire(() -> Bukkit.getPluginManager().isPluginEnabled("WorldEdit"));
    }
 }
--- a/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/IrisData.java
@@ -36,6 +36,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
+import com.volmit.iris.util.reflect.OldEnum;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import lombok.Data;
@@ -337,6 +338,15 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
        this.imageLoader = registerLoader(IrisImage.class);
        this.scriptLoader = registerLoader(IrisScript.class);
        this.matterObjectLoader = registerLoader(IrisMatterObject.class);
+        if (OldEnum.exists()) {
+            builder.registerTypeAdapterFactory(new TypeAdapterFactory() {
+                @Override
+                public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+                    return (TypeAdapter<T>) OldEnum.create(type.getRawType());
+                }
+            });
+        }
+
        gson = builder.create();
    }

@@ -434,6 +444,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
                    return adapter.read(reader);
                } catch (Throwable e) {
                    Iris.error("Failed to read " + typeToken.getRawType().getCanonicalName() + "... faking objects a little to load the file at least.");
+                    Iris.reportError(e);
                    try {
                        return (T) typeToken.getRawType().getConstructor().newInstance();
                    } catch (Throwable ignored) {
--- a/core/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java
@@ -50,10 +50,10 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject> {
        try {
            PrecisionStopwatch p = PrecisionStopwatch.start();
            IrisObject t = new IrisObject(0, 0, 0);
-            t.read(j);
            t.setLoadKey(name);
            t.setLoader(manager);
            t.setLoadFile(j);
+            t.read(j);
            logLoad(j, t);
            tlt.addAndGet(p.getMilliseconds());
            return t;
--- a/core/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
+++ b/core/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
@@ -362,7 +362,12 @@ public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
            if (folderCache.get() == null) {
                KList<File> fc = new KList<>();

-                for (File i : root.listFiles()) {
+                File[] files = root.listFiles();
+                if (files == null) {
+                    throw new IllegalStateException("Failed to list files in " + root);
+                }
+
+                for (File i : files) {
                    if (i.isDirectory()) {
                        if (i.getName().equals(folderName)) {
                            fc.add(i);
--- a/core/src/main/java/com/volmit/iris/core/nms/INMS.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/INMS.java
@@ -23,7 +23,17 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import org.bukkit.Bukkit;

+import java.util.Map;
+
 public class INMS {
+    private static final Map<String, String> REVISION = Map.of(
+        "1.20.5", "v1_20_R4",
+        "1.20.6", "v1_20_R4",
+        "1.21", "v1_21_R1",
+        "1.21.1", "v1_21_R1",
+        "1.21.2", "v1_21_R2",
+        "1.21.3", "v1_21_R2"
+    );
    //@done
    private static final INMSBinding binding = bind();

@@ -37,7 +47,12 @@ public class INMS {
        }

        try {
-            return Bukkit.getServer().getClass().getCanonicalName().split("\\Q.\\E")[3];
+            String name = Bukkit.getServer().getClass().getCanonicalName();
+            if (name.equals("org.bukkit.craftbukkit.CraftServer")) {
+                return REVISION.getOrDefault(Bukkit.getServer().getBukkitVersion().split("-")[0], "BUKKIT");
+            } else {
+                return name.split("\\Q.\\E")[3];
+            }
        } catch (Throwable e) {
            Iris.reportError(e);
            Iris.error("Failed to determine server nms version!");
--- a/core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
@@ -18,8 +18,9 @@

 package com.volmit.iris.core.nms;

+import com.volmit.iris.core.nms.container.BiomeColor;
+import com.volmit.iris.core.nms.datapack.DataVersion;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisEntity;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.mantle.Mantle;
@@ -27,25 +28,27 @@ import com.volmit.iris.util.math.Vector3d;
 import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
 import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
 import com.volmit.iris.util.nbt.tag.CompoundTag;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.WorldCreator;
+import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.Dolphin;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.structure.Structure;
 import org.bukkit.inventory.ItemStack;

+import java.awt.*;
+import java.awt.Color;
+
 public interface INMSBinding {
+    boolean hasTile(Material material);
+
    boolean hasTile(Location l);

-    CompoundTag serializeTile(Location location);
+    KMap<String, Object> serializeTile(Location location);

-    void deserializeTile(CompoundTag s, Location newPosition);
+    void deserializeTile(KMap<String, Object> s, Location newPosition);

    CompoundTag serializeEntity(Entity location);

@@ -105,11 +108,21 @@ public interface INMSBinding {

    ItemStack applyCustomNbt(ItemStack itemStack, KMap<String, Object> customNbt) throws IllegalArgumentException;

-    void setTreasurePos(Dolphin dolphin, com.volmit.iris.core.nms.container.BlockPos pos);
-
    void inject(long seed, Engine engine, World world) throws NoSuchFieldException, IllegalAccessException;

    Vector3d getBoundingbox(org.bukkit.entity.EntityType entity);
    
    Entity spawnEntity(Location location, EntityType type, CreatureSpawnEvent.SpawnReason reason);
+
+    Color getBiomeColor(Location location, BiomeColor type);
+
+    default DataVersion getDataVersion() {
+        return DataVersion.V1192;
+    }
+
+    default int getSpawnChunkCount(World world) {
+        return 441;
+    }
+
+    KList<String> getStructureKeys();
 }
--- a/core/src/main/java/com/volmit/iris/core/nms/container/BiomeColor.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/container/BiomeColor.java
@@ -0,0 +1,10 @@
+package com.volmit.iris.core.nms.container;
+
+public enum BiomeColor {
+    FOG,
+    WATER,
+    WATER_FOG,
+    SKY,
+    FOLIAGE,
+    GRASS
+}
--- a/core/src/main/java/com/volmit/iris/core/nms/datapack/DataVersion.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/datapack/DataVersion.java
@@ -0,0 +1,42 @@
+package com.volmit.iris.core.nms.datapack;
+
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.core.nms.datapack.v1192.DataFixerV1192;
+import com.volmit.iris.core.nms.datapack.v1206.DataFixerV1206;
+import com.volmit.iris.core.nms.datapack.v1213.DataFixerV1213;
+import com.volmit.iris.util.collection.KMap;
+import lombok.AccessLevel;
+import lombok.Getter;
+
+import java.util.function.Supplier;
+
+//https://minecraft.wiki/w/Pack_format
+@Getter
+public enum DataVersion {
+    V1192("1.19.2", 10, DataFixerV1192::new),
+    V1205("1.20.6", 41, DataFixerV1206::new),
+    V1213("1.21.3", 57, DataFixerV1213::new);
+    private static final KMap<DataVersion, IDataFixer> cache = new KMap<>();
+    @Getter(AccessLevel.NONE)
+    private final Supplier<IDataFixer> constructor;
+    private final String version;
+    private final int packFormat;
+
+    DataVersion(String version, int packFormat, Supplier<IDataFixer> constructor) {
+        this.constructor = constructor;
+        this.packFormat = packFormat;
+        this.version = version;
+    }
+
+    public IDataFixer get() {
+        return cache.computeIfAbsent(this, k -> constructor.get());
+    }
+
+    public static IDataFixer getDefault() {
+        return INMS.get().getDataVersion().get();
+    }
+
+    public static DataVersion getLatest() {
+        return values()[values().length - 1];
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/nms/datapack/IDataFixer.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/datapack/IDataFixer.java
@@ -0,0 +1,11 @@
+package com.volmit.iris.core.nms.datapack;
+
+import com.volmit.iris.engine.object.IrisBiomeCustom;
+import com.volmit.iris.util.json.JSONObject;
+
+public interface IDataFixer {
+
+    JSONObject fixCustomBiome(IrisBiomeCustom biome, JSONObject json);
+
+    JSONObject fixDimension(JSONObject json);
+}
--- a/core/src/main/java/com/volmit/iris/core/nms/datapack/v1192/DataFixerV1192.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/datapack/v1192/DataFixerV1192.java
@@ -0,0 +1,18 @@
+package com.volmit.iris.core.nms.datapack.v1192;
+
+import com.volmit.iris.core.nms.datapack.IDataFixer;
+import com.volmit.iris.engine.object.IrisBiomeCustom;
+import com.volmit.iris.util.json.JSONObject;
+
+public class DataFixerV1192 implements IDataFixer {
+
+    @Override
+    public JSONObject fixCustomBiome(IrisBiomeCustom biome, JSONObject json) {
+        return json;
+    }
+
+    @Override
+    public JSONObject fixDimension(JSONObject json) {
+        return json;
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/nms/datapack/v1206/DataFixerV1206.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/datapack/v1206/DataFixerV1206.java
@@ -0,0 +1,56 @@
+package com.volmit.iris.core.nms.datapack.v1206;
+
+import com.volmit.iris.core.nms.datapack.IDataFixer;
+import com.volmit.iris.engine.object.IrisBiomeCustom;
+import com.volmit.iris.engine.object.IrisBiomeCustomSpawn;
+import com.volmit.iris.engine.object.IrisBiomeCustomSpawnType;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.json.JSONArray;
+import com.volmit.iris.util.json.JSONObject;
+
+import java.util.Locale;
+
+public class DataFixerV1206 implements IDataFixer {
+    @Override
+    public JSONObject fixCustomBiome(IrisBiomeCustom biome, JSONObject json) {
+        int spawnRarity = biome.getSpawnRarity();
+        if (spawnRarity > 0) {
+            json.put("creature_spawn_probability", Math.min(spawnRarity/20d, 0.9999999));
+        } else {
+            json.remove("creature_spawn_probability");
+        }
+
+        var spawns = biome.getSpawns();
+        if (spawns != null && spawns.isNotEmpty()) {
+            JSONObject spawners = new JSONObject();
+            KMap<IrisBiomeCustomSpawnType, JSONArray> groups = new KMap<>();
+
+            for (IrisBiomeCustomSpawn i : spawns) {
+                JSONArray g = groups.computeIfAbsent(i.getGroup(), (k) -> new JSONArray());
+                JSONObject o = new JSONObject();
+                o.put("type", i.getType().getKey());
+                o.put("weight", i.getWeight());
+                o.put("minCount", i.getMinCount());
+                o.put("maxCount", i.getMaxCount());
+                g.put(o);
+            }
+
+            for (IrisBiomeCustomSpawnType i : groups.k()) {
+                spawners.put(i.name().toLowerCase(Locale.ROOT), groups.get(i));
+            }
+
+            json.put("spawners", spawners);
+        }
+        return json;
+    }
+
+    @Override
+    public JSONObject fixDimension(JSONObject json) {
+        if (!(json.get("monster_spawn_light_level") instanceof JSONObject lightLevel))
+            return json;
+        var value = (JSONObject) lightLevel.remove("value");
+        lightLevel.put("max_inclusive", value.get("max_inclusive"));
+        lightLevel.put("min_inclusive", value.get("min_inclusive"));
+        return json;
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/nms/datapack/v1213/DataFixerV1213.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/datapack/v1213/DataFixerV1213.java
@@ -0,0 +1,16 @@
+package com.volmit.iris.core.nms.datapack.v1213;
+
+import com.volmit.iris.core.nms.datapack.v1206.DataFixerV1206;
+import com.volmit.iris.engine.object.IrisBiomeCustom;
+import com.volmit.iris.util.json.JSONArray;
+import com.volmit.iris.util.json.JSONObject;
+
+public class DataFixerV1213 extends DataFixerV1206 {
+
+    @Override
+    public JSONObject fixCustomBiome(IrisBiomeCustom biome, JSONObject json) {
+        json = super.fixCustomBiome(biome, json);
+        json.put("carvers", new JSONArray());
+        return json;
+    }
+}
--- a/core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
+++ b/core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
@@ -20,7 +20,7 @@ package com.volmit.iris.core.nms.v1X;

 import com.volmit.iris.Iris;
 import com.volmit.iris.core.nms.INMSBinding;
-import com.volmit.iris.core.nms.container.BlockPos;
+import com.volmit.iris.core.nms.container.BiomeColor;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
@@ -29,17 +29,18 @@ import com.volmit.iris.util.math.Vector3d;
 import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
 import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
 import com.volmit.iris.util.nbt.tag.CompoundTag;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Biome;
-import org.bukkit.entity.Dolphin;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.structure.Structure;
 import org.bukkit.inventory.ItemStack;

+import java.awt.Color;
+import java.util.stream.StreamSupport;
+
 public class NMSBinding1X implements INMSBinding {
    private static final boolean supportsCustomHeight = testCustomHeight();

@@ -58,16 +59,27 @@ public class NMSBinding1X implements INMSBinding {
        return false;
    }

+    @Override
+    public boolean hasTile(Material material) {
+        return false;
+    }
+
    @Override
    public boolean hasTile(Location l) {
        return false;
    }

    @Override
-    public CompoundTag serializeTile(Location location) {
+    public KMap<String, Object> serializeTile(Location location) {
        return null;
    }

+    @Override
+    public void deserializeTile(KMap<String, Object> s, Location newPosition) {
+
+    }
+
+
    @Override
    public void injectBiomesFromMantle(Chunk e, Mantle mantle) {

@@ -78,11 +90,6 @@ public class NMSBinding1X implements INMSBinding {
        return itemStack;
    }

-    @Override
-    public void setTreasurePos(Dolphin dolphin, BlockPos pos) {
-
-    }
-
    @Override
    public void inject(long seed, Engine engine, World world) throws NoSuchFieldException, IllegalAccessException {

@@ -98,8 +105,17 @@ public class NMSBinding1X implements INMSBinding {
    }

    @Override
-    public void deserializeTile(CompoundTag s, Location newPosition) {
+    public Color getBiomeColor(Location location, BiomeColor type) {
+        return Color.GREEN;
+    }

+    @Override
+    public KList<String> getStructureKeys() {
+        var list = StreamSupport.stream(Registry.STRUCTURE.spliterator(), false)
+                .map(Structure::getKey)
+                .map(NamespacedKey::toString)
+                .toList();
+        return new KList<>(list);
    }

    @Override
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/ChunkUpdater.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/ChunkUpdater.java
@@ -0,0 +1,358 @@
+package com.volmit.iris.core.pregenerator;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.nms.container.Pair;
+import com.volmit.iris.core.tools.IrisToolbelt;
+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.math.M;
+import com.volmit.iris.util.math.Position2;
+import com.volmit.iris.util.math.RollingSequence;
+import com.volmit.iris.util.profile.LoadBalancer;
+import com.volmit.iris.util.scheduling.J;
+import io.papermc.lib.PaperLib;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+
+import java.io.File;
+
+import java.util.ArrayList;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class ChunkUpdater {
+    private final AtomicBoolean paused = new AtomicBoolean();
+    private final AtomicBoolean cancelled = new AtomicBoolean();
+    private final KMap<Long, Pair<Long, AtomicInteger>> lastUse = new KMap<>();
+    private final RollingSequence chunksPerSecond = new RollingSequence(5);
+    private final AtomicInteger totalMaxChunks = new AtomicInteger();
+    private final AtomicInteger chunksProcessed = new AtomicInteger();
+    private final AtomicInteger chunksProcessedLast = new AtomicInteger();
+    private final AtomicInteger chunksUpdated = new AtomicInteger();
+    private final AtomicBoolean serverEmpty = new AtomicBoolean(true);
+    private final AtomicLong lastCpsTime = new AtomicLong(M.ms());
+    private final int coreLimit = (int) Math.max(Runtime.getRuntime().availableProcessors() * IrisSettings.get().getUpdater().getThreadMultiplier(), 1);
+    private final Semaphore semaphore = new Semaphore(256);
+    private final LoadBalancer loadBalancer = new LoadBalancer(semaphore, 256, IrisSettings.get().getUpdater().emptyMsRange);
+    private final AtomicLong startTime = new AtomicLong();
+    private final Dimensions dimensions;
+    private final PregenTask task;
+    private final ExecutorService executor = Executors.newFixedThreadPool(coreLimit);
+    private final ExecutorService chunkExecutor = Executors.newFixedThreadPool(coreLimit);
+    private final ScheduledExecutorService scheduler  = Executors.newScheduledThreadPool(1);
+    private final CountDownLatch latch;
+    private final Engine engine;
+    private final World world;
+
+    public ChunkUpdater(World world) {
+        this.engine = IrisToolbelt.access(world).getEngine();
+        this.world = world;
+        this.dimensions = calculateWorldDimensions(new File(world.getWorldFolder(), "region"));
+        this.task = dimensions.task();
+        this.totalMaxChunks.set(dimensions.count * 1024);
+        this.latch = new CountDownLatch(totalMaxChunks.get());
+    }
+
+    public String getName() {
+        return world.getName();
+    }
+
+    public int getChunks() {
+        return totalMaxChunks.get();
+    }
+
+    public void start() {
+        unloadAndSaveAllChunks();
+        update();
+    }
+
+    public boolean pause() {
+        unloadAndSaveAllChunks();
+        if (paused.get()) {
+            paused.set(false);
+            return false;
+        } else {
+            paused.set(true);
+            return true;
+        }
+    }
+
+    public void stop() {
+        unloadAndSaveAllChunks();
+        cancelled.set(true);
+    }
+
+    private void update() {
+        Iris.info("Updating..");
+        try {
+            startTime.set(System.currentTimeMillis());
+            scheduler.scheduleAtFixedRate(() -> {
+                try {
+                    if (!paused.get()) {
+                        long eta = computeETA();
+                        int processed = chunksProcessed.get();
+                        double last = processed - chunksProcessedLast.getAndSet(processed);
+                        double cps = last / ((M.ms() - lastCpsTime.getAndSet(M.ms())) / 1000d);
+                        chunksPerSecond.put(cps);
+                        double percentage = ((double) processed / (double) totalMaxChunks.get()) * 100;
+                        if (!cancelled.get()) {
+                            Iris.info("Updated: " + Form.f(processed) + " of " + Form.f(totalMaxChunks.get()) + " (%.0f%%) " + Form.f(chunksPerSecond.getAverage()) + "/s, ETA: " + Form.duration(eta,
+                                    2), percentage);
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }, 0, 3, TimeUnit.SECONDS);
+            scheduler.scheduleAtFixedRate(this::unloadChunks, 0, 1, TimeUnit.SECONDS);
+            scheduler.scheduleAtFixedRate(() -> {
+                boolean empty = Bukkit.getOnlinePlayers().isEmpty();
+                if (serverEmpty.getAndSet(empty) == empty)
+                    return;
+                loadBalancer.setRange(empty ? IrisSettings.get().getUpdater().emptyMsRange : IrisSettings.get().getUpdater().defaultMsRange);
+            }, 0, 10, TimeUnit.SECONDS);
+
+            var t = new Thread(() -> {
+                run();
+                close();
+            }, "Iris Chunk Updater - " + world.getName());
+            t.setPriority(Thread.MAX_PRIORITY);
+            t.start();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void close() {
+        try {
+            loadBalancer.close();
+            semaphore.acquire(256);
+
+            executor.shutdown();
+            executor.awaitTermination(5, TimeUnit.SECONDS);
+            chunkExecutor.shutdown();
+            chunkExecutor.awaitTermination(5, TimeUnit.SECONDS);
+            scheduler.shutdownNow();
+            unloadAndSaveAllChunks();
+        } catch (Exception ignored) {}
+        if (cancelled.get()) {
+            Iris.info("Updated: " + Form.f(chunksUpdated.get()) + " Chunks");
+            Iris.info("Irritated: " + Form.f(chunksProcessed.get()) + " of " + Form.f(totalMaxChunks.get()));
+            Iris.info("Stopped updater.");
+        } else {
+            Iris.info("Processed: " + Form.f(chunksProcessed.get()) + " Chunks");
+            Iris.info("Finished Updating: " + Form.f(chunksUpdated.get()) + " Chunks");
+        }
+    }
+
+    private void run() {
+        task.iterateRegions((rX, rZ) -> {
+            if (cancelled.get())
+                return;
+
+            while (paused.get()) {
+                J.sleep(50);
+            }
+
+            if (rX < dimensions.min.getX() || rX > dimensions.max.getX() || rZ < dimensions.min.getZ() || rZ > dimensions.max.getZ()) {
+                return;
+            }
+
+            PregenTask.iterateRegion(rX, rZ, (x, z) -> {
+                while (paused.get() && !cancelled.get()) {
+                    J.sleep(50);
+                }
+
+                try {
+                    semaphore.acquire();
+                } catch (InterruptedException ignored) {
+                    return;
+                }
+                chunkExecutor.submit(() -> {
+                    try {
+                        if (!cancelled.get())
+                            processChunk(x, z);
+                    } finally {
+                        latch.countDown();
+                        semaphore.release();
+                    }
+                });
+            });
+        });
+    }
+
+    private void processChunk(int x, int z) {
+        if (!loadChunksIfGenerated(x, z)) {
+            chunksProcessed.getAndIncrement();
+            return;
+        }
+
+        try {
+            Chunk c = world.getChunkAt(x, z);
+            engine.getMantle().getMantle().getChunk(c);
+            engine.updateChunk(c);
+
+            for (int xx = -1; xx <= 1; xx++) {
+                for (int zz = -1; zz <= 1; zz++) {
+                    var counter = lastUse.get(Cache.key(x + xx, z + zz));
+                    if (counter != null) counter.getB().decrementAndGet();
+                }
+            }
+        } finally {
+            chunksUpdated.incrementAndGet();
+            chunksProcessed.getAndIncrement();
+        }
+    }
+
+    private boolean loadChunksIfGenerated(int x, int z) {
+        if (engine.getMantle().getMantle().hasFlag(x, z, MantleFlag.ETCHED))
+            return false;
+
+        for (int dx = -1; dx <= 1; dx++) {
+            for (int dz = -1; dz <= 1; dz++) {
+                if (!PaperLib.isChunkGenerated(world, x + dx, z + dz)) {
+                    return false;
+                }
+            }
+        }
+
+        AtomicBoolean generated = new AtomicBoolean(true);
+        CountDownLatch latch = new CountDownLatch(9);
+        for (int dx = -1; dx <= 1; dx++) {
+            for (int dz = -1; dz <= 1; dz++) {
+                int xx = x + dx;
+                int zz = z + dz;
+                executor.submit(() -> {
+                    try {
+                        Chunk c;
+                        try {
+                            c = PaperLib.getChunkAtAsync(world, xx, zz, false, true)
+                                    .thenApply(chunk -> {
+                                        if (chunk != null)
+                                            chunk.addPluginChunkTicket(Iris.instance);
+                                        return chunk;
+                                    }).get();
+                        } catch (InterruptedException | ExecutionException e) {
+                            generated.set(false);
+                            return;
+                        }
+
+                        if (c == null) {
+                            generated.set(false);
+                            return;
+                        }
+
+                        if (!c.isLoaded()) {
+                            var future = J.sfut(() -> c.load(false));
+                            if (future != null) future.join();
+                        }
+
+                        if (!PaperLib.isChunkGenerated(c.getWorld(), xx, zz))
+                            generated.set(false);
+
+                        var pair = lastUse.computeIfAbsent(Cache.key(c), k -> new Pair<>(0L, new AtomicInteger(-1)));
+                        pair.setA(M.ms());
+                        pair.getB().updateAndGet(i -> i == -1 ? 1 : ++i);
+                    } finally {
+                        latch.countDown();
+                    }
+                });
+            }
+        }
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            Iris.info("Interrupted while waiting for chunks to load");
+        }
+        return generated.get();
+    }
+
+    private synchronized void unloadChunks() {
+        for (var key : new ArrayList<>(lastUse.keySet())) {
+            if (key == null) continue;
+            var pair = lastUse.get(key);
+            if (pair == null) continue;
+            var lastUseTime = pair.getA();
+            var counter = pair.getB();
+            if (lastUseTime == null || counter == null)
+                continue;
+
+            if (M.ms() - lastUseTime >= 5000 && counter.get() == 0) {
+                int x = Cache.keyX(key);
+                int z = Cache.keyZ(key);
+                J.s(() -> {
+                    world.removePluginChunkTicket(x, z, Iris.instance);
+                    world.unloadChunk(x, z);
+                    lastUse.remove(key);
+                });
+            }
+        }
+    }
+
+    private void unloadAndSaveAllChunks() {
+        try {
+            J.sfut(() -> {
+                if (world == null) {
+                    Iris.warn("World was null somehow...");
+                    return;
+                }
+
+                unloadChunks();
+                world.save();
+            }).get();
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    private long computeETA() {
+        return (long) (totalMaxChunks.get() > 1024 ? // Generated chunks exceed 1/8th of total?
+                // If yes, use smooth function (which gets more accurate over time since its less sensitive to outliers)
+                ((totalMaxChunks.get() - chunksProcessed.get()) * ((double) (M.ms() - startTime.get()) / (double) chunksProcessed.get())) :
+                // If no, use quick function (which is less accurate over time but responds better to the initial delay)
+                ((totalMaxChunks.get() - chunksProcessed.get()) / chunksPerSecond.getAverage()) * 1000
+        );
+    }
+
+    private Dimensions calculateWorldDimensions(File regionDir) {
+        File[] files = regionDir.listFiles((dir, name) -> name.endsWith(".mca"));
+
+        int minX = Integer.MAX_VALUE;
+        int maxX = Integer.MIN_VALUE;
+        int minZ = Integer.MAX_VALUE;
+        int maxZ = Integer.MIN_VALUE;
+
+        for (File file : files) {
+            String[] parts = file.getName().split("\\.");
+            int x = Integer.parseInt(parts[1]);
+            int z = Integer.parseInt(parts[2]);
+
+            minX = Math.min(minX, x);
+            maxX = Math.max(maxX, x);
+            minZ = Math.min(minZ, z);
+            maxZ = Math.max(maxZ, z);
+        }
+        int oX = minX + ((maxX - minX) / 2);
+        int oZ = minZ + ((maxZ - minZ) / 2);
+
+        int height = maxX - minX + 1;
+        int width = maxZ - minZ + 1;
+
+        return new Dimensions(new Position2(minX, minZ), new Position2(maxX, maxZ), height * width, PregenTask.builder()
+                .width((int) Math.ceil(width / 2d))
+                .height((int) Math.ceil(height / 2d))
+                .center(new Position2(oX, oZ))
+                .build());
+    }
+
+    private record Dimensions(Position2 min, Position2 max, int count, PregenTask task) { }
+}
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/DeepSearchPregenerator.java
@@ -15,7 +15,6 @@ import com.volmit.iris.util.math.RollingSequence;
 import com.volmit.iris.util.math.Spiraler;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
-import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -261,14 +260,14 @@ public class DeepSearchPregenerator extends Thread implements Listener {
    }

    @Data
-    @Builder
+    @lombok.Builder
    public static class DeepSearchJob {
        private World world;
-        @Builder.Default
+        @lombok.Builder.Default
        private int radiusBlocks = 5000;
-        @Builder.Default
+        @lombok.Builder.Default
        private int position = 0;
-        @Builder.Default
+        @lombok.Builder.Default
        boolean paused = false;
    }
 }
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
@@ -12,7 +12,6 @@ import com.volmit.iris.util.math.Spiraler;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import io.papermc.lib.PaperLib;
-import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -264,22 +263,22 @@ public class LazyPregenerator extends Thread implements Listener {
    }

    @Data
-    @Builder
+    @lombok.Builder
    public static class LazyPregenJob {
        private String world;
-        @Builder.Default
+        @lombok.Builder.Default
        private int healingPosition = 0;
-        @Builder.Default
+        @lombok.Builder.Default
        private boolean healing = false;
-        @Builder.Default
+        @lombok.Builder.Default
        private int chunksPerMinute = 32;
-        @Builder.Default
+        @lombok.Builder.Default
        private int radiusBlocks = 5000;
-        @Builder.Default
+        @lombok.Builder.Default
        private int position = 0;
-        @Builder.Default
+        @lombok.Builder.Default
        boolean silent = false;
-        @Builder.Default
+        @lombok.Builder.Default
        boolean paused = false;
    }
 }
--- a/core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java
+++ b/core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java
@@ -18,7 +18,6 @@ import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import io.papermc.lib.PaperLib;
-import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 import org.apache.logging.log4j.core.util.ExecutorServices;
@@ -328,14 +327,14 @@ public class TurboPregenerator extends Thread implements Listener {
    }

    @Data
-    @Builder
+    @lombok.Builder
    public static class TurboPregenJob {
        private String world;
-        @Builder.Default
+        @lombok.Builder.Default
        private int radiusBlocks = 5000;
-        @Builder.Default
+        @lombok.Builder.Default
        private int position = 0;
-        @Builder.Default
+        @lombok.Builder.Default
        boolean paused = false;
    }
 }
--- 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
@@ -22,28 +22,23 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.scheduling.J;
 import io.papermc.lib.PaperLib;
-import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;

 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.Future;
+import java.util.concurrent.Semaphore;

 public class AsyncPregenMethod implements PregeneratorMethod {
    private final World world;
    private final MultiBurst burst;
-    private final KList<Future<?>> future;
+    private final Semaphore semaphore;
    private final Map<Chunk, Long> lastUse;

    public AsyncPregenMethod(World world, int threads) {
@@ -52,8 +47,8 @@ public class AsyncPregenMethod implements PregeneratorMethod {
        }

        this.world = world;
-        burst = MultiBurst.burst;
-        future = new KList<>(1024);
+        burst = new MultiBurst("Iris Async Pregen", Thread.MIN_PRIORITY);
+        semaphore = new Semaphore(256);
        this.lastUse = new KMap<>();
    }

@@ -67,7 +62,7 @@ public class AsyncPregenMethod implements PregeneratorMethod {

                for (Chunk i : new ArrayList<>(lastUse.keySet())) {
                    Long lastUseTime = lastUse.get(i);
-                    if (lastUseTime != null && M.ms() - lastUseTime >= 10000) {
+                    if (!i.isLoaded() || (lastUseTime != null && M.ms() - lastUseTime >= 10000)) {
                        i.unload();
                        lastUse.remove(i);
                    }
@@ -81,56 +76,19 @@ public class AsyncPregenMethod implements PregeneratorMethod {

    private void completeChunk(int x, int z, PregenListener listener) {
        try {
-            future.add(PaperLib.getChunkAtAsync(world, x, z, true).thenApply((i) -> {
-                if (i == null) {
-
-                }
-                Chunk c = Bukkit.getWorld(world.getUID()).getChunkAt(x, z);
-                lastUse.put(c, M.ms());
+            PaperLib.getChunkAtAsync(world, x, z, true).thenAccept((i) -> {
+                lastUse.put(i, M.ms());
                listener.onChunkGenerated(x, z);
                listener.onChunkCleaned(x, z);
-                return 0;
-            }));
+            }).get();
+        } catch (InterruptedException ignored) {
        } catch (Throwable e) {
            e.printStackTrace();
+        } finally {
+            semaphore.release();
        }
    }

-    private void waitForChunksPartial(int maxWaiting) {
-        future.removeWhere(Objects::isNull);
-
-        while (future.size() > maxWaiting) {
-            try {
-                Future<?> i = future.remove(0);
-
-                if (i == null) {
-                    continue;
-                }
-
-                i.get();
-            } catch (Throwable e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void waitForChunks() {
-        for (Future<?> i : future.copy()) {
-            if (i == null) {
-                continue;
-            }
-
-            try {
-                i.get();
-                future.remove(i);
-            } catch (Throwable e) {
-                e.printStackTrace();
-            }
-        }
-
-        future.removeWhere(Objects::isNull);
-    }
-
    @Override
    public void init() {
        unloadAndSaveAllChunks();
@@ -143,13 +101,13 @@ public class AsyncPregenMethod implements PregeneratorMethod {

    @Override
    public void close() {
-        waitForChunks();
+        semaphore.acquireUninterruptibly(256);
        unloadAndSaveAllChunks();
+        burst.close();
    }

    @Override
    public void save() {
-        waitForChunksPartial(256);
        unloadAndSaveAllChunks();
    }

@@ -166,10 +124,12 @@ public class AsyncPregenMethod implements PregeneratorMethod {
    @Override
    public void generateChunk(int x, int z, PregenListener listener) {
        listener.onChunkGenerating(x, z);
-        if (future.size() > 256) {
-            waitForChunksPartial(256);
+        try {
+            semaphore.acquire();
+        } catch (InterruptedException e) {
+            return;
        }
-        future.add(burst.complete(() -> completeChunk(x, z, listener)));
+        burst.complete(() -> completeChunk(x, z, listener));
    }

    @Override
--- a/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
+++ b/core/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java
@@ -28,14 +28,17 @@ import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.json.JSONArray;
 import com.volmit.iris.util.json.JSONObject;
+import com.volmit.iris.util.reflect.OldEnum;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.NotNull;

 import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;

 public class SchemaBuilder {
@@ -43,7 +46,6 @@ public class SchemaBuilder {
    private static final String SYMBOL_TYPE__N = "";
    private static final JSONArray POTION_TYPES = getPotionTypes();
    private static final JSONArray ENCHANT_TYPES = getEnchantTypes();
-    private static final JSONArray ITEM_TYPES = new JSONArray(B.getItemTypes());
    private static final JSONArray FONT_TYPES = new JSONArray(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
    private final KMap<String, JSONObject> definitions;
    private final Class<?> root;
@@ -261,7 +263,7 @@ public class SchemaBuilder {

                    if (!definitions.containsKey(key)) {
                        JSONObject j = new JSONObject();
-                        j.put("enum", ITEM_TYPES);
+                        j.put("enum", B.getItemTypes());
                        definitions.put(key, j);
                    }

@@ -309,6 +311,24 @@ public class SchemaBuilder {
                    fancyType = "Enchantment Type";
                    prop.put("$ref", "#/definitions/" + key);
                    description.add(SYMBOL_TYPE__N + "  Must be a valid Enchantment Type (use ctrl+space for auto complete!)");
+                } else if (k.isAnnotationPresent(RegistryListFunction.class)) {
+                    var functionClass = k.getDeclaredAnnotation(RegistryListFunction.class).value();
+                    try {
+                        var instance = functionClass.getDeclaredConstructor().newInstance();
+                        String key = instance.key();
+                        fancyType = instance.fancyName();
+
+                        if (!definitions.containsKey(key)) {
+                            JSONObject j = new JSONObject();
+                            j.put("enum", instance.apply(data));
+                            definitions.put(key, j);
+                        }
+
+                        prop.put("$ref", "#/definitions/" + key);
+                        description.add(SYMBOL_TYPE__N + "  Must be a valid " + fancyType + " (use ctrl+space for auto complete!)");
+                    } catch (Throwable e) {
+                        Iris.error("Could not execute apply method in " + functionClass.getName());
+                    }
                } else if (k.getType().equals(PotionEffectType.class)) {
                    String key = "enum-potion-effect-type";

@@ -323,38 +343,9 @@ public class SchemaBuilder {
                    description.add(SYMBOL_TYPE__N + "  Must be a valid Potion Effect Type (use ctrl+space for auto complete!)");

                } else if (k.getType().isEnum()) {
-                    fancyType = k.getType().getSimpleName().replaceAll("\\QIris\\E", "");
-                    JSONArray a = new JSONArray();
-                    boolean advanced = k.getType().isAnnotationPresent(Desc.class);
-                    for (Object gg : k.getType().getEnumConstants()) {
-                        if (advanced) {
-                            try {
-                                JSONObject j = new JSONObject();
-                                String name = ((Enum<?>) gg).name();
-                                j.put("const", name);
-                                Desc dd = k.getType().getField(name).getAnnotation(Desc.class);
-                                j.put("description", dd == null ? ("No Description for " + name) : dd.value());
-                                a.put(j);
-                            } catch (Throwable e) {
-                                Iris.reportError(e);
-                                e.printStackTrace();
-                            }
-                        } else {
-                            a.put(((Enum<?>) gg).name());
-                        }
-                    }
-
-                    String key = (advanced ? "oneof-" : "") + "enum-" + k.getType().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase();
-
-                    if (!definitions.containsKey(key)) {
-                        JSONObject j = new JSONObject();
-                        j.put(advanced ? "oneOf" : "enum", a);
-                        definitions.put(key, j);
-                    }
-
-                    prop.put("$ref", "#/definitions/" + key);
-                    description.add(SYMBOL_TYPE__N + "  Must be a valid " + k.getType().getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)");
-
+                    fancyType = addEnum(k.getType(), prop, description, k.getType().getEnumConstants(), o -> ((Enum<?>) o).name());
+                } else if (OldEnum.isOldEnum(k.getType())) {
+                    fancyType = addEnum(k.getType(), prop, description, OldEnum.values(k.getType()), OldEnum::name);
                }
            }
            case "object" -> {
@@ -449,7 +440,7 @@ public class SchemaBuilder {

                                if (!definitions.containsKey(key)) {
                                    JSONObject j = new JSONObject();
-                                    j.put("enum", ITEM_TYPES);
+                                    j.put("enum", B.getItemTypes());
                                    definitions.put(key, j);
                                }

@@ -500,39 +491,9 @@ public class SchemaBuilder {
                                prop.put("items", items);
                                description.add(SYMBOL_TYPE__N + "  Must be a valid Potion Effect Type (use ctrl+space for auto complete!)");
                            } else if (t.type().isEnum()) {
-                                fancyType = "List of " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + "s";
-                                JSONArray a = new JSONArray();
-                                boolean advanced = t.type().isAnnotationPresent(Desc.class);
-                                for (Object gg : t.type().getEnumConstants()) {
-                                    if (advanced) {
-                                        try {
-                                            JSONObject j = new JSONObject();
-                                            String name = ((Enum<?>) gg).name();
-                                            j.put("const", name);
-                                            Desc dd = t.type().getField(name).getAnnotation(Desc.class);
-                                            j.put("description", dd == null ? ("No Description for " + name) : dd.value());
-                                            a.put(j);
-                                        } catch (Throwable e) {
-                                            Iris.reportError(e);
-                                            e.printStackTrace();
-                                        }
-                                    } else {
-                                        a.put(((Enum<?>) gg).name());
-                                    }
-                                }
-
-                                String key = (advanced ? "oneof-" : "") + "enum-" + t.type().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase();
-
-                                if (!definitions.containsKey(key)) {
-                                    JSONObject j = new JSONObject();
-                                    j.put(advanced ? "oneOf" : "enum", a);
-                                    definitions.put(key, j);
-                                }
-
-                                JSONObject items = new JSONObject();
-                                items.put("$ref", "#/definitions/" + key);
-                                prop.put("items", items);
-                                description.add(SYMBOL_TYPE__N + "  Must be a valid " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)");
+                                fancyType = addEnumList(prop, description, t, t.type().getEnumConstants(), o -> ((Enum<?>) o).name());
+                            } else if (OldEnum.isOldEnum(t.type())) {
+                                fancyType = addEnumList(prop, description, t, OldEnum.values(t.type()), OldEnum::name);
                            }
                        }
                    }
@@ -565,7 +526,7 @@ public class SchemaBuilder {
                if (value instanceof List) {
                    d.add("    ");
                    d.add("* Default Value is an empty list");
-                } else if (!cl.isPrimitive() && !(value instanceof Number) && !(value instanceof String) && !(cl.isEnum())) {
+                } 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)");
                } else {
@@ -611,6 +572,50 @@ public class SchemaBuilder {
        return prop;
    }

+    @NotNull
+    private String addEnumList(JSONObject prop, KList<String> description, ArrayType t, Object[] values, Function<Object, String> function) {
+        JSONObject items = new JSONObject();
+        var s = addEnum(t.type(), items, description, values, function);
+        prop.put("items", items);
+
+        return "List of " + s + "s";
+    }
+
+    @NotNull
+    private String addEnum(Class<?> type, JSONObject prop, KList<String> description, Object[] values, Function<Object, String> function) {
+        JSONArray a = new JSONArray();
+        boolean advanced = type.isAnnotationPresent(Desc.class);
+        for (Object gg : values) {
+            if (advanced) {
+                try {
+                    JSONObject j = new JSONObject();
+                    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());
+                    a.put(j);
+                } catch (Throwable e) {
+                    Iris.reportError(e);
+                    e.printStackTrace();
+                }
+            } else {
+                a.put(function.apply(gg));
+            }
+        }
+
+        String key = (advanced ? "oneof-" : "") + "enum-" + type.getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase();
+
+        if (!definitions.containsKey(key)) {
+            JSONObject j = new JSONObject();
+            j.put(advanced ? "oneOf" : "enum", a);
+            definitions.put(key, j);
+        }
+
+        prop.put("$ref", "#/definitions/" + key);
+        description.add(SYMBOL_TYPE__N + "  Must be a valid " + type.getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)");
+        return type.getSimpleName().replaceAll("\\QIris\\E", "");
+    }
+
    private String getType(Class<?> c) {
        if (c.equals(int.class) || c.equals(Integer.class) || c.equals(long.class) || c.equals(Long.class)) {
            return "integer";
@@ -624,7 +629,7 @@ public class SchemaBuilder {
            return "boolean";
        }

-        if (c.equals(String.class) || c.isEnum() || c.equals(Enchantment.class) || c.equals(PotionEffectType.class)) {
+        if (c.equals(String.class) || c.isEnum() || OldEnum.isOldEnum(c) || c.equals(Enchantment.class) || c.equals(PotionEffectType.class)) {
            return "string";
        }

--- a/core/src/main/java/com/volmit/iris/core/safeguard/ModesSFG.java
+++ b/core/src/main/java/com/volmit/iris/core/safeguard/ModesSFG.java
@@ -44,13 +44,13 @@ public class ModesSFG {
            Iris.info(C.DARK_RED + "ATTENTION: " + C.RED + "While running Iris in unstable mode, you won't be eligible for support.");
            Iris.info(C.DARK_RED + "CAUSE: " + C.RED + UtilsSFG.MSGIncompatibleWarnings());

-            if (IrisSettings.get().getGeneral().ignoreBootMode) {
+            if (IrisSettings.get().getGeneral().DoomsdayAnnihilationSelfDestructMode) {
                Iris.info(C.DARK_RED + "Boot Unstable is set to true, continuing with the startup process.");
            } else {
-                Iris.info(C.DARK_RED + "Go to plugins/iris/settings.json and set ignoreBootMode to true if you wish to proceed.");
+                Iris.info(C.DARK_RED + "Go to plugins/iris/settings.json and set DoomsdayAnnihilationSelfDestructMode to true if you wish to proceed.");
                while (true) {
                    try {
-                        Thread.sleep(1000);
+                        Thread.sleep(Long.MAX_VALUE);
                    } catch (InterruptedException e) {
                        // no
                    }
--- a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
+++ b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
@@ -5,7 +5,7 @@ import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
-
+import org.bukkit.plugin.PluginManager;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
 import java.io.File;
@@ -15,16 +15,16 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;

 import static com.volmit.iris.Iris.getJavaVersion;
-import static com.volmit.iris.Iris.instance;
 import static com.volmit.iris.core.safeguard.IrisSafeguard.*;

 public class ServerBootSFG {
    public static final Map<String, Boolean> incompatibilities = new HashMap<>();
-    public static boolean isJDK17 = true;
+    public static boolean isCorrectJDK = true;
    public static boolean hasEnoughDiskSpace = true;
    public static boolean isJRE = false;
    public static boolean hasPrivileges = true;
@@ -39,7 +39,7 @@ public class ServerBootSFG {

    public static void BootCheck() {
        Iris.info("Checking for possible conflicts..");
-        org.bukkit.plugin.PluginManager pluginManager = Bukkit.getPluginManager();
+        PluginManager pluginManager = Bukkit.getPluginManager();
        Plugin[] plugins = pluginManager.getPlugins();

        incompatibilities.clear();
@@ -64,25 +64,30 @@ public class ServerBootSFG {
                joiner.add(entry.getKey());
            }
        }
+        // Legacy ServerInfo
+        String distro = Bukkit.getName().toLowerCase();
        if (
-                !instance.getServer().getVersion().contains("Purpur") &&
-                        !instance.getServer().getVersion().contains("Paper") &&
-                        !instance.getServer().getVersion().contains("Spigot") &&
-                        !instance.getServer().getVersion().contains("Pufferfish") &&
-                        !instance.getServer().getVersion().contains("Bukkit")) {
+                !distro.contains("purpur") &&
+                        !distro.contains("paper") &&
+                        !distro.contains("spigot") &&
+                        !distro.contains("pufferfish") &&
+                        !distro.contains("bukkit")) {
+
+
            passedserversoftware = false;
            joiner.add("Server Software");
-            severityHigh++;
+            severityMedium++;
        }

+
        if (INMS.get() instanceof NMSBinding1X) {
            unsuportedversion = true;
            joiner.add("Unsupported Minecraft Version");
            severityHigh++;
        }

-        if (getJavaVersion() != 17) {
-            isJDK17 = false;
+        if (!List.of(21).contains(getJavaVersion())) {
+            isCorrectJDK = false;
            joiner.add("Unsupported Java version");
            severityMedium++;
        }
--- a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java
+++ b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java
@@ -37,7 +37,7 @@ public class UtilsSFG {
            }
            if (ServerBootSFG.unsuportedversion) {
                Iris.safeguard(C.RED + "Server Version");
-                Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.20.4");
+                Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.21.3");
            }
            if (!ServerBootSFG.passedserversoftware) {
                Iris.safeguard(C.YELLOW + "Unsupported Server Software");
@@ -51,13 +51,13 @@ public class UtilsSFG {
                Iris.safeguard(C.YELLOW + "Insufficient Disk Space");
                Iris.safeguard(C.YELLOW + "- The server has insufficient Free DiskSpace to run iris required 3GB+.");
            }
-            if (!ServerBootSFG.isJDK17) {
+            if (!ServerBootSFG.isCorrectJDK) {
                Iris.safeguard(C.YELLOW + "Unsupported java version");
-                Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 Instead of JDK " + Iris.getJavaVersion());
+                Iris.safeguard(C.YELLOW + "- Please consider using JDK 21 Instead of JDK " + Iris.getJavaVersion());
            }
            if (ServerBootSFG.isJRE) {
                Iris.safeguard(C.YELLOW + "Unsupported Server JDK");
-                Iris.safeguard(C.YELLOW + "- Please consider using JDK 17 Instead of JRE " + Iris.getJavaVersion());
+                Iris.safeguard(C.YELLOW + "- Please consider using JDK 21 Instead of JRE " + Iris.getJavaVersion());
            }
        }
    }
--- a/core/src/main/java/com/volmit/iris/core/service/DolphinSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/DolphinSVC.java
@@ -1,93 +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.core.service;
-
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.container.BlockPos;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.documentation.ChunkCoordinates;
-import com.volmit.iris.util.function.Consumer4;
-import com.volmit.iris.util.math.Spiraler;
-import com.volmit.iris.util.matter.MatterStructurePOI;
-import com.volmit.iris.util.plugin.IrisService;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
-import org.bukkit.entity.Dolphin;
-import org.bukkit.entity.EntityType;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.generator.structure.StructureType;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-public class DolphinSVC implements IrisService {
-
-    @Override
-    public void onEnable() {
-
-    }
-
-    @Override
-    public void onDisable() {
-
-    }
-
-    @EventHandler
-    public void on(PlayerInteractEntityEvent event) {
-        if (!IrisToolbelt.isIrisWorld(event.getPlayer().getWorld())) {
-            return;
-        }
-
-        Material hand = event.getPlayer().getInventory().getItem(event.getHand()).getType();
-        if (event.getRightClicked().getType().equals(EntityType.DOLPHIN) && (hand.equals(Material.TROPICAL_FISH) || hand.equals(Material.PUFFERFISH) || hand.equals(Material.COD) || hand.equals(Material.SALMON))) {
-            Engine e = IrisToolbelt.access(event.getPlayer().getWorld()).getEngine();
-            searchNearestTreasure(e, event.getPlayer().getLocation().getBlockX() >> 4, event.getPlayer().getLocation().getBlockZ() >> 4, e.getMantle().getRadius() - 1, StructureType.BURIED_TREASURE, (x, y, z, p) -> {
-                event.setCancelled(true);
-                Dolphin d = (Dolphin) event.getRightClicked();
-                INMS.get().setTreasurePos(d, new BlockPos(x, y, z));
-                d.getWorld().playSound(d, Sound.ENTITY_DOLPHIN_EAT, SoundCategory.NEUTRAL, 1, 1);
-            });
-
-        }
-    }
-
-    @ChunkCoordinates
-    public void findTreasure(Engine engine, int chunkX, int chunkY, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
-        AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
-        engine.getMantle().getMantle().iterateChunk(chunkX, chunkY, MatterStructurePOI.class, ref.get() == null ? (x, y, z, d) -> {
-            if (d.getType().equals(type.getKey().getKey())) {
-                ref.set(d);
-                consumer.accept(x, y, z, d);
-            }
-        } : (x, y, z, d) -> {
-        });
-    }
-
-    @ChunkCoordinates
-    public void searchNearestTreasure(Engine engine, int chunkX, int chunkY, int radius, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
-        AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
-        new Spiraler(radius * 2, radius * 2, (x, z) -> findTreasure(engine, x, z, type, ref.get() == null ? (i, d, g, a) -> {
-            ref.set(a);
-            consumer.accept(i, d, g, a);
-        } : (i, d, g, a) -> {
-        })).setOffset(chunkX, chunkY).drain();
-    }
-}
--- a/core/src/main/java/com/volmit/iris/core/service/ExternalDataSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/ExternalDataSVC.java
@@ -20,10 +20,13 @@ package com.volmit.iris.core.service;

 import com.volmit.iris.Iris;
 import com.volmit.iris.core.link.*;
+import com.volmit.iris.core.nms.container.Pair;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.plugin.IrisService;
 import lombok.Data;
+import lombok.NonNull;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -31,8 +34,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.inventory.ItemStack;

-import java.util.MissingResourceException;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;

@Data
 public class ExternalDataSVC implements IrisService {
@@ -44,9 +47,13 @@ public class ExternalDataSVC implements IrisService {
        Iris.info("Loading ExternalDataProvider...");
        Bukkit.getPluginManager().registerEvents(this, Iris.instance);

-        providers.add(new OraxenDataProvider());
-        if (Bukkit.getPluginManager().getPlugin("Oraxen") != null) {
-            Iris.info("Oraxen found, loading OraxenDataProvider...");
+        providers.add(new NexoDataProvider());
+        if (Bukkit.getPluginManager().getPlugin("Nexo") != null) {
+            Iris.info("Nexo found, loading NexoDataProvider...");
+        }
+        providers.add(new MythicCrucibleDataProvider());
+        if (Bukkit.getPluginManager().getPlugin("MythicCrucible") != null) {
+            Iris.info("MythicCrucible found, loading MythicCrucibleDataProvider...");
        }
        providers.add(new ItemAdderDataProvider());
        if (Bukkit.getPluginManager().getPlugin("ItemAdder") != null) {
@@ -64,6 +71,10 @@ public class ExternalDataSVC implements IrisService {
        if (Bukkit.getPluginManager().getPlugin("MMOItems") != null) {
            Iris.info("MMOItems found, loading MMOItemsDataProvider...");
        }
+        providers.add(new EcoItemsDataProvider());
+        if (Bukkit.getPluginManager().getPlugin("EcoItems") != null) {
+            Iris.info("EcoItems found, loading EcoItemsDataProvider...");
+        }

        for (ExternalDataProvider p : providers) {
            if (p.isReady()) {
@@ -89,26 +100,41 @@ public class ExternalDataSVC implements IrisService {
        }
    }

-    public Optional<BlockData> getBlockData(Identifier key) {
-        Optional<ExternalDataProvider> provider = activeProviders.stream().filter(p -> p.isValidProvider(key, false)).findFirst();
+    public void registerProvider(@NonNull ExternalDataProvider provider) {
+        String plugin = provider.getPluginId();
+        if (providers.stream().map(ExternalDataProvider::getPluginId).anyMatch(plugin::equals))
+            throw new IllegalArgumentException("A provider with the same plugin id already exists.");
+
+        providers.add(provider);
+        if (provider.isReady()) {
+            activeProviders.add(provider);
+            provider.init();
+        }
+    }
+
+    public Optional<BlockData> getBlockData(final Identifier key) {
+        var pair = parseState(key);
+        Identifier mod = pair.getA();
+
+        Optional<ExternalDataProvider> provider = activeProviders.stream().filter(p -> p.isValidProvider(mod, false)).findFirst();
        if (provider.isEmpty())
            return Optional.empty();
        try {
-            return Optional.of(provider.get().getBlockData(key));
+            return Optional.of(provider.get().getBlockData(mod, pair.getB()));
        } catch (MissingResourceException e) {
            Iris.error(e.getMessage() + " - [" + e.getClassName() + ":" + e.getKey() + "]");
            return Optional.empty();
        }
    }

-    public Optional<ItemStack> getItemStack(Identifier key) {
+    public Optional<ItemStack> getItemStack(Identifier key, KMap<String, Object> customNbt) {
        Optional<ExternalDataProvider> provider = activeProviders.stream().filter(p -> p.isValidProvider(key, true)).findFirst();
        if (provider.isEmpty()) {
            Iris.warn("No matching Provider found for modded material \"%s\"!", key);
            return Optional.empty();
        }
        try {
-            return Optional.of(provider.get().getItemStack(key));
+            return Optional.of(provider.get().getItemStack(key, customNbt));
        } catch (MissingResourceException e) {
            Iris.error(e.getMessage() + " - [" + e.getClassName() + ":" + e.getKey() + "]");
            return Optional.empty();
@@ -135,4 +161,27 @@ public class ExternalDataSVC implements IrisService {
        activeProviders.forEach(p -> names.add(p.getItemTypes()));
        return names.toArray(new Identifier[0]);
    }
+
+    public static Pair<Identifier, KMap<String, String>> parseState(Identifier key) {
+        if (!key.key().contains("[") || !key.key().contains("]")) {
+            return new Pair<>(key, new KMap<>());
+        }
+        String state = key.key().split("\\Q[\\E")[1].split("\\Q]\\E")[0];
+        KMap<String, String> stateMap = new KMap<>();
+        if (!state.isEmpty()) {
+            Arrays.stream(state.split(",")).forEach(s -> stateMap.put(s.split("=")[0], s.split("=")[1]));
+        }
+        return new Pair<>(new Identifier(key.namespace(), key.key().split("\\Q[\\E")[0]), stateMap);
+    }
+
+    public static Identifier buildState(Identifier key, KMap<String, String> state) {
+        if (state.isEmpty()) {
+            return key;
+        }
+        String path = state.entrySet()
+                .stream()
+                .map(e -> e.getKey() + "=" + e.getValue())
+                .collect(Collectors.joining(",", key.key() + "[", "]"));
+        return new Identifier(key.namespace(), path);
+    }
 }
--- a/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java
@@ -78,6 +78,9 @@ public class IrisEngineSVC implements IrisService {
            t = t - 200;
        }
        this.setup();
+        this.TrimLogic();
+        this.UnloadLogic();
+
        trimAlive.begin();
        unloadAlive.begin();
        trimActiveAlive.begin();
@@ -85,8 +88,8 @@ public class IrisEngineSVC implements IrisService {

        updateTicker.start();
        cacheTicker.start();
-        trimTicker.start();
-        unloadTicker.start();
+        //trimTicker.start();
+        //unloadTicker.start();
        instance = this;

    }
@@ -104,10 +107,6 @@ public class IrisEngineSVC implements IrisService {
        return tectonicLimit.get();
    }

-    public void EngineReport() {
-        Iris.info(C.RED + "CRITICAL ENGINE FAILURE! The Tectonic Trim subsystem has not responded for: " + Form.duration(trimAlive.getMillis()) + ".");
-    }
-
    @EventHandler
    public void onWorldUnload(WorldUnloadEvent event) {
        updateWorlds();
@@ -179,9 +178,9 @@ public class IrisEngineSVC implements IrisService {
                    }
                    if (!isServerShuttingDown && isServerLoaded) {
                        if (!trimTicker.isAlive()) {
-                            Iris.info(C.IRIS + "TrimTicker found dead! Booting it up!");
+                            Iris.info(C.RED + "TrimTicker found dead! Booting it up!");
                            try {
-                                trimTicker.start();
+                                TrimLogic();
                            } catch (Exception e) {
                                Iris.error("What happened?");
                                e.printStackTrace();
@@ -189,9 +188,9 @@ public class IrisEngineSVC implements IrisService {
                        }

                        if (!unloadTicker.isAlive()) {
-                            Iris.info(C.IRIS + "UnloadTicker found dead! Booting it up!");
+                            Iris.info(C.RED + "UnloadTicker found dead! Booting it up!");
                            try {
-                                unloadTicker.start();
+                               UnloadLogic();
                            } catch (Exception e) {
                                Iris.error("What happened?");
                                e.printStackTrace();
@@ -205,63 +204,72 @@ public class IrisEngineSVC implements IrisService {
                return 1000;
            }
        };
+    }
+    public void TrimLogic() {
+        if (trimTicker == null || !trimTicker.isAlive()) {
+            trimTicker = new Looper() {
+                private final Supplier<Engine> supplier = createSupplier();

-        trimTicker = new Looper() {
-            private final Supplier<Engine> supplier = createSupplier();
-            @Override
-            protected long loop() {
-                long start = System.currentTimeMillis();
-                trimAlive.reset();
-                try {
-                    Engine engine = supplier.get();
-                    if (engine != null) {
-                        engine.getMantle().trim(tectonicLimit.get() / lastUse.size());
-                    }
-                } catch (Throwable e) {
-                    Iris.reportError(e);
-                    Iris.info(C.RED + "EngineSVC: Failed to trim. Please contact support!");
-                    e.printStackTrace();
-                    return -1;
-                }
-
-                int size = lastUse.size();
-                long time = (size > 0 ? 1000/size : 1000) - (System.currentTimeMillis() - start);
-                if (time <= 0)
-                    return 0;
-                return time;
-            }
-        };
-
-        unloadTicker = new Looper() {
-            private final Supplier<Engine> supplier = createSupplier();
-
-            @Override
-            protected long loop() {
-                long start = System.currentTimeMillis();
-                unloadAlive.reset();
-                try {
-                    Engine engine = supplier.get();
-                    if (engine != null) {
-                        long unloadStart = System.currentTimeMillis();
-                        int count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get() / lastUse.size());
-                        if (count > 0) {
-                            Iris.debug(C.GOLD + "Unloaded " +  C.YELLOW + count + " TectonicPlates in " + C.RED + Form.duration(System.currentTimeMillis() - unloadStart, 2));
+                @Override
+                protected long loop() {
+                    long start = System.currentTimeMillis();
+                    trimAlive.reset();
+                    try {
+                        Engine engine = supplier.get();
+                        if (engine != null) {
+                            engine.getMantle().trim(tectonicLimit.get() / lastUse.size());
                        }
+                    } catch (Throwable e) {
+                        Iris.reportError(e);
+                        Iris.info(C.RED + "EngineSVC: Failed to trim.");
+                        e.printStackTrace();
+                        return -1;
                    }
-                } catch (Throwable e) {
-                    Iris.reportError(e);
-                    Iris.info(C.RED + "EngineSVC: Failed to unload.");
-                    e.printStackTrace();
-                    return -1;
-                }

-                int size = lastUse.size();
-                long time = (size > 0 ? 1000/size : 1000) - (System.currentTimeMillis() - start);
-                if (time <= 0)
-                    return 0;
-                return time;
-            }
-        };
+                    int size = lastUse.size();
+                    long time = (size > 0 ? 1000 / size : 1000) - (System.currentTimeMillis() - start);
+                    if (time <= 0)
+                        return 0;
+                    return time;
+                }
+            };
+            trimTicker.start();
+        }
+    }
+    public void UnloadLogic() {
+        if (unloadTicker == null || !unloadTicker.isAlive()) {
+            unloadTicker = new Looper() {
+                private final Supplier<Engine> supplier = createSupplier();
+
+                @Override
+                protected long loop() {
+                    long start = System.currentTimeMillis();
+                    unloadAlive.reset();
+                    try {
+                        Engine engine = supplier.get();
+                        if (engine != null) {
+                            long unloadStart = System.currentTimeMillis();
+                            int count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get() / lastUse.size());
+                            if (count > 0) {
+                                Iris.debug(C.GOLD + "Unloaded " + C.YELLOW + count + " TectonicPlates in " + C.RED + Form.duration(System.currentTimeMillis() - unloadStart, 2));
+                            }
+                        }
+                    } catch (Throwable e) {
+                        Iris.reportError(e);
+                        Iris.info(C.RED + "EngineSVC: Failed to unload.");
+                        e.printStackTrace();
+                        return -1;
+                    }
+
+                    int size = lastUse.size();
+                    long time = (size > 0 ? 1000 / size : 1000) - (System.currentTimeMillis() - start);
+                    if (time <= 0)
+                        return 0;
+                    return time;
+                }
+            };
+            unloadTicker.start();
+        }
    }

    private Supplier<Engine> createSupplier() {
@@ -281,7 +289,8 @@ public class IrisEngineSVC implements IrisService {

                    if (generator != null) {
                        Engine engine = generator.getEngine();
-                        if (engine != null && !engine.isStudio()) {
+                        boolean closed = engine.getMantle().getData().isClosed();
+                        if (engine != null && !engine.isStudio() && !closed) {
                            lastUseLock.lock();
                            lastUse.put(world, System.currentTimeMillis());
                            lastUseLock.unlock();
--- a/core/src/main/java/com/volmit/iris/core/service/StudioSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/StudioSVC.java
@@ -63,7 +63,12 @@ public class StudioSVC implements IrisService {

            if (!f.exists()) {
                Iris.info("Downloading Default Pack " + pack);
-                downloadSearch(Iris.getSender(), pack, false);
+                if (pack.equals("overworld")) {
+                    String url = "https://github.com/IrisDimensions/overworld/releases/download/" + Iris.OVERWORLD_TAG + "/overworld.zip";
+                    Iris.service(StudioSVC.class).downloadRelease(Iris.getSender(), url, false, false);
+                } else {
+                    downloadSearch(Iris.getSender(), pack, false);
+                }
            }
        });
    }
@@ -232,7 +237,7 @@ public class StudioSVC implements IrisService {
        }

        try {
-            dir = zipFiles.length == 1 && zipFiles[0].isDirectory() ? zipFiles[0] : null;
+            dir = zipFiles.length > 1 ? work : zipFiles[0].isDirectory() ? zipFiles[0] : null;
        } catch (NullPointerException e) {
            Iris.reportError(e);
            sender.sendMessage("Error when finding home directory. Are there any non-text characters in the file name?");
--- a/core/src/main/java/com/volmit/iris/core/service/TreeSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/TreeSVC.java
@@ -183,7 +183,7 @@ public class TreeSVC implements IrisService {
            }

            @Override
-            public void setTile(int xx, int yy, int zz, TileData<? extends TileState> tile) {
+            public void setTile(int xx, int yy, int zz, TileData tile) {

            }

@@ -240,7 +240,7 @@ public class TreeSVC implements IrisService {
        boolean isUseAll = worldAccess.getEngine().getDimension().getTreeSettings().getMode().equals(IrisTreeModes.ALL);

        // Retrieve objectPlacements of type `species` from biome
-        IrisBiome biome = worldAccess.getEngine().getBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        IrisBiome biome = worldAccess.getEngine().getBiome(location.getBlockX(), location.getBlockY()-worldAccess.getTarget().getWorld().minHeight(), location.getBlockZ());
        placements.addAll(matchObjectPlacements(biome.getObjects(), size, type));

        // Add more or find any in the region
--- a/core/src/main/java/com/volmit/iris/core/service/VillageSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/VillageSVC.java
@@ -1,127 +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.core.service;
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.plugin.IrisService;
-import com.volmit.iris.util.plugin.VolmitSender;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Villager;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.entity.VillagerCareerChangeEvent;
-
-import java.util.List;
-
-public class VillageSVC implements IrisService {
-    @Override
-    public void onEnable() {
-
-    }
-
-    @Override
-    public void onDisable() {
-
-    }
-
-    @EventHandler
-    public void on(VillagerCareerChangeEvent event) {
-
-        if (!IrisToolbelt.isIrisWorld(event.getEntity().getWorld())) {
-            return;
-        }
-
-        IrisDimension dim = IrisToolbelt.access(event.getEntity().getWorld())
-                .getEngine().getDimension();
-
-        if (!dim.isRemoveCartographersDueToCrash()) {
-            return;
-        }
-
-        if (event.getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
-            event.setCancelled(true);
-
-            Location eventLocation = event.getEntity().getLocation();
-
-            int radius = dim.getNotifyPlayersOfCartographerCancelledRadius();
-
-            if (radius == -1) {
-                return;
-            }
-
-            List<Player> playersInWorld = event.getEntity().getWorld().getPlayers();
-
-            String message = C.GOLD + IrisSettings.get().getGeneral().cartographerMessage;
-
-            Iris.info("Cancelled Cartographer Villager to prevent server crash at " + eventLocation + "!");
-
-            if (radius == -2) {
-                playersInWorld.stream().map(VolmitSender::new).forEach(v -> v.sendMessage(message));
-            } else {
-                playersInWorld.forEach(p -> {
-                    if (p.getLocation().distance(eventLocation) < radius) {
-                        new VolmitSender(p).sendMessage(message);
-                    }
-                });
-            }
-
-        }
-    }
-
-    /*
-     * Replace or disable villager trade add event to prevent explorer map
-     */
-    /* Removed due to MC breaking stuff again. This event is now called after the cartographer maps are made,
-    so it can fuck right off.
-    @EventHandler
-    public void on(VillagerAcquireTradeEvent event) {
-        if(!IrisToolbelt.isIrisWorld((event.getEntity().getWorld()))) {
-            return;
-        }
-
-        // Iris.info("Trade event: type " + event.getRecipe().getResult().getType() + " / meta " + event.getRecipe().getResult().getItemMeta() + " / data " + event.getRecipe().getResult().getData());
-        if(!event.getRecipe().getResult().getType().equals(Material.FILLED_MAP)) {
-            return;
-        }
-
-        IrisVillagerOverride override = IrisToolbelt.access(event.getEntity().getWorld()).getEngine()
-            .getDimension().getPatchCartographers();
-
-        if(override.isDisableTrade()) {
-            event.setCancelled(true);
-            Iris.debug("Cancelled cartographer trade @ " + event.getEntity().getLocation());
-            return;
-        }
-
-        if(override.getValidItems() == null) {
-            event.setCancelled(true);
-            Iris.debug("Cancelled cartographer trade because no override items are valid @ " + event.getEntity().getLocation());
-            return;
-        }
-
-        IrisVillagerTrade trade = override.getValidItems().getRandom();
-        event.setRecipe(trade.convert());
-        Iris.debug("Overrode cartographer trade with: " + trade + " to prevent allowing cartography map trades");
-    }
-    */
-}
--- a/core/src/main/java/com/volmit/iris/core/service/WandSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/WandSVC.java
@@ -30,9 +30,13 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.WorldMatter;
+import com.volmit.iris.util.misc.E;
 import com.volmit.iris.util.plugin.IrisService;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;
+import com.volmit.iris.util.scheduling.S;
+import com.volmit.iris.util.scheduling.SR;
+import com.volmit.iris.util.scheduling.jobs.Job;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
@@ -51,8 +55,14 @@ import org.bukkit.util.Vector;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;

 public class WandSVC implements IrisService {
+    private static final Particle CRIT_MAGIC = E.getOrDefault(Particle.class, "CRIT_MAGIC", "CRIT");
+    private static final Particle REDSTONE = E.getOrDefault(Particle.class,  "REDSTONE", "DUST");
+    private static final int MS_PER_TICK = Integer.parseInt(System.getProperty("iris.ms_per_tick", "30"));
+
    private static ItemStack dust;
    private static ItemStack wand;

@@ -66,7 +76,7 @@ public class WandSVC implements IrisService {
     * @param p The wand player
     * @return The new object
     */
-    public static IrisObject createSchematic(Player p) {
+    public static IrisObject createSchematic(Player p, boolean legacy) {
        if (!isHoldingWand(p)) {
            return null;
        }
@@ -75,14 +85,81 @@ public class WandSVC implements IrisService {
            Location[] f = getCuboid(p);
            Cuboid c = new Cuboid(f[0], f[1]);
            IrisObject s = new IrisObject(c.getSizeX(), c.getSizeY(), c.getSizeZ());
-            for (Block b : c) {
-                if (b.getType().equals(Material.AIR)) {
-                    continue;
+
+            var it = c.chunkedIterator();
+
+            int total = c.getSizeX() * c.getSizeY() * c.getSizeZ();
+            var latch = new CountDownLatch(1);
+            new Job() {
+                private int i;
+                private Chunk chunk;
+
+                @Override
+                public String getName() {
+                    return "Scanning Selection";
                }

-                BlockVector bv = b.getLocation().subtract(c.getLowerNE().toVector()).toVector().toBlockVector();
-                s.setUnsigned(bv.getBlockX(), bv.getBlockY(), bv.getBlockZ(), b);
-            }
+                @Override
+                public void execute() {
+                    new SR() {
+                        @Override
+                        public void run() {
+                            var time = M.ms() + MS_PER_TICK;
+                            while (time > M.ms()) {
+                                if (!it.hasNext()) {
+                                    if (chunk != null) {
+                                        chunk.removePluginChunkTicket(Iris.instance);
+                                        chunk = null;
+                                    }
+
+                                    cancel();
+                                    latch.countDown();
+                                    return;
+                                }
+
+                                try {
+                                    var b = it.next();
+                                    var bChunk = b.getChunk();
+                                    if (chunk == null) {
+                                        chunk = bChunk;
+                                        chunk.addPluginChunkTicket(Iris.instance);
+                                    } else if (chunk != bChunk) {
+                                        chunk.removePluginChunkTicket(Iris.instance);
+                                        chunk = bChunk;
+                                    }
+
+                                    if (b.getType().equals(Material.AIR))
+                                        continue;
+
+                                    BlockVector bv = b.getLocation().subtract(c.getLowerNE().toVector()).toVector().toBlockVector();
+                                    s.setUnsigned(bv.getBlockX(), bv.getBlockY(), bv.getBlockZ(), b, legacy);
+                                } finally {
+                                    i++;
+                                }
+                            }
+                        }
+                    };
+                    try {
+                        latch.await();
+                    } catch (InterruptedException ignored) {}
+                }
+
+                @Override
+                public void completeWork() {}
+
+                @Override
+                public int getTotalWork() {
+                    return total;
+                }
+
+                @Override
+                public int getWorkCompleted() {
+                    return i;
+                }
+            }.execute(new VolmitSender(p), true, () -> {});
+            try {
+                latch.await();
+            } catch (InterruptedException ignored) {}

            return s;
        } catch (Throwable e) {
@@ -162,11 +239,11 @@ public class WandSVC implements IrisService {
     */
    public static ItemStack createDust() {
        ItemStack is = new ItemStack(Material.GLOWSTONE_DUST);
-        is.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, 1);
+        is.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, 1);
        ItemMeta im = is.getItemMeta();
        im.setDisplayName(C.BOLD + "" + C.YELLOW + "Dust of Revealing");
        im.setUnbreakable(true);
-        im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_ENCHANTS);
+        im.addItemFlags(ItemFlag.values());
        im.setLore(new KList<String>().qadd("Right click on a block to reveal it's placement structure!"));
        is.setItemMeta(im);

@@ -206,11 +283,11 @@ public class WandSVC implements IrisService {
     */
    public static ItemStack createWand(Location a, Location b) {
        ItemStack is = new ItemStack(Material.BLAZE_ROD);
-        is.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, 1);
+        is.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, 1);
        ItemMeta im = is.getItemMeta();
        im.setDisplayName(C.BOLD + "" + C.GOLD + "Wand of Iris");
        im.setUnbreakable(true);
-        im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_PLACED_ON, ItemFlag.HIDE_POTION_EFFECTS, ItemFlag.HIDE_DESTROYS, ItemFlag.HIDE_ENCHANTS);
+        im.addItemFlags(ItemFlag.values());
        im.setLore(new KList<String>().add(locationToString(a), locationToString(b)));
        is.setItemMeta(im);

@@ -311,9 +388,9 @@ public class WandSVC implements IrisService {
     */
    public void draw(Location[] d, Player p) {
        Vector gx = Vector.getRandom().subtract(Vector.getRandom()).normalize().clone().multiply(0.65);
-        d[0].getWorld().spawnParticle(Particle.CRIT_MAGIC, d[0], 1, 0.5 + gx.getX(), 0.5 + gx.getY(), 0.5 + gx.getZ(), 0, null, false);
+        d[0].getWorld().spawnParticle(CRIT_MAGIC, d[0], 1, 0.5 + gx.getX(), 0.5 + gx.getY(), 0.5 + gx.getZ(), 0, null, false);
        Vector gxx = Vector.getRandom().subtract(Vector.getRandom()).normalize().clone().multiply(0.65);
-        d[1].getWorld().spawnParticle(Particle.CRIT, d[1], 1, 0.5 + gxx.getX(), 0.5 + gxx.getY(), 0.5 + gxx.getZ(), 0, null, false);
+        d[1].getWorld().spawnParticle(CRIT_MAGIC, d[1], 1, 0.5 + gxx.getX(), 0.5 + gxx.getY(), 0.5 + gxx.getZ(), 0, null, false);

        if (!d[0].getWorld().equals(d[1].getWorld())) {
            return;
@@ -370,7 +447,7 @@ public class WandSVC implements IrisService {
                            int r = color.getRed();
                            int g = color.getGreen();
                            int b = color.getBlue();
-                            p.spawnParticle(Particle.REDSTONE, lv.getX(), lv.getY(), lv.getZ(), 1, 0, 0, 0, 0, new Particle.DustOptions(org.bukkit.Color.fromRGB(r, g, b), 0.75f));
+                            p.spawnParticle(REDSTONE, lv.getX(), lv.getY(), lv.getZ(), 1, 0, 0, 0, 0, new Particle.DustOptions(org.bukkit.Color.fromRGB(r, g, b), 0.75f));
                        }
                    }
                }
@@ -383,7 +460,7 @@ public class WandSVC implements IrisService {
        if (e.getHand() != EquipmentSlot.HAND)
            return;
        try {
-            if (isHoldingWand(e.getPlayer())) {
+            if (isHoldingIrisWand(e.getPlayer())) {
                if (e.getAction().equals(Action.LEFT_CLICK_BLOCK)) {
                    e.setCancelled(true);
                    e.getPlayer().getInventory().setItemInMainHand(update(true, Objects.requireNonNull(e.getClickedBlock()).getLocation(), e.getPlayer().getInventory().getItemInMainHand()));
--- a/core/src/main/java/com/volmit/iris/core/tools/IrisBenchmarking.java
+++ b/core/src/main/java/com/volmit/iris/core/tools/IrisBenchmarking.java
@@ -28,7 +28,6 @@ import java.io.InputStreamReader;

 import static com.google.common.math.LongMath.isPrime;
 import static com.volmit.iris.util.misc.getHardware.getCPUModel;
-import static com.volmit.iris.util.misc.getHardware.getDiskModel;
 public class IrisBenchmarking {
    static String ServerOS;
    static String filePath = "benchmark.dat";
@@ -180,12 +179,12 @@ public class IrisBenchmarking {
        Iris.info("- Data Compression: " + formatDouble(calculateDataCompression) + " MBytes/Sec");

        if (WindowsDiskSpeed) {
-            Iris.info("Disk Model: " + getDiskModel());
+            //Iris.info("Disk Model: " + getDiskModel());
            Iris.info(C.BLUE + "- Running with Windows System Assessment Tool");
            Iris.info("- Sequential 64.0 Write: " + C.BLUE + formatDouble(avgWriteSpeedMBps) + " Mbps");
            Iris.info("- Sequential 64.0 Read: " + C.BLUE + formatDouble(avgReadSpeedMBps) + " Mbps");
        } else {
-            Iris.info("Disk Model: " + getDiskModel());
+           // Iris.info("Disk Model: " + getDiskModel());
            Iris.info(C.GREEN + "- Running in Native Mode");
            Iris.info("- Average Write Speed: " + C.GREEN + formatDouble(avgWriteSpeedMBps) + " Mbps");
            Iris.info("- Average Read Speed: " + C.GREEN + formatDouble(avgReadSpeedMBps) + " Mbps");
--- a/core/src/main/java/com/volmit/iris/core/tools/IrisConverter.java
+++ b/core/src/main/java/com/volmit/iris/core/tools/IrisConverter.java
@@ -12,9 +12,11 @@ import com.volmit.iris.util.reflect.V;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.util.FileUtil;
 import org.bukkit.util.Vector;

 import java.io.File;
@@ -33,11 +35,15 @@ public class IrisConverter {

        FilenameFilter filter = (dir, name) -> name.endsWith(".schem");
        File[] fileList = folder.listFiles(filter);
+        if (fileList == null) {
+            sender.sendMessage("No schematic files to convert found in " + folder.getAbsolutePath());
+            return;
+        }
        ExecutorService executorService = Executors.newFixedThreadPool(1);
        executorService.submit(() -> {
        for (File schem : fileList) {
            try {
-                    PrecisionStopwatch p = new PrecisionStopwatch();
+                    PrecisionStopwatch p = PrecisionStopwatch.start();
                    boolean largeObject = false;
                    NamedTag tag = null;
                    try {
@@ -52,21 +58,17 @@ public class IrisConverter {
                    int objW = ((ShortTag) compound.get("Width")).getValue();
                    int objH = ((ShortTag) compound.get("Height")).getValue();
                    int objD = ((ShortTag) compound.get("Length")).getValue();
+                    int i = -1;
                    int mv = objW * objH * objD;
                    AtomicInteger v = new AtomicInteger(0);
-                    AtomicInteger fv = new AtomicInteger(0);
                    if (mv > 500_000) {
                        largeObject = true;
                        Iris.info(C.GRAY + "Converting.. "+ schem.getName() + " -> " + schem.getName().replace(".schem", ".iob"));
                        Iris.info(C.GRAY + "- It may take a while");
                        if (sender.isPlayer()) {
-                            J.a(() -> {
-//                                while (v.get() != mv) {
-//                                    double pr = ((double) v.get() / (double ) mv);
-//                                    sender.sendProgress(pr, "Converting");
-//                                    J.sleep(16);
-//                                }
-                            });
+                            i = J.ar(() -> {
+                                sender.sendProgress((double) v.get() / mv, "Converting");
+                            }, 0);
                        }
                    }

@@ -82,165 +84,8 @@ public class IrisConverter {

                    ByteArrayTag byteArray = (ByteArrayTag) compound.get("BlockData");
                    byte[] originalBlockArray = byteArray.getValue();
-                    int b = 0;
-                    int a = 0;
-                    Map<Integer, Byte> y = new HashMap<>();
-                    Map<Integer, Byte> x = new HashMap<>();
-                    Map<Integer, Byte> z = new HashMap<>();

-                    // Height adjustments
-                    for (int h = 0; h < objH; h++) {
-                        if (b == 0) {
-                            y.put(h, (byte) 0);
-                        }
-                        if (b > 0) {
-                            y.put(h, (byte) 1);
-                        }
-                        a = 0;
-                        b = 0;
-                        for (int d = 0; d < objD; d++) {
-                            for (int w = 0; w < objW; w++) {
-                                BlockData db = blockmap.get((int) originalBlockArray[fv.get()]);
-                                if(db.getAsString().contains("minecraft:air")) {
-                                    a++;
-                                } else {
-                                    b++;
-                                }
-                                fv.getAndAdd(1);
-                            }
-                        }
-                    }
-                    fv.set(0);
-
-                    // Width adjustments
-                    for (int w = 0; w < objW; w++) {
-                        if (b == 0) {
-                            x.put(w, (byte) 0);
-                        }
-                        if (b > 0) {
-                            x.put(w, (byte) 1);
-                        }
-                        a = 0;
-                        b = 0;
-                        for (int h = 0; h < objH; h++) {
-                            for (int d = 0; d < objD; d++) {
-                                BlockData db = blockmap.get((int) originalBlockArray[fv.get()]);
-                                if(db.getAsString().contains("minecraft:air")) {
-                                    a++;
-                                } else {
-                                    b++;
-                                }
-                                fv.getAndAdd(1);
-                            }
-                        }
-                    }
-                    fv.set(0);
-
-                    // Depth adjustments
-                    for (int d = 0; d < objD; d++) {
-                        if (b == 0) {
-                            z.put(d, (byte) 0);
-                        }
-                        if (b > 0) {
-                            z.put(d, (byte) 1);
-                        }
-                        a = 0;
-                        b = 0;
-                        for (int h = 0; h < objH; h++) {
-                            for (int w = 0; w < objW; w++) {
-                                BlockData db = blockmap.get((int) originalBlockArray[fv.get()]);
-                                if(db.getAsString().contains("minecraft:air")) {
-                                    a++;
-                                } else {
-                                    b++;
-                                }
-                                fv.getAndAdd(1);
-                            }
-                        }
-                    }
-                    fv.set(0);
-                    int CorrectObjH = getCorrectY(y, objH);
-                    int CorrectObjW = getCorrectX(x, objW);
-                    int CorrectObjD = getCorrectZ(z, objD);
-
-                    //IrisObject object = new IrisObject(CorrectObjW, CorrectObjH, CorrectObjH);
                    IrisObject object = new IrisObject(objW, objH, objD);
-                    Vector originalVector = new Vector(objW,objH,objD);
-
-
-                    int[] yc = null;
-                    int[] xc = null;
-                    int[] zc = null;
-
-
-                    int fo = 0;
-                    int so = 0;
-                    int o = 0;
-                    int c = 0;
-                    for (Integer i : y.keySet()) {
-                        if (y.get(i) == 0) {
-                            o++;
-                        }
-                        if (y.get(i) == 1) {
-                            c++;
-                            if (c == 1) {
-                                fo = o;
-                            }
-                            o = 0;
-                        }
-                    }
-                    so = o;
-                    yc = new int[]{fo, so};
-
-                    fo = 0;
-                    so = 0;
-                    o = 0;
-                    c = 0;
-                    for (Integer i : x.keySet()) {
-                        if (x.get(i) == 0) {
-                            o++;
-                        }
-                        if (x.get(i) == 1) {
-                            c++;
-                            if (c == 1) {
-                                fo = o;
-                            }
-                            o = 0;
-                        }
-                    }
-                    so = o;
-                    xc = new int[]{fo, so};
-
-                    fo = 0;
-                    so = 0;
-                    o = 0;
-                    c = 0;
-                    for (Integer i : z.keySet()) {
-                        if (z.get(i) == 0) {
-                            o++;
-                        }
-                        if (z.get(i) == 1) {
-                            c++;
-                            if (c == 1) {
-                                fo = o;
-                            }
-                            o = 0;
-                        }
-                    }
-                    so = o;
-                    zc = new int[]{fo, so};
-
-                    int h1, h2, w1, w2, v1 = 0, volume = objW * objH * objD;
-                    Map<Integer, Integer> blockLocationMap = new LinkedHashMap<>();
-                    boolean hasAir = false;
-                    int pos = 0;
-                    for (int i : originalBlockArray) {
-                        blockLocationMap.put(pos, i);
-                        pos++;
-                    }
-
-
-
                    for (int h = 0; h < objH; h++) {
                        for (int d = 0; d < objD; d++) {
                            for (int w = 0; w < objW; w++) {
@@ -252,9 +97,9 @@ public class IrisConverter {
                            }
                        }
                    }
-
-
+                    if (i != -1) J.car(i);
                    try {
+                        object.shrinkwrap();
                        object.write(new File(folder, schem.getName().replace(".schem", ".iob")));
                    } catch (IOException e) {
                        Iris.info(C.RED + "Failed to save: " + schem.getName());
@@ -272,7 +117,7 @@ public class IrisConverter {
                    } else {
                        Iris.info(C.GRAY + "Converted " + schem.getName() + " -> " + schem.getName().replace(".schem", ".iob"));
                    }
-                  //  schem.delete();
+                    FileUtils.delete(schem);
                }
            } catch (Exception e) {
                Iris.info(C.RED + "Failed to convert: " + schem.getName());
@@ -283,112 +128,10 @@ public class IrisConverter {
                Iris.reportError(e);
            }
        }
+        sender.sendMessage(C.GRAY + "converted: " + fileList.length);
        });
    }

-    public static boolean isNewPointFurther(int[] originalPoint, int[] oldPoint, int[] newPoint) {
-        int oX = oldPoint[1];
-        int oY = oldPoint[2];
-        int oZ = oldPoint[3];
-
-        int nX = newPoint[1];
-        int nY = newPoint[2];
-        int nZ = newPoint[3];
-
-        int orX = originalPoint[1];
-        int orY = originalPoint[2];
-        int orZ = originalPoint[3];
-
-        double oldDistance = Math.sqrt(Math.pow(oX - orX, 2) + Math.pow(oY - orY, 2) + Math.pow(oZ - orZ, 2));
-        double newDistance = Math.sqrt(Math.pow(nX - orX, 2) + Math.pow(nY - orY, 2) + Math.pow(nZ - orZ, 2));
-
-        if (newDistance > oldDistance) {
-            return true;
-        }
-        return false;
-    }
-
-    public static int[] getCoordinates(int pos, int obX, int obY, int obZ) {
-        int z = 0;
-        int[] coords = new int[4];
-        for (int h = 0; h < obY; h++) {
-            for (int d = 0; d < obZ; d++) {
-                for (int w = 0; w < obX; w++) {
-                    if (z == pos) {
-                        coords[1] = w;
-                        coords[2] = h;
-                        coords[3] = d;
-                        return coords;
-                    }
-                    z++;
-                }
-            }
-        }
-        return null;
-    }
-
-    public static int getCorrectY(Map<Integer, Byte> y, int H) {
-        int fo = 0;
-        int so = 0;
-        int o = 0;
-        int c = 0;
-        for (Integer i : y.keySet()) {
-            if (y.get(i) == 0) {
-                o++;
-            }
-            if (y.get(i) == 1) {
-                c++;
-                if(c == 1){
-                    fo = o;
-                }
-                o = 0;
-            }
-        }
-        so = o;
-        return H = H - (fo + so);
-    }
-
-    public static int getCorrectX(Map<Integer, Byte> x, int W) {
-        int fo = 0;
-        int so = 0;
-        int o = 0;
-        int c = 0;
-        for (Integer i : x.keySet()) {
-            if (x.get(i) == 0) {
-                o++;
-            }
-            if (x.get(i) == 1) {
-                c++;
-                if(c == 1){
-                    fo = o;
-                }
-                o = 0;
-            }
-        }
-        so = o;
-        return W = W - (fo + so);
-    }
-
-    public static int getCorrectZ(Map<Integer, Byte> z, int D) {
-        int fo = 0;
-        int so = 0;
-        int o = 0;
-        int c = 0;
-        for (Integer i : z.keySet()) {
-            if (z.get(i) == 0) {
-                o++;
-            }
-            if (z.get(i) == 1) {
-                c++;
-                if(c == 1){
-                    fo = o;
-                }
-                o = 0;
-            }
-        }
-        so = o;
-        return D = D - (fo + so);
-    }
 }


--- a/core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
+++ b/core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
@@ -24,10 +24,8 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.ServerConfigurator;
 import com.volmit.iris.core.pregenerator.PregenTask;
 import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
-import com.volmit.iris.core.safeguard.UtilsSFG;
 import com.volmit.iris.util.exceptions.IrisException;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
@@ -46,7 +44,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-import static com.volmit.iris.core.safeguard.IrisSafeguard.unstablemode;

 /**
 * Makes it a lot easier to setup an engine, world, studio or whatever
@@ -86,6 +83,7 @@ public class IrisCreator {
     * Benchmark mode
     */
    private boolean benchmark = false;
+    private boolean smartVanillaHeight = false;

    public static boolean removeFromBukkitYml(String name) throws IOException {
        YamlConfiguration yml = YamlConfiguration.loadConfiguration(BUKKIT_YML);
@@ -112,13 +110,6 @@ public class IrisCreator {
     */

    public World create() throws IrisException {
-        if (unstablemode){
-            Iris.info(C.RED + "Your server is experiencing an incompatibility with the Iris plugin. Please rectify this problem to avoid further complications.");
-            Iris.info(C.RED + "----------------------------------------------------------------");
-            Iris.info(C.RED + "Operation ran: Loading Iris World..");
-            UtilsSFG.printIncompatibleWarnings();
-            Iris.info(C.RED + "----------------------------------------------------------------");
-        }
        if (Bukkit.isPrimaryThread()) {
            throw new IrisException("You cannot invoke create() on the main thread.");
        }
@@ -132,14 +123,11 @@ public class IrisCreator {
        if (sender == null)
            sender = Iris.getSender();

-        if (!studio()) {
-            Iris.service(StudioSVC.class).installIntoWorld(sender, d.getLoadKey(), new File(Bukkit.getWorldContainer(), name()));
-        }
-        if (benchmark) {
+        if (!studio() || benchmark) {
            Iris.service(StudioSVC.class).installIntoWorld(sender, d.getLoadKey(), new File(Bukkit.getWorldContainer(), name()));
        }

-        PlatformChunkGenerator access = null;
+        PlatformChunkGenerator access;
        AtomicReference<World> world = new AtomicReference<>();
        AtomicDouble pp = new AtomicDouble(0);
        O<Boolean> done = new O<>();
@@ -149,6 +137,7 @@ public class IrisCreator {
                .name(name)
                .seed(seed)
                .studio(studio)
+                .smartVanillaHeight(smartVanillaHeight)
                .create();
        ServerConfigurator.installDataPacks(false);

@@ -157,7 +146,6 @@ public class IrisCreator {

        J.a(() ->
        {
-            int req = 441;
            Supplier<Integer> g = () -> {
                if (finalAccess1 == null || finalAccess1.getEngine() == null) {
                    return 0;
@@ -165,6 +153,9 @@ public class IrisCreator {
                return finalAccess1.getEngine().getGenerated();
            };
            if(!benchmark) {
+                if (finalAccess1 == null) return;
+                int req = finalAccess1.getSpawnChunks().join();
+
                while (g.get() < req) {
                    double v = (double) g.get() / (double) req;
                    if (sender.isPlayer()) {
--- a/core/src/main/java/com/volmit/iris/core/tools/IrisPackBenchmarking.java
+++ b/core/src/main/java/com/volmit/iris/core/tools/IrisPackBenchmarking.java
@@ -9,8 +9,6 @@ import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.exceptions.IrisException;
 import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.math.Position2;
-
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;
@@ -27,44 +25,44 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.Collections;
-import java.util.concurrent.*;


 public class IrisPackBenchmarking {
    @Getter
    public static IrisPackBenchmarking instance;
-     public static boolean benchmarkInProgress = false;
-     private IrisDimension IrisDimension;
-     private int radius;
-     private boolean finished = false;
-    PrecisionStopwatch stopwatch;
+    public static boolean benchmarkInProgress = false;
+    private final PrecisionStopwatch stopwatch = new PrecisionStopwatch();
+    private final IrisDimension dimension;
+    private final int radius;
+    private final boolean gui;

-    public IrisPackBenchmarking(IrisDimension dimension, int r) {
+    public IrisPackBenchmarking(IrisDimension dimension, int radius, boolean gui) {
        instance = this;
-        this.IrisDimension = dimension;
-        this.radius = r;
+        this.dimension = dimension;
+        this.radius = radius;
+        this.gui = gui;
        runBenchmark();
    }

    private void runBenchmark() {
-        this.stopwatch = new PrecisionStopwatch();
-        ExecutorService service = Executors.newSingleThreadExecutor();
-        service.submit(() -> {
-            Iris.info("Setting up benchmark environment ");
-            benchmarkInProgress = true;
-            File file = new File("benchmark");
-            if (file.exists()) {
-                deleteDirectory(file.toPath());
-            }
-            createBenchmark();
-            while (!IrisToolbelt.isIrisWorld(Bukkit.getWorld("benchmark"))) {
-                J.sleep(1000);
-                Iris.debug("Iris PackBenchmark: Waiting...");
-            }
-            Iris.info("Starting Benchmark!");
-            stopwatch.begin();
-            startBenchmark();
-        });
+        Thread.ofVirtual()
+                .name("PackBenchmarking")
+                .start(() -> {
+                    Iris.info("Setting up benchmark environment ");
+                    benchmarkInProgress = true;
+                    File file = new File("benchmark");
+                    if (file.exists()) {
+                        deleteDirectory(file.toPath());
+                    }
+                    createBenchmark();
+                    while (!IrisToolbelt.isIrisWorld(Bukkit.getWorld("benchmark"))) {
+                        J.sleep(1000);
+                        Iris.debug("Iris PackBenchmark: Waiting...");
+                    }
+                    Iris.info("Starting Benchmark!");
+                    stopwatch.begin();
+                    startBenchmark();
+                });

    }

@@ -88,14 +86,14 @@ public class IrisPackBenchmarking {
            File profilers = new File("plugins" + File.separator + "Iris" + File.separator + "packbenchmarks");
            profilers.mkdir();

-            File results = new File("plugins " + File.separator + "Iris", IrisDimension.getName() + LocalDateTime.now(Clock.systemDefaultZone()) + ".txt");
-            results.createNewFile();
+            File results = new File(profilers, dimension.getName() + " " + LocalDateTime.now(Clock.systemDefaultZone()).toString().replace(':', '-') + ".txt");
+            results.getParentFile().mkdirs();
            KMap<String, Double> metrics = engine.getMetrics().pull();
            try (FileWriter writer = new FileWriter(results)) {
                writer.write("-----------------\n");
                writer.write("Results:\n");
-                writer.write("Dimension: " + IrisDimension.getName() + "\n");
-                writer.write("- Date of Benchmark: " +  LocalDateTime.now(Clock.systemDefaultZone()) + "\n");
+                writer.write("Dimension: " + dimension.getName() + "\n");
+                writer.write("- Date of Benchmark: " + LocalDateTime.now(Clock.systemDefaultZone()) + "\n");
                writer.write("\n");
                writer.write("Metrics");
                for (String m : metrics.k()) {
@@ -103,7 +101,7 @@ public class IrisPackBenchmarking {
                    writer.write("- " + m + ": " + i);
                }
                writer.write("- " + metrics);
-                writer.write("Benchmark: " +  LocalDateTime.now(Clock.systemDefaultZone()) + "\n");
+                writer.write("Benchmark: " + LocalDateTime.now(Clock.systemDefaultZone()) + "\n");
                writer.write("- Total time: " + time + "\n");
                writer.write("- Average CPS: " + calculateAverage(cps) + "\n");
                writer.write("  - Median CPS: " + calculateMedian(cps) + "\n");
@@ -116,17 +114,24 @@ public class IrisPackBenchmarking {
                e.printStackTrace();
            }

-            Bukkit.getServer().unloadWorld("benchmark", true);
+            J.s(() -> {
+                var world = Bukkit.getWorld("benchmark");
+                if (world == null) return;
+                IrisToolbelt.evacuate(world);
+                Bukkit.unloadWorld(world, true);
+            });
+
            stopwatch.end();
        } catch (Exception e) {
            Iris.error("Something has gone wrong!");
            e.printStackTrace();
        }
    }
-     private void createBenchmark(){
+
+    private void createBenchmark() {
        try {
            IrisToolbelt.createWorld()
-                    .dimension(IrisDimension.getName())
+                    .dimension(dimension.getLoadKey())
                    .name("benchmark")
                    .seed(1337)
                    .studio(false)
@@ -137,17 +142,14 @@ public class IrisPackBenchmarking {
        }
    }

-     private void startBenchmark(){
-        int x = 0;
-        int z = 0;
-            IrisToolbelt.pregenerate(PregenTask
-                    .builder()
-                    .gui(false)
-                    .center(new Position2(x, z))
-                    .width(5)
-                    .height(5)
-                    .build(), Bukkit.getWorld("benchmark")
-            );
+    private void startBenchmark() {
+        IrisToolbelt.pregenerate(PregenTask
+                .builder()
+                .gui(gui)
+                .width(radius)
+                .height(radius)
+                .build(), Bukkit.getWorld("benchmark")
+        );
    }

    private double calculateAverage(KList<Integer> list) {
@@ -179,7 +181,7 @@ public class IrisPackBenchmarking {

    private boolean deleteDirectory(Path dir) {
        try {
-            Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+            Files.walkFileTree(dir, new SimpleFileVisitor<>() {
                @Override
                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                    Files.delete(file);
--- a/core/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
+++ b/core/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
@@ -32,6 +32,7 @@ public class IrisWorldCreator {
    private String name;
    private boolean studio = false;
    private String dimensionName = null;
+    private boolean smartVanillaHeight = false;
    private long seed = 1337;

    public IrisWorldCreator() {
@@ -63,6 +64,11 @@ public class IrisWorldCreator {
        return this;
    }

+    public IrisWorldCreator smartVanillaHeight(boolean smartVanillaHeight) {
+        this.smartVanillaHeight = smartVanillaHeight;
+        return this;
+    }
+
    public WorldCreator create() {
        IrisDimension dim = IrisData.loadAnyDimension(dimensionName);

@@ -76,7 +82,7 @@ public class IrisWorldCreator {
                .build();
        ChunkGenerator g = new BukkitChunkGenerator(w, studio, studio
                ? dim.getLoader().getDataFolder() :
-                new File(w.worldFolder(), "iris/pack"), dimensionName);
+                new File(w.worldFolder(), "iris/pack"), dimensionName, smartVanillaHeight);


        return new WorldCreator(name)
--- a/core/src/main/java/com/volmit/iris/core/wand/WandSelection.java
+++ b/core/src/main/java/com/volmit/iris/core/wand/WandSelection.java
@@ -21,6 +21,7 @@ package com.volmit.iris.core.wand;
 import com.volmit.iris.util.data.Cuboid;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.misc.E;
 import org.bukkit.Location;
 import org.bukkit.Particle;
 import org.bukkit.entity.Player;
@@ -29,8 +30,10 @@ import org.bukkit.util.Vector;
 import java.awt.*;

 public class WandSelection {
+    private static final Particle REDSTONE = E.getOrDefault(Particle.class, "REDSTONE", "DUST");
    private final Cuboid c;
    private final Player p;
+    private static final double STEP = 0.10;

    public WandSelection(Cuboid c, Player p) {
        this.c = c;
@@ -38,77 +41,58 @@ public class WandSelection {
    }

    public void draw() {
-        double accuracy;
-        double dist;
+        Location playerLoc = p.getLocation();
+        double maxDistanceSquared = 256 * 256;
+        int particleCount = 0;

-        for (double i = c.getLowerX() - 1; i < c.getUpperX() + 1; i += 0.25) {
-            for (double j = c.getLowerY() - 1; j < c.getUpperY() + 1; j += 0.25) {
-                for (double k = c.getLowerZ() - 1; k < c.getUpperZ() + 1; k += 0.25) {
-                    boolean ii = i == c.getLowerX() || i == c.getUpperX();
-                    boolean jj = j == c.getLowerY() || j == c.getUpperY();
-                    boolean kk = k == c.getLowerZ() || k == c.getUpperZ();
+        // cube!
+        Location[][] edges = {
+                {c.getLowerNE(), new Location(c.getWorld(), c.getUpperX() + 1, c.getLowerY(), c.getLowerZ())},
+                {c.getLowerNE(), new Location(c.getWorld(), c.getLowerX(), c.getUpperY() + 1, c.getLowerZ())},
+                {c.getLowerNE(), new Location(c.getWorld(), c.getLowerX(), c.getLowerY(), c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getUpperX() + 1, c.getLowerY(), c.getLowerZ()), new Location(c.getWorld(), c.getUpperX() + 1, c.getUpperY() + 1, c.getLowerZ())},
+                {new Location(c.getWorld(), c.getUpperX() + 1, c.getLowerY(), c.getLowerZ()), new Location(c.getWorld(), c.getUpperX() + 1, c.getLowerY(), c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getLowerX(), c.getUpperY() + 1, c.getLowerZ()), new Location(c.getWorld(), c.getUpperX() + 1, c.getUpperY() + 1, c.getLowerZ())},
+                {new Location(c.getWorld(), c.getLowerX(), c.getUpperY() + 1, c.getLowerZ()), new Location(c.getWorld(), c.getLowerX(), c.getUpperY() + 1, c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getLowerX(), c.getLowerY(), c.getUpperZ() + 1), new Location(c.getWorld(), c.getUpperX() + 1, c.getLowerY(), c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getLowerX(), c.getLowerY(), c.getUpperZ() + 1), new Location(c.getWorld(), c.getLowerX(), c.getUpperY() + 1, c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getUpperX() + 1, c.getUpperY() + 1, c.getLowerZ()), new Location(c.getWorld(), c.getUpperX() + 1, c.getUpperY() + 1, c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getLowerX(), c.getUpperY() + 1, c.getUpperZ() + 1), new Location(c.getWorld(), c.getUpperX() + 1, c.getUpperY() + 1, c.getUpperZ() + 1)},
+                {new Location(c.getWorld(), c.getUpperX() + 1, c.getLowerY(), c.getUpperZ() + 1), new Location(c.getWorld(), c.getUpperX() + 1, c.getUpperY() + 1, c.getUpperZ() + 1)}
+        };

-                    if ((ii && jj) || (ii && kk) || (kk && jj)) {
-                        Vector push = new Vector(0, 0, 0);
+        for (Location[] edge : edges) {
+            Vector direction = edge[1].toVector().subtract(edge[0].toVector());
+            double length = direction.length();
+            direction.normalize();

-                        if (i == c.getLowerX()) {
-                            push.add(new Vector(-0.55, 0, 0));
-                        }
+            for (double d = 0; d <= length; d += STEP) {
+                Location particleLoc = edge[0].clone().add(direction.clone().multiply(d));

-                        if (j == c.getLowerY()) {
-                            push.add(new Vector(0, -0.55, 0));
-                        }
-
-                        if (k == c.getLowerZ()) {
-                            push.add(new Vector(0, 0, -0.55));
-                        }
-
-                        if (i == c.getUpperX()) {
-                            push.add(new Vector(0.55, 0, 0));
-                        }
-
-                        if (j == c.getUpperY()) {
-                            push.add(new Vector(0, 0.55, 0));
-                        }
-
-                        if (k == c.getUpperZ()) {
-                            push.add(new Vector(0, 0, 0.55));
-                        }
-
-                        Location a = new Location(c.getWorld(), i, j, k).add(0.5, 0.5, 0.5).add(push);
-                        accuracy = M.lerpInverse(0, 64 * 64, p.getLocation().distanceSquared(a));
-                        dist = M.lerp(0.125, 3.5, accuracy);
-
-                        if (M.r(M.min(dist * 5, 0.9D) * 0.995)) {
-                            continue;
-                        }
-
-                        if (ii && jj) {
-                            a.add(0, 0, RNG.r.d(-0.3, 0.3));
-                        }
-
-                        if (kk && jj) {
-                            a.add(RNG.r.d(-0.3, 0.3), 0, 0);
-                        }
-
-                        if (ii && kk) {
-                            a.add(0, RNG.r.d(-0.3, 0.3), 0);
-                        }
-
-                        if (p.getLocation().distanceSquared(a) < 256 * 256) {
-                            Color color = Color.getHSBColor((float) (0.5f + (Math.sin((i + j + k + (p.getTicksLived() / 2f)) / (20f)) / 2)), 1, 1);
-                            int r = color.getRed();
-                            int g = color.getGreen();
-                            int b = color.getBlue();
-
-                            p.spawnParticle(Particle.REDSTONE, a.getX(), a.getY(), a.getZ(),
-                                    1, 0, 0, 0, 0,
-                                    new Particle.DustOptions(org.bukkit.Color.fromRGB(r, g, b),
-                                            (float) dist * 3f));
-                        }
-                    }
+                if (playerLoc.distanceSquared(particleLoc) > maxDistanceSquared) {
+                    continue;
                }
+
+                spawnParticle(particleLoc, playerLoc);
+                particleCount++;
            }
        }
    }
+
+    private void spawnParticle(Location particleLoc, Location playerLoc) {
+        double accuracy = M.lerpInverse(0, 64 * 64, playerLoc.distanceSquared(particleLoc));
+        double dist = M.lerp(0.125, 3.5, accuracy);
+
+        if (M.r(Math.min(dist * 5, 0.9D) * 0.995)) {
+            return;
+        }
+
+        float hue = (float) (0.5f + (Math.sin((particleLoc.getX() + particleLoc.getY() + particleLoc.getZ() + (p.getTicksLived() / 2f)) / 20f) / 2));
+        Color color = Color.getHSBColor(hue, 1, 1);
+
+        p.spawnParticle(REDSTONE, particleLoc,
+                0, 0, 0, 0, 1,
+                new Particle.DustOptions(org.bukkit.Color.fromRGB(color.getRed(), color.getGreen(), color.getBlue()),
+                        (float) dist * 3f));
+    }
 }
--- a/core/src/main/java/com/volmit/iris/engine/IrisComplex.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisComplex.java
@@ -29,6 +29,7 @@ import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.context.IrisContext;
 import com.volmit.iris.util.data.DataProvider;
+import com.volmit.iris.util.interpolation.IrisInterpolation.NoiseKey;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
@@ -131,6 +132,7 @@ public class IrisComplex implements DataProvider {
        caveBiomeStream = regionStream.contextInjecting((c, x, z) -> IrisContext.getOr(engine).getChunkContext().getRegion().get(x, z))
                .convert((r)
                        -> engine.getDimension().getCaveBiomeStyle().create(rng.nextParallelRNG(InferredType.CAVE.ordinal()), getData()).stream()
+                        .zoom(engine.getDimension().getBiomeZoom())
                        .zoom(r.getCaveBiomeZoom())
                        .selectRarity(data.getBiomeLoader().loadAll(r.getCaveBiomes()))
                        .onNull(emptyBiome)
@@ -139,6 +141,8 @@ public class IrisComplex implements DataProvider {
        landBiomeStream = regionStream.contextInjecting((c, x, z) -> IrisContext.getOr(engine).getChunkContext().getRegion().get(x, z))
                .convert((r)
                        -> engine.getDimension().getLandBiomeStyle().create(rng.nextParallelRNG(InferredType.LAND.ordinal()), getData()).stream()
+                        .zoom(engine.getDimension().getBiomeZoom())
+                        .zoom(engine.getDimension().getLandZoom())
                        .zoom(r.getLandBiomeZoom())
                        .selectRarity(data.getBiomeLoader().loadAll(r.getLandBiomes(), (t) -> t.setInferredType(InferredType.LAND)))
                ).convertAware2D(ProceduralStream::get)
@@ -147,6 +151,8 @@ public class IrisComplex implements DataProvider {
        seaBiomeStream = regionStream.contextInjecting((c, x, z) -> IrisContext.getOr(engine).getChunkContext().getRegion().get(x, z))
                .convert((r)
                        -> engine.getDimension().getSeaBiomeStyle().create(rng.nextParallelRNG(InferredType.SEA.ordinal()), getData()).stream()
+                        .zoom(engine.getDimension().getBiomeZoom())
+                        .zoom(engine.getDimension().getSeaZoom())
                        .zoom(r.getSeaBiomeZoom())
                        .selectRarity(data.getBiomeLoader().loadAll(r.getSeaBiomes(), (t) -> t.setInferredType(InferredType.SEA)))
                ).convertAware2D(ProceduralStream::get)
@@ -155,6 +161,7 @@ public class IrisComplex implements DataProvider {
        shoreBiomeStream = regionStream.contextInjecting((c, x, z) -> IrisContext.getOr(engine).getChunkContext().getRegion().get(x, z))
                .convert((r)
                        -> engine.getDimension().getShoreBiomeStyle().create(rng.nextParallelRNG(InferredType.SHORE.ordinal()), getData()).stream()
+                        .zoom(engine.getDimension().getBiomeZoom())
                        .zoom(r.getShoreBiomeZoom())
                        .selectRarity(data.getBiomeLoader().loadAll(r.getShoreBiomes(), (t) -> t.setInferredType(InferredType.SHORE)))
                ).convertAware2D(ProceduralStream::get).cache2D("shoreBiomeStream", engine, cacheSize).waste("Shore Biome Stream");
@@ -286,13 +293,15 @@ public class IrisComplex implements DataProvider {
            return 0;
        }

+        KMap<NoiseKey, IrisBiome> cache = new KMap<>();
        double hi = interpolator.interpolate(x, z, (xx, zz) -> {
            try {
                IrisBiome bx = baseBiomeStream.get(xx, zz);
+                cache.put(new NoiseKey(xx, zz), bx);
                double b = 0;

                for (IrisGenerator gen : generators) {
-                    b += bx.getGenLinkMax(gen.getLoadKey());
+                    b += bx.getGenLinkMax(gen.getLoadKey(), engine);
                }

                return b;
@@ -307,11 +316,15 @@ public class IrisComplex implements DataProvider {

        double lo = interpolator.interpolate(x, z, (xx, zz) -> {
            try {
-                IrisBiome bx = baseBiomeStream.get(xx, zz);
+                IrisBiome bx = cache.get(new NoiseKey(xx, zz));
+                if (bx == null) {
+                    bx = baseBiomeStream.get(xx, zz);
+                    cache.put(new NoiseKey(xx, zz), bx);
+                }
                double b = 0;

                for (IrisGenerator gen : generators) {
-                    b += bx.getGenLinkMin(gen.getLoadKey());
+                    b += bx.getGenLinkMin(gen.getLoadKey(), engine);
                }

                return b;
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -254,30 +254,40 @@ public class IrisEngine implements Engine {
        return engineData.aquire(() -> {
            //TODO: Method this file
            File f = new File(getWorld().worldFolder(), "iris/engine-data/" + getDimension().getLoadKey() + ".json");
+            IrisEngineData data = null;

-            if (!f.exists()) {
+            if (f.exists()) {
                try {
-                    f.getParentFile().mkdirs();
-                    IrisEngineData data = new IrisEngineData();
-                    data.getStatistics().setVersion(Iris.instance.getIrisVersion());
-                    data.getStatistics().setMCVersion(Iris.instance.getMCVersion());
-                    data.getStatistics().setUpgradedVersion(Iris.instance.getIrisVersion());
-                    if (data.getStatistics().getVersion() == -1 || data.getStatistics().getMCVersion() == -1 ) {
-                        Iris.error("Failed to setup Engine Data!");
+                    data = new Gson().fromJson(IO.readAll(f), IrisEngineData.class);
+                    if (data == null) {
+                        Iris.error("Failed to read Engine Data! Corrupted File? recreating...");
                    }
-                    IO.writeAll(f, new Gson().toJson(data));
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }

-            try {
-                return new Gson().fromJson(IO.readAll(f), IrisEngineData.class);
-            } catch (Throwable e) {
-                e.printStackTrace();
+            if (data == null) {
+                data = new IrisEngineData();
+                data.getStatistics().setVersion(Iris.instance.getIrisVersion());
+                data.getStatistics().setMCVersion(Iris.instance.getMCVersion());
+                data.getStatistics().setUpgradedVersion(Iris.instance.getIrisVersion());
+                if (data.getStatistics().getVersion() == -1 || data.getStatistics().getMCVersion() == -1 ) {
+                    Iris.error("Failed to setup Engine Data!");
+                }
+
+                if (f.getParentFile().exists() || f.getParentFile().mkdirs()) {
+                    try {
+                        IO.writeAll(f, new Gson().toJson(data));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    Iris.error("Failed to setup Engine Data!");
+                }
            }

-            return new IrisEngineData();
+            return data;
        });
    }

--- a/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
@@ -76,6 +76,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
    private final ChronoLatch ecl;
    private final ChronoLatch cln;
    private final ChronoLatch chunkUpdater;
+    private final ChronoLatch chunkDiscovery;
    private double energy = 25;
    private int entityCount = 0;
    private long charge = 0;
@@ -92,12 +93,14 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
        clw = null;
        looper = null;
        chunkUpdater = null;
+        chunkDiscovery = null;
        id = -1;
    }

    public IrisWorldManager(Engine engine) {
        super(engine);
        chunkUpdater = new ChronoLatch(3000);
+        chunkDiscovery = new ChronoLatch(5000);
        cln = new ChronoLatch(60000);
        cl = new ChronoLatch(3000);
        ecl = new ChronoLatch(250);
@@ -128,6 +131,10 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
                        updateChunks();
                    }

+                    if (chunkDiscovery.flip()) {
+                        discoverChunks();
+                    }
+

                    if (getDimension().isInfiniteEnergy()) {
                        energy += 1000;
@@ -174,6 +181,19 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
        looper.start();
    }

+    private void discoverChunks() {
+        var mantle = getEngine().getMantle().getMantle();
+        for (Player i : getEngine().getWorld().realWorld().getPlayers()) {
+            int r = 1;
+
+            for (int x = -r; x <= r; x++) {
+                for (int z = -r; z <= r; z++) {
+                    mantle.getChunk(i.getLocation().getChunk()).flag(MantleFlag.DISCOVERED, true);
+                }
+            }
+        }
+    }
+
    private void updateChunks() {
        for (Player i : getEngine().getWorld().realWorld().getPlayers()) {
            int r = 1;
@@ -439,7 +459,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
        IrisEngineData ed = getEngine().getEngineData();
        IrisEngineSpawnerCooldown cd = null;

-        for (IrisEngineSpawnerCooldown j : ed.getSpawnerCooldowns()) {
+        for (IrisEngineSpawnerCooldown j : ed.getSpawnerCooldowns().copy()) {
            if (j.getSpawner().equals(i.getLoadKey())) {
                cd = j;
            }
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
@@ -43,15 +43,7 @@ public class IrisCeilingDecorator extends IrisEngineDecorator {
        IrisDecorator decorator = getDecorator(biome, realX, realZ);
        if (decorator != null) {
            if (!decorator.isStacking()) {
-                if (height >= 0 || height < getEngine().getHeight()) {
-                    if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        height--;
-                        data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                    } else {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                    }
-                }
+                data.set(x, height, z, fixFaces(decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()), realX, height, realZ));
            } else {
                int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
                if (decorator.isScaleStack()) {
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
@@ -39,14 +39,12 @@ public class IrisSeaFloorDecorator extends IrisEngineDecorator {

        if (decorator != null) {
            if (!decorator.isStacking()) {
+                if (!decorator.isForcePlace() && !decorator.getSlopeCondition().isDefault()
+                        && !decorator.getSlopeCondition().isValid(getComplex().getSlopeStream().get(realX, realZ))) {
+                    return;
+                }
                if (height >= 0 || height < getEngine().getHeight()) {
-                    if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        height++;
-                        data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                    } else {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                    }
+                    data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
                }
            } else {
                int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
@@ -40,13 +40,7 @@ public class IrisSeaSurfaceDecorator extends IrisEngineDecorator {
        if (decorator != null) {
            if (!decorator.isStacking()) {
                if (height >= 0 || height < getEngine().getHeight()) {
-                    if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        height++;
-                        data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                    } else {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                    }
+                    data.set(x, height + 1, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
                }
            } else {
                int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
@@ -45,14 +45,13 @@ public class IrisShoreLineDecorator extends IrisEngineDecorator {
                IrisDecorator decorator = getDecorator(biome, realX, realZ);

                if (decorator != null) {
+                    if (!decorator.isForcePlace() && !decorator.getSlopeCondition().isDefault()
+                            && !decorator.getSlopeCondition().isValid(getComplex().getSlopeStream().get(realX, realZ))) {
+                        return;
+                    }
+
                    if (!decorator.isStacking()) {
-                        if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                            data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                            height++;
-                            data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                        } else {
-                            data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        }
+                        data.set(x, height + 1, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
                    } else {
                        int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
                        if (decorator.isScaleStack()) {
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
@@ -53,6 +53,11 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
        boolean underwater = height < getDimension().getFluidHeight();

        if (decorator != null) {
+            if (!decorator.isForcePlace() && !decorator.getSlopeCondition().isDefault()
+                    && !decorator.getSlopeCondition().isValid(getComplex().getSlopeStream().get(realX, realZ))) {
+                return;
+            }
+
            if (!decorator.isStacking()) {
                bd = decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData());

--- a/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/Engine.java
@@ -20,6 +20,7 @@ package com.volmit.iris.engine.framework;

 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.events.IrisLootEvent;
 import com.volmit.iris.core.gui.components.RenderType;
 import com.volmit.iris.core.gui.components.Renderer;
 import com.volmit.iris.core.link.Identifier;
@@ -27,6 +28,7 @@ import com.volmit.iris.core.loader.IrisData;
 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.service.ExternalDataSVC;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
@@ -57,15 +59,13 @@ import com.volmit.iris.util.matter.TileWrapper;
 import com.volmit.iris.util.matter.slices.container.JigsawPieceContainer;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
+import com.volmit.iris.util.reflect.W;
 import com.volmit.iris.util.scheduling.ChronoLatch;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import com.volmit.iris.util.stream.ProceduralStream;
 import io.papermc.lib.PaperLib;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -76,10 +76,11 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;

-import java.awt.*;
+import java.awt.Color;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -269,77 +270,106 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
    @ChunkCoordinates
    @Override
    default void updateChunk(Chunk c) {
-        if (c.getWorld().isChunkLoaded(c.getX() + 1, c.getZ() + 1)
-                && c.getWorld().isChunkLoaded(c.getX(), c.getZ() + 1)
-                && c.getWorld().isChunkLoaded(c.getX() + 1, c.getZ())
-                && c.getWorld().isChunkLoaded(c.getX() - 1, c.getZ() - 1)
-                && c.getWorld().isChunkLoaded(c.getX(), c.getZ() - 1)
-                && c.getWorld().isChunkLoaded(c.getX() - 1, c.getZ())
-                && c.getWorld().isChunkLoaded(c.getX() + 1, c.getZ() - 1)
-                && c.getWorld().isChunkLoaded(c.getX() - 1, c.getZ() + 1) && getMantle().getMantle().isLoaded(c)) {
-
-            getMantle().getMantle().raiseFlag(c.getX(), c.getZ(), MantleFlag.TILE, () -> J.s(() -> {
-                getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), TileWrapper.class, (x, y, z, tile) -> {
-                    int betterY = y + getWorld().minHeight();
-                    if (!TileData.setTileState(c.getBlock(x, betterY, z), tile.getData()))
-                        Iris.warn("Failed to set tile entity data at [%d %d %d | %s] for tile %s!", x, betterY, z, c.getBlock(x, betterY, z).getBlockData().getMaterial().getKey(), tile.getData().getTileId());
-                });
-            }));
-            getMantle().getMantle().raiseFlag(c.getX(), c.getZ(), MantleFlag.CUSTOM, () -> J.s(() -> {
-                getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), Identifier.class, (x, y, z, v) -> {
-                    Iris.service(ExternalDataSVC.class).processUpdate(this, c.getBlock(x & 15, y + getWorld().minHeight(), z & 15), v);
-                });
-            }));
-
-            getMantle().getMantle().raiseFlag(c.getX(), c.getZ(), MantleFlag.UPDATE, () -> J.s(() -> {
-                PrecisionStopwatch p = PrecisionStopwatch.start();
-                KMap<Long, Integer> updates = new KMap<>();
-                RNG r = new RNG(Cache.key(c.getX(), c.getZ()));
-                getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), MatterCavern.class, (x, yf, z, v) -> {
-                    int y = yf + getWorld().minHeight();
-                    if (!B.isFluid(c.getBlock(x & 15, y, z & 15).getBlockData())) {
-                        return;
-                    }
-                    boolean u = false;
-                    if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.DOWN).getBlockData())) {
-                        u = true;
-                    } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.WEST).getBlockData())) {
-                        u = true;
-                    } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.EAST).getBlockData())) {
-                        u = true;
-                    } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.SOUTH).getBlockData())) {
-                        u = true;
-                    } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.NORTH).getBlockData())) {
-                        u = true;
-                    }
-
-                    if (u) {
-                        updates.compute(Cache.key(x & 15, z & 15), (k, vv) -> {
-                            if (vv != null) {
-                                return Math.max(vv, y);
-                            }
-
-                            return y;
-                        });
-                    }
-                });
-
-                updates.forEach((k, v) -> update(Cache.keyX(k), v, Cache.keyZ(k), c, r));
-                getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), MatterUpdate.class, (x, yf, z, v) -> {
-                    int y = yf + getWorld().minHeight();
-                    if (v != null && v.isUpdate()) {
-                        int vx = x & 15;
-                        int vz = z & 15;
-                        update(x, y, z, c, new RNG(Cache.key(c.getX(), c.getZ())));
-                        if (vx > 0 && vx < 15 && vz > 0 && vz < 15) {
-                            updateLighting(x, y, z, c);
-                        }
-                    }
-                });
-                getMantle().getMantle().deleteChunkSlice(c.getX(), c.getZ(), MatterUpdate.class);
-                getMetrics().getUpdates().put(p.getMilliseconds());
-            }, RNG.r.i(0, 20)));
+        for (int x = -1; x <= 1; x++) {
+            for (int z = -1; z <= 1; z++) {
+                if (c.getWorld().isChunkLoaded(c.getX() + x, c.getZ() + z))
+                    continue;
+                var msg = "Chunk %s, %s [%s, %s] is not loaded".formatted(c.getX() + x, c.getZ() + z, x, z);
+                if (W.getStack().getCallerClass().equals(ChunkUpdater.class)) Iris.warn(msg);
+                else Iris.debug(msg);
+                return;
+            }
        }
+        var mantle = getMantle().getMantle();
+        if (!mantle.isLoaded(c)) {
+            var msg = "Mantle Chunk " + c.getX() + c.getX() + " is not loaded";
+            if (W.getStack().getCallerClass().equals(ChunkUpdater.class)) Iris.warn(msg);
+            else Iris.debug(msg);
+            return;
+        }
+
+        var chunk = mantle.getChunk(c);
+        if (chunk.isFlagged(MantleFlag.ETCHED)) return;
+        chunk.flag(MantleFlag.ETCHED, true);
+
+        Semaphore semaphore = new Semaphore(3);
+        chunk.raiseFlag(MantleFlag.TILE, run(semaphore, () -> J.s(() -> {
+            mantle.iterateChunk(c.getX(), c.getZ(), TileWrapper.class, (x, y, z, v) -> {
+                int betterY = y + getWorld().minHeight();
+                if (!TileData.setTileState(c.getBlock(x, betterY, z), v.getData()))
+                    Iris.warn("Failed to set tile entity data at [%d %d %d | %s] for tile %s!", x, betterY, z, c.getBlock(x, betterY, z).getBlockData().getMaterial().getKey(), v.getData().getMaterial().name());
+            });
+        })));
+        chunk.raiseFlag(MantleFlag.CUSTOM, run(semaphore, () -> J.s(() -> {
+            mantle.iterateChunk(c.getX(), c.getZ(), Identifier.class, (x, y, z, v) -> {
+                Iris.service(ExternalDataSVC.class).processUpdate(this, c.getBlock(x & 15, y + getWorld().minHeight(), z & 15), v);
+            });
+        })));
+
+        chunk.raiseFlag(MantleFlag.UPDATE, run(semaphore, () -> J.s(() -> {
+            PrecisionStopwatch p = PrecisionStopwatch.start();
+            KMap<Long, Integer> updates = new KMap<>();
+            RNG r = new RNG(Cache.key(c.getX(), c.getZ()));
+            mantle.iterateChunk(c.getX(), c.getZ(), MatterCavern.class, (x, yf, z, v) -> {
+                int y = yf + getWorld().minHeight();
+                if (!B.isFluid(c.getBlock(x & 15, y, z & 15).getBlockData())) {
+                    return;
+                }
+                boolean u = false;
+                if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.DOWN).getBlockData())) {
+                    u = true;
+                } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.WEST).getBlockData())) {
+                    u = true;
+                } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.EAST).getBlockData())) {
+                    u = true;
+                } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.SOUTH).getBlockData())) {
+                    u = true;
+                } else if (B.isAir(c.getBlock(x & 15, y, z & 15).getRelative(BlockFace.NORTH).getBlockData())) {
+                    u = true;
+                }
+
+                if (u) {
+                    updates.compute(Cache.key(x & 15, z & 15), (k, vv) -> {
+                        if (vv != null) {
+                            return Math.max(vv, y);
+                        }
+
+                        return y;
+                    });
+                }
+            });
+
+            updates.forEach((k, v) -> update(Cache.keyX(k), v, Cache.keyZ(k), c, r));
+            mantle.iterateChunk(c.getX(), c.getZ(), MatterUpdate.class, (x, yf, z, v) -> {
+                int y = yf + getWorld().minHeight();
+                if (v != null && v.isUpdate()) {
+                    int vx = x & 15;
+                    int vz = z & 15;
+                    update(x, y, z, c, new RNG(Cache.key(c.getX(), c.getZ())));
+                    if (vx > 0 && vx < 15 && vz > 0 && vz < 15) {
+                        updateLighting(x, y, z, c);
+                    }
+                }
+            });
+            mantle.deleteChunkSlice(c.getX(), c.getZ(), MatterUpdate.class);
+            getMetrics().getUpdates().put(p.getMilliseconds());
+        }, RNG.r.i(0, 20))));
+
+        try {
+            semaphore.acquire(3);
+        } catch (InterruptedException ignored) {}
+    }
+
+    private static Runnable run(Semaphore semaphore, Runnable runnable) {
+        return () -> {
+            if (!semaphore.tryAcquire())
+                return;
+            try {
+                runnable.run();
+            } finally {
+                semaphore.release();
+            }
+        };
    }

    @BlockCoordinates
@@ -385,7 +415,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
                    if (tables.isEmpty())
                        return;
                    InventoryHolder m = (InventoryHolder) block.getState();
-                    addItems(false, m.getInventory(), rx, tables, slot, x, y, z, 15);
+                    addItems(false, m.getInventory(), rx, tables, slot, c.getWorld(), x, y, z, 15);

                } catch (Throwable e) {
                    Iris.reportError(e);
@@ -438,7 +468,10 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
    }

    @Override
-    default void injectTables(KList<IrisLootTable> list, IrisLootReference r) {
+    default void injectTables(KList<IrisLootTable> list, IrisLootReference r, boolean fallback) {
+        if (r.getMode().equals(IrisLootMode.FALLBACK) && !fallback)
+            return;
+
        if (r.getMode().equals(IrisLootMode.CLEAR) || r.getMode().equals(IrisLootMode.REPLACE)) {
            list.clear();
        }
@@ -473,10 +506,11 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
        IrisBiome biomeUnder = ry < he ? getComplex().getCaveBiomeStream().get(rx, rz) : biomeSurface;

        double multiplier = 1D * getDimension().getLoot().getMultiplier() * region.getLoot().getMultiplier() * biomeSurface.getLoot().getMultiplier() * biomeUnder.getLoot().getMultiplier();
-        injectTables(tables, getDimension().getLoot());
-        injectTables(tables, region.getLoot());
-        injectTables(tables, biomeSurface.getLoot());
-        injectTables(tables, biomeUnder.getLoot());
+        boolean fallback = tables.isEmpty();
+        injectTables(tables, getDimension().getLoot(), fallback);
+        injectTables(tables, region.getLoot(), fallback);
+        injectTables(tables, biomeSurface.getLoot(), fallback);
+        injectTables(tables, biomeUnder.getLoot(), fallback);

        if (tables.isNotEmpty()) {
            int target = (int) Math.round(tables.size() * multiplier);
@@ -494,16 +528,16 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
    }

    @Override
-    default void addItems(boolean debug, Inventory inv, RNG rng, KList<IrisLootTable> tables, InventorySlotType slot, int x, int y, int z, int mgf) {
+    default void addItems(boolean debug, Inventory inv, RNG rng, KList<IrisLootTable> tables, InventorySlotType slot, World world, int x, int y, int z, int mgf) {
        KList<ItemStack> items = new KList<>();

-        int b = 4;
        for (IrisLootTable i : tables) {
            if (i == null)
                continue;
-            b++;
-            items.addAll(i.getLoot(debug, rng, slot, x, y, z));
+            items.addAll(i.getLoot(debug, rng, slot, world, x, y, z));
        }
+        if (IrisLootEvent.callLootEvent(items, inv, world, x, y, z))
+            return;

        if (PaperLib.isPaper() && getWorld().hasRealWorld()) {
            PaperLib.getChunkAtAsync(getWorld().realWorld(), x >> 4, z >> 4).thenAccept((c) -> {
@@ -837,7 +871,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat

    default void gotoJigsaw(IrisJigsawStructure s, Player player, boolean teleport) {
        if (s.getLoadKey().equals(getDimension().getStronghold())) {
-            KList<Position2> p = getDimension().getStrongholds(getSeedManager().getSpawn());
+            KList<Position2> p = getDimension().getStrongholds(getSeedManager().getMantle());

            if (p.isEmpty()) {
                player.sendMessage(C.GOLD + "No strongholds in world.");
--- a/core/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
@@ -110,7 +110,7 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
                return;
            }

-            KList<Position2> positions = getEngine().getDimension().getStrongholds(getEngine().getSeedManager().getSpawn());
+            KList<Position2> positions = getEngine().getDimension().getStrongholds(getEngine().getSeedManager().getMantle());
            if (positions.isEmpty()) {
                return;
            }
--- a/core/src/main/java/com/volmit/iris/engine/framework/IrisLootEvent.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/IrisLootEvent.java
@@ -1,32 +0,0 @@
-package com.volmit.iris.engine.framework;
-
-import com.volmit.iris.engine.object.InventorySlotType;
-import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.util.collection.KList;
-import lombok.Getter;
-import org.bukkit.block.Block;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-@Getter
-public class IrisLootEvent extends Event {
-    private static final HandlerList handlers = new HandlerList();
-    private final Engine engine;
-    private final Block block;
-    private final InventorySlotType slot;
-    private final KList<IrisLootTable> tables;
-
-    public IrisLootEvent(Engine engine, Block block, InventorySlotType slot, KList<IrisLootTable> tables) {
-        this.engine = engine;
-        this.block = block;
-        this.slot = slot;
-        this.tables = tables;
-    }
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
--- a/core/src/main/java/com/volmit/iris/engine/framework/ListFunction.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/ListFunction.java
@@ -0,0 +1,10 @@
+package com.volmit.iris.engine.framework;
+
+import com.volmit.iris.core.loader.IrisData;
+
+import java.util.function.Function;
+
+public interface ListFunction<R> extends Function<IrisData, R> {
+    String key();
+    String fancyName();
+}
--- a/core/src/main/java/com/volmit/iris/engine/framework/LootProvider.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/LootProvider.java
@@ -23,15 +23,16 @@ import com.volmit.iris.engine.object.IrisLootReference;
 import com.volmit.iris.engine.object.IrisLootTable;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.Inventory;

 public interface LootProvider {
    void scramble(Inventory inventory, RNG rng);

-    void injectTables(KList<IrisLootTable> list, IrisLootReference r);
+    void injectTables(KList<IrisLootTable> list, IrisLootReference r, boolean fallback);

    KList<IrisLootTable> getLootTables(RNG rng, Block b);

-    void addItems(boolean debug, Inventory inv, RNG rng, KList<IrisLootTable> tables, InventorySlotType slot, int x, int y, int z, int mgf);
+    void addItems(boolean debug, Inventory inv, RNG rng, KList<IrisLootTable> tables, InventorySlotType slot, World world, int x, int y, int z, int mgf);
 }
--- a/core/src/main/java/com/volmit/iris/engine/framework/ResultLocator.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/ResultLocator.java
@@ -0,0 +1,121 @@
+package com.volmit.iris.engine.framework;
+
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.object.IrisJigsawStructure;
+import com.volmit.iris.engine.object.IrisObject;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.math.Position2;
+import com.volmit.iris.util.math.Spiraler;
+import com.volmit.iris.util.parallel.BurstExecutor;
+import com.volmit.iris.util.parallel.MultiBurst;
+import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import org.apache.commons.lang3.function.TriFunction;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+@FunctionalInterface
+public interface ResultLocator<T> {
+    static void cancelSearch() {
+        if (LocatorCanceller.cancel != null) {
+            LocatorCanceller.cancel.run();
+            LocatorCanceller.cancel = null;
+        }
+    }
+
+    static ResultLocator<IrisJigsawStructure> locateStructure(Collection<String> keys) {
+        return (e, pos) -> {
+            var structure = e.getStructureAt(pos.getX(), pos.getZ());
+            return structure != null && keys.contains(structure.getLoadKey()) ? structure : null;
+        };
+    }
+
+    static ResultLocator<IrisObject> locateObject(Collection<String> keys) {
+        return (e, pos) -> {
+            Set<String> objects = e.getObjectsAt(pos.getX(), pos.getZ());
+            for (String object : objects) {
+                if (!keys.contains(object)) continue;
+                return e.getData().getObjectLoader().load(object);
+            }
+            return null;
+        };
+    }
+
+    T find(Engine e, Position2 chunkPos);
+
+    default <R> ResultLocator<R> then(TriFunction<Engine, Position2, T, R> filter) {
+        return (e, pos) -> {
+            var t = find(e, pos);
+            return t != null ? filter.apply(e, pos, t) : null;
+        };
+    }
+
+    default Future<Result<T>> find(Engine engine, Position2 pos, long timeout, Consumer<Integer> checks, boolean cancelable) throws WrongEngineBroException {
+        if (engine.isClosed()) {
+            throw new WrongEngineBroException();
+        }
+
+        cancelSearch();
+
+        return MultiBurst.burst.completeValue(() -> {
+            int tc = IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getParallelism()) * 17;
+            MultiBurst burst = MultiBurst.burst;
+            AtomicBoolean found = new AtomicBoolean(false);
+            AtomicReference<Result<T>> foundObj = new AtomicReference<>();
+            Position2 cursor = pos;
+            AtomicInteger searched = new AtomicInteger();
+            AtomicBoolean stop = new AtomicBoolean(false);
+            PrecisionStopwatch px = PrecisionStopwatch.start();
+            if (cancelable) LocatorCanceller.cancel = () -> stop.set(true);
+            AtomicReference<Position2> next = new AtomicReference<>(cursor);
+            Spiraler s = new Spiraler(100000, 100000, (x, z) -> next.set(new Position2(x, z)));
+            s.setOffset(cursor.getX(), cursor.getZ());
+            s.next();
+            while (!found.get() && !stop.get() && px.getMilliseconds() < timeout) {
+                BurstExecutor e = burst.burst(tc);
+
+                for (int i = 0; i < tc; i++) {
+                    Position2 p = next.get();
+                    s.next();
+                    e.queue(() -> {
+                        var o = find(engine, p);
+                        if (o != null) {
+                            if (foundObj.get() == null) {
+                                foundObj.set(new Result<>(o, p));
+                            }
+
+                            found.set(true);
+                        }
+                        searched.incrementAndGet();
+                    });
+                }
+
+                e.complete();
+                checks.accept(searched.get());
+            }
+
+            LocatorCanceller.cancel = null;
+
+            if (found.get() && foundObj.get() != null) {
+                return foundObj.get();
+            }
+
+            return null;
+        });
+    }
+
+    record Result<T>(T obj, Position2 pos) {
+        public int getBlockX() {
+            return (pos.getX() << 4) + 8;
+        }
+
+        public int getBlockZ() {
+            return (pos.getZ() << 4) + 8;
+        }
+    }
+}
--- a/core/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java
@@ -79,7 +79,7 @@ public class HeightmapObjectPlacer implements IObjectPlacer {
        return oplacer.isDebugSmartBore();
    }

-    public void setTile(int param1Int1, int param1Int2, int param1Int3, TileData<? extends TileState> param1TileData) {
+    public void setTile(int param1Int1, int param1Int2, int param1Int3, TileData param1TileData) {
        oplacer.setTile(param1Int1, param1Int2, param1Int3, param1TileData);
    }

--- a/core/src/main/java/com/volmit/iris/engine/framework/placer/WorldObjectPlacer.java
+++ b/core/src/main/java/com/volmit/iris/engine/framework/placer/WorldObjectPlacer.java
@@ -0,0 +1,123 @@
+package com.volmit.iris.engine.framework.placer;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.tools.IrisToolbelt;
+import com.volmit.iris.engine.data.cache.Cache;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.core.events.IrisLootEvent;
+import com.volmit.iris.engine.mantle.EngineMantle;
+import com.volmit.iris.engine.object.IObjectPlacer;
+import com.volmit.iris.engine.object.InventorySlotType;
+import com.volmit.iris.engine.object.IrisLootTable;
+import com.volmit.iris.engine.object.TileData;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.math.RNG;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.inventory.InventoryHolder;
+
+@Getter
+@EqualsAndHashCode(exclude = {"engine", "mantle"})
+public class WorldObjectPlacer implements IObjectPlacer {
+    private final World world;
+    private final Engine engine;
+    private final EngineMantle mantle;
+
+    public WorldObjectPlacer(World world) {
+        var a = IrisToolbelt.access(world);
+        if (a == null || a.getEngine() == null) throw new IllegalStateException(world.getName() + " is not an Iris World!");
+        this.world = world;
+        this.engine = a.getEngine();
+        this.mantle = engine.getMantle();
+    }
+
+    @Override
+    public int getHighest(int x, int z, IrisData data) {
+        return mantle.getHighest(x, z, data);
+    }
+
+    @Override
+    public int getHighest(int x, int z, IrisData data, boolean ignoreFluid) {
+        return mantle.getHighest(x, z, data, ignoreFluid);
+    }
+
+    @Override
+    public void set(int x, int y, int z, BlockData d) {
+        Block block = world.getBlockAt(x, y + world.getMinHeight(), z);
+
+        if (y <= world.getMinHeight() || block.getType() == Material.BEDROCK) return;
+        InventorySlotType slot = null;
+        if (B.isStorageChest(d)) {
+            slot = InventorySlotType.STORAGE;
+        }
+
+        if (slot != null) {
+            RNG rx = new RNG(Cache.key(x, z));
+            KList<IrisLootTable> tables = engine.getLootTables(rx, block);
+
+            try {
+                Bukkit.getPluginManager().callEvent(new IrisLootEvent(engine, block, slot, tables));
+
+                if (!tables.isEmpty()){
+                    Iris.debug("IrisLootEvent has been accessed");
+                }
+
+                if (tables.isEmpty())
+                    return;
+                InventoryHolder m = (InventoryHolder) block.getState();
+                engine.addItems(false, m.getInventory(), rx, tables, slot, world, x, y, z, 15);
+            } catch (Throwable e) {
+                Iris.reportError(e);
+            }
+        }
+
+        block.setBlockData(d);
+    }
+
+    @Override
+    public BlockData get(int x, int y, int z) {
+        return world.getBlockAt(x, y + world.getMinHeight(), z).getBlockData();
+    }
+
+    @Override
+    public boolean isPreventingDecay() {
+        return mantle.isPreventingDecay();
+    }
+
+    @Override
+    public boolean isCarved(int x, int y, int z) {
+        return mantle.isCarved(x, y, z);
+    }
+
+    @Override
+    public boolean isSolid(int x, int y, int z) {
+        return world.getBlockAt(x, y + world.getMinHeight(), z).getType().isSolid();
+    }
+
+    @Override
+    public boolean isUnderwater(int x, int z) {
+        return mantle.isUnderwater(x, z);
+    }
+
+    @Override
+    public int getFluidHeight() {
+        return mantle.getFluidHeight();
+    }
+
+    @Override
+    public boolean isDebugSmartBore() {
+        return mantle.isDebugSmartBore();
+    }
+
+    @Override
+    public void setTile(int xx, int yy, int zz, TileData tile) {
+        tile.toBukkitTry(world.getBlockAt(xx, yy + world.getMinHeight(), zz));
+    }
+}
--- a/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java
+++ b/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java
@@ -20,29 +20,19 @@ package com.volmit.iris.engine.jigsaw;

 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.context.IrisContext;
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.math.AxisAlignedBB;
-import com.volmit.iris.util.math.BlockPosition;
-import com.volmit.iris.util.math.RNG;
+import lombok.AccessLevel;
 import lombok.Data;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.TileState;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.inventory.InventoryHolder;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
 import org.bukkit.util.BlockVector;

 import java.util.ArrayList;
 import java.util.List;

-@SuppressWarnings("ALL")
@Data
 public class PlannedPiece {
    private IrisPosition position;
@@ -50,11 +40,19 @@ public class PlannedPiece {
    private IrisObject ogObject;
    private IrisJigsawPiece piece;
    private IrisObjectRotation rotation;
+    @EqualsAndHashCode.Exclude
    private IrisData data;
    private KList<IrisJigsawPieceConnector> connected;
    private boolean dead = false;
    private AxisAlignedBB box;
+    @EqualsAndHashCode.Exclude
    private PlannedStructure structure;
+    @EqualsAndHashCode.Exclude
+    @Setter(AccessLevel.NONE)
+    private ParentConnection parent = null;
+    @EqualsAndHashCode.Exclude
+    @Setter(AccessLevel.NONE)
+    private KMap<IrisJigsawPieceConnector, IrisPosition> realPositions;

    public PlannedPiece(PlannedStructure structure, IrisPosition position, IrisJigsawPiece piece) {
        this(structure, position, piece, 0, 0, 0);
@@ -76,6 +74,7 @@ public class PlannedPiece {
        this.object.setLoadKey(piece.getObject());
        this.ogObject.setLoadKey(piece.getObject());
        this.connected = new KList<>();
+        this.realPositions = new KMap<>();

    }

@@ -94,7 +93,15 @@ public class PlannedPiece {
        }

        BlockVector v = getObject().getCenter();
-        box = object.getAABB().shifted(position.add(new IrisPosition(object.getCenter())));
+        IrisPosition pos = new IrisPosition();
+        IrisObjectPlacement options = piece.getPlacementOptions();
+        if (options != null && options.getTranslate() != null) {
+            IrisObjectTranslate translate = options.getTranslate();
+            pos.setX(translate.getX());
+            pos.setY(translate.getY());
+            pos.setZ(translate.getZ());
+        }
+        box = object.getAABB().shifted(position.add(new IrisPosition(object.getCenter())).add(pos));
        return box;
    }

@@ -126,11 +133,21 @@ public class PlannedPiece {
        return c;
    }

-    public boolean connect(IrisJigsawPieceConnector c) {
-        if (piece.getConnectors().contains(c)) {
-            return connected.addIfMissing(c);
-        }
+    public KList<IrisJigsawPieceConnector> getChildConnectors() {
+        ParentConnection pc = getParent();
+        KList<IrisJigsawPieceConnector> c = getConnected().copy();
+        if (pc != null) c.removeIf(i -> i.equals(pc.connector));
+        return c;
+    }

+    public boolean connect(IrisJigsawPieceConnector c, PlannedPiece p, IrisJigsawPieceConnector pc) {
+        if (piece.getConnectors().contains(c) && p.getPiece().getConnectors().contains(pc)) {
+            if (connected.contains(c) || p.connected.contains(pc)) return false;
+            connected.add(c);
+            p.connected.add(pc);
+            p.parent = new ParentConnection(this, c, p, pc);
+            return true;
+        }
        return false;
    }

@@ -162,108 +179,29 @@ public class PlannedPiece {
    }

    public boolean isFull() {
-        return connected.size() >= piece.getConnectors().size() || isDead();
+        return connected.size() >= piece.getConnectors().size();
    }

-    public void place(World world) {
-        PlatformChunkGenerator a = IrisToolbelt.access(world);
-
-        int minY = 0;
-        if (a != null) {
-            minY = a.getEngine().getMinHeight();
-
-            if (!a.getEngine().getDimension().isBedrock())
-                minY--; //If the dimension has no bedrock, allow it to go a block lower
+    public void setRealPositions(int x, int y, int z, IObjectPlacer placer) {
+        boolean isUnderwater = piece.getPlacementOptions().isUnderwater();
+        for (IrisJigsawPieceConnector c : piece.getConnectors()) {
+            var pos = c.getPosition().add(new IrisPosition(x, 0, z));
+            if (y < 0) {
+                pos.setY(pos.getY() + placer.getHighest(pos.getX(), pos.getZ(), getData(), isUnderwater) + (object.getH() / 2));
+            } else {
+                pos.setY(pos.getY() + y);
+            }
+            realPositions.put(c, pos);
        }
+    }

-        getPiece().getPlacementOptions().setTranslate(new IrisObjectTranslate());
-        getPiece().getPlacementOptions().setRotation(rotation);
-        int finalMinY = minY;
-        RNG rng = getStructure().getRng().nextParallelRNG(37555);
-
-        // TODO: REAL CLASSES!!!!!!!
-        getOgObject().place(position.getX() + getObject().getCenter().getBlockX(), position.getY() + getObject().getCenter().getBlockY(), position.getZ() + getObject().getCenter().getBlockZ(), new IObjectPlacer() {
-            @Override
-            public int getHighest(int x, int z, IrisData data) {
-                return position.getY();
-            }
-
-            @Override
-            public int getHighest(int x, int z, IrisData data, boolean ignoreFluid) {
-                return position.getY();
-            }
-
-            @Override
-            public void set(int x, int y, int z, BlockData d) {
-                Block block = world.getBlockAt(x, y, z);
-
-                //Prevent blocks being set in or bellow bedrock
-                if (y <= finalMinY || block.getType() == Material.BEDROCK) return;
-
-                block.setBlockData(d);
-
-                if (a != null && getPiece().getPlacementOptions().getLoot().isNotEmpty() &&
-                        block.getState() instanceof InventoryHolder) {
-
-                    IrisLootTable table = getPiece().getPlacementOptions().getTable(block.getBlockData(), getData());
-                    if (table == null) return;
-                    Engine engine = a.getEngine();
-                    engine.addItems(false, ((InventoryHolder) block.getState()).getInventory(),
-                            rng.nextParallelRNG(BlockPosition.toLong(x, y, z)),
-                            new KList<>(table), InventorySlotType.STORAGE, x, y, z, 15);
-                }
-            }
-
-            @Override
-            public BlockData get(int x, int y, int z) {
-                return world.getBlockAt(x, y, z).getBlockData();
-            }
-
-            @Override
-            public boolean isPreventingDecay() {
-                return false;
-            }
-
-            @Override
-            public boolean isCarved(int x, int y, int z) {
-                return false;
-            }
-
-            @Override
-            public boolean isSolid(int x, int y, int z) {
-                return world.getBlockAt(x, y, z).getType().isSolid();
-            }
-
-            @Override
-            public boolean isUnderwater(int x, int z) {
-                return false;
-            }
-
-            @Override
-            public int getFluidHeight() {
-                return 0;
-            }
-
-            @Override
-            public boolean isDebugSmartBore() {
-                return false;
-            }
-
-            @Override
-            public void setTile(int xx, int yy, int zz, TileData<? extends TileState> tile) {
-                BlockState state = world.getBlockAt(xx, yy, zz).getState();
-                tile.toBukkitTry(state);
-                state.update();
-            }
-
-            @Override
-            public Engine getEngine() {
-                if (IrisToolbelt.isIrisWorld(world)) {
-                    return IrisToolbelt.access(world).getEngine();
-                }
-
-                return IrisContext.get().getEngine();
-            }
-        }, piece.getPlacementOptions(), rng, getData());
+    public record ParentConnection(PlannedPiece parent, IrisJigsawPieceConnector parentConnector, PlannedPiece self, IrisJigsawPieceConnector connector) {
+        public IrisPosition getTargetPosition() {
+            var pos = parent.realPositions.get(parentConnector);
+            if (pos == null) return null;
+            return pos.add(new IrisPosition(parentConnector.getDirection().toVector()))
+                    .sub(connector.getPosition())
+                    .sub(new IrisPosition(self.object.getCenter()));
+        }
    }
 }
--- a/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
+++ b/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
@@ -21,19 +21,21 @@ package com.volmit.iris.engine.jigsaw;
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.mantle.MantleWriter;
+import com.volmit.iris.engine.framework.placer.WorldObjectPlacer;
 import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.data.IrisBlockData;
 import com.volmit.iris.util.mantle.Mantle;
+import com.volmit.iris.util.math.Position2;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.slices.container.JigsawPieceContainer;
+import com.volmit.iris.util.matter.slices.container.JigsawStructuresContainer;
+import com.volmit.iris.util.scheduling.J;
 import lombok.Data;
 import org.bukkit.Axis;
-import org.bukkit.World;
-import org.bukkit.block.TileState;
-import org.bukkit.block.data.BlockData;
+
+import java.util.function.Consumer;

@Data
 public class PlannedStructure {
@@ -48,16 +50,18 @@ public class PlannedStructure {
    private IrisPosition position;
    private IrisData data;
    private RNG rng;
+    private boolean forcePlace;
    private boolean verbose;
    private boolean terminating;

-    public PlannedStructure(IrisJigsawStructure structure, IrisPosition position, RNG rng) {
+    public PlannedStructure(IrisJigsawStructure structure, IrisPosition position, RNG rng, boolean forcePlace) {
        terminating = false;
        verbose = true;
        this.pieces = new KList<>();
        this.structure = structure;
        this.position = position;
        this.rng = rng;
+        this.forcePlace = forcePlace || structure.isForcePlace();
        this.data = structure.getLoader();
        generateStartPiece();

@@ -74,33 +78,47 @@ public class PlannedStructure {
        }
    }

-    public void place(IObjectPlacer placer, Mantle e, Engine eng) {
+    public boolean place(IObjectPlacer placer, Mantle e, Engine eng) {
        IrisObjectPlacement options = new IrisObjectPlacement();
-        options.getRotation().setEnabled(false);
+        options.setRotation(IrisObjectRotation.of(0,0,0));
        int startHeight = pieces.get(0).getPosition().getY();

+        boolean placed = false;
        for (PlannedPiece i : pieces) {
-            place(i, startHeight, options, placer, e, eng);
+            if (place(i, startHeight, options, placer, e, eng))
+                placed = true;
        }
+        if (placed) {
+            Position2 chunkPos = new Position2(position.getX() >> 4, position.getZ() >> 4);
+            Position2 regionPos = new Position2(chunkPos.getX() >> 5, chunkPos.getZ() >> 5);
+            JigsawStructuresContainer slice = e.get(regionPos.getX(), 0, regionPos.getZ(), JigsawStructuresContainer.class);
+            if (slice == null) slice = new JigsawStructuresContainer();
+            slice.add(structure, chunkPos);
+            e.set(regionPos.getX(), 0, regionPos.getZ(), slice);
+        }
+        return placed;
    }

-    public void place(PlannedPiece i, int startHeight, IrisObjectPlacement o, IObjectPlacer placer, Mantle e, Engine eng) {
+    public boolean place(PlannedPiece i, int startHeight, IrisObjectPlacement o, IObjectPlacer placer, Mantle e, Engine eng) {
        IrisObjectPlacement options = o;

        if (i.getPiece().getPlacementOptions() != null) {
            options = i.getPiece().getPlacementOptions();
            options.getRotation().setEnabled(false);
+            options.setRotateTowardsSlope(false);
+            options.setWarp(new IrisGeneratorStyle(NoiseStyle.FLAT));
        } else {
            options.setMode(i.getPiece().getPlaceMode());
        }
+        if (forcePlace) {
+            options.setForcePlace(true);
+        }

-        IrisObject vo = i.getOgObject();
        IrisObject v = i.getObject();
        int sx = (v.getW() / 2);
        int sz = (v.getD() / 2);
        int xx = i.getPosition().getX() + sx;
        int zz = i.getPosition().getZ() + sz;
-        RNG rngf = new RNG(Cache.key(xx, zz));
        int offset = i.getPosition().getY() - startHeight;
        int height;

@@ -108,12 +126,23 @@ public class PlannedStructure {
            if (i.getStructure().getStructure().getOverrideYRange() != null) {
                height = (int) i.getStructure().getStructure().getOverrideYRange().get(rng, xx, zz, getData());
            } else {
-                height = placer.getHighest(xx, zz, getData());
+                height = placer.getHighest(xx, zz, getData(), options.isUnderwater());
            }
        } else {
            height = i.getStructure().getStructure().getLockY();
        }

+        PlannedPiece.ParentConnection connection = i.getParent();
+        if (connection != null && connection.connector().isLockY()) {
+            var pos = connection.getTargetPosition();
+            if (pos != null) {
+                height = pos.getY();
+                offset = 0;
+            } else {
+                Iris.warn("Failed to get target position for " + v.getLoadKey());
+            }
+        }
+
        height += offset + (v.getH() / 2);

        if (options.getMode().equals(ObjectPlaceMode.PAINT)) {
@@ -122,16 +151,18 @@ public class PlannedStructure {

        int id = rng.i(0, Integer.MAX_VALUE);
        JigsawPieceContainer container = JigsawPieceContainer.toContainer(i.getPiece());
-        vo.place(xx, height, zz, placer, options, rng, (b, data) -> {
+        i.setRealPositions(xx, height, zz, placer);
+        return v.place(xx, height, zz, placer, options, rng, (b, data) -> {
            e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id);
            e.set(b.getX(), b.getY(), b.getZ(), container);
-        }, null, getData());
+            if (data instanceof IrisBlockData d) {
+                e.set(b.getX(), b.getY(), b.getZ(), d.getCustom());
+            }
+        }, null, getData().getEngine() != null ? getData() : eng.getData()) != -1;
    }

-    public void place(World world) {
-        for (PlannedPiece i : pieces) {
-            Iris.sq(() -> i.place(world));
-        }
+    public void place(WorldObjectPlacer placer, Consumer<Boolean> consumer) {
+        J.s(() -> consumer.accept(place(placer, placer.getMantle().getMantle(), placer.getEngine())));
    }

    private void generateOutwards() {
@@ -167,9 +198,7 @@ public class PlannedStructure {

    private boolean generateRotatedPiece(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector, IrisJigsawPiece idea) {
        if (!piece.getPiece().getPlacementOptions().getRotation().isEnabled()) {
-            if (generateRotatedPiece(piece, pieceConnector, idea, 0, 0, 0)) {
-                return true;
-            }
+            return generateRotatedPiece(piece, pieceConnector, idea, 0, 0, 0);
        }

        KList<Integer> forder1 = new KList<Integer>().qadd(0).qadd(1).qadd(2).qadd(3).shuffle(rng);
@@ -216,7 +245,7 @@ public class PlannedStructure {
    }

    private boolean generateRotatedPiece(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector, IrisJigsawPiece idea, int x, int y, int z) {
-        return generateRotatedPiece(piece, pieceConnector, idea, IrisObjectRotation.of(x, y, z));
+        return generateRotatedPiece(piece, pieceConnector, idea, IrisObjectRotation.of(x * 90D, y * 90D, z * 90D));
    }

    private boolean generatePositionedPiece(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector, PlannedPiece test, IrisJigsawPieceConnector testConnector) {
@@ -240,8 +269,7 @@ public class PlannedStructure {
            return false;
        }

-        piece.connect(pieceConnector);
-        test.connect(testConnector);
+        piece.connect(pieceConnector, test, testConnector);
        pieces.add(test);

        return true;
@@ -250,7 +278,8 @@ public class PlannedStructure {
    private KList<IrisJigsawPiece> getShuffledPiecesFor(IrisJigsawPieceConnector c) {
        KList<IrisJigsawPiece> p = new KList<>();

-        for (String i : c.getPools().shuffleCopy(rng)) {
+        KList<String> pools = terminating && getStructure().getTerminatePool() != null ? new KList<>(getStructure().getTerminatePool()) : c.getPools().shuffleCopy(rng);
+        for (String i : pools) {
            for (String j : getData().getJigsawPoolLoader().load(i).getPieces().shuffleCopy(rng)) {
                IrisJigsawPiece pi = getData().getJigsawPieceLoader().load(j);

@@ -276,7 +305,9 @@ public class PlannedStructure {
    }

    public KList<PlannedPiece> getPiecesWithAvailableConnectors() {
-        return pieces.copy().removeWhere(PlannedPiece::isFull);
+        KList<PlannedPiece> available = pieces.copy().removeWhere(PlannedPiece::isFull);
+        if (!terminating) available.removeIf(PlannedPiece::isDead);
+        return available;
    }

    public int getVolume() {
@@ -301,6 +332,10 @@ public class PlannedStructure {

    public boolean collidesWith(PlannedPiece piece, PlannedPiece ignore) {
        for (PlannedPiece i : pieces) {
+            if (i.equals(ignore)) {
+                continue;
+            }
+
            if (i.collidesWith(piece)) {
                return true;
            }
--- a/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
@@ -107,7 +107,7 @@ public interface EngineMantle extends IObjectPlacer {
    }

    @Override
-    default void setTile(int x, int y, int z, TileData<? extends TileState> d) {
+    default void setTile(int x, int y, int z, TileData d) {
        getMantle().set(x, y, z, new TileWrapper(d));
    }

--- a/core/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java
+++ b/core/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java
@@ -206,7 +206,7 @@ public class MantleWriter implements IObjectPlacer {
    }

    @Override
-    public void setTile(int xx, int yy, int zz, TileData<? extends TileState> tile) {
+    public void setTile(int xx, int yy, int zz, TileData tile) {
        getEngineMantle().setTile(xx, yy, zz, tile);
    }

--- 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
@@ -24,13 +24,17 @@ import com.volmit.iris.engine.mantle.IrisMantleComponent;
 import com.volmit.iris.engine.mantle.MantleWriter;
 import com.volmit.iris.engine.object.*;
 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.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.math.Position2;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.matter.slices.container.JigsawStructuresContainer;
 import com.volmit.iris.util.noise.CNG;
+import org.jetbrains.annotations.Nullable;

 import java.util.List;

@@ -39,21 +43,22 @@ public class MantleJigsawComponent extends IrisMantleComponent {

    public MantleJigsawComponent(EngineMantle engineMantle) {
        super(engineMantle, MantleFlag.JIGSAW);
-        cng = NoiseStyle.STATIC.create(new RNG(engineMantle.getEngine().getSeedManager().getJigsaw()));
+        cng = NoiseStyle.STATIC.create(new RNG(jigsaw()));
    }

    @Override
    public void generateLayer(MantleWriter writer, int x, int z, ChunkContext context) {
-        RNG rng = new RNG(cng.fit(-Integer.MAX_VALUE, Integer.MAX_VALUE, x, z));
        int xxx = 8 + (x << 4);
        int zzz = 8 + (z << 4);
        IrisRegion region = getComplex().getRegionStream().get(xxx, zzz);
        IrisBiome biome = getComplex().getTrueBiomeStream().get(xxx, zzz);
-        generateJigsaw(writer, rng, x, z, biome, region);
+        generateJigsaw(writer, x, z, biome, region);
    }

    @ChunkCoordinates
-    private void generateJigsaw(MantleWriter writer, RNG rng, int x, int z, IrisBiome biome, IrisRegion region) {
+    private void generateJigsaw(MantleWriter writer, int x, int z, IrisBiome biome, IrisRegion region) {
+        long seed = cng.fit(Integer.MIN_VALUE, Integer.MAX_VALUE, x, z);
+
        if (getDimension().getStronghold() != null) {
            List<Position2> poss = getDimension().getStrongholds(seed());

@@ -61,28 +66,61 @@ public class MantleJigsawComponent extends IrisMantleComponent {
                for (Position2 pos : poss) {
                    if (x == pos.getX() >> 4 && z == pos.getZ() >> 4) {
                        IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(getDimension().getStronghold());
-                        place(writer, pos.toIris(), structure, rng);
+                        place(writer, pos.toIris(), structure, new RNG(seed), true);
                        return;
                    }
                }
            }
        }

-        boolean placed = placeStructures(writer, rng, x, z, biome.getJigsawStructures());
+        KSet<Position2> cachedRegions = new KSet<>();
+        KMap<String, KSet<Position2>> cache = new KMap<>();
+        KMap<Position2, Double> distanceCache = new KMap<>();
+        boolean placed = placeStructures(writer, seed, x, z, biome.getJigsawStructures(), cachedRegions, cache, distanceCache);
        if (!placed)
-            placed = placeStructures(writer, rng, x, z, region.getJigsawStructures());
+            placed = placeStructures(writer, seed, x, z, region.getJigsawStructures(), cachedRegions, cache, distanceCache);
        if (!placed)
-            placeStructures(writer, rng, x, z, getDimension().getJigsawStructures());
+            placeStructures(writer, seed, x, z, getDimension().getJigsawStructures(), cachedRegions, cache, distanceCache);
    }

    @ChunkCoordinates
-    private boolean placeStructures(MantleWriter writer, RNG rng, int x, int z, KList<IrisJigsawStructurePlacement> structures) {
-        for (IrisJigsawStructurePlacement i : structures) {
-            if (rng.nextInt(i.getRarity()) == 0) {
-                IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15));
-                IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure());
-                place(writer, position, structure, rng);
-                return true;
+    private boolean placeStructures(MantleWriter writer, long seed, int x, int z, KList<IrisJigsawStructurePlacement> structures,
+            KSet<Position2> cachedRegions, KMap<String, KSet<Position2>> cache, KMap<Position2, Double> distanceCache) {
+        IrisJigsawStructurePlacement i = pick(structures, seed, x, z);
+        if (i == null || checkMinDistances(i.collectMinDistances(), x, z, cachedRegions, cache, distanceCache))
+            return false;
+        RNG rng = new RNG(seed);
+        IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15));
+        IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure());
+        return place(writer, position, structure, rng, false);
+    }
+
+    @ChunkCoordinates
+    private boolean checkMinDistances(KMap<String, Integer> minDistances, int x, int z, KSet<Position2> cachedRegions, KMap<String, KSet<Position2>> cache, KMap<Position2, Double> distanceCache) {
+        int range = 0;
+        for (int d : minDistances.values())
+            range = Math.max(range, d);
+
+        for (int xx = -range; xx <= range; xx++) {
+            for (int zz = -range; zz <= range; zz++) {
+                Position2 pos = new Position2((xx + x) >> 5, (zz + z) >> 5);
+                if (cachedRegions.contains(pos)) continue;
+                cachedRegions.add(pos);
+                JigsawStructuresContainer container = getMantle().get(pos.getX(), 0, pos.getZ(), JigsawStructuresContainer.class);
+                if (container == null) continue;
+                for (String key : container.getStructures()) {
+                    cache.computeIfAbsent(key, k -> new KSet<>()).addAll(container.getPositions(key));
+                }
+            }
+        }
+        Position2 pos = new Position2(x, z);
+        for (String structure : minDistances.keySet()) {
+            if (!cache.containsKey(structure)) continue;
+            double minDist = minDistances.get(structure);
+            minDist = minDist * minDist;
+            for (Position2 sPos : cache.get(structure)) {
+                double dist = distanceCache.computeIfAbsent(sPos,  position2 -> position2.distance(pos));
+                if (minDist > dist) return true;
            }
        }
        return false;
@@ -91,8 +129,8 @@ public class MantleJigsawComponent extends IrisMantleComponent {
    @ChunkCoordinates
    public IrisJigsawStructure guess(int x, int z) {
        // todo The guess doesnt bring into account that the placer may return -1
-        boolean t = false;
-        RNG rng = new RNG(cng.fit(-Integer.MAX_VALUE, Integer.MAX_VALUE, x, z));
+        // todo doesnt bring skipped placements into account
+        long seed = cng.fit(Integer.MIN_VALUE, Integer.MAX_VALUE, x, z);
        IrisBiome biome = getEngineMantle().getEngine().getSurfaceBiome((x << 4) + 8, (z << 4) + 8);
        IrisRegion region = getEngineMantle().getEngine().getRegion((x << 4) + 8, (z << 4) + 8);

@@ -108,29 +146,26 @@ public class MantleJigsawComponent extends IrisMantleComponent {
            }
        }

-        for (IrisJigsawStructurePlacement i : biome.getJigsawStructures()) {
-            if (rng.nextInt(i.getRarity()) == 0) {
-                return getData().getJigsawStructureLoader().load(i.getStructure());
-            }
-        }
+        IrisJigsawStructurePlacement i = pick(biome.getJigsawStructures(), seed, x, z);
+        if (i == null) i = pick(region.getJigsawStructures(), seed, x, z);
+        if (i == null) i = pick(getDimension().getJigsawStructures(), seed, x, z);
+        return i != null ? getData().getJigsawStructureLoader().load(i.getStructure()) : null;
+    }

-        for (IrisJigsawStructurePlacement i : region.getJigsawStructures()) {
-            if (rng.nextInt(i.getRarity()) == 0) {
-                return getData().getJigsawStructureLoader().load(i.getStructure());
-            }
-        }
-
-        for (IrisJigsawStructurePlacement i : getDimension().getJigsawStructures()) {
-            if (rng.nextInt(i.getRarity()) == 0) {
-                return getData().getJigsawStructureLoader().load(i.getStructure());
-            }
-        }
-
-        return null;
+    @Nullable
+    @ChunkCoordinates
+    private IrisJigsawStructurePlacement pick(List<IrisJigsawStructurePlacement> structures, long seed, int x, int z) {
+        return IRare.pick(structures.stream()
+                .filter(p -> p.shouldPlace(getDimension().getJigsawStructureDivisor(), jigsaw(), x, z))
+                .toList(), new RNG(seed).nextDouble());
    }

    @BlockCoordinates
-    private void place(MantleWriter writer, IrisPosition position, IrisJigsawStructure structure, RNG rng) {
-        new PlannedStructure(structure, position, rng).place(writer, getMantle(), writer.getEngine());
+    private boolean place(MantleWriter writer, IrisPosition position, IrisJigsawStructure structure, RNG rng, boolean forcePlace) {
+        return new PlannedStructure(structure, position, rng, forcePlace).place(writer, getMantle(), writer.getEngine());
+    }
+
+    private long jigsaw() {
+        return getEngineMantle().getEngine().getSeedManager().getJigsaw();
    }
 }
--- 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
@@ -27,6 +27,7 @@ import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.context.ChunkContext;
 import com.volmit.iris.util.data.B;
+import com.volmit.iris.util.data.IrisBlockData;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;
@@ -103,6 +104,9 @@ public class MantleObjectComponent extends IrisMantleComponent {
                if (objectPlacement.isDolphinTarget() && objectPlacement.isUnderwater() && B.isStorageChest(data)) {
                    writer.setData(b.getX(), b.getY(), b.getZ(), MatterStructurePOI.BURIED_TREASURE);
                }
+                if (data instanceof IrisBlockData d) {
+                    writer.setData(b.getX(), b.getY(), b.getZ(), d.getCustom());
+                }
            }, null, getData());
        }
    }
--- a/core/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java
+++ b/core/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java
@@ -60,15 +60,11 @@ public class IrisDepositModifier extends EngineAssignedModifier<BlockData> {
        }

        for (IrisDepositGenerator k : region.getDeposits()) {
-            for (int l = 0; l < ro.i(k.getMinPerChunk(), k.getMaxPerChunk()); l++) {
-                burst.queue(() -> generate(k, terrain, ro, x, z, false, context));
-            }
+            burst.queue(() -> generate(k, terrain, ro, x, z, false, context));
        }

        for (IrisDepositGenerator k : biome.getDeposits()) {
-            for (int l = 0; l < ro.i(k.getMinPerChunk(), k.getMaxPerChunk()); l++) {
-                burst.queue(() -> generate(k, terrain, ro, x, z, false, context));
-            }
+            burst.queue(() -> generate(k, terrain, ro, x, z, false, context));
        }
        burst.complete();
    }
--- a/core/src/main/java/com/volmit/iris/engine/object/IObjectLoot.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IObjectLoot.java
@@ -0,0 +1,13 @@
+package com.volmit.iris.engine.object;
+
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.util.collection.KList;
+import org.bukkit.block.data.BlockData;
+
+public interface IObjectLoot {
+    KList<IrisBlockData> getFilter();
+    KList<BlockData> getFilter(IrisData manager);
+    boolean isExact();
+    String getName();
+    int getWeight();
+}
--- a/core/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java
@@ -44,7 +44,7 @@ public interface IObjectPlacer {

    boolean isDebugSmartBore();

-    void setTile(int xx, int yy, int zz, TileData<? extends TileState> tile);
+    void setTile(int xx, int yy, int zz, TileData tile);

    Engine getEngine();
 }
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBiome.java
@@ -194,13 +194,14 @@ public class IrisBiome extends IrisRegistrant implements IRare {
        return getCustomDerivitives() != null && getCustomDerivitives().isNotEmpty();
    }

-    public double getGenLinkMax(String loadKey) {
+    public double getGenLinkMax(String loadKey, Engine engine) {
        Integer v = genCacheMax.aquire(() ->
        {
            KMap<String, Integer> l = new KMap<>();

            for (IrisBiomeGeneratorLink i : getGenerators()) {
-                l.put(i.getGenerator(), i.getMax());
+                l.put(i.getGenerator(), i.getMax(engine));
+
            }

            return l;
@@ -209,13 +210,13 @@ public class IrisBiome extends IrisRegistrant implements IRare {
        return v == null ? 0 : v;
    }

-    public double getGenLinkMin(String loadKey) {
+    public double getGenLinkMin(String loadKey, Engine engine) {
        Integer v = genCacheMin.aquire(() ->
        {
            KMap<String, Integer> l = new KMap<>();

            for (IrisBiomeGeneratorLink i : getGenerators()) {
-                l.put(i.getGenerator(), i.getMin());
+                l.put(i.getGenerator(), i.getMin(engine));
            }

            return l;
@@ -450,26 +451,26 @@ public class IrisBiome extends IrisRegistrant implements IRare {
        return real;
    }

-    public int getMaxHeight() {
+    public int getMaxHeight(Engine engine) {
        return maxHeight.aquire(() ->
        {
            int maxHeight = 0;

            for (IrisBiomeGeneratorLink i : getGenerators()) {
-                maxHeight += i.getMax();
+                maxHeight += i.getMax(engine);
            }

            return maxHeight;
        });
    }

-    public int getMaxWithObjectHeight(IrisData data) {
+    public int getMaxWithObjectHeight(IrisData data, Engine engine) {
        return maxWithObjectHeight.aquire(() ->
        {
            int maxHeight = 0;

            for (IrisBiomeGeneratorLink i : getGenerators()) {
-                maxHeight += i.getMax();
+                maxHeight += i.getMax(engine);
            }

            int gg = 0;
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java
@@ -19,6 +19,7 @@
 package com.volmit.iris.engine.object;

 import com.volmit.iris.Iris;
+import com.volmit.iris.core.nms.datapack.IDataFixer;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
@@ -68,8 +69,10 @@ public class IrisBiomeCustom {
    @Desc("The biome's category type")
    private IrisBiomeCustomCategory category = IrisBiomeCustomCategory.plains;

+    @MinNumber(0)
+    @MaxNumber(20)
    @Desc("The spawn rarity of any defined spawners")
-    private int spawnRarity = -1;
+    private int spawnRarity = 0;

    @Desc("The color of the sky, top half of sky. (hex format)")
    private String skyColor = "#79a8e1";
@@ -89,7 +92,7 @@ public class IrisBiomeCustom {
    @Desc("The color of foliage (hex format). Leave blank / don't define to not change")
    private String foliageColor = "";

-    public String generateJson() {
+    public String generateJson(IDataFixer fixer) {
        JSONObject effects = new JSONObject();
        effects.put("sky_color", parseColor(getSkyColor()));
        effects.put("fog_color", parseColor(getFogColor()));
@@ -101,7 +104,7 @@ public class IrisBiomeCustom {
            JSONObject po = new JSONObject();
            po.put("type", ambientParticle.getParticle().name().toLowerCase());
            particle.put("options", po);
-            particle.put("probability", ambientParticle.getRarity());
+            particle.put("probability", 1f/ambientParticle.getRarity());
            effects.put("particle", particle);
        }

@@ -155,7 +158,7 @@ public class IrisBiomeCustom {
            j.put("spawners", spawners);
        }

-        return j.toString(4);
+        return fixer.fixCustomBiome(this, j).toString(4);
    }

    private int parseColor(String c) {
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java
@@ -37,12 +37,10 @@ public class IrisBiomeCustomSpawn {
    private EntityType type = EntityType.COW;

    @MinNumber(1)
-    @MaxNumber(20)
    @Desc("The min to spawn")
    private int minCount = 2;

    @MinNumber(1)
-    @MaxNumber(20)
    @Desc("The max to spawn")
    private int maxCount = 5;

--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java
@@ -18,14 +18,13 @@

 package com.volmit.iris.engine.object;

-import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.interpolation.IrisInterpolation;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.Accessors;

@Snippet("generator-layer")
@@ -40,22 +39,23 @@ public class IrisBiomeGeneratorLink {
    @RegistryListResource(IrisGenerator.class)
    @Desc("The generator id")
    private String generator = "default";
-    @DependsOn({"min", "max"})
+    @DependsOn({ "min", "max" })
    @Required
    @MinNumber(-2032) // TODO: WARNING HEIGHT
    @MaxNumber(2032) // TODO: WARNING HEIGHT
    @Desc("The min block value (value + fluidHeight)")
+    @Getter(AccessLevel.NONE)
    private int min = 0;
-    @DependsOn({"min", "max"})
+    @DependsOn({ "min", "max" })
    @Required
    @MinNumber(-2032) // TODO: WARNING HEIGHT
    @MaxNumber(2032) // TODO: WARNING HEIGHT
+    @Getter(AccessLevel.NONE)
    @Desc("The max block value (value + fluidHeight)")
    private int max = 0;

    public IrisGenerator getCachedGenerator(DataProvider g) {
-        return gen.aquire(() ->
-        {
+        return gen.aquire(() -> {
            IrisGenerator gen = g.getData().getGeneratorLoader().load(getGenerator());

            if (gen == null) {
@@ -66,21 +66,74 @@ public class IrisBiomeGeneratorLink {
        });
    }

+    private int[] getBiomeGeneratorsRaw(Engine engine) {
+        int max = engine.getDimension().getMinHeight();
+        int min = engine.getDimension().getMaxHeight();
+        for (IrisBiome biome : engine.getAllBiomes()) {
+            for (IrisBiomeGeneratorLink i : biome.getGenerators()) {
+                int biomeRawMax = i.getMaxRaw();
+                int biomeRawMin = i.getMinRaw();
+                if (max < biomeRawMax)
+                    max = biomeRawMax;
+                if (min > biomeRawMin)
+                    min = biomeRawMin;
+            }
+        }
+
+        return new int[] { min, max };
+    }
+
+    private int calculateHeight(Engine engine, int option) {
+        int dmx = engine.getDimension().getMaxHeight();
+        int dmn = engine.getDimension().getMinHeight();
+        int[] heights = getBiomeGeneratorsRaw(engine);
+        int gmx = heights[1];
+        int gmn = heights[0];
+
+        int mx = getMaxRaw();
+        int mn = getMinRaw();
+        if (engine.getDimension().isSmartVanillaHeight()) {
+            if (mx > 0)
+                mx = Math.min((int) (((float) mx / (float) gmx) * 300.0f), 300);
+            if (mx < 0)
+                mx = Math.min((int) (((float) mx / (float) gmn) * 300.0f), 56);
+
+            if (mn > 0)
+                mn = Math.min((int) (((float) mn / (float) gmx) * 300.0f), 300);
+            if (mn < 0)
+                mn = Math.min((int) (((float) mn / (float) gmn) * 300.0f), 56);
+        }
+
+        if (option == 1) {
+            return mx;
+        }
+        if (option == 0) {
+            return mn;
+        }
+        Iris.error("Fatal Generator error!");
+        return 0;
+    }
+
+    public int getMax(Engine engine) {
+        return calculateHeight(engine, 1);
+    }
+
+    public int getMin(Engine engine) {
+        return calculateHeight(engine, 0);
+    }
+
+    private int getMaxRaw() {
+        return max;
+    }
+
+    private int getMinRaw() {
+        return min;
+    }
+
    public double getHeight(DataProvider xg, double x, double z, long seed) {
        double g = getCachedGenerator(xg).getHeight(x, z, seed);
        g = g < 0 ? 0 : g;
        g = g > 1 ? 1 : g;
-//        if (IrisSettings.get().getGenerator().forceConvertTo320Height) {
-//           if (max > 320 || min > 320) {
-//                double scaleFactor = 320.0 / Math.max(max, min);
-//                min *= (int) scaleFactor;
-//                max *= (int) scaleFactor;
-//                if (min < 0) {
-//
-//                }
-//            }
-//        }
-        // todo This

        return IrisInterpolation.lerp(min, max, g);
    }
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java
@@ -21,6 +21,7 @@ package com.volmit.iris.engine.object;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
+import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
@@ -61,6 +62,8 @@ public class IrisBlockData extends IrisRegistrant {
    private IrisBlockData backup = null;
    @Desc("Optional properties for this block data such as 'waterlogged': true")
    private KMap<String, Object> data = new KMap<>();
+    @Desc("Optional tile data for this block data")
+    private KMap<String, Object> tileData = new KMap<>();

    public IrisBlockData(String b) {
        this.block = b;
@@ -196,17 +199,12 @@ public class IrisBlockData extends IrisRegistrant {
        });
    }

-    public TileData<?> tryGetTile() {
+    public TileData tryGetTile(IrisData data) {
        //TODO Do like a registry thing with the tile data registry. Also update the parsing of data to include **block** entities.
-        if (data.containsKey("entitySpawn")) {
-            TileSpawner spawner = new TileSpawner();
-            String name = (String) data.get("entitySpawn");
-            if (name.contains(":"))
-                name = name.split(":")[1];
-            spawner.setEntityType(EntityType.fromName(name));
-            return spawner;
-        }
-        return null;
+        var type = getBlockData(data).getMaterial();
+        if (!INMS.get().hasTile(type) || tileData == null || tileData.isEmpty())
+            return null;
+        return new TileData(type, this.tileData);
    }

    private String keyify(String dat) {
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java
@@ -55,6 +55,8 @@ public class IrisDecorator {
    @ArrayType(min = 1, type = IrisBlockData.class)
    @Desc("When set, the decorator will never place onto any of these blocks.")
    private KList<IrisBlockData> blacklist;
+    @Desc("The slope at which this decorator can be placed. Range from 0 to 10 by default. Calculated from a 3-block radius from the center of the decorator placement.")
+    private IrisSlopeClip slopeCondition = new IrisSlopeClip();
    @DependsOn({"scaleStack", "stackMin", "stackMax"})
    @Desc("If stackMax is set to true, use this to limit its max height for large caverns")
    private int absoluteMaxStack = 30;
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -21,12 +21,12 @@ package com.volmit.iris.engine.object;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.core.nms.datapack.IDataFixer;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.data.DataProvider;
-import com.volmit.iris.util.data.Dimension;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.math.Position2;
@@ -42,7 +42,6 @@ import org.bukkit.Material;
 import org.bukkit.World.Environment;
 import org.bukkit.block.data.BlockData;

-import java.io.DataInput;
 import java.io.File;
 import java.io.IOException;

@@ -210,6 +209,8 @@ public class IrisDimension extends IrisRegistrant {
    private IrisCarving carving = new IrisCarving();
    @Desc("Configuration of fluid bodies such as rivers & lakes")
    private IrisFluidBodies fluidBodies = new IrisFluidBodies();
+    @Desc("forceConvertTo320Height")
+    private Boolean forceConvertTo320Height = false;
    @Desc("The world environment")
    private Environment environment = Environment.NORMAL;
    @RegistryListResource(IrisRegion.class)
@@ -220,6 +221,8 @@ public class IrisDimension extends IrisRegistrant {
    @ArrayType(min = 1, type = IrisJigsawStructurePlacement.class)
    @Desc("Jigsaw structures")
    private KList<IrisJigsawStructurePlacement> jigsawStructures = new KList<>();
+    @Desc("The jigsaw structure divisor to use when generating missing jigsaw placement values")
+    private double jigsawStructureDivisor = 18;
    @Required
    @MinNumber(0)
    @MaxNumber(1024)
@@ -231,6 +234,8 @@ public class IrisDimension extends IrisRegistrant {
    private IrisRange dimensionHeightEnd = new IrisRange(-64, 320);
    @Desc("Define the min and max Y bounds of this dimension. Please keep in mind that Iris internally generates from 0 to (max - min). \n\nFor example at -64 to 320, Iris is internally generating to 0 to 384, then on outputting chunks, it shifts it down by the min height (64 blocks). The default is -64 to 320. \n\nThe fluid height is placed at (fluid height + min height). So a fluid height of 63 would actually show up in the world at 1.")
    private IrisRange dimensionHeightNether = new IrisRange(-64, 320);
+    @Desc("Enable smart vanilla height")
+    private boolean smartVanillaHeight = false;
    @RegistryListResource(IrisBiome.class)
    @Desc("Keep this either undefined or empty. Setting any biome name into this will force iris to only generate the specified biome. Great for testing.")
    private String focus = "";
@@ -240,7 +245,7 @@ public class IrisDimension extends IrisRegistrant {
    @MinNumber(0.0001)
    @MaxNumber(512)
    @Desc("Zoom in or out the biome size. Higher = bigger biomes")
-    private double biomeZoom = 5D;
+    private double biomeZoom = 1D;
    @MinNumber(0)
    @MaxNumber(360)
    @Desc("You can rotate the input coordinates by an angle. This can make terrain appear more natural (less sharp corners and lines). This literally rotates the entire dimension by an angle. Hint: Try 12 degrees or something not on a 90 or 45 degree angle.")
@@ -296,10 +301,8 @@ public class IrisDimension extends IrisRegistrant {
    private IrisMaterialPalette rockPalette = new IrisMaterialPalette().qclear().qadd("stone");
    @Desc("The palette of blocks for 'water'")
    private IrisMaterialPalette fluidPalette = new IrisMaterialPalette().qclear().qadd("water");
-    @Desc("Remove cartographers so they do not crash the server (Iris worlds only)")
-    private boolean removeCartographersDueToCrash = true;
-    @Desc("Notify players of cancelled cartographer villager in this radius in blocks (set to -1 to disable, -2 for everyone)")
-    private int notifyPlayersOfCartographerCancelledRadius = 30;
+    @Desc("Prevent cartographers to generate explorer maps (Iris worlds only)\nONLY TOUCH IF YOUR SERVER CRASHES WHILE GENERATING EXPLORER MAPS")
+    private boolean disableExplorerMaps = false;
    @Desc("Collection of ores to be generated")
    @ArrayType(type = IrisOreGenerator.class, min = 1)
    private KList<IrisOreGenerator> ores = new KList<>();
@@ -442,7 +445,7 @@ public class IrisDimension extends IrisRegistrant {
        return landBiomeStyle;
    }

-    public boolean installDataPack(DataProvider data, File datapacks, double ultimateMaxHeight, double ultimateMinHeight) {
+    public boolean installDataPack(IDataFixer fixer, DataProvider data, File datapacks, double ultimateMaxHeight, double ultimateMinHeight) {
        boolean write = false;
        boolean changed = false;

@@ -462,7 +465,7 @@ public class IrisDimension extends IrisRegistrant {
                    Iris.verbose("    Installing Data Pack Biome: " + output.getPath());
                    output.getParentFile().mkdirs();
                    try {
-                        IO.writeAll(output, j.generateJson());
+                        IO.writeAll(output, j.generateJson(fixer));
                    } catch (IOException e) {
                        Iris.reportError(e);
                        e.printStackTrace();
@@ -475,7 +478,7 @@ public class IrisDimension extends IrisRegistrant {
            Iris.verbose("    Installing Data Pack Dimension Types: \"minecraft:overworld\", \"minecraft:the_nether\", \"minecraft:the_end\"");
            dimensionHeight.setMax(ultimateMaxHeight);
            dimensionHeight.setMin(ultimateMinHeight);
-            changed = writeDimensionType(changed, datapacks);
+            changed = writeDimensionType(fixer, changed, datapacks);
        }

        if (write) {
@@ -485,10 +488,10 @@ public class IrisDimension extends IrisRegistrant {
                        {
                            "pack": {
                                "description": "Iris Data Pack. This pack contains all installed Iris Packs' resources.",
-                                "pack_format": 10
+                                "pack_format": {}
                            }
                        }
-                        """);
+                        """.replace("{}", INMS.get().getDataVersion().getPackFormat() + ""));
            } catch (IOException e) {
                Iris.reportError(e);
                e.printStackTrace();
@@ -514,13 +517,13 @@ public class IrisDimension extends IrisRegistrant {

    }

-    public boolean writeDimensionType(boolean changed, File datapacks) {
+    public boolean writeDimensionType(IDataFixer fixer, boolean changed, File datapacks) {
        File dimTypeOverworld = new File(datapacks, "iris/data/minecraft/dimension_type/overworld.json");
        if (!dimTypeOverworld.exists())
            changed = true;
        dimTypeOverworld.getParentFile().mkdirs();
        try {
-            IO.writeAll(dimTypeOverworld, generateDatapackJsonOverworld());
+            IO.writeAll(dimTypeOverworld, generateDatapackJsonOverworld(fixer));
        } catch (IOException e) {
            Iris.reportError(e);
            e.printStackTrace();
@@ -532,7 +535,7 @@ public class IrisDimension extends IrisRegistrant {
            changed = true;
        dimTypeNether.getParentFile().mkdirs();
        try {
-            IO.writeAll(dimTypeNether, generateDatapackJsonNether());
+            IO.writeAll(dimTypeNether, generateDatapackJsonNether(fixer));
        } catch (IOException e) {
            Iris.reportError(e);
            e.printStackTrace();
@@ -544,7 +547,7 @@ public class IrisDimension extends IrisRegistrant {
            changed = true;
        dimTypeEnd.getParentFile().mkdirs();
        try {
-            IO.writeAll(dimTypeEnd, generateDatapackJsonEnd());
+            IO.writeAll(dimTypeEnd, generateDatapackJsonEnd(fixer));
        } catch (IOException e) {
            Iris.reportError(e);
            e.printStackTrace();
@@ -553,27 +556,27 @@ public class IrisDimension extends IrisRegistrant {
        return changed;
    }

-    private String generateDatapackJsonOverworld() {
+    private String generateDatapackJsonOverworld(IDataFixer fixer) {
        JSONObject obj = new JSONObject(DP_OVERWORLD_DEFAULT);
        obj.put("min_y", dimensionHeight.getMin());
        obj.put("height", dimensionHeight.getMax() - dimensionHeight.getMin());
        obj.put("logical_height", logicalHeight);
-        return obj.toString(4);
+        return fixer.fixDimension(obj).toString(4);
    }

-    private String generateDatapackJsonNether() {
+    private String generateDatapackJsonNether(IDataFixer fixer) {
        JSONObject obj = new JSONObject(DP_NETHER_DEFAULT);
        obj.put("min_y", dimensionHeightNether.getMin());
        obj.put("height", dimensionHeightNether.getMax() - dimensionHeightNether.getMin());
        obj.put("logical_height", logicalHeightNether);
-        return obj.toString(4);
+        return fixer.fixDimension(obj).toString(4);
    }

-    private String generateDatapackJsonEnd() {
+    private String generateDatapackJsonEnd(IDataFixer fixer) {
        JSONObject obj = new JSONObject(DP_END_DEFAULT);
        obj.put("min_y", dimensionHeightEnd.getMin());
        obj.put("height", dimensionHeightEnd.getMax() - dimensionHeightEnd.getMin());
        obj.put("logical_height", logicalHeightEnd);
-        return obj.toString(4);
+        return fixer.fixDimension(obj).toString(4);
    }
 }
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisEntity.java
@@ -29,6 +29,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.misc.E;
 import com.volmit.iris.util.plugin.Chunks;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.J;
@@ -65,6 +66,7 @@ import java.util.concurrent.atomic.AtomicReference;
@Data
@EqualsAndHashCode(callSuper = false)
 public class IrisEntity extends IrisRegistrant {
+    private static final Particle ITEM = E.getOrDefault(Particle.class, "ITEM_CRACK", "ITEM");
    @Required
    @Desc("The type of entity to spawn. To spawn a mythic mob, set this type to unknown and define mythic type.")
    private EntityType type = EntityType.UNKNOWN;
@@ -269,7 +271,7 @@ public class IrisEntity extends IrisRegistrant {

                        for (String fi : getLoot().getTables()) {
                            IrisLootTable i = gen.getData().getLootLoader().load(fi);
-                            items.addAll(i.getLoot(gen.isStudio(), rng.nextParallelRNG(345911), InventorySlotType.STORAGE, finalAt.getBlockX(), finalAt.getBlockY(), finalAt.getBlockZ()));
+                            items.addAll(i.getLoot(gen.isStudio(), rng.nextParallelRNG(345911), InventorySlotType.STORAGE, finalAt.getWorld(), finalAt.getBlockX(), finalAt.getBlockY(), finalAt.getBlockZ()));
                        }

                        return items;
@@ -386,7 +388,7 @@ public class IrisEntity extends IrisRegistrant {
                    if (e.getLocation().getBlock().getType().isSolid() || ((LivingEntity) e).getEyeLocation().getBlock().getType().isSolid()) {
                        e.teleport(start.add(new Vector(0, 0.1, 0)));
                        ItemStack itemCrackData = new ItemStack(((LivingEntity) e).getEyeLocation().clone().subtract(0, 2, 0).getBlock().getBlockData().getMaterial());
-                        e.getWorld().spawnParticle(Particle.ITEM_CRACK, ((LivingEntity) e).getEyeLocation(), 6, 0.2, 0.4, 0.2, 0.06f, itemCrackData);
+                        e.getWorld().spawnParticle(ITEM, ((LivingEntity) e).getEyeLocation(), 6, 0.2, 0.4, 0.2, 0.06f, itemCrackData);
                        if (M.r(0.2)) {
                            e.getWorld().playSound(e.getLocation(), Sound.BLOCK_CHORUS_FLOWER_GROW, 0.8f, 0.1f);
                        }
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawMinDistance.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawMinDistance.java
@@ -0,0 +1,29 @@
+package com.volmit.iris.engine.object;
+
+import com.volmit.iris.engine.object.annotations.Desc;
+import com.volmit.iris.engine.object.annotations.MinNumber;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
+import com.volmit.iris.engine.object.annotations.Required;
+import com.volmit.iris.engine.object.annotations.Snippet;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Snippet("jigsaw-structure-min-distance")
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Desc("Represents the min distance between jigsaw structure placements")
+@Data
+public class IrisJigsawMinDistance {
+    @Required
+    @RegistryListResource(IrisJigsawStructure.class)
+    @Desc("The structure to check against")
+    private String structure;
+
+    @Required
+    @MinNumber(0)
+    @Desc("The min distance in blocks to a placed structure\nWARNING: The performance impact scales exponentially!")
+    private int distance;
+}
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java
@@ -101,19 +101,12 @@ public class IrisJigsawPiece extends IrisRegistrant {
    }

    public IrisJigsawPiece copy() {
-        IrisJigsawPiece p = new IrisJigsawPiece();
-        p.setObject(getObject());
-        p.setLoader(getLoader());
-        p.setLoadKey(getLoadKey());
-        p.setLoadFile(getLoadFile());
-        p.setConnectors(new KList<>());
-        p.setPlacementOptions(getPlacementOptions());
-
-        for (IrisJigsawPieceConnector i : getConnectors()) {
-            p.getConnectors().add(i.copy());
-        }
-
-        return p;
+        var gson = getLoader().getGson();
+        IrisJigsawPiece copy = gson.fromJson(gson.toJson(this), IrisJigsawPiece.class);
+        copy.setLoader(getLoader());
+        copy.setLoadKey(getLoadKey());
+        copy.setLoadFile(getLoadFile());
+        return copy;
    }

    public boolean isTerminal() {
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java
@@ -79,6 +79,9 @@ public class IrisJigsawPieceConnector {
    @Required
    private IrisDirection direction = IrisDirection.UP_POSITIVE_Y;

+    @Desc("Lock the Y position of this connector")
+    private boolean lockY = false;
+
    public String toString() {
        return direction.getFace().name() + "@(" + position.getX() + "," + position.getY() + "," + position.getZ() + ")";
    }
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java
@@ -22,6 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.annotations.functions.StructureKeyFunction;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.plugin.VolmitSender;
@@ -56,6 +57,10 @@ public class IrisJigsawStructure extends IrisRegistrant {
    @Desc("If set to true, iris will look for any pieces with only one connector in valid pools for edge connectors and attach them to 'terminate' the paths/piece connectors. Essentially it caps off ends. For example in a village, Iris would add houses to the ends of roads where possible. For terminators to be selected, they can only have one connector or they wont be chosen.")
    private boolean terminate = true;

+    @RegistryListResource(IrisJigsawPool.class)
+    @Desc("The pool to use when terminating pieces")
+    private String terminatePool = null;
+
    @Desc("Override the y range instead of placing on the height map")
    private IrisStyledRange overrideYRange = null;

@@ -65,6 +70,13 @@ public class IrisJigsawStructure extends IrisRegistrant {
    @Desc("Set to true to prevent rotating the initial structure piece")
    private boolean disableInitialRotation = false;

+    @RegistryListFunction(StructureKeyFunction.class)
+    @Desc("The minecraft key to use when creating treasure maps")
+    private String structureKey = null;
+
+    @Desc("Force Place the whole structure")
+    private boolean forcePlace = false;
+
    private transient AtomicCache<Integer> maxDimension = new AtomicCache<>();

    private void loadPool(String p, KList<String> pools, KList<String> pieces) {
@@ -133,7 +145,7 @@ public class IrisJigsawStructure extends IrisRegistrant {
                    avg += getLoader().getJigsawPieceLoader().load(i).getMax2dDimension();
                }

-                return (avg / (pieces.size() > 0 ? pieces.size() : 1)) * (((getMaxDepth() + 1) * 2) + 1);
+                return (avg / (!pieces.isEmpty() ? pieces.size() : 1)) * (((getMaxDepth() + 1) * 2) + 1);
            }
        });
    }
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
@@ -18,17 +18,24 @@

 package com.volmit.iris.engine.object;

+import com.volmit.iris.Iris;
+import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
+import com.volmit.iris.engine.object.annotations.MaxNumber;
+import com.volmit.iris.engine.object.annotations.MinNumber;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.engine.object.annotations.Snippet;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.collection.KMap;
+import com.volmit.iris.util.documentation.ChunkCoordinates;
+import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

-
@Snippet("jigsaw-structure-placement")
@Accessors(chain = true)
@NoArgsConstructor
@@ -36,13 +43,99 @@ import lombok.experimental.Accessors;
@Desc("Represents a jigsaw structure placer")
@Data
@EqualsAndHashCode(callSuper = false)
-public class IrisJigsawStructurePlacement {
+public class IrisJigsawStructurePlacement implements IRare {
    @RegistryListResource(IrisJigsawStructure.class)
    @Required
    @Desc("The structure to place")
    private String structure;

    @Required
-    @Desc("The 1 in X chance rarity")
+    @Desc("The 1 in X chance rarity applies when generating multiple structures at once")
    private int rarity = 100;
+
+    @Required
+    @Desc("The salt to use when generating the structure (to differentiate structures)")
+    @MinNumber(Long.MIN_VALUE)
+    @MaxNumber(Long.MAX_VALUE)
+    private long salt = 0;
+
+    @Required
+    @MinNumber(0)
+    @Desc("Average distance in chunks between two neighboring generation attempts")
+    private int spacing = -1;
+
+    @Required
+    @MinNumber(0)
+    @Desc("Minimum distance in chunks between two neighboring generation attempts\nThe maximum distance of two neighboring generation attempts is 2*spacing - separation")
+    private int separation = -1;
+
+    @Desc("The method used to spread the structure")
+    private SpreadType spreadType = SpreadType.TRIANGULAR;
+
+    @ArrayType(type = IrisJigsawMinDistance.class)
+    @Desc("List of minimum distances to check for")
+    private KList<IrisJigsawMinDistance> minDistances = new KList<>();
+
+    public KMap<String, Integer> collectMinDistances() {
+        KMap<String, Integer> map = new KMap<>();
+        for (IrisJigsawMinDistance d : minDistances) {
+            map.compute(d.getStructure(), (k, v) -> v != null ? Math.min(toChunks(d.getDistance()), v) : toChunks(d.getDistance()));
+        }
+        return map;
+    }
+
+    private int toChunks(int blocks) {
+        return (int) Math.ceil(blocks / 16d);
+    }
+
+    private void calculateMissing(double divisor, long seed) {
+        seed = seed + hashCode();
+        if (salt == 0) {
+            salt = new RNG(seed).nextLong(Integer.MIN_VALUE, Integer.MAX_VALUE);
+        }
+
+        if (separation == -1 || spacing == -1) {
+            separation = (int) Math.round(rarity / divisor);
+            spacing = new RNG(seed).nextInt(separation, separation * 2);
+        }
+    }
+
+    @ChunkCoordinates
+    public boolean shouldPlace(double divisor, long seed, int x, int z) {
+        calculateMissing(divisor, seed);
+        if (separation > spacing) {
+            separation = spacing;
+            Iris.warn("JigsawStructurePlacement: separation must be less than or equal to spacing");
+        }
+
+        int i = Math.floorDiv(x, spacing);
+        int j = Math.floorDiv(z, spacing);
+        RNG rng = new RNG(i * 341873128712L + j * 132897987541L + seed + salt);
+
+        int k = spacing - separation;
+        int l = spreadType.apply(rng, k);
+        int m = spreadType.apply(rng, k);
+        return i * spacing + l == x && j * spacing + m == z;
+    }
+
+    @Desc("Spread type")
+    public enum SpreadType {
+        @Desc("Linear spread")
+        LINEAR(RNG::i),
+        @Desc("Triangular spread")
+        TRIANGULAR((rng, bound) -> (rng.i(bound) + rng.i(bound)) / 2);
+        private final SpreadMethod method;
+
+        SpreadType(SpreadMethod method) {
+            this.method = method;
+        }
+
+        public int apply(RNG rng, int bound) {
+            return method.apply(rng, bound);
+        }
+    }
+
+    private interface SpreadMethod {
+        int apply(RNG rng, int bound);
+    }
 }
--- a/Show More
+++ b/Show More