v+

3.6.6

build.gradle

@@ -1,3 +1,5 @@
+import xyz.jpenilla.runpaper.task.RunServer
+
 /*
  * Iris is a World Generator for Minecraft Bukkit Servers
  * Copyright (c) 2021 Arcane Arts (Volmit Software)
@@ -30,10 +32,11 @@ plugins {
     id 'java-library'
     id "io.github.goooler.shadow" version "8.1.7"
     id "de.undercouch.download" version "5.0.1"
+    id "xyz.jpenilla.run-paper" version "2.3.1"
 }
 
 
-version '3.6.5-1.20.1-1.21.4'
+version '3.6.6-1.20.1-1.21.4'
 
 // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
 // ======================== WINDOWS =============================
@@ -45,7 +48,7 @@ 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('PixelFury', 'C://Users/repix/workplace/Iris/1.21.3 - Development-Public-v3/plugins')
-registerCustomOutputTask('PixelFuryDev', 'C://Users/repix/workplace/Iris/1.21.4 - Development-v3/plugins')
+registerCustomOutputTask('PixelFuryDev', 'C://Users/repix/workplace/Iris/1.21 - Development-v3/plugins')
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
 registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Developer/RemoteGit/Server/plugins')
@@ -53,6 +56,11 @@ registerCustomOutputTaskUnix('PixelMac', '/Users/test/Desktop/mcserver/plugins')
 registerCustomOutputTaskUnix('CrazyDev22LT', '/home/julian/Desktop/server/plugins')
 // ==============================================================
 
+def MIN_HEAP_SIZE = "2G"
+def MAX_HEAP_SIZE = "8G"
+//Valid values are: none, truecolor, indexed256, indexed16, indexed8
+def COLOR = "truecolor"
+
 def NMS_BINDINGS = Map.of(
         "v1_21_R3", "1.21.4-R0.1-SNAPSHOT",
         "v1_21_R2", "1.21.3-R0.1-SNAPSHOT",
@@ -62,21 +70,34 @@ def NMS_BINDINGS = Map.of(
         "v1_20_R2", "1.20.2-R0.1-SNAPSHOT",
         "v1_20_R1", "1.20.1-R0.1-SNAPSHOT",
 )
-def JVM_VERSION = Map.of()
-NMS_BINDINGS.each { nms ->
-    project(":nms:${nms.key}") {
+def JVM_VERSION = Map.<String, Integer>of()
+NMS_BINDINGS.forEach { key, value ->
+    project(":nms:$key") {
         apply plugin: 'java'
         apply plugin: 'com.volmit.nmstools'
 
         nmsTools {
-            it.jvm = JVM_VERSION.getOrDefault(nms.key, 21)
-            it.version = nms.value
+            it.jvm = JVM_VERSION.getOrDefault(key, 21)
+            it.version = value
         }
 
         dependencies {
             implementation project(":core")
         }
     }
+
+    tasks.register("runServer-$key", RunServer) {
+        group("servers")
+        minecraftVersion(value.split("-")[0])
+        minHeapSize(MIN_HEAP_SIZE)
+        maxHeapSize(MAX_HEAP_SIZE)
+        pluginJars(tasks.shadowJar.archiveFile)
+        javaLauncher = javaToolchains.launcherFor { it.languageVersion = JavaLanguageVersion.of(JVM_VERSION.getOrDefault(key, 21))}
+        runDirectory.convention(layout.buildDirectory.dir("run/$key"))
+        systemProperty("disable.watchdog", "")
+        systemProperty("net.kyori.ansi.colorLevel", COLOR)
+        systemProperty("com.mojang.eula.agree", true)
+    }
 }
 
 shadowJar {

core/src/main/java/com/volmit/iris/core/IrisSettings.java

@@ -24,6 +24,7 @@ import com.volmit.iris.util.io.IO;
 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;
@@ -134,11 +135,6 @@ public class IrisSettings {
     @Data
     public static class IrisSettingsConcurrency {
         public int parallelism = -1;
-        public int worldGenParallelism = -1;
-
-        public int getWorldGenThreads() {
-            return getThreadCount(worldGenParallelism);
-        }
     }
 
     @Data

core/src/main/java/com/volmit/iris/core/commands/CommandEdit.java

@@ -19,17 +19,13 @@
 package com.volmit.iris.core.commands;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.object.*;
 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.NullableBiomeHandler;
-import com.volmit.iris.util.decree.specialhandlers.NullableRegionHandler;
 import com.volmit.iris.util.format.C;
-import org.bukkit.block.Biome;
 
 import java.awt.*;
 
@@ -55,31 +51,12 @@ public class CommandEdit implements DecreeExecutor {
 
 
     @Decree(description = "Edit the biome you specified", aliases = {"b"}, origin = DecreeOrigin.PLAYER)
-    public void biome(@Param(contextual = false, description = "The biome to edit", defaultValue = "---", customHandler = NullableBiomeHandler.class) IrisBiome biome) {
+    public void biome(@Param(contextual = false, description = "The biome to edit") IrisBiome biome) {
         if (noStudio()) {
             return;
         }
-        if (biome == null) {
-            try {
-                IrisBiome b = engine().getBiome(player().getLocation().getBlockX(), player().getLocation().getBlockY() - player().getWorld().getMinHeight(), player().getLocation().getBlockZ());
-                Desktop.getDesktop().open(b.getLoadFile());
-                sender().sendMessage(C.GREEN + "Opening " + b.getTypeName() + " " + b.getLoadFile().getName().split("\\Q.\\E")[0] + " in VSCode! ");
-            } catch (Throwable e) {
-                Iris.reportError(e);
-                sender().sendMessage("Non-Iris Biome: " + player().getLocation().getBlock().getBiome().name());
-                if (player().getLocation().getBlock().getBiome().equals(Biome.CUSTOM)) {
-                    try {
-                        sender().sendMessage("Data Pack Biome: " + INMS.get().getTrueBiomeBaseKey(player().getLocation()) + " (ID: " + INMS.get().getTrueBiomeBaseId(INMS.get().getTrueBiomeBase(player().getLocation())) + ")");
-                    } catch (Throwable ee) {
-                        Iris.reportError(ee);
-                    }
-                }
-            }
-            return;
-        }
-
         try {
-            if (biome.getLoadFile() == null) {
+            if (biome == null || biome.getLoadFile() == null) {
                 sender().sendMessage(C.GOLD + "Cannot find the file; Perhaps it was not loaded directly from a file?");
                 return;
             }
@@ -92,20 +69,10 @@ public class CommandEdit implements DecreeExecutor {
     }
 
     @Decree(description = "Edit the region you specified", aliases = {"r"}, origin = DecreeOrigin.PLAYER)
-    public void region(@Param(contextual = false, description = "The region to edit", defaultValue = "---", customHandler = NullableRegionHandler.class) IrisRegion region) {
+    public void region(@Param(contextual = false, description = "The region to edit") IrisRegion region) {
         if (noStudio()) {
             return;
         }
-        if (region == null) {
-            try {
-                IrisRegion r = engine().getRegion(player().getLocation().getBlockX(), player().getLocation().getBlockZ());
-                Desktop.getDesktop().open(r.getLoadFile());
-                sender().sendMessage(C.GREEN + "Opening " + r.getTypeName() + " " + r.getLoadFile().getName().split("\\Q.\\E")[0] + " in VSCode! ");
-            } catch (Throwable e) {
-                sender().sendMessage(C.RED + "Failed to get region.");
-            }
-            return;
-        }
         try {
             if (region == null || region.getLoadFile() == null) {
                 sender().sendMessage(C.GOLD + "Cannot find the file; Perhaps it was not loaded directly from a file?");

core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java

@@ -22,7 +22,6 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.gui.NoiseExplorerGUI;
 import com.volmit.iris.core.gui.VisionGUI;
-import com.volmit.iris.core.gui.components.IrisRenderer;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.project.IrisProject;
 import com.volmit.iris.core.service.ConversionSVC;
@@ -66,9 +65,6 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.util.BlockVector;
 import org.bukkit.util.Vector;
 
-import javax.imageio.ImageIO;
-import java.awt.Color;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -160,37 +156,6 @@ public class CommandStudio implements DecreeExecutor {
         sender().sendMessage(C.GREEN + "The \"" + dimension.getName() + "\" pack has version: " + dimension.getVersion());
     }
 
-    @Decree(description = "Debug image")
-    public void printImageChannel(
-            @Param(name = "image", description = "Image found in the image folder inside the project")
-            String image,
-            @Param(name = "channel", description = "Image channel")
-            IrisImageChannel channel
-    ) {
-        if (noStudio()) return;
-        try {
-            File file = new File(access().getEngine().getComplex().getData().getDataFolder(), "images/" + image);
-            if (!file.exists()) {
-                sender().sendMessage(C.RED + "The image \"" + image + "\" does not exist.");
-                return;
-            }
-            BufferedImage buffer = ImageIO.read(file);
-            IrisImage irisImage = new IrisImage(buffer);
-            File at = new File(file.getParentFile(), "debug-see-" + file.getName());
-            BufferedImage b = new BufferedImage(buffer.getWidth(), buffer.getHeight(), BufferedImage.TYPE_INT_RGB);
-            for (int i = 0; i < buffer.getWidth(); i++) {
-                for (int j = 0; j < buffer.getHeight(); j++) {
-                    b.setRGB(i, j, Color.getHSBColor(0, 0, (float) irisImage.getValue(channel, i, j)).getRGB());
-                }
-            }
-            ImageIO.write(b, "png", at);
-            sender().sendMessage(C.IRIS + "Debug image written to ./images for channel " + channel.name());
-        } catch (Exception e) {
-            sender().sendMessage(C.RED + "Something went wrong.. ");
-            e.printStackTrace();
-        }
-    }
-
     @Decree(name = "regen", description = "Regenerate nearby chunks.", aliases = "rg", sync = true, origin = DecreeOrigin.PLAYER)
     public void regen(
             @Param(name = "radius", description = "The radius of nearby cunks", defaultValue = "5")
@@ -439,16 +404,9 @@ public class CommandStudio implements DecreeExecutor {
             @Param(name = "world", description = "The world to open the generator for", contextual = true)
             World world
     ) {
-        if (noGUI()) {
-            sender().sendMessage(C.GOLD + "GUI Support isn't enabled or supported on this server.");
-            return;
-        }
+        if (noGUI()) return;
 
-        if (world == null) {
-            if (noStudio()) return;
-            world = player().getWorld();
-        }
-        else if (!IrisToolbelt.isIrisWorld(world)) {
+        if (!IrisToolbelt.isIrisWorld(world)) {
             sender().sendMessage(C.RED + "You need to be in or specify an Iris-generated world!");
             return;
         }
@@ -884,7 +842,7 @@ public class CommandStudio implements DecreeExecutor {
             sender().sendMessage(C.RED + "No studio world is open!");
             return true;
         }
-       if (engine() == null || !engine().isStudio()) {
+        if (!engine().isStudio()) {
             sender().sendMessage(C.RED + "You must be in a studio world!");
             return true;
         }

core/src/main/java/com/volmit/iris/core/gui/VisionGUI.java

@@ -1,6 +1,6 @@
 /*
- *  Iris is a World Generator for Minecraft Bukkit Servers
- *  Copyright (c) 2024 Arcane Arts (Volmit Software)
+ * 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
@@ -30,6 +30,7 @@ import com.volmit.iris.engine.object.IrisWorld;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
+import com.volmit.iris.util.data.registry.Attributes;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.math.BlockPosition;
 import com.volmit.iris.util.math.M;
@@ -56,9 +57,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiFunction;
 
-//todo
-// - Misalignment
-// - Weird snapping?
+import static com.volmit.iris.util.data.registry.Attributes.MAX_HEALTH;
+
 public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener, MouseMotionListener, MouseInputListener {
     private static final long serialVersionUID = 2094606939770332040L;
     private final KList<LivingEntity> lastEntities = new KList<>();
@@ -415,8 +415,8 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
     }
 
     private double getWorldX(double screenX) {
-        return (mscale * screenX) + ((oxp / scale) * mscale);
-       // return (mscale * screenX) + ((oxp / scale));
+        //return (mscale * screenX) + ((oxp / scale) * mscale);
+        return (mscale * screenX) + ((oxp / scale));
     }
 
     private double getWorldZ(double screenZ) {
@@ -639,7 +639,7 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
 
                 k.add("Pos: " + h.getLocation().getBlockX() + ", " + h.getLocation().getBlockY() + ", " + h.getLocation().getBlockZ());
                 k.add("UUID: " + h.getUniqueId());
-                k.add("HP: " + h.getHealth() + " / " + h.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
+                k.add("HP: " + h.getHealth() + " / " + h.getAttribute(MAX_HEALTH).getValue());
 
                 drawCardTR(g, k);
             }

core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java

@@ -20,7 +20,6 @@ package com.volmit.iris.core.nms;
 
 import com.volmit.iris.core.nms.container.AutoClosing;
 import com.volmit.iris.core.nms.container.BiomeColor;
-import com.volmit.iris.core.nms.container.Pair;
 import com.volmit.iris.core.nms.datapack.DataVersion;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KList;
@@ -94,6 +93,7 @@ public interface INMSBinding {
             throw new IllegalStateException("Missing dimenstion types to create world");
 
         try (var ignored = injectLevelStems()) {
+            ignored.storeContext();
             return c.createWorld();
         }
     }
@@ -132,7 +132,11 @@ public interface INMSBinding {
 
     AutoClosing injectLevelStems();
 
-    Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end);
+    default AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
+        return null;
+    }
 
     boolean missingDimensionTypes(boolean overworld, boolean nether, boolean end);
+
+    void removeCustomDimensions(World world);
 }

core/src/main/java/com/volmit/iris/core/nms/container/AutoClosing.java

@@ -1,5 +1,6 @@
 package com.volmit.iris.core.nms.container;
 
+import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.function.NastyRunnable;
 import lombok.AllArgsConstructor;
 
@@ -7,6 +8,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 @AllArgsConstructor
 public class AutoClosing implements AutoCloseable {
+    private static final KMap<Thread, AutoClosing> CONTEXTS = new KMap<>();
     private final AtomicBoolean closed = new AtomicBoolean();
     private final NastyRunnable action;
 
@@ -14,9 +16,24 @@ public class AutoClosing implements AutoCloseable {
     public void close() {
         if (closed.getAndSet(true)) return;
         try {
+            removeContext();
             action.run();
         } catch (Throwable e) {
             throw new RuntimeException(e);
         }
     }
+
+    public void storeContext() {
+        CONTEXTS.put(Thread.currentThread(), this);
+    }
+
+    public void removeContext() {
+        CONTEXTS.values().removeIf(c -> c == this);
+    }
+
+    public static void closeContext() {
+        AutoClosing closing = CONTEXTS.remove(Thread.currentThread());
+        if (closing == null) return;
+        closing.close();
+    }
 }

core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java

@@ -126,8 +126,8 @@ public class NMSBinding1X implements INMSBinding {
     }
 
     @Override
-    public Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
-        return new Pair<>(0, new AutoClosing(() -> {}));
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
+        return injectLevelStems();
     }
 
     @Override
@@ -135,6 +135,11 @@ public class NMSBinding1X implements INMSBinding {
         return false;
     }
 
+    @Override
+    public void removeCustomDimensions(World world) {
+
+    }
+
     @Override
     public CompoundTag serializeEntity(Entity location) {
         return null;

core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java

@@ -19,7 +19,6 @@
 package com.volmit.iris.core.pregenerator.methods;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
 import com.volmit.iris.core.tools.IrisToolbelt;
@@ -35,10 +34,8 @@ import org.bukkit.World;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class AsyncPregenMethod implements PregeneratorMethod {
-    private static final AtomicInteger THREAD_COUNT = new AtomicInteger();
     private final World world;
     private final MultiBurst burst;
     private final Semaphore semaphore;
@@ -95,7 +92,6 @@ public class AsyncPregenMethod implements PregeneratorMethod {
     @Override
     public void init() {
         unloadAndSaveAllChunks();
-        increaseWorkerThreads();
     }
 
     @Override
@@ -108,7 +104,6 @@ public class AsyncPregenMethod implements PregeneratorMethod {
         semaphore.acquireUninterruptibly(256);
         unloadAndSaveAllChunks();
         burst.close();
-        resetWorkerThreads();
     }
 
     @Override
@@ -145,44 +140,4 @@ public class AsyncPregenMethod implements PregeneratorMethod {
 
         return null;
     }
-
-
-    public static void increaseWorkerThreads() {
-        THREAD_COUNT.updateAndGet(i -> {
-            if (i > 0) return 1;
-            try {
-                var field = Class.forName("ca.spottedleaf.moonrise.common.util.MoonriseCommon").getDeclaredField("WORKER_POOL");
-                var pool = field.get(null);
-                var threads = ((Thread[]) pool.getClass().getDeclaredMethod("getCoreThreads").invoke(pool)).length;
-                var adjusted = IrisSettings.get().getConcurrency().getWorldGenThreads();
-                if (threads >= adjusted) return 0;
-
-                pool.getClass().getDeclaredMethod("adjustThreadCount", int.class).invoke(pool, adjusted);
-                return threads;
-            } catch (ClassNotFoundException ignored) {
-            } catch (Throwable e) {
-                Iris.error("Failed to increase worker threads");
-                e.printStackTrace();
-            }
-            return 0;
-        });
-    }
-
-    public static void resetWorkerThreads() {
-        THREAD_COUNT.updateAndGet(i -> {
-            if (i == 0) return 0;
-            try {
-                var field = Class.forName("ca.spottedleaf.moonrise.common.util.MoonriseCommon").getDeclaredField("WORKER_POOL");
-                var pool = field.get(null);
-                var method = pool.getClass().getDeclaredMethod("adjustThreadCount", int.class);
-                method.invoke(pool, i);
-                return 0;
-            } catch (ClassNotFoundException ignored) {
-            } catch (Throwable e) {
-                Iris.error("Failed to reset worker threads");
-                e.printStackTrace();
-            }
-            return i;
-        });
-    }
 }

core/src/main/java/com/volmit/iris/core/tools/IrisPackBenchmarking.java

@@ -9,7 +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.io.IO;
 import com.volmit.iris.util.scheduling.J;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;
@@ -18,6 +17,11 @@ import org.bukkit.Bukkit;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.Collections;
@@ -46,7 +50,10 @@ public class IrisPackBenchmarking {
                 .start(() -> {
                     Iris.info("Setting up benchmark environment ");
                     benchmarkInProgress = true;
-                    IO.delete(new File(Bukkit.getWorldContainer(), "benchmark"));
+                    File file = new File("benchmark");
+                    if (file.exists()) {
+                        deleteDirectory(file.toPath());
+                    }
                     createBenchmark();
                     while (!IrisToolbelt.isIrisWorld(Bukkit.getWorld("benchmark"))) {
                         J.sleep(1000);
@@ -65,7 +72,7 @@ public class IrisPackBenchmarking {
 
     public void finishedBenchmark(KList<Integer> cps) {
         try {
-            String time = Form.duration((long) stopwatch.getMilliseconds());
+            String time = Form.duration(stopwatch.getMillis());
             Engine engine = IrisToolbelt.access(Bukkit.getWorld("benchmark")).getEngine();
             Iris.info("-----------------");
             Iris.info("Results:");
@@ -76,7 +83,11 @@ public class IrisPackBenchmarking {
             Iris.info("  - Lowest CPS: " + findLowest(cps));
             Iris.info("-----------------");
             Iris.info("Creating a report..");
-            File results = Iris.instance.getDataFile("packbenchmarks", dimension.getName() + " " + LocalDateTime.now(Clock.systemDefaultZone()).toString().replace(':', '-') + ".txt");
+            File profilers = new File("plugins" + File.separator + "Iris" + File.separator + "packbenchmarks");
+            profilers.mkdir();
+
+            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");
@@ -167,4 +178,26 @@ public class IrisPackBenchmarking {
     private int findHighest(KList<Integer> list) {
         return Collections.max(list);
     }
+
+    private boolean deleteDirectory(Path dir) {
+        try {
+            Files.walkFileTree(dir, new SimpleFileVisitor<>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    Files.delete(file);
+                    return FileVisitResult.CONTINUE;
+                }
+
+                @Override
+                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                    Files.delete(dir);
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }

core/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java

@@ -93,27 +93,13 @@ public class MantleJigsawComponent extends IrisMantleComponent {
         try {
             if (i == null || checkMinDistances(i.collectMinDistances(), x, z, cachedRegions, cache, distanceCache))
                 return false;
-            if (!checkBiomes(i, x, z))
-                return false;
-        } catch (Throwable ignored) {
-        }
+        } catch (Throwable ignored) {}
         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);
     }
 
-    private boolean checkBiomes(IrisJigsawStructurePlacement placement, int x, int z) {
-        var biome = getEngineMantle().getEngine().getSurfaceBiome((x << 4) + 8, (z << 4) + 8);
-        if (biome == null) {
-            return true;
-        }
-        var exclude = placement.getExclude();
-        return !(biome.isSea() && exclude.isExcludeOceanBiomes() ||
-                biome.isLand() && exclude.isExcludeLandBiomes() ||
-                biome.isShore() && exclude.isExcludeShoreBiomes());
-    }
-
     @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;

core/src/main/java/com/volmit/iris/engine/object/IrisContextInjector.java

@@ -2,12 +2,15 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.nms.container.AutoClosing;
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.misc.ServerProperties;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 
@@ -19,14 +22,9 @@ public class IrisContextInjector implements Listener {
     @Getter
     private static boolean missingDimensionTypes = false;
     private AutoClosing autoClosing = null;
-    private final int totalWorlds;
-    private int worldCounter = 0;
 
     public IrisContextInjector() {
-        if (!Bukkit.getWorlds().isEmpty()) {
-            totalWorlds = 0;
-            return;
-        }
+        if (!Bukkit.getWorlds().isEmpty()) return;
 
         String levelName = ServerProperties.LEVEL_NAME;
         List<String> irisWorlds = irisWorlds();
@@ -34,29 +32,20 @@ public class IrisContextInjector implements Listener {
         boolean nether = irisWorlds.contains(levelName + "_nether");
         boolean end = irisWorlds.contains(levelName + "_end");
 
-        int i = 1;
-        if (Bukkit.getAllowNether()) i++;
-        if (Bukkit.getAllowEnd()) i++;
-
         if (INMS.get().missingDimensionTypes(overworld, nether, end)) {
             missingDimensionTypes = true;
-            totalWorlds = 0;
             return;
         }
 
         if (overworld || nether || end) {
-            var pair = INMS.get().injectUncached(overworld, nether, end);
-            i += pair.getA() - 3;
-            autoClosing = pair.getB();
+            autoClosing = INMS.get().injectUncached(overworld, nether, end);
         }
 
-        totalWorlds = i;
         instance.registerListener(this);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST)
     public void on(WorldInitEvent event) {
-        if (++worldCounter < totalWorlds) return;
         if (autoClosing != null) {
             autoClosing.close();
             autoClosing = null;

core/src/main/java/com/volmit/iris/engine/object/IrisImage.java

@@ -123,6 +123,8 @@ public class IrisImage extends IrisRegistrant {
     }
 
     public void writeDebug(IrisImageChannel channel) {
+
+
         try {
             File at = new File(getLoadFile().getParentFile(), "debug-see-" + getLoadFile().getName());
             BufferedImage b = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB);

core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java

@@ -78,9 +78,6 @@ public class IrisJigsawStructurePlacement implements IRare {
     @Desc("Threshold for noise style")
     private double threshold = 0.5;
 
-    @Desc("Exclude the structure from certain places")
-    private IrisPlacementExclusion exclude = new IrisPlacementExclusion();
-
     @ArrayType(type = IrisJigsawMinDistance.class)
     @Desc("List of minimum distances to check for")
     private KList<IrisJigsawMinDistance> minDistances = new KList<>();

core/src/main/java/com/volmit/iris/engine/object/IrisPlacementExclusion.java

@@ -1,33 +0,0 @@
-package com.volmit.iris.engine.object;
-
-import com.volmit.iris.engine.object.annotations.ArrayType;
-import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListResource;
-import com.volmit.iris.util.collection.KList;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-@Accessors(chain = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Desc("Represents an image map")
-@Data
-public class IrisPlacementExclusion {
-
-    @Desc("Excludes the structure from all ocean biomes defined in region")
-    private boolean excludeOceanBiomes;
-
-    @Desc("Excludes the structure from all shore biomes defined in region")
-    private boolean excludeShoreBiomes;
-
-    @Desc("Excludes the structure from all land biomes defined in region")
-    private boolean excludeLandBiomes;
-
-    @RegistryListResource(IrisBiome.class)
-    @Desc("tbd")
-    @ArrayType(min = 1, type = String.class)
-    private KList<String> excludeBiomes = new KList<>();
-
-}

core/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java

@@ -21,6 +21,7 @@ package com.volmit.iris.engine.platform;
 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.container.AutoClosing;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.IrisEngine;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
@@ -48,6 +49,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 import org.bukkit.generator.BiomeProvider;
@@ -122,11 +124,13 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onWorldInit(WorldInitEvent event) {
         try {
             if (initialized || !world.name().equals(event.getWorld().getName()))
                 return;
+            AutoClosing.closeContext();
+            INMS.get().removeCustomDimensions(event.getWorld());
             world.setRawWorldSeed(event.getWorld().getSeed());
             Engine engine = getEngine(event.getWorld());
             if (engine == null) {

core/src/main/java/com/volmit/iris/util/collection/KList.java

@@ -26,6 +26,8 @@ import com.volmit.iris.util.math.RNG;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("ALL")
 public class KList<T> extends ArrayList<T> implements List<T> {
@@ -65,6 +67,10 @@ public class KList<T> extends ArrayList<T> implements List<T> {
         return s;
     }
 
+    public static <T> Collector<T, ?, KList<T>> collector() {
+        return Collectors.toCollection(KList::new);
+    }
+
     public static KList<String> asStringList(List<?> oo) {
         KList<String> s = new KList<String>();
 

core/src/main/java/com/volmit/iris/util/decree/handlers/ImageChannelHandler.java

@@ -1,53 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.util.decree.handlers;
-
-import com.volmit.iris.engine.object.IrisImageChannel;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.decree.DecreeParameterHandler;
-import com.volmit.iris.util.decree.exceptions.DecreeParsingException;
-
-import java.util.Arrays;
-
-public class ImageChannelHandler implements DecreeParameterHandler<IrisImageChannel> {
-    @Override
-    public KList<IrisImageChannel> getPossibilities() {
-        return new KList<>(Arrays.stream(IrisImageChannel.values()).toList());
-    }
-
-    @Override
-    public String toString(IrisImageChannel channel) {
-        return channel.name();
-    }
-
-    @Override
-    public IrisImageChannel parse(String in, boolean force) throws DecreeParsingException {
-        return IrisImageChannel.valueOf(in);
-    }
-
-    @Override
-    public boolean supports(Class<?> type) {
-        return type.equals(IrisImageChannel.class);
-    }
-
-    @Override
-    public String getRandomDefault() {
-        return IrisImageChannel.BRIGHTNESS.toString();
-    }
-}

core/src/main/java/com/volmit/iris/util/decree/specialhandlers/NullableBiomeHandler.java

@@ -1,31 +0,0 @@
-/*
- *  Iris is a World Generator for Minecraft Bukkit Servers
- *  Copyright (c) 2024 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.util.decree.specialhandlers;
-
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.util.decree.exceptions.DecreeParsingException;
-import com.volmit.iris.util.decree.handlers.BiomeHandler;
-
-public class NullableBiomeHandler extends BiomeHandler {
-
-    @Override
-    public IrisBiome parse(String in, boolean force) throws DecreeParsingException {
-        return getPossibilities(in).stream().filter((i) -> toString(i).equalsIgnoreCase(in)).findFirst().orElse(null);
-    }
-}

core/src/main/java/com/volmit/iris/util/decree/specialhandlers/NullableRegionHandler.java

@@ -1,31 +0,0 @@
-/*
- *  Iris is a World Generator for Minecraft Bukkit Servers
- *  Copyright (c) 2024 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.util.decree.specialhandlers;
-
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.util.decree.exceptions.DecreeParsingException;
-import com.volmit.iris.util.decree.handlers.RegionHandler;
-
-public class NullableRegionHandler extends RegionHandler {
-
-    @Override
-    public IrisRegion parse(String in, boolean force) throws DecreeParsingException {
-        return getPossibilities(in).stream().filter((i) -> toString(i).equalsIgnoreCase(in)).findFirst().orElse(null);
-    }
-}

nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java

@@ -645,37 +645,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public com.volmit.iris.core.nms.container.Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                        old.resources(),
-                        old.dataConfiguration(),
-                        old.datapackWorldgen(),
-                        createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.registryOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new com.volmit.iris.core.nms.container.Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -687,31 +694,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().K.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -735,7 +720,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.registryOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {

nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java

@@ -646,37 +646,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public com.volmit.iris.core.nms.container.Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                        old.resources(),
-                        old.dataConfiguration(),
-                        old.datapackWorldgen(),
-                        createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.registryOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new com.volmit.iris.core.nms.container.Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -688,31 +695,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().K.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -736,7 +721,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.registryOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {

nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java

@@ -647,37 +647,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public com.volmit.iris.core.nms.container.Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                        old.resources(),
-                        old.dataConfiguration(),
-                        old.datapackWorldgen(),
-                        createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.registryOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new com.volmit.iris.core.nms.container.Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -689,31 +696,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().K.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -737,7 +722,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.registryOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {

nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java

@@ -672,37 +672,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public com.volmit.iris.core.nms.container.Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                        old.resources(),
-                        old.dataConfiguration(),
-                        old.datapackWorldgen(),
-                        createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.registryOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new com.volmit.iris.core.nms.container.Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -714,31 +721,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().K.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -762,7 +747,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.registryOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {

nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java

@@ -676,37 +676,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public com.volmit.iris.core.nms.container.Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                        old.resources(),
-                        old.dataConfiguration(),
-                        old.datapackWorldgen(),
-                        createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.registryOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new com.volmit.iris.core.nms.container.Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -718,31 +725,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().K.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -766,7 +751,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.registryOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {

nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java

@@ -666,37 +666,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                        old.resources(),
-                        old.dataConfiguration(),
-                        old.datapackWorldgen(),
-                        createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().lookupOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.lookupOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -708,31 +715,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().L.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -756,7 +741,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.lookupOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {

nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java

@@ -665,37 +665,44 @@ public class NMSBinding implements INMSBinding {
     }
 
     @Override
+    @SneakyThrows
     public AutoClosing injectLevelStems() {
-        return inject(this::supplier);
+        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
+
+        var server = ((CraftServer) Bukkit.getServer());
+        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
+        var nmsServer = server.getServer();
+        var old = nmsServer.worldLoader;
+
+        field.setAccessible(true);
+        field.set(nmsServer, dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
+                old.resources(),
+                old.dataConfiguration(),
+                old.datapackWorldgen(),
+                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
+        )));
+
+        return new AutoClosing(() -> {
+            field.set(nmsServer, old);
+            dataContextLock.unlock();
+        });
     }
 
     @Override
     @SneakyThrows
-    public Pair<Integer, AutoClosing> injectUncached(boolean overworld, boolean nether, boolean end) {
+    public AutoClosing injectUncached(boolean overworld, boolean nether, boolean end) {
         var reg = registry();
         var field = getField(RegistryAccess.ImmutableRegistryAccess.class, Map.class);
         field.setAccessible(true);
 
-        AutoClosing closing = inject(old -> new WorldLoader.DataLoadContext(
-                    old.resources(),
-                    old.dataConfiguration(),
-                    old.datapackWorldgen(),
-                    createRegistryAccess(old.datapackDimensions(), true, overworld, nether, end)
-                )
-        );
-
-        var injected = ((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions().lookupOrThrow(Registries.LEVEL_STEM);
+        var access = createRegistryAccess(((CraftServer) Bukkit.getServer()).getServer().worldLoader.datapackDimensions(), true, overworld, nether, end);
+        var injected = access.lookupOrThrow(Registries.LEVEL_STEM);
         var old = (Map<ResourceKey<? extends Registry<?>>, Registry<?>>) field.get(reg);
         var fake = new HashMap<>(old);
         fake.put(Registries.LEVEL_STEM, injected);
         field.set(reg, fake);
 
-        return new Pair<>(
-                injected.size(),
-                new AutoClosing(() -> {
-                    closing.close();
-                    field.set(reg, old);
-                }));
+        return new AutoClosing(() -> field.set(reg, old));
     }
 
     @Override
@@ -707,31 +714,9 @@ public class NMSBinding implements INMSBinding {
         return overworld || nether || end;
     }
 
-    private WorldLoader.DataLoadContext supplier(WorldLoader.DataLoadContext old) {
-        return dataLoadContext.aquire(() -> new WorldLoader.DataLoadContext(
-                old.resources(),
-                old.dataConfiguration(),
-                old.datapackWorldgen(),
-                createRegistryAccess(old.datapackDimensions(), false, true, true, true)
-        ));
-    }
-
-    @SneakyThrows
-    private AutoClosing inject(Function<WorldLoader.DataLoadContext, WorldLoader.DataLoadContext> transformer) {
-        if (!dataContextLock.tryLock()) throw new IllegalStateException("Failed to inject data context!");
-
-        var server = ((CraftServer) Bukkit.getServer());
-        var field = getField(MinecraftServer.class, WorldLoader.DataLoadContext.class);
-        var nmsServer = server.getServer();
-        var old = nmsServer.worldLoader;
-
-        field.setAccessible(true);
-        field.set(nmsServer, transformer.apply(old));
-
-        return new AutoClosing(() -> {
-            field.set(nmsServer, old);
-            dataContextLock.unlock();
-        });
+    @Override
+    public void removeCustomDimensions(World world) {
+        ((CraftWorld) world).getHandle().L.customDimensions = null;
     }
 
     private RegistryAccess.Frozen createRegistryAccess(RegistryAccess.Frozen datapack, boolean copy, boolean overworld, boolean nether, boolean end) {
@@ -755,7 +740,7 @@ public class NMSBinding implements INMSBinding {
 
         if (copy) copy(fake, access.lookupOrThrow(Registries.LEVEL_STEM));
 
-        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake.freeze())).freeze();
+        return new RegistryAccess.Frozen.ImmutableRegistryAccess(List.of(fake)).freeze();
     }
 
     private void register(MappedRegistry<LevelStem> target, Registry<DimensionType> dimensions, FlatLevelSource source, ResourceKey<LevelStem> key) {