Plugin Eviction

core/src/main/java/art/arcane/iris/core/IrisWorlds.java

@@ -3,7 +3,8 @@ package art.arcane.iris.core;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.loader.IrisData;
 import art.arcane.iris.engine.data.cache.AtomicCache;
 import art.arcane.iris.engine.object.IrisDimension;
@@ -36,7 +37,7 @@ public class IrisWorlds {
 
     public static IrisWorlds get() {
         return cache.aquire(() -> {
-            File file = Iris.instance.getDataFile("worlds.json");
+            File file = IrisPlatforms.get().dataFile("worlds.json");
             if (!file.exists()) {
                 return new IrisWorlds(new KMap<>());
             }
@@ -46,9 +47,9 @@ public class IrisWorlds {
                 KMap<String, String> worlds = GSON.fromJson(json, TYPE);
                 return new IrisWorlds(Objects.requireNonNullElseGet(worlds, KMap::new));
             } catch (Throwable e) {
-                Iris.error("Failed to load worlds.json!");
+                IrisLogging.error("Failed to load worlds.json!");
                 e.printStackTrace();
-                Iris.reportError(e);
+                IrisLogging.reportError(e);
             }
 
             return new IrisWorlds(new KMap<>());
@@ -81,7 +82,7 @@ public class IrisWorlds {
         return getWorlds()
                 .entrySet()
                 .stream()
-                .map(entry -> Iris.loadDimension(entry.getKey(), entry.getValue()))
+                .map(entry -> loadDimension(entry.getKey(), entry.getValue()))
                 .filter(Objects::nonNull);
     }
 
@@ -93,12 +94,12 @@ public class IrisWorlds {
         clean();
         if (!dirty) return;
         try {
-            IO.write(Iris.instance.getDataFile("worlds.json"), OutputStreamWriter::new, writer -> GSON.toJson(worlds, TYPE, writer));
+            IO.write(IrisPlatforms.get().dataFile("worlds.json"), OutputStreamWriter::new, writer -> GSON.toJson(worlds, TYPE, writer));
             dirty = false;
         } catch (IOException e) {
-            Iris.error("Failed to save worlds.json!");
+            IrisLogging.error("Failed to save worlds.json!");
             e.printStackTrace();
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
         }
     }
 
@@ -134,4 +135,21 @@ public class IrisWorlds {
 
         return result;
     }
+
+    private static art.arcane.iris.engine.object.IrisDimension loadDimension(String worldName, String id) {
+        java.io.File pack = new java.io.File(org.bukkit.Bukkit.getWorldContainer(), String.join(java.io.File.separator, worldName, "iris", "pack"));
+        art.arcane.iris.engine.object.IrisDimension dimension = pack.isDirectory() ? art.arcane.iris.core.loader.IrisData.get(pack).getDimensionLoader().load(id) : null;
+        if (dimension == null) {
+            dimension = art.arcane.iris.core.loader.IrisData.loadAnyDimension(id, null);
+        }
+        if (dimension == null) {
+            IrisLogging.warn("Unable to find dimension type " + id + " Looking for online packs...");
+            art.arcane.iris.spi.IrisServices.get(art.arcane.iris.core.service.StudioSVC.class).downloadSearch(new art.arcane.iris.util.common.plugin.VolmitSender(org.bukkit.Bukkit.getConsoleSender()), id, false);
+            dimension = art.arcane.iris.core.loader.IrisData.loadAnyDimension(id, null);
+            if (dimension != null) {
+                IrisLogging.info("Resolved missing dimension, proceeding.");
+            }
+        }
+        return dimension;
+    }
 }

core/src/main/java/art/arcane/iris/core/ServerConfigurator.java

@@ -18,7 +18,8 @@
 
 package art.arcane.iris.core;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.datapack.DatapackIngestService;
 import art.arcane.iris.core.loader.IrisData;
 import art.arcane.iris.core.nms.INMS;
@@ -98,8 +99,8 @@ public class ServerConfigurator {
         long spigotTimeout = TimeUnit.MINUTES.toSeconds(5);
 
         if (tt < spigotTimeout) {
-            Iris.warn("Updating spigot.yml timeout-time: " + tt + " -> " + spigotTimeout + " (5 minutes)");
-            Iris.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value.");
+            IrisLogging.warn("Updating spigot.yml timeout-time: " + tt + " -> " + spigotTimeout + " (5 minutes)");
+            IrisLogging.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value.");
             f.set("settings.timeout-time", spigotTimeout);
             f.save(spigotConfig);
         }
@@ -113,8 +114,8 @@ public class ServerConfigurator {
 
         long watchdog = TimeUnit.MINUTES.toMillis(3);
         if (tt < watchdog) {
-            Iris.warn("Updating paper.yml watchdog early-warning-delay: " + tt + " -> " + watchdog + " (3 minutes)");
-            Iris.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value.");
+            IrisLogging.warn("Updating paper.yml watchdog early-warning-delay: " + tt + " -> " + watchdog + " (3 minutes)");
+            IrisLogging.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value.");
             f.set("watchdog.early-warning-delay", watchdog);
             f.save(spigotConfig);
         }
@@ -141,7 +142,7 @@ public class ServerConfigurator {
         IDataFixer fixer = DataVersion.getDefault();
         if (fixer == null) {
             DataVersion fallback = DataVersion.getLatest();
-            Iris.warn("Primary datapack fixer was null, forcing latest fixer: " + fallback.getVersion());
+            IrisLogging.warn("Primary datapack fixer was null, forcing latest fixer: " + fallback.getVersion());
             fixer = fallback.get();
         }
         return installDataPacks(fixer, fullInstall);
@@ -149,13 +150,13 @@ public class ServerConfigurator {
 
     public static boolean installDataPacks(IDataFixer fixer, boolean fullInstall) {
         if (fixer == null) {
-            Iris.error("Unable to install datapacks, fixer is null!");
+            IrisLogging.error("Unable to install datapacks, fixer is null!");
             return false;
         }
         if (fullInstall) {
-            Iris.info("Checking Data Packs...");
+            IrisLogging.info("Checking Data Packs...");
         } else {
-            Iris.verbose("Checking Data Packs...");
+            IrisLogging.debug("Checking Data Packs...");
         }
         DimensionHeight height = new DimensionHeight(fixer);
         KList<File> folders = getDatapacksFolder();
@@ -166,25 +167,25 @@ public class ServerConfigurator {
             stream.flatMap(height::merge)
                     .parallel()
                     .forEach(dim -> {
-                        Iris.verbose("  Checking Dimension " + dim.getLoadFile().getPath());
+                        IrisLogging.debug("  Checking Dimension " + dim.getLoadFile().getPath());
                         dim.installBiomes(fixer, dim::getLoader, folders, biomes.computeIfAbsent(dim.getLoadKey(), k -> new KSet<>()));
                         dim.installDimensionType(fixer, folders);
                     });
         }
         IrisDimension.writeShared(folders, height);
         if (fullInstall) {
-            Iris.info("Data Packs Setup!");
+            IrisLogging.info("Data Packs Setup!");
         } else {
-            Iris.verbose("Data Packs Setup!");
+            IrisLogging.debug("Data Packs Setup!");
         }
 
         return fullInstall && verifyDataPacksPost(IrisSettings.get().getAutoConfiguration().isAutoRestartOnCustomBiomeInstall());
     }
 
     public static boolean installDataPacksIfChanged(boolean fullInstall) {
-        File packsDir = Iris.instance.getDataFolder("packs");
+        File packsDir = IrisPlatforms.get().dataFolder("packs");
         String current = computePackFingerprint(packsDir);
-        File cacheFile = new File(Iris.instance.getDataFolder("cache"), "datapack-fingerprint");
+        File cacheFile = new File(IrisPlatforms.get().dataFolder("cache"), "datapack-fingerprint");
         String cached = "";
         if (cacheFile.exists()) {
             try {
@@ -194,7 +195,7 @@ public class ServerConfigurator {
             }
         }
         if (!current.isEmpty() && current.equals(cached)) {
-            Iris.verbose("Data packs unchanged, skipping install.");
+            IrisLogging.debug("Data packs unchanged, skipping install.");
             return false;
         }
         boolean result = installDataPacks(fullInstall);
@@ -202,7 +203,7 @@ public class ServerConfigurator {
             cacheFile.getParentFile().mkdirs();
             Files.writeString(cacheFile.toPath(), current, StandardCharsets.UTF_8);
         } catch (IOException e) {
-            Iris.warn("Failed to write datapack fingerprint cache: " + e.getMessage());
+            IrisLogging.warn("Failed to write datapack fingerprint cache: " + e.getMessage());
         }
         return result;
     }
@@ -286,7 +287,7 @@ public class ServerConfigurator {
         try (Stream<IrisData> stream = allPacks()) {
             boolean bad = stream
                     .map(data -> {
-                        Iris.verbose("Checking Pack: " + data.getDataFolder().getPath());
+                        IrisLogging.debug("Checking Pack: " + data.getDataFolder().getPath());
                         var loader = data.getDimensionLoader();
                         return loader.loadAll(loader.getPossibleKeys())
                                 .stream()
@@ -304,16 +305,16 @@ public class ServerConfigurator {
         if (allowRestarting) {
             restart();
         } else if (INMS.get().supportsDataPacks()) {
-            Iris.error("============================================================================");
-            Iris.error(C.ITALIC + "You need to restart your server to properly generate custom biomes.");
-            Iris.error(C.ITALIC + "By continuing, Iris will use backup biomes in place of the custom biomes.");
-            Iris.error("----------------------------------------------------------------------------");
-            Iris.error(C.UNDERLINE + "IT IS HIGHLY RECOMMENDED YOU RESTART THE SERVER BEFORE GENERATING!");
-            Iris.error("============================================================================");
+            IrisLogging.error("============================================================================");
+            IrisLogging.error(C.ITALIC + "You need to restart your server to properly generate custom biomes.");
+            IrisLogging.error(C.ITALIC + "By continuing, Iris will use backup biomes in place of the custom biomes.");
+            IrisLogging.error("----------------------------------------------------------------------------");
+            IrisLogging.error(C.UNDERLINE + "IT IS HIGHLY RECOMMENDED YOU RESTART THE SERVER BEFORE GENERATING!");
+            IrisLogging.error("============================================================================");
 
             for (Player i : Bukkit.getOnlinePlayers()) {
                 if (i.isOp() || i.hasPermission("iris.all")) {
-                    VolmitSender sender = new VolmitSender(i, Iris.instance.getTag("WARNING"));
+                    VolmitSender sender = new VolmitSender(i, art.arcane.iris.platform.bukkit.BukkitPlatform.volmitPlugin().getTag("WARNING"));
                     sender.sendMessage("There are some Iris Packs that have custom biomes in them");
                     sender.sendMessage("You need to restart your server to use these packs.");
                 }
@@ -326,11 +327,11 @@ public class ServerConfigurator {
 
     public static void restart() {
         J.s(() -> {
-            Iris.warn("New data pack entries have been installed in Iris! Restarting server!");
-            Iris.warn("This will only happen when your pack changes (updates/first time setup)");
-            Iris.warn("(You can disable this auto restart in iris settings)");
+            IrisLogging.warn("New data pack entries have been installed in Iris! Restarting server!");
+            IrisLogging.warn("This will only happen when your pack changes (updates/first time setup)");
+            IrisLogging.warn("(You can disable this auto restart in iris settings)");
             J.s(() -> {
-                Iris.warn("Looks like the restart command didn't work. Stopping the server instead!");
+                IrisLogging.warn("Looks like the restart command didn't work. Stopping the server instead!");
                 Bukkit.shutdown();
             }, 100);
             Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "restart");
@@ -354,11 +355,11 @@ public class ServerConfigurator {
 
         if (!INMS.get().supportsDataPacks()) {
             if (!keys.isEmpty()) {
-                Iris.warn("===================================================================================");
-                Iris.warn("Pack " + key + " has " + keys.size() + " custom biome(s). ");
-                Iris.warn("Your server version does not yet support datapacks for iris.");
-                Iris.warn("The world will generate these biomes as backup biomes.");
-                Iris.warn("====================================================================================");
+                IrisLogging.warn("===================================================================================");
+                IrisLogging.warn("Pack " + key + " has " + keys.size() + " custom biome(s). ");
+                IrisLogging.warn("Your server version does not yet support datapacks for iris.");
+                IrisLogging.warn("The world will generate these biomes as backup biomes.");
+                IrisLogging.warn("====================================================================================");
             }
 
             return true;
@@ -368,26 +369,26 @@ public class ServerConfigurator {
             Object o = INMS.get().getCustomBiomeBaseFor(i);
 
             if (o == null) {
-                Iris.warn("The Biome " + i + " is not registered on the server.");
+                IrisLogging.warn("The Biome " + i + " is not registered on the server.");
                 warn = true;
             }
         }
 
         if (INMS.get().missingDimensionTypes(dimension.getDimensionTypeKey())) {
-            Iris.warn("The Dimension Type for " + dimension.getLoadFile() + " is not registered on the server.");
+            IrisLogging.warn("The Dimension Type for " + dimension.getLoadFile() + " is not registered on the server.");
             warn = true;
         }
 
         if (warn) {
-            Iris.error("The Pack " + key + " is INCAPABLE of generating custom biomes");
-            Iris.error("If not done automatically, restart your server before generating with this pack!");
+            IrisLogging.error("The Pack " + key + " is INCAPABLE of generating custom biomes");
+            IrisLogging.error("If not done automatically, restart your server before generating with this pack!");
         }
 
         return !warn;
     }
 
     public static Stream<IrisData> allPacks() {
-        File[] packs = Iris.instance.getDataFolder("packs").listFiles(File::isDirectory);
+        File[] packs = IrisPlatforms.get().dataFolder("packs").listFiles(File::isDirectory);
         Stream<File> locals = packs == null ? Stream.empty() : Arrays.stream(packs);
         return Stream.concat(locals
                 .filter( base -> {
@@ -422,7 +423,7 @@ public class ServerConfigurator {
         }
 
         public Stream<IrisDimension> merge(IrisData data) {
-            Iris.verbose("Checking Pack: " + data.getDataFolder().getPath());
+            IrisLogging.debug("Checking Pack: " + data.getDataFolder().getPath());
             var loader = data.getDimensionLoader();
             return loader.loadAll(loader.getPossibleKeys())
                     .stream()

core/src/main/java/art/arcane/iris/core/commands/CommandDatapack.java

@@ -1,72 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.core.datapack.DatapackIngestService;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-
-import java.util.List;
-
-@Director(name = "datapack", aliases = {"datapacks", "dp"}, description = "Download & manage external datapack imports (Modrinth)")
-public class CommandDatapack implements DirectorExecutor {
-    @Director(description = "Download/update every datapack listed in a pack dimension's 'datapackImports' and install it into the world so its structures register like vanilla", aliases = {"pull"})
-    public void ingest(
-            @Param(description = "Restart the server when new datapacks are installed (required for new structures to register and generate)", defaultValue = "false")
-            boolean restart
-    ) {
-        VolmitSender sender = sender();
-        sender.sendMessage(C.GRAY + "Starting datapack ingest...");
-        J.a(() -> DatapackIngestService.ingestAll(sender, restart));
-    }
-
-    @Director(description = "List configured datapack imports and their installed versions", aliases = {"ls"})
-    public void list() {
-        VolmitSender sender = sender();
-        KList<String> configured = DatapackIngestService.collectConfiguredImports();
-        List<DatapackIngestService.Entry> installed = DatapackIngestService.installed();
-
-        sender.sendMessage(C.GREEN + "Configured datapack imports: " + C.WHITE + configured.size());
-        for (String url : configured) {
-            sender.sendMessage(C.GRAY + "  - " + C.WHITE + url);
-        }
-
-        sender.sendMessage(C.GREEN + "Installed datapacks: " + C.WHITE + installed.size());
-        for (DatapackIngestService.Entry entry : installed) {
-            sender.sendMessage(C.GRAY + "  - " + C.WHITE + entry.id + C.GRAY + " " + (entry.versionNumber == null ? "?" : entry.versionNumber));
-        }
-
-        if (configured.isEmpty()) {
-            sender.sendMessage(C.YELLOW + "Add Modrinth URLs to a dimension's 'datapackImports' list, then run /iris datapack ingest.");
-        }
-    }
-
-    @Director(description = "Remove an installed datapack by id (also delete its URL from datapackImports to keep it gone)", aliases = {"rm"})
-    public void remove(
-            @Param(description = "The datapack id (folder name) shown by /iris datapack list")
-            String id
-    ) {
-        DatapackIngestService.remove(sender(), id);
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandDeveloper.java

@@ -1,410 +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 art.arcane.iris.core.commands;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.ServerConfigurator;
-import art.arcane.iris.core.nms.datapack.DataVersion;
-import art.arcane.iris.core.runtime.ChunkClearer;
-import art.arcane.iris.core.runtime.GoldenHashScanner;
-import art.arcane.iris.core.runtime.InPlaceChunkRegenerator;
-import art.arcane.iris.core.service.IrisEngineSVC;
-import art.arcane.iris.core.service.StudioSVC;
-import art.arcane.iris.core.tools.IrisPackBenchmarking;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.IrisEngineMantle;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.iris.engine.object.annotations.Snippet;
-import art.arcane.volmlib.util.collection.KSet;
-import art.arcane.iris.util.project.context.IrisContext;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.director.specialhandlers.NullableDimensionHandler;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.format.Form;
-import art.arcane.volmlib.util.io.CountingDataInputStream;
-import art.arcane.volmlib.util.mantle.runtime.TectonicPlate;
-import art.arcane.volmlib.util.math.M;
-import art.arcane.volmlib.util.matter.Matter;
-import art.arcane.iris.util.nbt.common.mca.MCAFile;
-import art.arcane.iris.util.nbt.common.mca.MCAUtil;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import lombok.SneakyThrows;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-
-import java.io.*;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.stream.Collectors;
-
-@Director(name = "Developer", origin = DirectorOrigin.BOTH, description = "Iris World Manager", aliases = {"dev"})
-public class CommandDeveloper implements DirectorExecutor {
-    @Director(description = "Get Loaded TectonicPlates Count", origin = DirectorOrigin.BOTH, sync = true)
-    public void EngineStatus() {
-        Iris.service(IrisEngineSVC.class)
-                .engineStatus(sender());
-    }
-
-    @Director(description = "Send a test exception to sentry")
-    public void Sentry() {
-        Engine engine = engine();
-        if (engine != null) IrisContext.getOr(engine);
-        Iris.reportError(new Exception("This is a test"));
-    }
-
-    @Director(description = "Hash generated block output of a fixed area for determinism/identity testing", origin = DirectorOrigin.BOTH)
-    public void genhash(
-            @Param(description = "The world to hash", contextual = true)
-            World world,
-            @Param(description = "Radius in chunks around the center", defaultValue = "4")
-            int radius,
-            @Param(description = "Center chunk X", defaultValue = "0")
-            int centerX,
-            @Param(description = "Center chunk Z", defaultValue = "0")
-            int centerZ) {
-        if (world == null) {
-            sender().sendMessage(C.RED + "World is null.");
-            return;
-        }
-
-        VolmitSender sender = sender();
-        sender.sendMessage(C.GREEN + "genhash started: " + ((radius * 2 + 1) * (radius * 2 + 1)) + " chunks...");
-        J.a(() -> runGenhash(sender, world, radius, centerX, centerZ));
-    }
-
-    private void runGenhash(VolmitSender sender, World world, int radius, int centerX, int centerZ) {
-        long startMs = M.ms();
-        int minY = world.getMinHeight();
-        int maxY = world.getMaxHeight();
-        long globalHash = 0L;
-        long solidBlocks = 0L;
-        Map<String, Long> histogram = new TreeMap<>();
-        JsonObject chunkHashes = new JsonObject();
-
-        for (int rx = centerX - radius; rx <= centerX + radius; rx++) {
-            for (int rz = centerZ - radius; rz <= centerZ + radius; rz++) {
-                org.bukkit.ChunkSnapshot snapshot;
-                try {
-                    org.bukkit.Chunk loaded = io.papermc.lib.PaperLib.getChunkAtAsync(world, rx, rz, true).get();
-                    snapshot = loaded.getChunkSnapshot(false, false, false);
-                } catch (Throwable e) {
-                    Iris.reportError(e);
-                    sender.sendMessage(C.RED + "genhash failed at chunk " + rx + "," + rz + ": " + e.getMessage());
-                    return;
-                }
-                long chunkHash = 0L;
-                for (int x = 0; x < 16; x++) {
-                    for (int z = 0; z < 16; z++) {
-                        int worldX = (rx << 4) + x;
-                        int worldZ = (rz << 4) + z;
-                        for (int y = minY; y < maxY; y++) {
-                            org.bukkit.Material material = snapshot.getBlockType(x, y, z);
-                            long positionSeed = ((long) worldX * 0x9E3779B97F4A7C15L)
-                                    ^ ((long) y * 0xC2B2AE3D27D4EB4FL)
-                                    ^ ((long) worldZ * 0x165667B19E3779F9L);
-                            long blockHash = genHashMix(positionSeed ^ ((long) (material.ordinal() + 1) * 0xD6E8FEB86659FD93L));
-                            chunkHash ^= blockHash;
-                            if (material != org.bukkit.Material.AIR
-                                    && material != org.bukkit.Material.CAVE_AIR
-                                    && material != org.bukkit.Material.VOID_AIR) {
-                                histogram.merge(material.name(), 1L, Long::sum);
-                                solidBlocks++;
-                            }
-                        }
-                    }
-                }
-                globalHash ^= chunkHash;
-                chunkHashes.addProperty(rx + "," + rz, Long.toHexString(chunkHash));
-            }
-        }
-
-        int side = radius * 2 + 1;
-        JsonObject result = new JsonObject();
-        result.addProperty("global", Long.toHexString(globalHash));
-        result.addProperty("chunks", side * side);
-        result.addProperty("solidBlocks", solidBlocks);
-        result.addProperty("minY", minY);
-        result.addProperty("maxY", maxY);
-        JsonObject hist = new JsonObject();
-        for (Map.Entry<String, Long> entry : histogram.entrySet()) {
-            hist.addProperty(entry.getKey(), entry.getValue());
-        }
-        result.add("histogram", hist);
-        result.add("chunkHashes", chunkHashes);
-
-        File out = new File(Iris.instance.getDataFolder(), "genhash.json");
-        try {
-            Files.writeString(out.toPath(), result.toString());
-        } catch (IOException e) {
-            Iris.reportError(e);
-        }
-
-        sender.sendMessage(C.GREEN + "genhash global=" + C.GOLD + Long.toHexString(globalHash)
-                + C.GREEN + " chunks=" + (side * side) + " solid=" + solidBlocks
-                + " in " + Form.duration((long) (M.ms() - startMs), 1));
-        Iris.info("genhash world=" + world.getName() + " global=" + Long.toHexString(globalHash)
-                + " chunks=" + (side * side) + " solidBlocks=" + solidBlocks + " -> " + out.getAbsolutePath());
-    }
-
-    private static long genHashMix(long z) {
-        z = (z ^ (z >>> 30)) * 0xBF58476D1CE4E5B9L;
-        z = (z ^ (z >>> 27)) * 0x94D049BB133111EBL;
-        return z ^ (z >>> 31);
-    }
-
-    @Director(description = "Update the pack of a world (UNSAFE!)", name = "update-world", aliases = "^world")
-    public void updateWorld(
-            @Param(description = "The world to update", contextual = true)
-            World world,
-            @Param(description = "The pack to install into the world", contextual = true, aliases = "dimension")
-            IrisDimension pack,
-            @Param(description = "Make sure to make a backup & read the warnings first!", defaultValue = "false", aliases = "c")
-            boolean confirm,
-            @Param(description = "Should Iris download the pack again for you", defaultValue = "false", name = "fresh-download", aliases = {"fresh", "new"})
-            boolean freshDownload
-    ) {
-        if (!confirm) {
-            sender().sendMessage(new String[]{
-                    C.RED + "You should always make a backup before using this",
-                    C.YELLOW + "Issues caused by this can be, but are not limited to:",
-                    C.YELLOW + " - Broken chunks (cut-offs) between old and new chunks (before & after the update)",
-                    C.YELLOW + " - Regenerated chunks that do not fit in with the old chunks",
-                    C.YELLOW + " - Structures not spawning again when regenerating",
-                    C.YELLOW + " - Caves not lining up",
-                    C.YELLOW + " - Terrain layers not lining up",
-                    C.RED + "Now that you are aware of the risks, and have made a back-up:",
-                    C.RED + "/iris developer update-world " + world.getName() + " " + pack.getLoadKey() + " confirm=true"
-            });
-            return;
-        }
-
-        File folder = world.getWorldFolder();
-        folder.mkdirs();
-
-        if (freshDownload) {
-            Iris.service(StudioSVC.class).downloadSearch(sender(), pack.getLoadKey(), true);
-        }
-
-        Iris.service(StudioSVC.class).installIntoWorld(sender(), pack.getLoadKey(), folder);
-    }
-
-    @Director(description = "Test")
-    public void mantle(
-            @Param(name = "plate", description = "Dump the whole tectonic plate instead of a single section", defaultValue = "false")
-            boolean plate,
-            @Param(name = "name", description = "The dump file id under plugins/Iris/dump (pv.<id>.*)", defaultValue = "21474836474")
-            String name
-    ) throws Throwable {
-        var base = Iris.instance.getDataFile("dump", "pv." + name + ".ttp.lz4b.bin");
-        var section = Iris.instance.getDataFile("dump", "pv." + name + ".section.bin");
-
-        if (plate) {
-            try (var in = CountingDataInputStream.wrap(new BufferedInputStream(new FileInputStream(base)))) {
-                TectonicPlate.read(1088, in, true, IrisEngineMantle.createRuntimeDataAdapter(), IrisEngineMantle.createRuntimeHooks());
-            } catch (Throwable e) {
-                e.printStackTrace();
-            }
-        } else Matter.read(section);
-        if (!TectonicPlate.hasError())
-            Iris.info("Read " + (plate ? base : section).length() + " bytes from " + (plate ? base : section).getAbsolutePath());
-    }
-
-    @Director(description = "Test")
-    public void packBenchmark(
-            @Param(description = "The pack to bench", aliases = {"pack"}, defaultValue = "overworld")
-            IrisDimension dimension,
-            @Param(description = "Radius in regions", defaultValue = "2048")
-            int radius,
-            @Param(description = "Open GUI while benchmarking", defaultValue = "false")
-            boolean gui
-    ) {
-        new IrisPackBenchmarking(dimension, radius, gui);
-    }
-
-    @Director(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());
-    }
-
-    @Director(description = "test")
-    public void mca (
-            @Param(description = "The world folder to scan for .mca region files") 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();
-        }
-
-    }
-
-    @Director(description = "Delete nearby chunk blocks for regen testing", name = "delete-chunk", aliases = {"dc"}, origin = DirectorOrigin.PLAYER, sync = true)
-    public void deleteChunk(
-            @Param(description = "Radius in chunks around your current chunk", defaultValue = "0")
-            int radius
-    ) {
-        if (radius < 0) {
-            sender().sendMessage(C.RED + "Radius must be 0 or greater.");
-            return;
-        }
-
-        World world = player().getWorld();
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "This is not an Iris world.");
-            return;
-        }
-
-        PlatformChunkGenerator access = IrisToolbelt.access(world);
-        if (access == null || access.getEngine() == null) {
-            sender().sendMessage(C.RED + "The engine access for this world is null.");
-            return;
-        }
-
-        int centerX = player().getLocation().getBlockX() >> 4;
-        int centerZ = player().getLocation().getBlockZ() >> 4;
-        int chunks = (radius * 2 + 1) * (radius * 2 + 1);
-
-        sender().sendMessage(C.GREEN + "Delete started: " + C.GOLD + chunks + C.GREEN
-                + " chunk(s) around " + C.GOLD + centerX + "," + centerZ + C.GREEN
-                + ". Clearing blocks to air.");
-
-        new ChunkClearer(world, access.getEngine(), sender(), centerX, centerZ, radius).start();
-    }
-
-    @Director(description = "Test", aliases = {"ip"})
-    public void network() {
-        try {
-            Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
-            for (NetworkInterface ni : Collections.list(networkInterfaces)) {
-                Iris.info("Display Name: %s", ni.getDisplayName());
-                Enumeration<InetAddress> inetAddresses = ni.getInetAddresses();
-                for (InetAddress ia : Collections.list(inetAddresses)) {
-                    Iris.info("IP: %s", ia.getHostAddress());
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    // --- Regen ---
-
-    @Director(name = "regen", aliases = {"rg"}, description = "Delete and regenerate nearby chunks in place using Iris generation", origin = DirectorOrigin.PLAYER, sync = true)
-    public void regen(
-            @Param(name = "radius", description = "The radius of nearby chunks", defaultValue = "5")
-            int radius
-    ) {
-        if (radius < 0) {
-            sender().sendMessage(C.RED + "Radius must be 0 or greater.");
-            return;
-        }
-
-        World world = player().getWorld();
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "You must be in an Iris world to use regen.");
-            return;
-        }
-
-        Engine engine = IrisToolbelt.access(world).getEngine();
-        if (engine == null) {
-            sender().sendMessage(C.RED + "The engine access for this world is null. Generate nearby chunks first.");
-            return;
-        }
-
-        int centerX = player().getLocation().getBlockX() >> 4;
-        int centerZ = player().getLocation().getBlockZ() >> 4;
-        int chunks = (radius * 2 + 1) * (radius * 2 + 1);
-
-        sender().sendMessage(C.GREEN + "Regen started: " + C.GOLD + chunks + C.GREEN
-                + " chunk(s) around " + C.GOLD + centerX + "," + centerZ + C.GREEN
-                + ". Deleting and regenerating in place.");
-        Iris.info("Regen run start: world=" + world.getName()
-                + " center=" + centerX + "," + centerZ
-                + " radius=" + radius
-                + " chunks=" + chunks);
-
-        new InPlaceChunkRegenerator(world, engine, sender(), centerX, centerZ, radius).start();
-    }
-
-    @Director(name = "goldenhash", aliases = {"gold"}, description = "Generate chunks into buffers (no world writes) and hash blocks+biomes; captures a golden file or verifies against an existing one. Resets mantle in the scanned area - use on disposable test worlds.", origin = DirectorOrigin.BOTH)
-    public void goldenhash(
-            @Param(description = "The world to scan", contextual = true)
-            World world,
-            @Param(name = "radius", description = "Radius in chunks around the center", defaultValue = "8")
-            int radius,
-            @Param(name = "center-x", description = "Center chunk X", defaultValue = "0")
-            int centerX,
-            @Param(name = "center-z", description = "Center chunk Z", defaultValue = "0")
-            int centerZ,
-            @Param(name = "reset-mantle", description = "Delete mantle data in the scan area first for full regeneration from scratch", defaultValue = "true")
-            boolean resetMantle,
-            @Param(name = "threads", description = "Concurrent chunk generations; 1 = strictly serial for order-dependence testing", defaultValue = "8")
-            int threads,
-            @Param(name = "deep", description = "Also dump full per-chunk non-air blockstates for offline diffing", defaultValue = "false")
-            boolean deep
-    ) {
-        if (radius < 0) {
-            sender().sendMessage(C.RED + "Radius must be 0 or greater.");
-            return;
-        }
-
-        if (world == null || !IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "Target must be an Iris world.");
-            return;
-        }
-
-        PlatformChunkGenerator access = IrisToolbelt.access(world);
-        if (access == null || access.getEngine() == null) {
-            sender().sendMessage(C.RED + "The engine access for this world is null.");
-            return;
-        }
-
-        int chunks = (radius * 2 + 1) * (radius * 2 + 1);
-        sender().sendMessage(C.GREEN + "GoldenHash started: " + C.GOLD + chunks + C.GREEN
-                + " chunk(s) around " + C.GOLD + centerX + "," + centerZ + C.GREEN
-                + " in buffers (world untouched).");
-        Iris.info("goldenhash start: world=" + world.getName()
-                + " center=" + centerX + "," + centerZ
-                + " radius=" + radius
-                + " chunks=" + chunks);
-
-        new GoldenHashScanner(world, access.getEngine(), sender(), centerX, centerZ, radius, resetMantle, threads, deep).start();
-    }
-
-}

core/src/main/java/art/arcane/iris/core/commands/CommandEdit.java

@@ -1,116 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.service.StudioSVC;
-import art.arcane.iris.engine.object.*;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
-
-import java.awt.*;
-
-
-@Director(name = "edit", origin = DirectorOrigin.PLAYER, description = "Edit something")
-public class CommandEdit implements DirectorExecutor {
-    private boolean noStudio() {
-        if (!sender().isPlayer()) {
-            sender().sendMessage(C.RED + "Players only!");
-            return true;
-        }
-        if (!Iris.service(StudioSVC.class).isProjectOpen()) {
-            sender().sendMessage(C.RED + "No studio world is open!");
-            return true;
-        }
-        if (!engine().isStudio()) {
-            sender().sendMessage(C.RED + "You must be in a studio world!");
-            return true;
-        }
-
-        if (GraphicsEnvironment.isHeadless()) {
-            sender().sendMessage(C.RED + "Cannot open files in headless environments!");
-            return true;
-        }
-
-        if (!Desktop.isDesktopSupported()) {
-            sender().sendMessage(C.RED + "Desktop is not supported by this environment!");
-            return true;
-        }
-        return false;
-    }
-
-
-    @Director(description = "Edit the biome you specified", aliases = {"b"}, origin = DirectorOrigin.PLAYER)
-    public void biome(@Param(contextual = false, description = "The biome to edit") IrisBiome biome) {
-        if (noStudio()) {
-            return;
-        }
-        try {
-            if (biome == null || biome.getLoadFile() == null) {
-                sender().sendMessage(C.GOLD + "Cannot find the file; Perhaps it was not loaded directly from a file?");
-                return;
-            }
-            Desktop.getDesktop().open(biome.getLoadFile());
-            sender().sendMessage(C.GREEN + "Opening " + biome.getTypeName() + " " + biome.getLoadFile().getName().split("\\Q.\\E")[0] + " in VSCode! ");
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            sender().sendMessage(C.RED + "Cant find the file. Or registrant does not exist");
-        }
-    }
-
-    @Director(description = "Edit the region you specified", aliases = {"r"}, origin = DirectorOrigin.PLAYER)
-    public void region(@Param(contextual = false, description = "The region to edit") IrisRegion region) {
-        if (noStudio()) {
-            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?");
-                return;
-            }
-            Desktop.getDesktop().open(region.getLoadFile());
-            sender().sendMessage(C.GREEN + "Opening " + region.getTypeName() + " " + region.getLoadFile().getName().split("\\Q.\\E")[0] + " in VSCode! ");
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            sender().sendMessage(C.RED + "Cant find the file. Or registrant does not exist");
-        }
-    }
-
-    @Director(description = "Edit the dimension you specified", aliases = {"d"}, origin = DirectorOrigin.PLAYER)
-    public void dimension(@Param(contextual = false, description = "The dimension to edit") IrisDimension dimension) {
-        if (noStudio()) {
-            return;
-        }
-        try {
-            if (dimension == null || dimension.getLoadFile() == null) {
-                sender().sendMessage(C.GOLD + "Cannot find the file; Perhaps it was not loaded directly from a file?");
-                return;
-            }
-            Desktop.getDesktop().open(dimension.getLoadFile());
-            sender().sendMessage(C.GREEN + "Opening " + dimension.getTypeName() + " " + dimension.getLoadFile().getName().split("\\Q.\\E")[0] + " in VSCode! ");
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            sender().sendMessage(C.RED + "Cant find the file. Or registrant does not exist");
-        }
-    }
-
-}

core/src/main/java/art/arcane/iris/core/commands/CommandFind.java

@@ -1,189 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.service.ObjectStudioSaveService;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.IrisStructureLocator;
-import art.arcane.iris.engine.framework.StructureReachability;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisRegion;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.common.director.specialhandlers.ObjectHandler;
-import art.arcane.iris.util.common.director.specialhandlers.StructureHandler;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import io.papermc.lib.PaperLib;
-import org.bukkit.Location;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StructureSearchResult;
-
-@Director(name = "find", origin = DirectorOrigin.PLAYER, description = "Iris Find commands", aliases = "goto")
-public class CommandFind implements DirectorExecutor {
-    @Director(description = "Find a biome")
-    public void biome(
-            @Param(description = "The biome to look for")
-            IrisBiome biome,
-            @Param(description = "Should you be teleported", defaultValue = "true")
-            boolean teleport
-    ) {
-        Engine e = engine();
-
-        if (e == null) {
-            sender().sendMessage(C.GOLD + "Not in an Iris World!");
-            return;
-        }
-
-        e.gotoBiome(biome, player(), teleport);
-    }
-
-    @Director(description = "Find a region")
-    public void region(
-            @Param(description = "The region to look for")
-            IrisRegion region,
-            @Param(description = "Should you be teleported", defaultValue = "true")
-            boolean teleport
-    ) {
-        Engine e = engine();
-
-        if (e == null) {
-            sender().sendMessage(C.GOLD + "Not in an Iris World!");
-            return;
-        }
-
-        e.gotoRegion(region, player(), teleport);
-    }
-
-    @Director(description = "Find a point of interest.")
-    public void poi(
-            @Param(description = "The type of PoI to look for.")
-            String type,
-            @Param(description = "Should you be teleported", defaultValue = "true")
-            boolean teleport
-    ) {
-        Engine e = engine();
-        if (e == null) {
-            sender().sendMessage(C.GOLD + "Not in an Iris World!");
-            return;
-        }
-
-        e.gotoPOI(type, player(), teleport);
-    }
-
-    @Director(description = "Find a structure (a vanilla key like minecraft:village_plains or minecraft:stronghold, or an imported iris structure key)")
-    public void structure(
-            @Param(description = "The structure to look for (e.g. minecraft:village_plains, minecraft:stronghold, minecraft_ancient_city)", customHandler = StructureHandler.class)
-            String structure
-    ) {
-        Engine e = engine();
-
-        if (e == null) {
-            sender().sendMessage(C.GOLD + "Not in an Iris World!");
-            return;
-        }
-
-        if (IrisStructureLocator.isPlaced(e, structure)) {
-            e.gotoStructure(structure, player(), true);
-            return;
-        }
-
-        Player target = player();
-        if (target == null) {
-            sender().sendMessage(C.GOLD + "Run this in-game to teleport to a structure.");
-            return;
-        }
-
-        sender().sendMessage(C.GRAY + "Locating " + structure + "...");
-        J.s(() -> {
-            try {
-                org.bukkit.generator.structure.Structure match = null;
-                for (org.bukkit.generator.structure.Structure s : Registry.STRUCTURE) {
-                    NamespacedKey key = s.getKey();
-                    if (key != null && key.toString().equalsIgnoreCase(structure)) {
-                        match = s;
-                        break;
-                    }
-                }
-                if (match == null) {
-                    sender().sendMessage(C.RED + "Unknown structure: " + structure);
-                    return;
-                }
-                if (!StructureReachability.isReachable(e, structure)) {
-                    KList<String> miss = StructureReachability.missingBiomeKeys(e, structure);
-                    sender().sendMessage(C.YELLOW + structure + " cannot generate in this world (its required biomes are not produced by this pack"
-                            + (miss.isEmpty() ? "" : ": needs " + String.join("/", miss)) + ").");
-                    return;
-                }
-                StructureSearchResult result = target.getWorld().locateNearestStructure(target.getLocation(), match, 100, true);
-                if (result == null || result.getLocation() == null) {
-                    sender().sendMessage(C.YELLOW + "No " + structure + " found within range of you.");
-                    return;
-                }
-                Location at = result.getLocation();
-                int y = target.getWorld().getHighestBlockYAt(at.getBlockX(), at.getBlockZ()) + 2;
-                Location dest = new Location(target.getWorld(), at.getBlockX() + 0.5, y, at.getBlockZ() + 0.5);
-                PaperLib.teleportAsync(target, dest);
-                sender().sendMessage(C.GREEN + "Teleported to " + structure + " @ " + at.getBlockX() + ", " + at.getBlockZ());
-            } catch (Throwable t) {
-                sender().sendMessage(C.RED + "Could not locate " + structure + ": " + t.getClass().getSimpleName());
-            }
-        });
-    }
-
-    @Director(description = "Find an object")
-    public void object(
-            @Param(description = "The object to look for", customHandler = ObjectHandler.class)
-            String object,
-            @Param(description = "Should you be teleported", defaultValue = "true")
-            boolean teleport
-    ) {
-        Engine e = engine();
-
-        if (e == null) {
-            sender().sendMessage(C.GOLD + "Not in an Iris World!");
-            return;
-        }
-
-        Player studioPlayer = player();
-        if (studioPlayer != null) {
-            try {
-                if (ObjectStudioSaveService.get().teleportTo(studioPlayer, object)) {
-                    sender().sendMessage(C.GREEN + "Object Studio: teleporting to " + object);
-                    return;
-                }
-            } catch (Throwable t) {
-                Iris.reportError(t);
-            }
-        }
-
-        if (e.hasObjectPlacement(object)) {
-            e.gotoObject(object, player(), teleport);
-            return;
-        }
-
-        sender().sendMessage(C.RED + object + " is not configured in any region/biome object placements.");
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandIris.java

@@ -1,645 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.IrisWorlds;
-import art.arcane.iris.core.ServerConfigurator;
-import art.arcane.iris.core.lifecycle.WorldLifecycleService;
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.service.StudioSVC;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.common.director.DirectorContext;
-import art.arcane.volmlib.util.director.DirectorParameterHandler;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
-import art.arcane.iris.util.common.director.specialhandlers.NullablePlayerHandler;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.io.IO;
-import art.arcane.volmlib.util.math.Position2;
-import art.arcane.iris.util.common.parallel.SyncExecutor;
-import art.arcane.iris.util.common.misc.ServerProperties;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import io.papermc.lib.PaperLib;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.boss.BarColor;
-import org.bukkit.boss.BarStyle;
-import org.bukkit.boss.BossBar;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-
-import java.io.*;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static art.arcane.iris.core.service.EditSVC.deletingWorld;
-import static art.arcane.iris.util.common.misc.ServerProperties.BUKKIT_YML;
-import static org.bukkit.Bukkit.getServer;
-
-@Director(name = "iris", aliases = {"ir", "irs"}, description = "Basic Command")
-public class CommandIris implements DirectorExecutor {
-    private CommandStudio studio;
-    private CommandPregen pregen;
-    private CommandObject object;
-    private CommandStructure structure;
-    private CommandWhat what;
-    private CommandEdit edit;
-    private CommandDeveloper developer;
-    private CommandPack pack;
-    private CommandFind find;
-    private CommandDatapack datapack;
-    public static boolean worldCreation = false;
-    private static final AtomicReference<Thread> mainWorld = new AtomicReference<>();
-    String WorldEngine;
-    String worldNameToCheck = "YourWorldName";
-    VolmitSender sender = Iris.getSender();
-
-    @Director(description = "Create a new world", aliases = {"c"})
-    public void create(
-            @Param(aliases = "world-name", description = "The name of the world to create")
-            String name,
-            @Param(
-                    aliases = {"dimension", "pack"},
-                    description = "The dimension/pack to create the world with",
-                    defaultValue = "default",
-                    customHandler = PackDimensionTypeHandler.class
-            )
-            String type,
-            @Param(description = "The seed to generate the world with", defaultValue = "1337")
-            long seed,
-            @Param(aliases = "main-world", description = "Whether or not to automatically use this world as the main world", defaultValue = "false")
-            boolean main
-    ) {
-        if (name.equalsIgnoreCase("iris")) {
-            sender().sendMessage(C.RED + "You cannot use the world name \"iris\" for creating worlds as Iris uses this directory for studio worlds.");
-            sender().sendMessage(C.RED + "May we suggest the name \"IrisWorld\" instead?");
-            return;
-        }
-
-        if (name.equalsIgnoreCase("benchmark")) {
-            sender().sendMessage(C.RED + "You cannot use the world name \"benchmark\" for creating worlds as Iris uses this directory for Benchmarking Packs.");
-            sender().sendMessage(C.RED + "May we suggest the name \"IrisWorld\" instead?");
-            return;
-        }
-
-        if (new File(Bukkit.getWorldContainer(), name).exists()) {
-            sender().sendMessage(C.RED + "That folder already exists!");
-            return;
-        }
-
-        String resolvedType = type.equalsIgnoreCase("default")
-                ? IrisSettings.get().getGenerator().getDefaultWorldType()
-                : type;
-
-        IrisDimension dimension = IrisToolbelt.getDimension(resolvedType);
-        if (dimension == null) {
-            sender().sendMessage(C.RED + "Could not find or download dimension \"" + resolvedType + "\".");
-            sender().sendMessage(C.YELLOW + "Try one of: overworld, vanilla, flat, theend");
-            sender().sendMessage(C.YELLOW + "Or download manually: /iris download " + resolvedType);
-            return;
-        }
-
-        if (J.isFolia()) {
-            if (stageFoliaWorldCreation(name, dimension, seed, main)) {
-                sender().sendMessage(C.GREEN + "World staging completed. Restart the server to generate/load \"" + name + "\".");
-            }
-            return;
-        }
-
-        try {
-            worldCreation = true;
-            IrisToolbelt.createWorld()
-                    .dimension(dimension.getLoadKey())
-                    .name(name)
-                    .seed(seed)
-                    .sender(sender())
-                    .studio(false)
-                    .create();
-            if (main) {
-                Runtime.getRuntime().addShutdownHook(mainWorld.updateAndGet(old -> {
-                    if (old != null) Runtime.getRuntime().removeShutdownHook(old);
-                    return new Thread(() -> updateMainWorld(name));
-                }));
-            }
-        } catch (Throwable e) {
-            sender().sendMessage(C.RED + "Exception raised during creation. See the console for more details.");
-            Iris.reportError("Exception raised during world creation for \"" + name + "\".", e);
-            worldCreation = false;
-            return;
-        }
-
-        worldCreation = false;
-        sender().sendMessage(C.GREEN + "Successfully created your world!");
-        if (main) sender().sendMessage(C.GREEN + "Your world will automatically be set as the main world when the server restarts.");
-    }
-
-    private boolean updateMainWorld(String newName) {
-        try {
-            File worlds = Bukkit.getWorldContainer();
-            var data = ServerProperties.DATA;
-            try (var in = new FileInputStream(ServerProperties.SERVER_PROPERTIES)) {
-                data.load(in);
-            }
-
-            File oldWorldFolder = new File(worlds, ServerProperties.LEVEL_NAME);
-            File newWorldFolder = new File(worlds, newName);
-            if (!newWorldFolder.exists() && !newWorldFolder.mkdirs()) {
-                Iris.warn("Could not create target main world folder: " + newWorldFolder.getAbsolutePath());
-            }
-
-            for (String sub : List.of("datapacks", "playerdata", "advancements", "stats")) {
-                File source = new File(oldWorldFolder, sub);
-                if (!source.exists()) {
-                    continue;
-                }
-
-                IO.copyDirectory(source.toPath(), new File(newWorldFolder, sub).toPath());
-            }
-
-            data.setProperty("level-name", newName);
-            try (var out = new FileOutputStream(ServerProperties.SERVER_PROPERTIES)) {
-                data.store(out, null);
-            }
-            return true;
-        } catch (Throwable e) {
-            Iris.error("Failed to update server.properties main world to \"" + newName + "\"");
-            Iris.reportError(e);
-            return false;
-        }
-    }
-
-    private boolean stageFoliaWorldCreation(String name, IrisDimension dimension, long seed, boolean main) {
-        sender().sendMessage(C.YELLOW + "Runtime world creation is disabled on Folia.");
-        sender().sendMessage(C.YELLOW + "Preparing world files and bukkit.yml for next startup...");
-
-        File worldFolder = new File(Bukkit.getWorldContainer(), name);
-        IrisDimension installed = Iris.service(StudioSVC.class).installIntoWorld(sender(), dimension.getLoadKey(), worldFolder);
-        if (installed == null) {
-            sender().sendMessage(C.RED + "Failed to stage world files for dimension \"" + dimension.getLoadKey() + "\".");
-            return false;
-        }
-
-        if (!registerWorldInBukkitYml(name, dimension.getLoadKey(), seed)) {
-            return false;
-        }
-
-        if (main) {
-            if (updateMainWorld(name)) {
-                sender().sendMessage(C.GREEN + "Updated server.properties level-name to \"" + name + "\".");
-            } else {
-                sender().sendMessage(C.RED + "World was staged, but failed to update server.properties main world.");
-                return false;
-            }
-        }
-
-        sender().sendMessage(C.GREEN + "Staged Iris world \"" + name + "\" with generator Iris:" + dimension.getLoadKey() + " and seed " + seed + ".");
-        if (main) {
-            sender().sendMessage(C.GREEN + "This world is now configured as main for next restart.");
-        }
-        return true;
-    }
-
-    private boolean registerWorldInBukkitYml(String worldName, String dimension, Long seed) {
-        YamlConfiguration yml = YamlConfiguration.loadConfiguration(BUKKIT_YML);
-        ConfigurationSection worlds = yml.getConfigurationSection("worlds");
-        if (worlds == null) {
-            worlds = yml.createSection("worlds");
-        }
-        ConfigurationSection worldSection = worlds.getConfigurationSection(worldName);
-        if (worldSection == null) {
-            worldSection = worlds.createSection(worldName);
-        }
-
-        String generator = "Iris:" + dimension;
-        worldSection.set("generator", generator);
-        if (seed != null) {
-            worldSection.set("seed", seed);
-        }
-
-        try {
-            yml.save(BUKKIT_YML);
-            Iris.info("Registered \"" + worldName + "\" in bukkit.yml");
-            return true;
-        } catch (IOException e) {
-            sender().sendMessage(C.RED + "Failed to update bukkit.yml: " + e.getMessage());
-            Iris.error("Failed to update bukkit.yml!");
-            Iris.reportError(e);
-            return false;
-        }
-    }
-
-    @Director(description = "Teleport to another world", aliases = {"tp"}, sync = true)
-    public void teleport(
-            @Param(description = "World to teleport to")
-            World world,
-            @Param(description = "Player to teleport", defaultValue = "---", customHandler = NullablePlayerHandler.class)
-            Player player
-    ) {
-        if (player == null && sender().isPlayer())
-            player = sender().player();
-
-        final Player target = player;
-        if (target == null) {
-            sender().sendMessage(C.RED + "The specified player does not exist.");
-            return;
-        }
-
-        final Location spawn = world.getSpawnLocation();
-        final Runnable teleportTask = () -> {
-            PaperLib.teleportAsync(target, spawn);
-            new VolmitSender(target).sendMessage(C.GREEN + "You have been teleported to " + world.getName() + ".");
-        };
-        if (!J.runEntity(target, teleportTask)) {
-            teleportTask.run();
-        }
-    }
-
-    @Director(description = "Print version information")
-    public void version() {
-        sender().sendMessage(C.GREEN + "Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software");
-    }
-
-    /*
-    /todo
-    @Director(description = "Benchmark a pack", origin = DirectorOrigin.CONSOLE)
-    public void packbenchmark(
-            @Param(description = "Dimension to benchmark")
-            IrisDimension type
-    ) throws InterruptedException {
-
-         BenchDimension = type.getLoadKey();
-
-        IrisPackBenchmarking.runBenchmark();
-    } */
-
-    @Director(description = "Print world height information", origin = DirectorOrigin.PLAYER)
-    public void height() {
-        if (sender().isPlayer()) {
-            sender().sendMessage(C.GREEN + "" + sender().player().getWorld().getMinHeight() + " to " + sender().player().getWorld().getMaxHeight());
-            sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));
-        } else {
-            World mainWorld = getServer().getWorlds().get(0);
-            Iris.info(C.GREEN + "" + mainWorld.getMinHeight() + " to " + mainWorld.getMaxHeight());
-            Iris.info(C.GREEN + "Total Height: " + (mainWorld.getMaxHeight() - mainWorld.getMinHeight()));
-        }
-    }
-
-    @Director(description = "Check access of all worlds.", aliases = {"accesslist"})
-    public void worlds() {
-        KList<World> IrisWorlds = new KList<>();
-        KList<World> BukkitWorlds = new KList<>();
-
-        for (World w : Bukkit.getServer().getWorlds()) {
-            try {
-                Engine engine = IrisToolbelt.access(w).getEngine();
-                if (engine != null) {
-                    IrisWorlds.add(w);
-                }
-            } catch (Exception e) {
-                BukkitWorlds.add(w);
-            }
-        }
-
-        if (sender().isPlayer()) {
-            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.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());
-            }
-            
-        }
-    }
-
-    @Director(description = "Remove an Iris world", aliases = {"rm"}, sync = true)
-    public void remove(
-            @Param(description = "The world to remove")
-            World world,
-            @Param(description = "Whether to also remove the folder (if set to false, just does not load the world)", defaultValue = "true")
-            boolean delete
-    ) {
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "This is not an Iris world. Iris worlds: " + String.join(", ", getServer().getWorlds().stream().filter(IrisToolbelt::isIrisWorld).map(World::getName).toList()));
-            return;
-        }
-        sender().sendMessage(C.GREEN + "Removing world: " + world.getName());
-
-        if (!IrisToolbelt.evacuate(world)) {
-            sender().sendMessage(C.RED + "Failed to evacuate world: " + world.getName());
-            return;
-        }
-
-        if (!WorldLifecycleService.get().unload(world, false)) {
-            sender().sendMessage(C.RED + "Failed to unload world: " + world.getName());
-            return;
-        }
-
-        try {
-            if (IrisToolbelt.removeWorld(world)) {
-                sender().sendMessage(C.GREEN + "Successfully removed " + world.getName() + " from bukkit.yml");
-            } else {
-                sender().sendMessage(C.YELLOW + "Looks like the world was already removed from bukkit.yml");
-            }
-        } catch (IOException e) {
-            sender().sendMessage(C.RED + "Failed to save bukkit.yml because of " + e.getMessage());
-            Iris.reportError("Failed to remove world \"" + world.getName() + "\" from bukkit.yml.", e);
-        }
-        IrisToolbelt.evacuate(world, "Deleting world");
-        deletingWorld = true;
-        if (!delete) {
-            deletingWorld = false;
-            return;
-        }
-        VolmitSender sender = sender();
-        J.a(() -> {
-            int retries = 12;
-
-            if (deleteDirectory(world.getWorldFolder())) {
-                sender.sendMessage(C.GREEN + "Successfully removed world folder");
-            } else {
-                while(true){
-                    if (deleteDirectory(world.getWorldFolder())){
-                        sender.sendMessage(C.GREEN + "Successfully removed world folder");
-                        break;
-                    }
-                    retries--;
-                    if (retries == 0){
-                        sender.sendMessage(C.RED + "Failed to remove world folder");
-                        break;
-                    }
-                    J.sleep(3000);
-                }
-            }
-            deletingWorld = false;
-        });
-    }
-
-    public static boolean deleteDirectory(File dir) {
-        if (dir.isDirectory()) {
-            File[] children = dir.listFiles();
-            for (int i = 0; i < children.length; i++) {
-                boolean success = deleteDirectory(children[i]);
-                if (!success) {
-                    return false;
-                }
-            }
-        }
-        return dir.delete();
-    }
-
-    @Director(description = "Toggle debug")
-    public void debug() {
-        boolean to = !IrisSettings.get().getGeneral().isDebug();
-        IrisSettings.get().getGeneral().setDebug(to);
-        IrisSettings.get().forceSave();
-        sender().sendMessage(C.GREEN + "Set debug to: " + to);
-    }
-
-    @Director(description = "Download a project.", aliases = "dl")
-    public void download(
-            @Param(name = "pack", description = "The pack to download", aliases = "project")
-            String pack,
-            @Param(name = "branch", description = "The branch to download from", defaultValue = "stable")
-            String branch,
-            @Param(name = "overwrite", description = "Whether or not to overwrite the pack with the downloaded one", aliases = "force", defaultValue = "false")
-            boolean overwrite
-    ) {
-        sender().sendMessage(C.GREEN + "Downloading pack: " + pack + "/" + branch + (overwrite ? " overwriting" : ""));
-        if (pack.equals("overworld")) {
-            Iris.service(StudioSVC.class).downloadBranch(sender(), "IrisDimensions/overworld", "master", overwrite);
-        } else {
-            Iris.service(StudioSVC.class).downloadSearch(sender(), "IrisDimensions/" + pack + "/" + branch, overwrite);
-        }
-        ServerConfigurator.installDataPacksIfChanged(true);
-    }
-
-    @Director(description = "Get metrics for your world", aliases = "measure", origin = DirectorOrigin.PLAYER)
-    public void metrics() {
-        if (!IrisToolbelt.isIrisWorld(world())) {
-            sender().sendMessage(C.RED + "You must be in an Iris world");
-            return;
-        }
-        sender().sendMessage(C.GREEN + "Sending metrics...");
-        engine().printMetrics(sender());
-    }
-
-    @Director(description = "Reload configuration file (this is also done automatically)")
-    public void reload() {
-        IrisSettings.invalidate();
-        IrisSettings.get();
-        sender().sendMessage(C.GREEN + "Hotloaded settings");
-    }
-
-
-    @Director(description = "Unload an Iris World", origin = DirectorOrigin.PLAYER, sync = true)
-    public void unloadWorld(
-            @Param(description = "The world to unload")
-            World world
-    ) {
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "This is not an Iris world. Iris worlds: " + String.join(", ", getServer().getWorlds().stream().filter(IrisToolbelt::isIrisWorld).map(World::getName).toList()));
-            return;
-        }
-        sender().sendMessage(C.GREEN + "Unloading world: " + world.getName());
-        try {
-            IrisToolbelt.evacuate(world);
-            boolean unloaded = WorldLifecycleService.get().unload(world, false);
-            if (unloaded) {
-                sender().sendMessage(C.GREEN + "World unloaded successfully.");
-            } else {
-                sender().sendMessage(C.RED + "Failed to unload the world.");
-            }
-        } catch (Exception e) {
-            sender().sendMessage(C.RED + "Failed to unload the world: " + e.getMessage());
-            Iris.reportError("Failed to unload world \"" + world.getName() + "\".", e);
-        }
-    }
-
-    @Director(description = "Load an Iris World", origin = DirectorOrigin.PLAYER, sync = true, aliases = {"import"})
-    public void loadWorld(
-            @Param(description = "The name of the world to load")
-            String world
-    ) {
-        World worldloaded = Bukkit.getWorld(world);
-        worldNameToCheck = world;
-        boolean worldExists = doesWorldExist(worldNameToCheck);
-        WorldEngine = world;
-
-        if (!worldExists) {
-            sender().sendMessage(C.YELLOW + world + " Doesnt exist on the server.");
-            return;
-        }
-
-        String pathtodim = world + File.separator +"iris"+File.separator +"pack"+File.separator +"dimensions"+File.separator;
-        File directory = new File(Bukkit.getWorldContainer(), pathtodim);
-
-        String dimension = null;
-        if (directory.exists() && directory.isDirectory()) {
-            File[] files = directory.listFiles();
-            if (files != null) {
-                for (File file : files) {
-                    if (file.isFile()) {
-                        String fileName = file.getName();
-                        if (fileName.endsWith(".json")) {
-                            dimension = fileName.substring(0, fileName.length() - 5);
-                            sender().sendMessage(C.BLUE + "Generator: " + dimension);
-                        }
-                    }
-                }
-            }
-        } else {
-            sender().sendMessage(C.GOLD + world + " is not an iris world.");
-            return;
-        }
-
-        if (dimension == null) {
-            sender().sendMessage(C.RED + "Could not determine Iris dimension for " + world + ".");
-            return;
-        }
-
-        sender().sendMessage(C.GREEN + "Loading world: " + world);
-
-        if (!registerWorldInBukkitYml(world, dimension, null)) {
-            return;
-        }
-
-        if (J.isFolia()) {
-            sender().sendMessage(C.YELLOW + "Folia cannot load new worlds at runtime. Restart the server to load \"" + world + "\".");
-            return;
-        }
-
-        Iris.instance.checkForBukkitWorlds(world::equals);
-        sender().sendMessage(C.GREEN + world + " loaded successfully.");
-    }
-    @Director(description = "Evacuate an iris world", origin = DirectorOrigin.PLAYER, sync = true)
-    public void evacuate(
-            @Param(description = "Evacuate the world")
-            World world
-    ) {
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "This is not an Iris world. Iris worlds: " + String.join(", ", getServer().getWorlds().stream().filter(IrisToolbelt::isIrisWorld).map(World::getName).toList()));
-            return;
-        }
-        sender().sendMessage(C.GREEN + "Evacuating world" + world.getName());
-        IrisToolbelt.evacuate(world);
-    }
-
-    boolean doesWorldExist(String worldName) {
-        File worldContainer = Bukkit.getWorldContainer();
-        File worldDirectory = new File(worldContainer, worldName);
-        return worldDirectory.exists() && worldDirectory.isDirectory();
-    }
-
-    public static class PackDimensionTypeHandler implements DirectorParameterHandler<String> {
-        @Override
-        public KList<String> getPossibilities() {
-            Set<String> options = new LinkedHashSet<>();
-            options.add("default");
-
-            File packsFolder = Iris.instance.getDataFolder("packs");
-            File[] packs = packsFolder.listFiles();
-            if (packs != null) {
-                for (File pack : packs) {
-                    if (pack == null || !pack.isDirectory()) {
-                        continue;
-                    }
-
-                    options.add(pack.getName());
-
-                    try {
-                        IrisData data = IrisData.get(pack);
-                        for (String key : data.getDimensionLoader().getPossibleKeys()) {
-                            options.add(key);
-                        }
-                    } catch (Throwable ex) {
-                        Iris.warn("Failed to read dimension keys from pack %s: %s%s",
-                                pack.getName(),
-                                ex.getClass().getSimpleName(),
-                                ex.getMessage() == null ? "" : " - " + ex.getMessage());
-                        Iris.reportError(ex);
-                    }
-                }
-            }
-
-            return new KList<>(options);
-        }
-
-        @Override
-        public String toString(String value) {
-            return value == null ? "" : value;
-        }
-
-        @Override
-        public String parse(String in, boolean force) throws DirectorParsingException {
-            if (in == null || in.trim().isEmpty()) {
-                throw new DirectorParsingException("World type cannot be empty");
-            }
-
-            return in.trim();
-        }
-
-        @Override
-        public boolean supports(Class<?> type) {
-            return type == String.class;
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandObject.java

@@ -1,878 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.link.WorldEditLink;
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.loader.ResourceLoader;
-import art.arcane.iris.core.runtime.ObjectStudioActivation;
-import art.arcane.iris.core.runtime.WorldRuntimeControlService;
-import art.arcane.iris.core.service.ObjectSVC;
-import art.arcane.iris.core.service.StudioSVC;
-import art.arcane.iris.core.service.WandSVC;
-import art.arcane.iris.core.tools.IrisConverter;
-import art.arcane.iris.core.tools.PlausibilizeMode;
-import art.arcane.iris.core.tools.TreePlausibilizer;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.*;
-import art.arcane.iris.platform.bukkit.BukkitBlockState;
-import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.volmlib.util.data.Cuboid;
-import art.arcane.iris.util.common.data.IrisCustomData;
-import art.arcane.iris.util.common.data.registry.Materials;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.common.director.specialhandlers.NullableDimensionHandler;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.director.specialhandlers.ObjectHandler;
-import art.arcane.iris.util.common.director.specialhandlers.ObjectTargetHandler;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.common.math.Direction;
-import art.arcane.volmlib.util.math.RNG;
-import io.papermc.lib.PaperLib;
-import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.NumberFormat;
-import java.util.*;
-
-@Director(name = "object", aliases = "o", origin = DirectorOrigin.PLAYER, description = "Iris object manipulation")
-public class CommandObject implements DirectorExecutor {
-    @Director(description = "Open an object studio world (grid of every object; dimension optional, defaults to all packs)", sync = true)
-    public void studio(
-            @Param(defaultValue = "null", description = "Optional dimension whose object pack to lay out; omit to aggregate objects from every pack", aliases = "dim", customHandler = NullableDimensionHandler.class)
-            IrisDimension dimension,
-            @Param(defaultValue = "1337", description = "The seed to generate the studio with", aliases = "s")
-            long seed
-    ) {
-        VolmitSender commandSender = sender();
-        Map<String, IrisData> sources = new LinkedHashMap<>();
-        IrisDimension hostDimension = dimension;
-
-        if (dimension != null) {
-            IrisData data = dimension.getLoader();
-            if (data == null) {
-                data = IrisData.get(dimension.getLoadFile().getParentFile().getParentFile());
-            }
-            sources.put(data.getDataFolder().getName(), data);
-        } else {
-            File workspace = Iris.service(StudioSVC.class).getWorkspaceFolder();
-            File[] packs = workspace == null ? null : workspace.listFiles();
-            if (packs != null) {
-                Arrays.sort(packs, Comparator.comparing(File::getName, String.CASE_INSENSITIVE_ORDER));
-                for (File pack : packs) {
-                    if (!pack.isDirectory()) continue;
-                    File dimensionsDir = new File(pack, "dimensions");
-                    if (!dimensionsDir.isDirectory()) continue;
-                    IrisData data = IrisData.get(pack);
-                    String[] keys = data.getObjectLoader().getPossibleKeys();
-                    if (keys == null || keys.length == 0) continue;
-                    sources.put(pack.getName(), data);
-                    if (hostDimension == null) {
-                        File[] dimFiles = dimensionsDir.listFiles((f) -> f.isFile() && f.getName().endsWith(".json"));
-                        if (dimFiles != null && dimFiles.length > 0) {
-                            String loadKey = dimFiles[0].getName().replaceFirst("\\.json$", "");
-                            IrisDimension loaded = data.getDimensionLoader().load(loadKey);
-                            if (loaded != null) {
-                                hostDimension = loaded;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (hostDimension == null || sources.isEmpty()) {
-            commandSender.sendMessage(C.RED + "No packs with objects were found on this server.");
-            return;
-        }
-
-        int totalObjects = 0;
-        for (IrisData d : sources.values()) {
-            String[] k = d.getObjectLoader().getPossibleKeys();
-            if (k != null) totalObjects += k.length;
-        }
-        if (totalObjects == 0) {
-            commandSender.sendMessage(C.RED + "No objects to place across the selected pack(s).");
-            return;
-        }
-
-        hostDimension.setStudioMode(StudioMode.OBJECT_BUFFET);
-        ObjectStudioActivation.activate(hostDimension.getLoadKey());
-        ObjectStudioActivation.setSources(hostDimension.getLoadKey(), sources);
-
-        String scope = dimension == null
-                ? ("all packs [" + sources.size() + "]")
-                : ("\"" + hostDimension.getName() + "\"");
-        commandSender.sendMessage(C.GREEN + "Opening Object Studio for " + scope + " ("
-                + totalObjects + " objects)");
-
-        IrisDimension finalHost = hostDimension;
-        try {
-            Iris.service(StudioSVC.class).open(commandSender, seed, hostDimension.getLoadKey(), world -> {
-                if (world == null) return;
-                try {
-                    WorldRuntimeControlService.get().applyObjectStudioWorldRules(world);
-                } catch (Throwable e) {
-                    Iris.reportError("Failed to apply object studio world rules for " + world.getName(), e);
-                }
-
-                if (commandSender.isPlayer()) {
-                    Player p = commandSender.player();
-                    if (p != null) {
-                        Location target = new Location(world, 0.5D, 66D, 0.5D);
-                        J.runEntity(p, () -> {
-                            PaperLib.teleportAsync(p, target).thenRun(() -> p.setGameMode(GameMode.CREATIVE));
-                        });
-                    }
-                }
-            });
-        } catch (Throwable e) {
-            Iris.reportError("Failed to open object studio world \"" + finalHost.getLoadKey() + "\".", e);
-            commandSender.sendMessage(C.RED + "Failed to open object studio: " + e.getMessage());
-        }
-    }
-
-    private static final Set<Material> skipBlocks = Set.of(Materials.GRASS, Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH,
-            Material.POPPY, Material.DANDELION);
-
-    public static IObjectPlacer createPlacer(World world, Map<Block, BlockData> futureBlockChanges) {
-
-        return new IObjectPlacer() {
-            @Override
-            public int getHighest(int x, int z, IrisData data) {
-                return world.getHighestBlockYAt(x, z);
-            }
-
-            @Override
-            public int getHighest(int x, int z, IrisData data, boolean ignoreFluid) {
-                return world.getHighestBlockYAt(x, z, ignoreFluid ? HeightMap.OCEAN_FLOOR : HeightMap.MOTION_BLOCKING);
-            }
-
-            @Override
-            public void set(int x, int y, int z, PlatformBlockState s) {
-                BlockData d = (BlockData) s.nativeHandle();
-                Block block = world.getBlockAt(x, y, z);
-
-                //Prevent blocks being set in or bellow bedrock
-                if (y <= world.getMinHeight() || block.getType() == Material.BEDROCK) return;
-
-                futureBlockChanges.put(block, block.getBlockData());
-
-                if (d instanceof IrisCustomData data) {
-                    block.setBlockData(data.getBase(), false);
-                    Iris.warn("Tried to place custom block at " + x + ", " + y + ", " + z + " which is not supported!");
-                } else block.setBlockData(d, false);
-            }
-
-            @Override
-            public PlatformBlockState get(int x, int y, int z) {
-                return BukkitBlockState.of(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 63;
-            }
-
-            @Override
-            public boolean isDebugSmartBore() {
-                return false;
-            }
-
-            @Override
-            public void setTile(int xx, int yy, int zz, TileData tile) {
-                tile.toBukkitTry(world.getBlockAt(xx, yy, zz));
-            }
-
-            @Override
-            public <T> void setData(int xx, int yy, int zz, T data) {
-
-            }
-
-            @Override
-            public <T> T getData(int xx, int yy, int zz, Class<T> t) {
-                return null;
-            }
-
-            @Override
-            public Engine getEngine() {
-                return null;
-            }
-        };
-    }
-
-    @Director(description = "Check the composition of an object")
-    public void analyze(
-            @Param(description = "The object to analyze", customHandler = ObjectHandler.class)
-            String object
-    ) {
-        IrisObject o = IrisData.loadAnyObject(object, data());
-        sender().sendMessage("Object Size: " + o.getW() + " * " + o.getH() + " * " + o.getD() + "");
-        sender().sendMessage("Blocks Used: " + NumberFormat.getIntegerInstance().format(o.getBlocks().size()));
-
-        var queue = o.getBlocks().values();
-        Map<Material, Set<BlockData>> unsorted = new HashMap<>();
-        Map<BlockData, Integer> amounts = new HashMap<>();
-        Map<Material, Integer> materials = new HashMap<>();
-        while (queue.hasNext()) {
-            BlockData block = (BlockData) queue.next().nativeHandle();
-
-            //unsorted.put(block.getMaterial(), block);
-
-            if (!amounts.containsKey(block)) {
-                amounts.put(block, 1);
-
-
-            } else
-                amounts.put(block, amounts.get(block) + 1);
-
-            if (!materials.containsKey(block.getMaterial())) {
-                materials.put(block.getMaterial(), 1);
-                unsorted.put(block.getMaterial(), new HashSet<>());
-                unsorted.get(block.getMaterial()).add(block);
-            } else {
-                materials.put(block.getMaterial(), materials.get(block.getMaterial()) + 1);
-                unsorted.get(block.getMaterial()).add(block);
-            }
-
-        }
-
-        List<Material> sortedMatsList = amounts.keySet().stream().map(BlockData::getMaterial)
-                .sorted().toList();
-        Set<Material> sortedMats = new TreeSet<>(Comparator.comparingInt(materials::get).reversed());
-        sortedMats.addAll(sortedMatsList);
-        sender().sendMessage("== Blocks in object ==");
-
-        int n = 0;
-        for (Material mat : sortedMats) {
-            int amount = materials.get(mat);
-            List<BlockData> set = new ArrayList<>(unsorted.get(mat));
-            set.sort(Comparator.comparingInt(amounts::get).reversed());
-            BlockData data = set.get(0);
-            int dataAmount = amounts.get(data);
-
-            String string = " - " + mat.toString() + "*" + amount;
-            if (data.getAsString(true).contains("[")) {
-                string = string + " --> [" + data.getAsString(true).split("\\[")[1]
-                        .replaceAll("true", ChatColor.GREEN + "true" + ChatColor.GRAY)
-                        .replaceAll("false", ChatColor.RED + "false" + ChatColor.GRAY) + "*" + dataAmount;
-            }
-
-            sender().sendMessage(string);
-
-            n++;
-
-            if (n >= 10) {
-                sender().sendMessage("  + " + (sortedMats.size() - n) + " other block types");
-                return;
-            }
-        }
-    }
-
-    @Director(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, data());
-        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();
-        }
-    }
-
-    @Director(description = "Make tree leaves vanilla-decay-plausible (every leaf within 6 blocks of a log)",
-            origin = DirectorOrigin.BOTH)
-    public void plausibilize(
-            @Param(description = "Object key, prefix (trees/), or filesystem path",
-                    customHandler = ObjectTargetHandler.class)
-            String target,
-            @Param(description = "DEFAULT: tentacle logs, delete orphans. NORMALIZE: + flip persistent=false. FOLIAGE_OVERATURE: add leaves to bridge orphans, no deletions. SMOKE: wipe & repaint canopy shell.",
-                    defaultValue = "DEFAULT")
-            PlausibilizeMode mode,
-            @Param(description = "Analyze only, do not write", defaultValue = "false")
-            boolean dryRun,
-            @Param(description = "Canopy shell radius (SMOKE only), clamped [0,5]", defaultValue = "2")
-            int radius
-    ) {
-        List<Target> targets = resolveTargets(target);
-        if (targets.isEmpty()) {
-            sender().sendMessage(C.RED + "No objects matched: " + target);
-            return;
-        }
-
-        sender().sendMessage(C.IRIS + "Plausibilize [" + mode.name()
-                + (dryRun ? " DRY" : "")
-                + (mode == PlausibilizeMode.SMOKE ? " r=" + radius : "")
-                + "] queued " + targets.size() + " object(s)");
-
-        org.bukkit.command.CommandSender s = sender();
-        J.a(() -> runPlausibilize(targets, dryRun, mode, radius, s));
-    }
-
-    private List<Target> resolveTargets(String target) {
-        List<Target> out = new ArrayList<>();
-        if (target == null || target.isEmpty()) {
-            return out;
-        }
-
-        File direct = new File(target);
-        if (direct.isFile() && target.toLowerCase().endsWith(".iob")) {
-            out.add(new Target(direct.getName().replaceAll("\\.iob$", ""), direct));
-            return out;
-        }
-        if (direct.isDirectory()) {
-            walkIob(direct, direct, out);
-            return out;
-        }
-
-        IrisData irisData = data();
-        if (irisData != null) {
-            ResourceLoader<IrisObject> loader = irisData.getObjectLoader();
-            if (!target.endsWith("/") && loader.findFile(target) != null) {
-                out.add(new Target(target, null));
-                return out;
-            }
-            String prefix = target.endsWith("/") ? target : target + "/";
-            for (String k : loader.getPossibleKeys()) {
-                if (k.startsWith(prefix)) {
-                    out.add(new Target(k, null));
-                }
-            }
-            return out;
-        }
-
-        File packsFolder = Iris.instance.getDataFolder("packs");
-        File[] packs = packsFolder.listFiles(File::isDirectory);
-        if (packs != null) {
-            for (File pack : packs) {
-                File objectsRoot = new File(pack, "objects");
-                if (!objectsRoot.isDirectory()) continue;
-                File candidate = new File(objectsRoot, target + ".iob");
-                if (candidate.isFile()) {
-                    out.add(new Target(pack.getName() + "/" + target, candidate));
-                    continue;
-                }
-                File candidateDir = new File(objectsRoot, target);
-                if (candidateDir.isDirectory()) {
-                    walkIob(candidateDir, objectsRoot, out);
-                }
-            }
-        }
-        return out;
-    }
-
-    private static void walkIob(File root, File keyRoot, List<Target> out) {
-        File[] kids = root.listFiles();
-        if (kids == null) return;
-        for (File f : kids) {
-            if (f.isDirectory()) {
-                walkIob(f, keyRoot, out);
-            } else if (f.getName().toLowerCase().endsWith(".iob")) {
-                String rel = keyRoot.toPath().relativize(f.toPath()).toString()
-                        .replace(File.separatorChar, '/')
-                        .replaceAll("\\.iob$", "");
-                out.add(new Target(rel, f));
-            }
-        }
-    }
-
-    private record Target(String key, File file) {
-    }
-
-    private static void runPlausibilize(
-            List<Target> targets,
-            boolean dryRun,
-            PlausibilizeMode mode,
-            int radius,
-            org.bukkit.command.CommandSender s
-    ) {
-        int processed = 0;
-        int skipped = 0;
-        int failed = 0;
-        int changed = 0;
-        long totalLogsAdded = 0L;
-        long totalLeavesAdded = 0L;
-        long totalLeavesRemoved = 0L;
-        long totalNormalized = 0L;
-        long totalUnreachableAfter = 0L;
-
-        int progressStep = Math.max(1, targets.size() / 20);
-        int index = 0;
-
-        for (Target t : targets) {
-            index++;
-            try {
-                IrisObject o = loadTarget(t);
-                if (o == null) {
-                    s.sendMessage(C.YELLOW + "  skip " + t.key() + ": failed to load");
-                    skipped++;
-                    continue;
-                }
-
-                TreePlausibilizer.Result r = dryRun
-                        ? TreePlausibilizer.analyze(o, mode, radius)
-                        : TreePlausibilizer.apply(o, mode, radius);
-
-                if (r.skipReason() != null) {
-                    s.sendMessage(C.YELLOW + "  skip " + t.key() + ": " + r.skipReason());
-                    skipped++;
-                    continue;
-                }
-
-                boolean touched = r.logsAdded() > 0 || r.leavesAdded() > 0
-                        || r.leavesRemoved() > 0 || r.leavesNormalized() > 0;
-                if (!dryRun && touched) {
-                    File dest = o.getLoadFile() != null ? o.getLoadFile() : t.file();
-                    if (dest != null) {
-                        o.write(dest);
-                        changed++;
-                    }
-                }
-
-                processed++;
-                totalLogsAdded += r.logsAdded();
-                totalLeavesAdded += r.leavesAdded();
-                totalLeavesRemoved += r.leavesRemoved();
-                totalNormalized += r.leavesNormalized();
-                totalUnreachableAfter += r.unreachableAfter();
-
-                if (touched || targets.size() == 1) {
-                    s.sendMessage(C.GRAY + "  " + t.key()
-                            + C.WHITE + " +" + r.logsAdded() + " logs"
-                            + C.WHITE + " +" + r.leavesAdded() + " leaves"
-                            + C.WHITE + " -" + r.leavesRemoved() + " removed"
-                            + (r.leavesNormalized() > 0 ? C.WHITE + " ~" + r.leavesNormalized() + " normalized" : "")
-                            + (r.unreachableAfter() > 0 ? C.YELLOW + " " + r.unreachableAfter() + " unreachable" : ""));
-                }
-
-                if (targets.size() > 1 && index % progressStep == 0) {
-                    s.sendMessage(C.IRIS + "  [" + index + "/" + targets.size() + "]");
-                }
-            } catch (Throwable e) {
-                s.sendMessage(C.RED + "  fail " + t.key() + ": " + e.getClass().getSimpleName()
-                        + ": " + e.getMessage());
-                e.printStackTrace();
-                failed++;
-            }
-        }
-
-        s.sendMessage(C.IRIS + "Done: " + processed + " processed, " + changed + " changed, "
-                + skipped + " skipped, " + failed + " failed");
-        s.sendMessage(C.IRIS + "Totals: +" + totalLogsAdded + " logs, +" + totalLeavesAdded + " leaves, -"
-                + totalLeavesRemoved + " removed, ~" + totalNormalized + " normalized, "
-                + totalUnreachableAfter + " unreachable");
-    }
-
-    private static IrisObject loadTarget(Target t) throws IOException {
-        if (t.file() != null) {
-            IrisObject o = new IrisObject();
-            o.read(t.file());
-            o.setLoadFile(t.file());
-            return o;
-        }
-        return IrisData.loadAnyObject(t.key(), null);
-    }
-
-    @Director(description = "Convert .schem files in the 'convert' folder to .iob files.")
-    public void convert () {
-        try {
-            IrisConverter.convertSchematics(sender());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    @Director(description = "Get a powder that reveals objects", aliases = "d")
-    public void dust() {
-        player().getInventory().addItem(WandSVC.createDust());
-        sender().playSound(Sound.AMBIENT_SOUL_SAND_VALLEY_ADDITIONS, 1f, 1.5f);
-    }
-
-    @Director(description = "Contract a selection based on your looking direction", aliases = "-")
-    public void contract(
-            @Param(description = "The amount to inset by", defaultValue = "1")
-            int amount
-    ) {
-        if (!WandSVC.isHoldingWand(player())) {
-            sender().sendMessage("Hold your wand.");
-            return;
-        }
-
-
-        Location[] b = WandSVC.getCuboid(player());
-        if (b == null || b[0] == null || b[1] == null) {
-            sender().sendMessage("No area selected.");
-            return;
-        }
-        Location a1 = b[0].clone();
-        Location a2 = b[1].clone();
-        Cuboid cursor = new Cuboid(a1, a2);
-        Direction d = Direction.closest(player().getLocation().getDirection()).reverse();
-        assert d != null;
-        cursor = cursor.expand(d.f(), -amount);
-        b[0] = cursor.getLowerNE();
-        b[1] = cursor.getUpperSW();
-        player().getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
-        player().updateInventory();
-        sender().playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
-    }
-
-    @Director(description = "Set point 1 to look", aliases = "p1")
-    public void position1(
-            @Param(description = "Whether to use your current position, or where you look", defaultValue = "true")
-            boolean here
-    ) {
-        if (!WandSVC.isHoldingWand(player())) {
-            sender().sendMessage("Ready your Wand.");
-            return;
-        }
-
-        if (WandSVC.isHoldingWand(player())) {
-            Location[] g = WandSVC.getCuboid(player());
-
-            if (g == null) {
-                return;
-            }
-            if (!here) {
-                // TODO: WARNING HEIGHT
-                g[1] = player().getTargetBlock(null, 256).getLocation().clone();
-            } else {
-                g[1] = player().getLocation().getBlock().getLocation().clone().add(0, -1, 0);
-            }
-            player().getInventory().setItemInMainHand(WandSVC.createWand(g[0], g[1]));
-        }
-    }
-
-    @Director(description = "Set point 2 to look", aliases = "p2")
-    public void position2(
-            @Param(description = "Whether to use your current position, or where you look", defaultValue = "true")
-            boolean here
-    ) {
-        if (!WandSVC.isHoldingWand(player())) {
-            sender().sendMessage("Ready your Wand.");
-            return;
-        }
-
-        if (WandSVC.isHoldingIrisWand(player())) {
-            Location[] g = WandSVC.getCuboid(player());
-
-            if (g == null) {
-                return;
-            }
-
-            if (!here) {
-                // TODO: WARNING HEIGHT
-                g[0] = player().getTargetBlock(null, 256).getLocation().clone();
-            } else {
-                g[0] = player().getLocation().getBlock().getLocation().clone().add(0, -1, 0);
-            }
-            player().getInventory().setItemInMainHand(WandSVC.createWand(g[0], g[1]));
-        }
-    }
-
-    @Director(description = "Paste an object", sync = true)
-    public void paste(
-            @Param(description = "The object to paste", customHandler = ObjectHandler.class)
-            String object,
-            @Param(description = "Whether or not to edit the object (need to hold wand)", defaultValue = "false")
-            boolean edit,
-            @Param(description = "The amount of degrees to rotate by", defaultValue = "0")
-            int rotate,
-            @Param(description = "The factor by which to scale the object placement", defaultValue = "1")
-            double scale
-//            ,
-//            @Param(description = "The scale interpolator to use", defaultValue = "none")
-//            IrisObjectPlacementScaleInterpolator interpolator
-    ) {
-        IrisObject o = IrisData.loadAnyObject(object, data());
-        double maxScale = Double.max(10 - o.getBlocks().size() / 10000d, 1);
-        if (scale > maxScale) {
-            sender().sendMessage(C.YELLOW + "Indicated scale exceeds maximum. Downscaled to maximum: " + maxScale);
-            scale = maxScale;
-        }
-
-        sender().playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
-
-        IrisObjectPlacement placement = new IrisObjectPlacement();
-        placement.setRotation(IrisObjectRotation.of(0, rotate, 0));
-
-        ItemStack wand = player().getInventory().getItemInMainHand();
-        Location block = player().getTargetBlock(skipBlocks, 256).getLocation().clone().add(0, 1, 0);
-
-        Map<Block, BlockData> futureChanges = new HashMap<>();
-
-        if (scale != 1) {
-            o = o.scaled(scale, IrisObjectPlacementScaleInterpolator.TRICUBIC);
-        }
-
-        o.place(block.getBlockX(), block.getBlockY() + (int) o.getCenter().getY(), block.getBlockZ(), createPlacer(block.getWorld(), futureChanges), placement, new RNG(), null);
-
-        Iris.service(ObjectSVC.class).addChanges(futureChanges);
-
-        if (edit) {
-            ItemStack newWand = WandSVC.createWand(block.clone().subtract(o.getCenter()).add(o.getW() - 1,
-                    o.getH() + o.getCenter().clone().getY() - 1, o.getD() - 1), block.clone().subtract(o.getCenter().clone().setY(0)));
-            if (WandSVC.isWand(wand)) {
-                wand = newWand;
-                player().getInventory().setItemInMainHand(wand);
-                sender().sendMessage("Updated wand for " + "objects/" + o.getLoadKey() + ".iob ");
-            } else {
-                int slot = WandSVC.findWand(player().getInventory());
-                if (slot == -1) {
-                    player().getInventory().addItem(newWand);
-                    sender().sendMessage("Given new wand for " + "objects/" + o.getLoadKey() + ".iob ");
-                } else {
-                    player().getInventory().setItem(slot, newWand);
-                    sender().sendMessage("Updated wand for " + "objects/" + o.getLoadKey() + ".iob ");
-                }
-            }
-        } else {
-            sender().sendMessage(C.IRIS + "Placed " + object);
-        }
-    }
-
-    @Director(description = "Save an object")
-    public void save(
-            @Param(description = "The dimension to store the object in", contextual = true)
-            IrisDimension dimension,
-            @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,
-            @Param(description = "Use legacy TileState serialization if possible", defaultValue = "true")
-            boolean legacy
-    ) {
-        IrisObject o = WandSVC.createSchematic(player(), legacy);
-
-        if (o == null) {
-            sender().sendMessage(C.YELLOW + "You need to hold your wand!");
-            return;
-        }
-
-        File file = Iris.service(StudioSVC.class).getWorkspaceFile(dimension.getLoadKey(), "objects", name + ".iob");
-
-        if (file.exists() && !overwrite) {
-            sender().sendMessage(C.RED + "File already exists. Set overwrite=true to overwrite it.");
-            return;
-        }
-        try {
-            o.write(file, sender());
-        } catch (IOException e) {
-            sender().sendMessage(C.RED + "Failed to save object because of an IOException: " + e.getMessage());
-            Iris.reportError(e);
-        }
-
-        sender().playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
-        sender().sendMessage(C.GREEN + "Successfully object to saved: " + dimension.getLoadKey() + "/objects/" + name);
-    }
-
-    @Director(description = "Shift a selection in your looking direction")
-    public void shift(
-            @Param(description = "The amount to shift by", defaultValue = "1")
-            int amount
-    ) {
-        if (!WandSVC.isHoldingWand(player())) {
-            sender().sendMessage("Hold your wand.");
-            return;
-        }
-
-        Location[] b = WandSVC.getCuboid(player());
-        if (b == null || b[0] == null || b[1] == null) {
-            sender().sendMessage("No area selected.");
-            return;
-        }
-        Location a1 = b[0].clone();
-        Location a2 = b[1].clone();
-        Direction d = Direction.closest(player().getLocation().getDirection()).reverse();
-        if (d == null) {
-            return; // HOW DID THIS HAPPEN
-        }
-        a1.add(d.toVector().multiply(amount));
-        a2.add(d.toVector().multiply(amount));
-        Cuboid cursor = new Cuboid(a1, a2);
-        b[0] = cursor.getLowerNE();
-        b[1] = cursor.getUpperSW();
-        player().getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
-        player().updateInventory();
-        sender().playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
-    }
-
-    @Director(description = "Undo a number of pastes", aliases = "u")
-    public void undo(
-            @Param(description = "The amount of pastes to undo", defaultValue = "1")
-            int amount
-    ) {
-        ObjectSVC service = Iris.service(ObjectSVC.class);
-        int actualReverts = Math.min(service.getUndos().size(), amount);
-        service.revertChanges(actualReverts);
-        sender().sendMessage(C.BLUE + "Reverted " + actualReverts + C.BLUE +" pastes!");
-    }
-
-    @Director(description = "Gets an object wand and grabs the current WorldEdit selection.", aliases = "we", origin = DirectorOrigin.PLAYER)
-    public void we() {
-        if (!Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) {
-            sender().sendMessage(C.RED + "You can't get a WorldEdit selection without WorldEdit, you know.");
-            return;
-        }
-
-        Cuboid locs = WorldEditLink.getSelection(sender().player());
-
-        if (locs == null) {
-            sender().sendMessage(C.RED + "You don't have a WorldEdit selection in this world.");
-            return;
-        }
-
-        sender().player().getInventory().addItem(WandSVC.createWand(locs.getLowerNE(), locs.getUpperSW()));
-        sender().sendMessage(C.GREEN + "A fresh wand with your current WorldEdit selection on it!");
-    }
-
-    @Director(description = "Get an object wand", sync = true)
-    public void wand() {
-        player().getInventory().addItem(WandSVC.createWand());
-        sender().playSound(Sound.ITEM_ARMOR_EQUIP_NETHERITE, 1f, 1.5f);
-        sender().sendMessage(C.GREEN + "Poof! Good luck building!");
-    }
-
-    @Director(name = "x&y", description = "Autoselect up, down & out", sync = true)
-    public void xay() {
-        if (!WandSVC.isHoldingWand(player())) {
-            sender().sendMessage(C.YELLOW + "Hold your wand!");
-            return;
-        }
-
-        Location[] b = WandSVC.getCuboid(player());
-        if (b == null || b[0] == null || b[1] == null) {
-            sender().sendMessage("No area selected.");
-            return;
-        }
-        Location a1 = b[0].clone();
-        Location a2 = b[1].clone();
-        Location a1x = b[0].clone();
-        Location a2x = b[1].clone();
-        Cuboid cursor = new Cuboid(a1, a2);
-        Cuboid cursorx = new Cuboid(a1, a2);
-
-        while (!cursor.containsOnly(Material.AIR)) {
-            a1.add(new org.bukkit.util.Vector(0, 1, 0));
-            a2.add(new org.bukkit.util.Vector(0, 1, 0));
-            cursor = new Cuboid(a1, a2);
-        }
-
-        a1.add(new org.bukkit.util.Vector(0, -1, 0));
-        a2.add(new org.bukkit.util.Vector(0, -1, 0));
-
-        while (!cursorx.containsOnly(Material.AIR)) {
-            a1x.add(new org.bukkit.util.Vector(0, -1, 0));
-            a2x.add(new org.bukkit.util.Vector(0, -1, 0));
-            cursorx = new Cuboid(a1x, a2x);
-        }
-
-        a1x.add(new org.bukkit.util.Vector(0, 1, 0));
-        a2x.add(new Vector(0, 1, 0));
-        b[0] = a1;
-        b[1] = a2x;
-        cursor = new Cuboid(b[0], b[1]);
-        cursor = cursor.contract(Cuboid.CuboidDirection.North);
-        cursor = cursor.contract(Cuboid.CuboidDirection.South);
-        cursor = cursor.contract(Cuboid.CuboidDirection.East);
-        cursor = cursor.contract(Cuboid.CuboidDirection.West);
-        b[0] = cursor.getLowerNE();
-        b[1] = cursor.getUpperSW();
-        player().getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
-        player().updateInventory();
-        sender().playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
-        sender().sendMessage(C.GREEN + "Auto-select complete!");
-    }
-
-    @Director(name = "x+y", description = "Autoselect up & out", sync = true)
-    public void xpy() {
-        if (!WandSVC.isHoldingWand(player())) {
-            sender().sendMessage(C.YELLOW + "Hold your wand!");
-            return;
-        }
-
-        Location[] b = WandSVC.getCuboid(player());
-        if (b == null || b[0] == null || b[1] == null) {
-            sender().sendMessage("No area selected.");
-            return;
-        }
-        b[0].add(new Vector(0, 1, 0));
-        b[1].add(new Vector(0, 1, 0));
-        Location a1 = b[0].clone();
-        Location a2 = b[1].clone();
-        Cuboid cursor = new Cuboid(a1, a2);
-
-        while (!cursor.containsOnly(Material.AIR)) {
-            a1.add(new Vector(0, 1, 0));
-            a2.add(new Vector(0, 1, 0));
-            cursor = new Cuboid(a1, a2);
-        }
-
-        a1.add(new Vector(0, -1, 0));
-        a2.add(new Vector(0, -1, 0));
-        b[0] = a1;
-        a2 = b[1];
-        cursor = new Cuboid(a1, a2);
-        cursor = cursor.contract(Cuboid.CuboidDirection.North);
-        cursor = cursor.contract(Cuboid.CuboidDirection.South);
-        cursor = cursor.contract(Cuboid.CuboidDirection.East);
-        cursor = cursor.contract(Cuboid.CuboidDirection.West);
-        b[0] = cursor.getLowerNE();
-        b[1] = cursor.getUpperSW();
-        player().getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
-        player().updateInventory();
-        sender().playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
-        sender().sendMessage(C.GREEN + "Auto-select complete!");
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandPack.java

@@ -1,163 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.pack.PackValidationRegistry;
-import art.arcane.iris.core.pack.PackValidationResult;
-import art.arcane.iris.core.pack.PackValidator;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-
-import java.io.File;
-
-@Director(name = "pack", aliases = {"pk"}, description = "Pack validation and maintenance")
-public class CommandPack implements DirectorExecutor {
-    @Director(description = "Validate a pack (or all packs) and re-publish results", aliases = {"v"})
-    public void validate(
-            @Param(description = "The pack folder name to validate (leave empty for all)", defaultValue = "")
-            String pack
-    ) {
-        VolmitSender s = sender();
-        File packsRoot = Iris.instance.getDataFolder("packs");
-        if (!packsRoot.isDirectory()) {
-            s.sendMessage(C.RED + "packs/ folder not found.");
-            return;
-        }
-
-        if (pack == null || pack.isBlank()) {
-            File[] dirs = packsRoot.listFiles(File::isDirectory);
-            if (dirs == null || dirs.length == 0) {
-                s.sendMessage(C.YELLOW + "No packs to validate.");
-                return;
-            }
-            int broken = 0;
-            for (File dir : dirs) {
-                PackValidationResult result = runValidate(s, dir);
-                if (result != null && !result.isLoadable()) {
-                    broken++;
-                }
-            }
-            s.sendMessage(C.GREEN + "Validation complete. Broken packs: " + broken + "/" + dirs.length);
-            return;
-        }
-
-        File target = new File(packsRoot, pack);
-        if (!target.isDirectory()) {
-            s.sendMessage(C.RED + "Pack '" + pack + "' not found under packs/.");
-            return;
-        }
-        runValidate(s, target);
-    }
-
-    @Director(description = "Restore most recent trashed files for a pack", aliases = {"r"})
-    public void restore(
-            @Param(description = "The pack folder name to restore")
-            String pack
-    ) {
-        VolmitSender s = sender();
-        if (pack == null || pack.isBlank()) {
-            s.sendMessage(C.RED + "You must specify a pack name.");
-            return;
-        }
-        File packFolder = new File(Iris.instance.getDataFolder("packs"), pack);
-        if (!packFolder.isDirectory()) {
-            s.sendMessage(C.RED + "Pack '" + pack + "' not found under packs/.");
-            return;
-        }
-        int restored = PackValidator.restoreTrash(packFolder);
-        if (restored == 0) {
-            s.sendMessage(C.YELLOW + "Nothing to restore for pack '" + pack + "'.");
-            return;
-        }
-        s.sendMessage(C.GREEN + "Restored " + restored + " file(s) from the most recent trash dump for pack '" + pack + "'.");
-        s.sendMessage(C.GRAY + "Re-run /iris pack validate " + pack + " to re-check.");
-    }
-
-    @Director(description = "Show cached validation status for a pack", aliases = {"s"})
-    public void status(
-            @Param(description = "The pack folder name", defaultValue = "")
-            String pack
-    ) {
-        VolmitSender s = sender();
-        if (pack == null || pack.isBlank()) {
-            if (PackValidationRegistry.snapshot().isEmpty()) {
-                s.sendMessage(C.YELLOW + "No validation results recorded. Run /iris pack validate first.");
-                return;
-            }
-            PackValidationRegistry.snapshot().forEach((name, result) -> {
-                String tag = result.isLoadable() ? (C.GREEN + "OK") : (C.RED + "BROKEN");
-                s.sendMessage(tag + C.RESET + " " + name
-                        + C.GRAY + " (blocking=" + result.getBlockingErrors().size()
-                        + ", warnings=" + result.getWarnings().size()
-                        + ", trashed=" + result.getRemovedUnusedFiles().size() + ")");
-            });
-            return;
-        }
-        PackValidationResult result = PackValidationRegistry.get(pack);
-        if (result == null) {
-            s.sendMessage(C.YELLOW + "No validation result for '" + pack + "'. Run /iris pack validate " + pack + ".");
-            return;
-        }
-        reportResult(s, result);
-    }
-
-    private PackValidationResult runValidate(VolmitSender s, File packFolder) {
-        try {
-            PackValidationResult result = PackValidator.validate(packFolder);
-            PackValidationRegistry.publish(result);
-            reportResult(s, result);
-            return result;
-        } catch (Throwable e) {
-            Iris.reportError("Pack validation failed for '" + packFolder.getName() + "'", e);
-            s.sendMessage(C.RED + "Validation of '" + packFolder.getName() + "' failed: " + e.getMessage());
-            return null;
-        }
-    }
-
-    private void reportResult(VolmitSender s, PackValidationResult result) {
-        if (result.isLoadable()) {
-            s.sendMessage(C.GREEN + "Pack '" + result.getPackName() + "' is loadable."
-                    + C.GRAY + " (warnings=" + result.getWarnings().size()
-                    + ", trashed=" + result.getRemovedUnusedFiles().size() + ")");
-        } else {
-            s.sendMessage(C.RED + "Pack '" + result.getPackName() + "' is BROKEN:");
-            for (String reason : result.getBlockingErrors()) {
-                s.sendMessage(C.RED + "  - " + reason);
-            }
-        }
-        int wMax = Math.min(10, result.getWarnings().size());
-        for (int i = 0; i < wMax; i++) {
-            s.sendMessage(C.YELLOW + "  ! " + result.getWarnings().get(i));
-        }
-        if (result.getWarnings().size() > wMax) {
-            s.sendMessage(C.GRAY + "  ... and " + (result.getWarnings().size() - wMax) + " more warning(s).");
-        }
-        int tMax = Math.min(10, result.getRemovedUnusedFiles().size());
-        for (int i = 0; i < tMax; i++) {
-            s.sendMessage(C.GRAY + "  ~ trashed " + result.getRemovedUnusedFiles().get(i));
-        }
-        if (result.getRemovedUnusedFiles().size() > tMax) {
-            s.sendMessage(C.GRAY + "  ... and " + (result.getRemovedUnusedFiles().size() - tMax) + " more trashed file(s).");
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandPregen.java

@@ -1,86 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.gui.PregeneratorJob;
-import art.arcane.iris.core.pregenerator.PregenTask;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.math.Position2;
-import org.bukkit.World;
-import org.bukkit.util.Vector;
-
-@Director(name = "pregen", aliases = "pregenerate", description = "Pregenerate your Iris worlds!")
-public class CommandPregen implements DirectorExecutor {
-    @Director(description = "Pregenerate a world")
-    public void start(
-            @Param(description = "The radius of the pregen in blocks", aliases = "size")
-            int radius,
-            @Param(description = "The world to pregen", contextual = true)
-            World world,
-            @Param(aliases = "middle", description = "The center location of the pregen. Use \"me\" for your current location", defaultValue = "0,0")
-            Vector center,
-            @Param(description = "Open the Iris pregen gui", defaultValue = "true")
-            boolean gui
-            ) {
-        try {
-            if (sender().isPlayer() && access() == null) {
-                sender().sendMessage(C.RED + "The engine access for this world is null!");
-                sender().sendMessage(C.RED + "Please make sure the world is loaded & the engine is initialized. Generate a new chunk, for example.");
-            }
-            radius = Math.max(radius, 1024);
-            IrisToolbelt.pregenerate(PregenTask
-                    .builder()
-                    .center(new Position2(center.getBlockX(), center.getBlockZ()))
-                    .gui(gui)
-                    .radiusX(radius)
-                    .radiusZ(radius)
-                    .build(), world);
-            String msg = C.GREEN + "Pregen started in " + C.GOLD + world.getName() + C.GREEN + " of " + C.GOLD + (radius * 2) + C.GREEN + " by " + C.GOLD + (radius * 2) + C.GREEN + " blocks from " + C.GOLD + center.getX() + "," + center.getZ();
-            sender().sendMessage(msg);
-            Iris.info(msg);
-        } catch (Throwable e) {
-            sender().sendMessage(C.RED + "Epic fail. See console.");
-            Iris.reportError(e);
-            e.printStackTrace();
-        }
-    }
-
-    @Director(description = "Stop the active pregeneration task", aliases = "x")
-    public void stop() {
-        if (PregeneratorJob.shutdownInstance()) {
-            Iris.info( C.BLUE + "Finishing up mca region...");
-        } else {
-            sender().sendMessage(C.YELLOW + "No active pregeneration tasks to stop");
-        }
-    }
-
-    @Director(description = "Pause / continue the active pregeneration task", aliases = {"resume"})
-    public void pause() {
-        if (PregeneratorJob.pauseResume()) {
-            sender().sendMessage(C.GREEN + "Paused/unpaused pregeneration task, now: " + (PregeneratorJob.isPaused() ? "Paused" : "Running") + ".");
-        } else {
-            sender().sendMessage(C.YELLOW + "No active pregeneration tasks to pause/unpause.");
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandStructure.java

@@ -1,280 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.structure.BulkStructureImporter;
-import art.arcane.iris.core.structure.StructureCaptureImporter;
-import art.arcane.iris.core.structure.StructureImporter;
-import art.arcane.iris.core.structure.StructureIndexService;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.IrisStructureLocator;
-import art.arcane.iris.engine.framework.PlacedStructurePiece;
-import art.arcane.iris.engine.framework.StructureAssembler;
-import art.arcane.iris.engine.framework.StructureReachability;
-import art.arcane.iris.engine.object.IObjectPlacer;
-import art.arcane.iris.engine.object.IrisDimension;
-import art.arcane.iris.engine.object.IrisObjectPlacement;
-import art.arcane.iris.engine.object.IrisStructure;
-import art.arcane.iris.engine.object.ObjectPlaceMode;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.volmlib.util.math.RNG;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.util.StructureSearchResult;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-@Director(name = "structure", aliases = {"struct", "str"}, description = "Iris structure tools (index, import, info)")
-public class CommandStructure implements DirectorExecutor {
-    @Director(description = "Regenerate structure-index.json listing all vanilla, datapack & iris structures", aliases = {"ls"}, origin = DirectorOrigin.BOTH)
-    public void list(
-            @Param(description = "The dimension whose pack to index", aliases = "dim")
-            IrisDimension dimension
-    ) {
-        IrisData data = dimension.getLoader();
-        if (data == null) {
-            sender().sendMessage(C.RED + "Could not resolve the pack for dimension " + dimension.getLoadKey());
-            return;
-        }
-        File file = StructureIndexService.write(data);
-        sender().sendMessage(C.GREEN + "Wrote structure index: " + C.WHITE + file.getPath());
-    }
-
-    @Director(name = "import", description = "Import EVERY structure - vanilla AND ingested datapacks - into this pack as editable Iris resources, always overwriting. Rebuilds jigsaw structures (villages, outposts, datapack jigsaws) as editable pool/piece graphs, imports every structure template NBT as an object, and assembles the multi-template structures (shipwrecks, ruined portals, ocean ruins, nether fossils). Run after ingesting a datapack and restarting. Regenerate chunks or use a fresh world for the imported copies to place.", aliases = {"import-all", "reimport", "imp", "all"}, origin = DirectorOrigin.BOTH)
-    public void importAll(
-            @Param(description = "The dimension whose pack to import into", aliases = "dim")
-            IrisDimension dimension
-    ) {
-        IrisData data = dimension.getLoader();
-        if (data == null) {
-            sender().sendMessage(C.RED + "Could not resolve the pack for dimension " + dimension.getLoadKey());
-            return;
-        }
-        sender().sendMessage(C.GREEN + "Importing all vanilla & datapack structures into " + C.WHITE + dimension.getLoadKey() + C.GREEN + " (overwrite)...");
-        BulkStructureImporter.Report jigsaws = BulkStructureImporter.importAllVanilla(data, StructureImporter.Mode.OVERWRITE, true, sender());
-        BulkStructureImporter.Report templates = BulkStructureImporter.importAllTemplates(data, StructureImporter.Mode.OVERWRITE, sender());
-        BulkStructureImporter.Report groups = BulkStructureImporter.importTemplateGroups(data, StructureImporter.Mode.OVERWRITE, sender());
-        StructureCaptureImporter.Report captured = StructureCaptureImporter.importAllStructures(data, StructureImporter.Mode.OVERWRITE, sender());
-        int imported = jigsaws.imported() + templates.imported() + groups.imported() + captured.imported();
-        int failed = jigsaws.failed() + templates.failed() + groups.failed() + captured.failed();
-        sender().sendMessage(C.GREEN + "Import complete: " + C.WHITE + imported + C.GREEN + " structures/objects written, " + C.WHITE + failed + C.GREEN + " failed.");
-        sender().sendMessage(C.GRAY + "Reference them from a biome/region/dimension 'structures' list, or run /iris structure list " + dimension.getLoadKey() + " to refresh the index. Regenerate chunks for changes to take effect.");
-    }
-
-    @Director(name = "capture", description = "Capture code-generated structures that have no NBT template (swamp huts, igloos, etc.) into editable Iris objects by generating each one in a throwaway scratch world and reading back its blocks. Skips structures that already import as a structure, structures wider/taller than the capture cap (strongholds, mansions, monuments stay vanilla), and anything that will not generate in a flat overworld. Each captured structure becomes a single-piece Iris structure you can place from a biome/region/dimension 'structures' list. Runs automatically as the last pass of /iris structure import.", aliases = {"cap"}, origin = DirectorOrigin.BOTH)
-    public void capture(
-            @Param(description = "The dimension whose pack to capture into", aliases = "dim")
-            IrisDimension dimension
-    ) {
-        IrisData data = dimension.getLoader();
-        if (data == null) {
-            sender().sendMessage(C.RED + "Could not resolve the pack for dimension " + dimension.getLoadKey());
-            return;
-        }
-        StructureCaptureImporter.Report report = StructureCaptureImporter.importAllStructures(data, StructureImporter.Mode.OVERWRITE, sender());
-        sender().sendMessage(C.GRAY + "Captured " + report.imported() + " structures. Place them from a 'structures' list and regenerate chunks. Delete a structures/*.json to re-capture it.");
-    }
-
-    @Director(description = "Locate every vanilla/datapack/iris structure to verify which are locatable in this world. Heavy synchronous search per structure - keep the radius modest. 'Not found' can mean rarer than the radius, a different dimension (nether/end structures never appear in the overworld), or a structure that generates but cannot be located; generation itself happens during chunk decoration, independent of locate.", aliases = {"locateall"}, origin = DirectorOrigin.BOTH, sync = true)
-    public void verify(
-            @Param(description = "The dimension to verify", aliases = "dim")
-            IrisDimension dimension,
-            @Param(description = "Search radius in chunks around the origin (larger is much slower)", defaultValue = "48")
-            int radius
-    ) {
-        World world = resolveIrisWorld(dimension);
-        if (world == null) {
-            sender().sendMessage(C.RED + "No loaded Iris world found for " + dimension.getLoadKey() + ". Join or create one first (the search runs against a live world).");
-            return;
-        }
-        boolean senderIsPlayer = sender() != null && sender().isPlayer();
-        Location center = (senderIsPlayer && player().getWorld() == world) ? player().getLocation() : world.getSpawnLocation();
-        int searchRadius = Math.max(1, Math.min(radius, 1000));
-
-        sender().sendMessage(C.GREEN + "Verifying structures in " + C.WHITE + world.getName() + C.GREEN + " from " + center.getBlockX() + "," + center.getBlockZ() + " within " + searchRadius + " chunks...");
-
-        Engine engine = null;
-        PlatformChunkGenerator access = IrisToolbelt.access(world);
-        if (access != null) {
-            engine = access.getEngine();
-        }
-        Set<String> reachable = engine == null ? Collections.emptySet() : StructureReachability.reachableKeys(engine);
-
-        int found = 0;
-        int missing = 0;
-        int unreachable = 0;
-        int irisPlaced = 0;
-        KList<String> notFound = new KList<>();
-        KList<String> cannotGenerate = new KList<>();
-        for (org.bukkit.generator.structure.Structure structure : Registry.STRUCTURE) {
-            NamespacedKey key = structure.getKey();
-            String keyName = key == null ? structure.toString() : key.toString();
-            boolean isIrisPlaced = engine != null && IrisStructureLocator.suppressesVanilla(engine, keyName);
-            boolean isReachable = engine != null && reachable.contains(keyName.toLowerCase());
-            if (engine != null && !isIrisPlaced && !isReachable) {
-                unreachable++;
-                KList<String> miss = StructureReachability.missingBiomeKeys(engine, keyName);
-                cannotGenerate.add(keyName + (miss.isEmpty() ? "" : " (needs " + String.join("/", miss) + ")"));
-                continue;
-            }
-            if (isIrisPlaced) {
-                irisPlaced++;
-            }
-            try {
-                StructureSearchResult result = world.locateNearestStructure(center, structure, searchRadius, true);
-                if (result != null && result.getLocation() != null) {
-                    found++;
-                    Location l = result.getLocation();
-                    sender().sendMessage((isIrisPlaced ? C.AQUA + "[iris] " : C.GREEN + "[ok] ") + C.WHITE + keyName + C.GREEN + " @ " + l.getBlockX() + "," + l.getBlockZ());
-                } else {
-                    missing++;
-                    notFound.add(keyName);
-                }
-            } catch (Throwable e) {
-                missing++;
-                notFound.add(keyName + " (error: " + e.getClass().getSimpleName() + ")");
-            }
-        }
-
-        sender().sendMessage(C.GREEN + "Structure verify: " + C.WHITE + found + C.GREEN + " located (" + irisPlaced + " iris-placed), "
-                + C.WHITE + unreachable + C.GREEN + " cannot generate here, "
-                + C.WHITE + missing + C.GREEN + " reachable-but-not-found within " + searchRadius + " chunks.");
-        if (!cannotGenerate.isEmpty()) {
-            sender().sendMessage(C.RED + "Cannot generate (required biomes absent from this pack): " + C.GRAY + String.join(", ", cannotGenerate));
-        }
-        if (!notFound.isEmpty()) {
-            sender().sendMessage(C.YELLOW + "Reachable but not found (rarer than radius): " + C.GRAY + String.join(", ", notFound));
-        }
-    }
-
-    private World resolveIrisWorld(IrisDimension dimension) {
-        if (sender() != null && sender().isPlayer() && IrisToolbelt.isIrisWorld(player().getWorld())) {
-            return player().getWorld();
-        }
-        World fallback = null;
-        for (World w : Bukkit.getWorlds()) {
-            if (!IrisToolbelt.isIrisWorld(w)) {
-                continue;
-            }
-            if (fallback == null) {
-                fallback = w;
-            }
-            PlatformChunkGenerator gen = IrisToolbelt.access(w);
-            if (gen != null && gen.getEngine() != null && gen.getEngine().getDimension() != null
-                    && dimension.getLoadKey().equals(gen.getEngine().getDimension().getLoadKey())) {
-                return w;
-            }
-        }
-        return fallback;
-    }
-
-    @Director(description = "Resolve an iris structure's jigsaw graph and report piece count & bounds", origin = DirectorOrigin.BOTH)
-    public void info(
-            @Param(description = "The dimension whose pack holds the structure", aliases = "dim")
-            IrisDimension dimension,
-            @Param(description = "The iris structure key to inspect")
-            String structure
-    ) {
-        IrisData data = dimension.getLoader();
-        if (data == null) {
-            sender().sendMessage(C.RED + "Could not resolve the pack for dimension " + dimension.getLoadKey());
-            return;
-        }
-        IrisStructure s = IrisData.loadAnyStructure(structure, data);
-        if (s == null) {
-            sender().sendMessage(C.RED + "No iris structure '" + structure + "' in this pack");
-            return;
-        }
-        StructureAssembler assembler = new StructureAssembler(data, s, 0, 64, 0);
-        KList<PlacedStructurePiece> pieces = assembler.assemble(new RNG(1234));
-        if (pieces == null || pieces.isEmpty()) {
-            sender().sendMessage(C.RED + "Structure '" + structure + "' assembled 0 pieces (check startPool '" + s.getStartPool() + "')");
-            return;
-        }
-        int minX = Integer.MAX_VALUE;
-        int minZ = Integer.MAX_VALUE;
-        int maxX = Integer.MIN_VALUE;
-        int maxZ = Integer.MIN_VALUE;
-        for (PlacedStructurePiece p : pieces) {
-            minX = Math.min(minX, p.getMinX());
-            minZ = Math.min(minZ, p.getMinZ());
-            maxX = Math.max(maxX, p.getMaxX());
-            maxZ = Math.max(maxZ, p.getMaxZ());
-        }
-        sender().sendMessage(C.GREEN + "Structure '" + structure + "': " + C.WHITE + pieces.size() + C.GREEN + " pieces, footprint " + C.WHITE + (maxX - minX + 1) + "x" + (maxZ - minZ + 1) + C.GREEN + " blocks (sample seed 1234)");
-    }
-
-    @Director(description = "Assemble and place an iris structure at your location (studio testing)", aliases = {"p"}, origin = DirectorOrigin.PLAYER, sync = true)
-    public void place(
-            @Param(description = "The dimension whose pack holds the structure", aliases = "dim")
-            IrisDimension dimension,
-            @Param(description = "The iris structure key to place")
-            String structure
-    ) {
-        IrisData data = dimension.getLoader();
-        if (data == null) {
-            sender().sendMessage(C.RED + "Could not resolve the pack for dimension " + dimension.getLoadKey());
-            return;
-        }
-        IrisStructure s = IrisData.loadAnyStructure(structure, data);
-        if (s == null) {
-            sender().sendMessage(C.RED + "No iris structure '" + structure + "' in this pack");
-            return;
-        }
-        Location loc = player().getLocation();
-        StructureAssembler assembler = new StructureAssembler(data, s, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
-        RNG rng = new RNG((long) loc.getBlockX() * 341873128712L + loc.getBlockZ());
-        KList<PlacedStructurePiece> pieces = assembler.assemble(rng);
-        if (pieces == null || pieces.isEmpty()) {
-            sender().sendMessage(C.RED + "Structure '" + structure + "' assembled 0 pieces");
-            return;
-        }
-        Map<Block, BlockData> future = new HashMap<>();
-        IObjectPlacer placer = CommandObject.createPlacer(player().getWorld(), future);
-        for (PlacedStructurePiece p : pieces) {
-            IrisObjectPlacement config = new IrisObjectPlacement();
-            config.setMode(ObjectPlaceMode.STRUCTURE_PIECE);
-            config.setRotation(p.getRotation());
-            config.getPlace().add(p.getObject().getLoadKey());
-            if (!s.getEdit().isEmpty()) {
-                config.setEdit(s.getEdit());
-            }
-            p.getObject().place(p.getX(), p.getY(), p.getZ(), placer, config, rng, null, null, data);
-        }
-        sender().sendMessage(C.GREEN + "Placed '" + structure + "' (" + pieces.size() + " pieces) at your location.");
-    }
-
-}

core/src/main/java/art/arcane/iris/core/commands/CommandStudio.java

@@ -1,873 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.gui.NoiseExplorerGUI;
-import art.arcane.iris.core.gui.VisionGUI;
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.project.IrisProject;
-import art.arcane.iris.core.service.StudioSVC;
-import art.arcane.iris.core.structure.BulkStructureImporter;
-import art.arcane.iris.core.structure.FeatureImporter;
-import art.arcane.iris.core.structure.StructureImporter;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.*;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.volmlib.util.collection.KSet;
-import art.arcane.iris.util.common.director.DirectorContext;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.common.director.handlers.DimensionHandler;
-import art.arcane.iris.util.common.director.specialhandlers.NullableDimensionHandler;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.format.Form;
-import art.arcane.volmlib.util.function.Function2;
-import art.arcane.volmlib.util.function.NoiseProvider;
-import art.arcane.iris.util.project.interpolation.InterpolationMethod;
-import art.arcane.volmlib.util.io.IO;
-import art.arcane.volmlib.util.json.JSONArray;
-import art.arcane.volmlib.util.json.JSONObject;
-import art.arcane.volmlib.util.mantle.runtime.MantleChunk;
-import art.arcane.volmlib.util.math.M;
-import art.arcane.volmlib.util.math.Position2;
-import art.arcane.volmlib.util.math.RNG;
-import art.arcane.volmlib.util.math.Spiraler;
-import art.arcane.iris.util.project.noise.CNG;
-import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.common.parallel.SyncExecutor;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.scheduling.O;
-import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import art.arcane.iris.util.common.scheduling.jobs.ParallelRadiusJob;
-import io.papermc.lib.PaperLib;
-import org.bukkit.*;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.util.BlockVector;
-import org.bukkit.util.Vector;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.attribute.FileTime;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.Objects;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-
-@Director(name = "studio", aliases = {"std", "s"}, description = "Studio Commands")
-public class CommandStudio implements DirectorExecutor {
-    private CommandEdit edit;
-    //private CommandDeepSearch deepSearch;
-
-    public static String hrf(Duration duration) {
-        return duration.toString().substring(2).replaceAll("(\\d[HMS])(?!$)", "$1 ").toLowerCase();
-    }
-
-    @Director(description = "Open a new studio world", aliases = "o", sync = true)
-    public void open(
-            @Param(description = "The dimension pack to open a studio for", aliases = "dim", customHandler = DimensionHandler.class)
-            IrisDimension dimension,
-            @Param(defaultValue = "1337", description = "The seed to generate the studio with", aliases = "s")
-            long seed) {
-        sender().sendMessage(C.GREEN + "Opening studio for the \"" + dimension.getName() + "\" pack (seed: " + seed + ")");
-        Iris.service(StudioSVC.class).open(sender(), seed, dimension.getLoadKey());
-    }
-
-    @Director(description = "Import vanilla trees, mushrooms & objects (and structures/jigsaw) from the server into a pack's objects/vanilla folder", aliases = {"importv", "iv"}, origin = DirectorOrigin.BOTH)
-    public void importvanilla(
-            @Param(description = "The dimension pack to import vanilla content into", aliases = {"pack", "dim"}, customHandler = DimensionHandler.class)
-            IrisDimension dimension,
-            @Param(description = "How many variants to capture per tree/object feature", defaultValue = "3")
-            int variants,
-            @Param(description = "Also import vanilla & datapack structures/jigsaw into the pack", defaultValue = "true")
-            boolean structures
-    ) {
-        if (dimension == null) {
-            sender().sendMessage(C.RED + "Provide a dimension pack: /iris std importvanilla pack=<dimension>");
-            return;
-        }
-        IrisData data = dimension.getLoader();
-        if (data == null) {
-            sender().sendMessage(C.RED + "Could not resolve the pack for dimension " + dimension.getLoadKey());
-            return;
-        }
-
-        VolmitSender sender = sender();
-        sender.sendMessage(C.GREEN + "Importing vanilla content into " + C.WHITE + dimension.getLoadKey() + C.GREEN + "...");
-
-        FeatureImporter.Report features = FeatureImporter.importAllObjectFeatures(data, variants, sender);
-        int imported = features.imported();
-        int failed = features.failed();
-
-        if (structures) {
-            BulkStructureImporter.Report jigsaws = BulkStructureImporter.importAllVanilla(data, StructureImporter.Mode.OVERWRITE, true, sender);
-            BulkStructureImporter.Report templates = BulkStructureImporter.importAllTemplates(data, StructureImporter.Mode.OVERWRITE, sender);
-            BulkStructureImporter.Report groups = BulkStructureImporter.importTemplateGroups(data, StructureImporter.Mode.OVERWRITE, sender);
-            imported += jigsaws.imported() + templates.imported() + groups.imported();
-            failed += jigsaws.failed() + templates.failed() + groups.failed();
-        }
-
-        sender.sendMessage(C.GREEN + "importvanilla complete: " + C.WHITE + imported + C.GREEN + " objects/structures written, " + C.WHITE + failed + C.GREEN + " failed.");
-        sender.sendMessage(C.GRAY + "Trees/objects are under objects/vanilla/...; reference them from biome object placements.");
-    }
-
-    @Director(description = "Open VSCode for a dimension", aliases = {"vsc"})
-    public void vscode(
-            @Param(defaultValue = "default", description = "The dimension to open VSCode for", aliases = "dim", customHandler = DimensionHandler.class)
-            IrisDimension dimension
-    ) {
-        sender().sendMessage(C.GREEN + "Opening VSCode for the \"" + dimension.getName() + "\" pack");
-        Iris.service(StudioSVC.class).openVSCode(sender(), dimension.getLoadKey());
-    }
-
-    @Director(description = "Close an open studio project", aliases = {"x"}, sync = true)
-    public void close() {
-        VolmitSender commandSender = sender();
-        if (!Iris.service(StudioSVC.class).isProjectOpen()) {
-            commandSender.sendMessage(C.RED + "No open studio projects.");
-            return;
-        }
-
-        commandSender.sendMessage(C.YELLOW + "Closing studio...");
-        Iris.service(StudioSVC.class).close().whenComplete((result, throwable) -> J.s(() -> {
-            if (throwable != null) {
-                commandSender.sendMessage(C.RED + "Studio close failed: " + throwable.getMessage());
-                return;
-            }
-
-            if (result != null && result.failureCause() != null) {
-                commandSender.sendMessage(C.RED + "Studio close failed: " + result.failureCause().getMessage());
-                return;
-            }
-
-            if (result != null && result.startupCleanupQueued()) {
-                commandSender.sendMessage(C.YELLOW + "Studio closed. Remaining world-family cleanup was queued for startup fallback.");
-                return;
-            }
-
-            commandSender.sendMessage(C.GREEN + "Studio closed.");
-        }));
-    }
-
-    @Director(description = "Create a new studio project", aliases = "+", sync = true)
-    public void create(
-            @Param(description = "The name of this new Iris Project.", defaultValue = "studio")
-            String name,
-            @Param(
-                    description = "Copy the contents of an existing project in your packs folder and use it as a template in this new project.",
-                    contextual = true,
-                    customHandler = NullableDimensionHandler.class
-            )
-            IrisDimension template) {
-        String projectName = name;
-        if (name.equals("studio")) {
-            File workspace = Iris.service(StudioSVC.class).getWorkspaceFolder();
-            int suffix = 2;
-            while (new File(workspace, projectName).exists()) {
-                projectName = "studio" + suffix++;
-            }
-        }
-
-        if (template != null) {
-            Iris.service(StudioSVC.class).create(sender(), projectName, template.getLoadKey());
-        } else {
-            Iris.service(StudioSVC.class).create(sender(), projectName);
-        }
-    }
-
-    @Director(description = "Get the version of a pack")
-    public void version(
-            @Param(defaultValue = "default", description = "The dimension get the version of", aliases = "dim", contextual = true, customHandler = DimensionHandler.class)
-            IrisDimension dimension
-    ) {
-        sender().sendMessage(C.GREEN + "The \"" + dimension.getName() + "\" pack has version: " + dimension.getVersion());
-    }
-
-    @Director(description = "Open the noise explorer (External GUI)", aliases = {"nmap"})
-    public void noise(
-            @Param(description = "Optional pack generator to preview", defaultValue = "null", contextual = true)
-            IrisGenerator generator,
-            @Param(description = "The seed to preview the generator with", defaultValue = "12345")
-            long seed
-    ) {
-        if (noGUI()) return;
-        sender().sendMessage(C.GREEN + "Opening Noise Explorer!");
-
-        if (generator == null) {
-            NoiseExplorerGUI.launch();
-            return;
-        }
-
-        Supplier<Function2<Double, Double, Double>> supplier = () -> (x, z) -> generator.getHeight(x, z, new RNG(seed).nextParallelRNG(3245).lmax());
-        NoiseExplorerGUI.launch(supplier, "Custom Generator");
-    }
-
-    @Director(description = "Show loot if a chest were right here", origin = DirectorOrigin.PLAYER, sync = true)
-    public void loot(
-            @Param(description = "Fast insertion of items in virtual inventory (may cause performance drop)", defaultValue = "false")
-            boolean fast,
-            @Param(description = "Whether or not to append to the inventory currently open (if false, clears opened inventory)", defaultValue = "true")
-            boolean add
-    ) {
-        if (noStudio()) return;
-
-        KList<IrisLootTable> tables = engine().getLootTables(RNG.r, player().getLocation().getBlock());
-        Inventory inv = Bukkit.createInventory(null, 27 * 2);
-
-        try {
-            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());
-            return;
-        }
-
-
-        O<Integer> ta = new O<>();
-        ta.set(-1);
-
-        var sender = sender();
-        var player = player();
-        var engine = engine();
-
-        ta.set(J.sr(() ->
-        {
-            if (!player.getOpenInventory().getType().equals(InventoryType.CHEST)) {
-                J.csr(ta.get());
-                sender.sendMessage(C.GREEN + "Opened inventory!");
-                return;
-            }
-
-            if (!add) {
-                inv.clear();
-            }
-
-            engine.addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, player.getWorld(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ(), 1);
-        }, fast ? 5 : 35));
-
-        sender().sendMessage(C.GREEN + "Opening inventory now!");
-        player().openInventory(inv);
-    }
-
-    @Director(description = "Calculate the chance for each region to generate", origin = DirectorOrigin.PLAYER)
-    public void regions(@Param(description = "The radius in chunks", defaultValue = "500") int radius) {
-        var engine = engine();
-        if (engine == null) {
-            sender().sendMessage(C.RED + "Only works in an Iris world!");
-            return;
-        }
-        var sender = sender();
-        var player = player();
-        Thread.ofVirtual()
-                .start(() -> {
-                    int d = radius * 2;
-                    KMap<String, AtomicInteger> data = new KMap<>();
-                    engine.getDimension().getRegions().forEach(key -> data.put(key, new AtomicInteger(0)));
-                    var multiBurst = new MultiBurst("Region Sampler");
-                    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 regions"), 0);
-                    new Spiraler(d, d, (x, z) -> executor.queue(() -> {
-                        var region = engine.getRegion((x << 4) + 8, (z << 4) + 8);
-                        data.computeIfAbsent(region.getLoadKey(), (k) -> new AtomicInteger(0))
-                                .incrementAndGet();
-                        completedTasks.incrementAndGet();
-                    })).setOffset(loc.getBlockX(), loc.getBlockZ()).drain();
-                    executor.complete();
-                    multiBurst.close();
-                    J.car(c);
-
-                    sender.sendMessage(C.GREEN + "Done!");
-                    var loader = engine.getData().getRegionLoader();
-                    data.forEach((k, v) -> sender.sendMessage(C.GREEN + k + ": " + loader.load(k).getRarity() + " / " + Form.f((double) v.get() / totalTasks * 100, 2) + "%"));
-                });
-    }
-
-    @Director(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)
-            World world
-    ) {
-        if (noGUI()) return;
-
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage(C.RED + "You need to be in or specify an Iris-generated world!");
-            return;
-        }
-
-        VisionGUI.launch(IrisToolbelt.access(world).getEngine(), 0);
-        sender().sendMessage(C.GREEN + "Opening map!");
-    }
-
-    @Director(description = "Package a dimension into a compressed format", aliases = "package")
-    public void pkg(
-            @Param(name = "dimension", description = "The dimension pack to compress", contextual = true, defaultValue = "default", customHandler = DimensionHandler.class)
-            IrisDimension dimension,
-            @Param(name = "obfuscate", description = "Whether or not to obfuscate the pack", defaultValue = "false")
-            boolean obfuscate,
-            @Param(name = "minify", description = "Whether or not to minify the pack", defaultValue = "true")
-            boolean minify
-    ) {
-        Iris.service(StudioSVC.class).compilePackage(sender(), dimension.getLoadKey(), obfuscate, minify);
-    }
-
-    @Director(description = "Profiles the performance of a dimension", origin = DirectorOrigin.PLAYER)
-    public void profile(
-            @Param(description = "The dimension to profile", contextual = true, defaultValue = "default", customHandler = DimensionHandler.class)
-            IrisDimension dimension
-    ) {
-        // Todo: Make this more accurate
-        File pack = dimension.getLoadFile().getParentFile().getParentFile();
-        File report = Iris.instance.getDataFile("profile.txt");
-        IrisProject project = new IrisProject(pack);
-        IrisData data = IrisData.get(pack);
-        PlatformChunkGenerator activeGenerator = resolveProfileGenerator(dimension);
-        Engine activeEngine = activeGenerator == null ? null : activeGenerator.getEngine();
-
-        if (activeEngine != null) {
-            IrisToolbelt.applyPregenPerformanceProfile(activeEngine);
-        } else {
-            IrisToolbelt.applyPregenPerformanceProfile();
-        }
-
-        KList<String> fileText = new KList<>();
-
-        KMap<NoiseStyle, Double> styleTimings = new KMap<>();
-        KMap<InterpolationMethod, Double> interpolatorTimings = new KMap<>();
-        KMap<String, Double> generatorTimings = new KMap<>();
-        KMap<String, Double> biomeTimings = new KMap<>();
-        KMap<String, Double> regionTimings = new KMap<>();
-
-        sender().sendMessage("Calculating Performance Metrics for Noise generators");
-
-        for (NoiseStyle i : NoiseStyle.values()) {
-            CNG c = i.create(new RNG(i.hashCode()));
-
-            for (int j = 0; j < 3000; j++) {
-                c.noise(j, j + 1000, j * j);
-                c.noise(j, -j);
-            }
-
-            PrecisionStopwatch px = PrecisionStopwatch.start();
-
-            for (int j = 0; j < 100000; j++) {
-                c.noise(j, j + 1000, j * j);
-                c.noise(j, -j);
-            }
-
-            styleTimings.put(i, px.getMilliseconds());
-        }
-
-        fileText.add("Noise Style Performance Impacts: ");
-
-        for (NoiseStyle i : styleTimings.sortKNumber()) {
-            fileText.add(i.name() + ": " + styleTimings.get(i));
-        }
-
-        fileText.add("");
-
-        sender().sendMessage("Calculating Interpolator Timings...");
-
-        for (InterpolationMethod i : InterpolationMethod.values()) {
-            IrisInterpolator in = new IrisInterpolator();
-            in.setFunction(i);
-            in.setHorizontalScale(8);
-
-            NoiseProvider np = (x, z) -> Math.random();
-
-            for (int j = 0; j < 3000; j++) {
-                in.interpolate(j, -j, np);
-            }
-
-            PrecisionStopwatch px = PrecisionStopwatch.start();
-
-            for (int j = 0; j < 100000; j++) {
-                in.interpolate(j + 10000, -j - 100000, np);
-            }
-
-            interpolatorTimings.put(i, px.getMilliseconds());
-        }
-
-        fileText.add("Noise Interpolator Performance Impacts: ");
-
-        for (InterpolationMethod i : interpolatorTimings.sortKNumber()) {
-            fileText.add(i.name() + ": " + interpolatorTimings.get(i));
-        }
-
-        fileText.add("");
-
-        sender().sendMessage("Processing Generator Scores: ");
-
-        KMap<String, KList<String>> btx = new KMap<>();
-
-        for (String i : data.getGeneratorLoader().getPossibleKeys()) {
-            KList<String> vv = new KList<>();
-            IrisGenerator g = data.getGeneratorLoader().load(i);
-            KList<IrisNoiseGenerator> composites = g.getAllComposites();
-            double score = 0;
-            int m = 0;
-            for (IrisNoiseGenerator j : composites) {
-                m++;
-                score += styleTimings.get(j.getStyle().getStyle());
-                vv.add("Composite Noise Style " + m + " " + j.getStyle().getStyle().name() + ": " + styleTimings.get(j.getStyle().getStyle()));
-            }
-
-            score += interpolatorTimings.get(g.getInterpolator().getFunction());
-            vv.add("Interpolator " + g.getInterpolator().getFunction().name() + ": " + interpolatorTimings.get(g.getInterpolator().getFunction()));
-            generatorTimings.put(i, score);
-            btx.put(i, vv);
-        }
-
-        fileText.add("Project Generator Performance Impacts: ");
-
-        for (String i : generatorTimings.sortKNumber()) {
-            fileText.add(i + ": " + generatorTimings.get(i));
-
-            btx.get(i).forEach((ii) -> fileText.add("  " + ii));
-        }
-
-        fileText.add("");
-
-        KMap<String, KList<String>> bt = new KMap<>();
-
-        for (String i : data.getBiomeLoader().getPossibleKeys()) {
-            KList<String> vv = new KList<>();
-            IrisBiome b = data.getBiomeLoader().load(i);
-            double score = 0;
-
-            int m = 0;
-            for (IrisBiomePaletteLayer j : b.getLayers()) {
-                m++;
-                score += styleTimings.get(j.getStyle().getStyle());
-                vv.add("Palette Layer " + m + ": " + styleTimings.get(j.getStyle().getStyle()));
-            }
-
-            score += styleTimings.get(b.getBiomeStyle().getStyle());
-            vv.add("Biome Style: " + styleTimings.get(b.getBiomeStyle().getStyle()));
-            score += styleTimings.get(b.getChildStyle().getStyle());
-            vv.add("Child Style: " + styleTimings.get(b.getChildStyle().getStyle()));
-            biomeTimings.put(i, score);
-            bt.put(i, vv);
-        }
-
-        fileText.add("Project Biome Performance Impacts: ");
-
-        for (String i : biomeTimings.sortKNumber()) {
-            fileText.add(i + ": " + biomeTimings.get(i));
-
-            bt.get(i).forEach((ff) -> fileText.add("  " + ff));
-        }
-
-        fileText.add("");
-
-        for (String i : data.getRegionLoader().getPossibleKeys()) {
-            IrisRegion b = data.getRegionLoader().load(i);
-            double score = 0;
-
-            score += styleTimings.get(b.getLakeStyle().getStyle());
-            score += styleTimings.get(b.getRiverStyle().getStyle());
-            regionTimings.put(i, score);
-        }
-
-        fileText.add("Project Region Performance Impacts: ");
-
-        for (String i : regionTimings.sortKNumber()) {
-            fileText.add(i + ": " + regionTimings.get(i));
-        }
-
-        fileText.add("");
-
-        double m = 0;
-        for (double i : biomeTimings.v()) {
-            m += i;
-        }
-        m /= biomeTimings.size();
-        double mm = 0;
-        for (double i : generatorTimings.v()) {
-            mm += i;
-        }
-        mm /= generatorTimings.size();
-        m += mm;
-        double mmm = 0;
-        for (double i : regionTimings.v()) {
-            mmm += i;
-        }
-        mmm /= regionTimings.size();
-        m += mmm;
-
-        fileText.add("Average Score: " + m);
-        sender().sendMessage("Score: " + Form.duration(m, 0));
-
-        try {
-            IO.writeAll(report, fileText.toString("\n"));
-        } catch (IOException e) {
-            Iris.reportError(e);
-            e.printStackTrace();
-        }
-
-        sender().sendMessage(C.GREEN + "Done! " + report.getPath());
-    }
-
-    private PlatformChunkGenerator resolveProfileGenerator(IrisDimension dimension) {
-        StudioSVC studioService = Iris.service(StudioSVC.class);
-        if (studioService != null && studioService.isProjectOpen()) {
-            IrisProject activeProject = studioService.getActiveProject();
-            if (activeProject != null) {
-                PlatformChunkGenerator activeProvider = activeProject.getActiveProvider();
-                if (isGeneratorDimension(activeProvider, dimension)) {
-                    return activeProvider;
-                }
-            }
-        }
-
-        if (!sender().isPlayer()) {
-            return null;
-        }
-
-        Player player = sender().player();
-        if (player == null) {
-            return null;
-        }
-
-        PlatformChunkGenerator worldAccess = IrisToolbelt.access(player.getWorld());
-        if (isGeneratorDimension(worldAccess, dimension)) {
-            return worldAccess;
-        }
-
-        return null;
-    }
-
-    private boolean isGeneratorDimension(PlatformChunkGenerator generator, IrisDimension dimension) {
-        if (generator == null || generator.getEngine() == null || dimension == null || dimension.getLoadKey() == null) {
-            return false;
-        }
-
-        IrisDimension engineDimension = generator.getEngine().getDimension();
-        if (engineDimension == null || engineDimension.getLoadKey() == null) {
-            return false;
-        }
-
-        return engineDimension.getLoadKey().equalsIgnoreCase(dimension.getLoadKey());
-    }
-
-    @Director(description = "Spawn an Iris entity", aliases = "summon", origin = DirectorOrigin.PLAYER)
-    public void spawn(
-            @Param(description = "The entity to spawn")
-            IrisEntity entity,
-            @Param(description = "The location to spawn the entity at", contextual = true)
-            Vector location
-    ) {
-        if (!IrisToolbelt.isIrisWorld(player().getWorld())) {
-            sender().sendMessage(C.RED + "You have to be in an Iris world to spawn entities properly. Trying to spawn the best we can do.");
-        }
-        entity.spawn(engine(), new Location(world(), location.getX(), location.getY(), location.getZ()));
-    }
-
-    @Director(description = "Teleport to the active studio world", aliases = "stp", origin = DirectorOrigin.PLAYER, sync = true)
-    public void tpstudio() {
-        if (!Iris.service(StudioSVC.class).isProjectOpen()) {
-            sender().sendMessage(C.RED + "No studio world is open!");
-            return;
-        }
-
-        if (IrisToolbelt.isIrisWorld(world()) && engine().isStudio()) {
-            sender().sendMessage(C.RED + "You are already in a studio world!");
-            return;
-        }
-
-        sender().sendMessage(C.GREEN + "Sending you to the studio world!");
-        var player = player();
-        PaperLib.teleportAsync(player(), Iris.service(StudioSVC.class)
-                .getActiveProject()
-                .getActiveProvider()
-                .getTarget()
-                .getWorld()
-                .spawnLocation()
-        ).thenRun(() -> player.setGameMode(GameMode.SPECTATOR));
-    }
-
-    @Director(description = "Update your dimension projects VSCode workspace")
-    public void update(
-            @Param(description = "The dimension to update the workspace of", contextual = true, defaultValue = "default", customHandler = DimensionHandler.class)
-            IrisDimension dimension
-    ) {
-        sender().sendMessage(C.GOLD + "Updating Code Workspace for " + dimension.getName() + "...");
-        if (new IrisProject(dimension.getLoader().getDataFolder()).updateWorkspace()) {
-            sender().sendMessage(C.GREEN + "Updated Code Workspace for " + dimension.getName());
-        } else {
-            sender().sendMessage(C.RED + "Invalid project: " + dimension.getName() + ". Try deleting the code-workspace file and try again.");
-        }
-    }
-
-    @Director(aliases = "find-objects", description = "Capture an IGenData chunk report for nearby chunks")
-    public void objects() {
-        if (!IrisToolbelt.isIrisWorld(player().getWorld())) {
-            sender().sendMessage(C.RED + "You must be in an Iris world");
-            return;
-        }
-
-        World world = player().getWorld();
-
-        if (!IrisToolbelt.isIrisWorld(world)) {
-            sender().sendMessage("You must be in an iris world.");
-            return;
-        }
-        KList<Chunk> chunks = new KList<>();
-        int bx = player().getLocation().getChunk().getX();
-        int bz = player().getLocation().getChunk().getZ();
-
-        try {
-            Location l = player().getTargetBlockExact(48, FluidCollisionMode.NEVER).getLocation();
-
-            int cx = l.getChunk().getX();
-            int cz = l.getChunk().getZ();
-            new Spiraler(3, 3, (x, z) -> chunks.addIfMissing(world.getChunkAt(x + cx, z + cz))).drain();
-        } catch (Throwable e) {
-            Iris.reportError(e);
-        }
-
-        new Spiraler(3, 3, (x, z) -> chunks.addIfMissing(world.getChunkAt(x + bx, z + bz))).drain();
-        sender().sendMessage("Capturing IGenData from " + chunks.size() + " nearby chunks.");
-        try {
-            File ff = Iris.instance.getDataFile("reports/" + M.ms() + ".txt");
-            PrintWriter pw = new PrintWriter(ff);
-            pw.println("=== Iris Chunk Report ===");
-            pw.println("== General Info ==");
-            pw.println("Iris Version: " + Iris.instance.getDescription().getVersion());
-            pw.println("Bukkit Version: " + Bukkit.getBukkitVersion());
-            pw.println("MC Version: " + Bukkit.getVersion());
-            pw.println("PaperSpigot: " + (PaperLib.isPaper() ? "Yup!" : "Nope!"));
-            pw.println("Report Captured At: " + new Date());
-            pw.println("Chunks: (" + chunks.size() + "): ");
-
-            for (Chunk i : chunks) {
-                pw.println("- [" + i.getX() + ", " + i.getZ() + "]");
-            }
-
-            int regions = 0;
-            long size = 0;
-            String age = "No idea...";
-
-            try {
-                for (File i : Objects.requireNonNull(new File(world.getWorldFolder(), "region").listFiles())) {
-                    if (i.isFile()) {
-                        size += i.length();
-                    }
-                }
-            } catch (Throwable e) {
-                Iris.reportError(e);
-            }
-
-            try {
-                FileTime creationTime = (FileTime) Files.getAttribute(world.getWorldFolder().toPath(), "creationTime");
-                age = hrf(Duration.of(M.ms() - creationTime.toMillis(), ChronoUnit.MILLIS));
-            } catch (IOException e) {
-                Iris.reportError(e);
-            }
-
-            KList<String> biomes = new KList<>();
-            KList<String> caveBiomes = new KList<>();
-            KMap<String, KMap<String, KList<String>>> objects = new KMap<>();
-
-            for (Chunk i : chunks) {
-                for (int j = 0; j < 16; j += 3) {
-
-                    for (int k = 0; k < 16; k += 3) {
-
-                        assert engine() != null;
-                        IrisBiome bb = engine().getSurfaceBiome((i.getX() * 16) + j, (i.getZ() * 16) + k);
-                        IrisBiome bxf = engine().getCaveBiome((i.getX() * 16) + j, (i.getZ() * 16) + k);
-                        biomes.addIfMissing(bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")");
-                        caveBiomes.addIfMissing(bxf.getName() + " (" + bxf.getLoadFile().getName() + ")");
-                        exportObjects(bb, pw, engine(), objects);
-                        exportObjects(bxf, pw, engine(), objects);
-                    }
-                }
-            }
-
-            regions = Objects.requireNonNull(new File(world.getWorldFolder().getPath() + "/region").list()).length;
-
-            pw.println();
-            pw.println("== World Info ==");
-            pw.println("World Name: " + world.getName());
-            pw.println("Age: " + age);
-            pw.println("Folder: " + world.getWorldFolder().getPath());
-            pw.println("Regions: " + Form.f(regions));
-            pw.println("Chunks: max. " + Form.f(regions * 32 * 32));
-            pw.println("World Size: min. " + Form.fileSize(size));
-            pw.println();
-            pw.println("== Biome Info ==");
-            pw.println("Found " + biomes.size() + " Biome(s): ");
-
-            for (String i : biomes) {
-                pw.println("- " + i);
-            }
-            pw.println();
-
-            pw.println("== Object Info ==");
-
-            for (String i : objects.k()) {
-                pw.println("- " + i);
-
-                for (String j : objects.get(i).k()) {
-                    pw.println("  @ " + j);
-
-                    for (String k : objects.get(i).get(j)) {
-                        pw.println("    * " + k);
-                    }
-                }
-            }
-
-            pw.println();
-            pw.close();
-
-            sender().sendMessage("Reported to: " + ff.getPath());
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            Iris.reportError(e);
-        }
-    }
-
-    private void exportObjects(IrisBiome bb, PrintWriter pw, Engine g, KMap<String, KMap<String, KList<String>>> objects) {
-        String n1 = bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")";
-        int m = 0;
-        KSet<String> stop = new KSet<>();
-        for (IrisObjectPlacement f : bb.getObjects()) {
-            m++;
-            String n2 = "Placement #" + m + " (" + f.getPlace().size() + " possible objects)";
-
-            for (String i : f.getPlace()) {
-                String nn3 = i + ": [ERROR] Failed to find object!";
-
-                try {
-                    if (stop.contains(i)) {
-                        continue;
-                    }
-
-                    File ff = g.getData().getObjectLoader().findFile(i);
-                    BlockVector sz = IrisObject.sampleSize(ff);
-                    nn3 = i + ": size=[" + sz.getBlockX() + "," + sz.getBlockY() + "," + sz.getBlockZ() + "] location=[" + ff.getPath() + "]";
-                    stop.add(i);
-                } catch (Throwable e) {
-                    Iris.reportError(e);
-                }
-
-                String n3 = nn3;
-                objects.computeIfAbsent(n1, (k1) -> new KMap<>())
-                        .computeIfAbsent(n2, (k) -> new KList<>()).addIfMissing(n3);
-            }
-        }
-    }
-
-    /**
-     * @return true if server GUIs are not enabled
-     */
-    private boolean noGUI() {
-        if (!IrisSettings.get().getGui().isUseServerLaunchedGuis()) {
-            sender().sendMessage(C.RED + "You must have server launched GUIs enabled in the settings!");
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return true if no studio is open or the player is not in one
-     */
-    private boolean noStudio() {
-        if (!sender().isPlayer()) {
-            sender().sendMessage(C.RED + "Players only!");
-            return true;
-        }
-        if (!Iris.service(StudioSVC.class).isProjectOpen()) {
-            sender().sendMessage(C.RED + "No studio world is open!");
-            return true;
-        }
-        if (!engine().isStudio()) {
-            sender().sendMessage(C.RED + "You must be in a studio world!");
-            return true;
-        }
-        return false;
-    }
-
-
-    public void files(File clean, KList<File> files) {
-        if (clean.isDirectory()) {
-            for (File i : clean.listFiles()) {
-                files(i, files);
-            }
-        } else if (clean.getName().endsWith(".json")) {
-            try {
-                files.add(clean);
-            } catch (Throwable e) {
-                Iris.reportError(e);
-                Iris.error("Failed to beautify " + clean.getAbsolutePath() + " You may have errors in your json!");
-            }
-        }
-    }
-
-    private void fixBlocks(JSONObject obj) {
-        for (String i : obj.keySet()) {
-            Object o = obj.get(i);
-
-            if (i.equals("block") && o instanceof String && !o.toString().trim().isEmpty() && !o.toString().contains(":")) {
-                obj.put(i, "minecraft:" + o);
-            }
-
-            if (o instanceof JSONObject) {
-                fixBlocks((JSONObject) o);
-            } else if (o instanceof JSONArray) {
-                fixBlocks((JSONArray) o);
-            }
-        }
-    }
-
-    private void fixBlocks(JSONArray obj) {
-        for (int i = 0; i < obj.length(); i++) {
-            Object o = obj.get(i);
-
-            if (o instanceof JSONObject) {
-                fixBlocks((JSONObject) o);
-            } else if (o instanceof JSONArray) {
-                fixBlocks((JSONArray) o);
-            }
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/commands/CommandWhat.java

@@ -1,207 +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 art.arcane.iris.core.commands;
-
-import art.arcane.iris.platform.bukkit.BukkitPlatform;
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.edit.BlockSignal;
-import art.arcane.iris.core.nms.INMS;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisRegion;
-import art.arcane.iris.util.common.data.B;
-import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.volmlib.util.director.DirectorOrigin;
-import art.arcane.volmlib.util.director.annotations.Director;
-import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.matter.MatterMarker;
-import org.bukkit.Chunk;
-import org.bukkit.FluidCollisionMode;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.block.Biome;
-import org.bukkit.block.data.BlockData;
-
-import java.lang.reflect.Method;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Director(name = "what", origin = DirectorOrigin.PLAYER, description = "Iris What?")
-public class CommandWhat implements DirectorExecutor {
-    @Director(description = "What is in my hand?", origin = DirectorOrigin.PLAYER)
-    public void hand() {
-        try {
-            BlockData bd = player().getInventory().getItemInMainHand().getType().createBlockData();
-            if (!bd.getMaterial().equals(Material.AIR)) {
-                sender().sendMessage("Material: " + C.GREEN + bd.getMaterial().name());
-                sender().sendMessage("Full: " + C.WHITE + bd.getAsString(true));
-            } else {
-                sender().sendMessage("Please hold a block/item");
-            }
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            Material bd = player().getInventory().getItemInMainHand().getType();
-            if (!bd.equals(Material.AIR)) {
-                sender().sendMessage("Material: " + C.GREEN + bd.name());
-            } else {
-                sender().sendMessage("Please hold a block/item");
-            }
-        }
-    }
-
-    @Director(description = "What biome am i in?", origin = DirectorOrigin.PLAYER)
-    public void biome() {
-        try {
-            IrisBiome b = engine().getBiome(player().getLocation().getBlockX(), player().getLocation().getBlockY() - player().getWorld().getMinHeight(), player().getLocation().getBlockZ());
-            Biome derivative = b.getDerivative();
-            NamespacedKey derivativeKey = resolveBiomeKey(derivative);
-            sender().sendMessage("IBiome: " + b.getLoadKey() + " (" + (derivativeKey == null ? "unregistered" : derivativeKey.getKey()) + ")");
-
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            Biome biome = player().getLocation().getBlock().getBiome();
-            NamespacedKey key = resolveBiomeKey(biome);
-            sender().sendMessage("Non-Iris Biome: " + (key == null ? "unregistered" : key));
-
-            if (key == null || key.getKey().equals("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);
-                }
-            }
-        }
-    }
-
-    @Director(description = "What region am i in?", origin = DirectorOrigin.PLAYER)
-    public void region() {
-        try {
-            Chunk chunk = world().getChunkAt(player().getLocation().getBlockZ() / 16, player().getLocation().getBlockZ() /  16);
-            IrisRegion r = engine().getRegion(chunk);
-            sender().sendMessage("IRegion: " + r.getLoadKey() + " (" + r.getName() + ")");
-
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            sender().sendMessage(C.IRIS + "Iris worlds only.");
-        }
-    }
-
-    @Director(description = "What block am i looking at?", origin = DirectorOrigin.PLAYER)
-    public void block() {
-        BlockData bd;
-        try {
-            bd = player().getTargetBlockExact(128, FluidCollisionMode.NEVER).getBlockData();
-        } catch (NullPointerException e) {
-            Iris.reportError(e);
-            sender().sendMessage("Please look at any block, not at the sky");
-            bd = null;
-        }
-
-        if (bd != null) {
-            sender().sendMessage("Material: " + C.GREEN + bd.getMaterial().name());
-            sender().sendMessage("Full: " + C.WHITE + bd.getAsString(true));
-
-            if (B.isStorage(bd)) {
-                sender().sendMessage(C.YELLOW + "* Storage Block (Loot Capable)");
-            }
-
-            if (B.isLit(bd)) {
-                sender().sendMessage(C.YELLOW + "* Lit Block (Light Capable)");
-            }
-
-            if (B.isFoliage(bd)) {
-                sender().sendMessage(C.YELLOW + "* Foliage Block");
-            }
-
-            if (B.isDecorant(bd)) {
-                sender().sendMessage(C.YELLOW + "* Decorant Block");
-            }
-
-            if (B.isFluid(bd)) {
-                sender().sendMessage(C.YELLOW + "* Fluid Block");
-            }
-
-            if (B.isFoliagePlantable(bd)) {
-                sender().sendMessage(C.YELLOW + "* Plantable Foliage Block");
-            }
-
-            if (B.isSolid(bd)) {
-                sender().sendMessage(C.YELLOW + "* Solid Block");
-            }
-        }
-    }
-
-    @Director(description = "Show markers in chunk", origin = DirectorOrigin.PLAYER)
-    public void markers(@Param(description = "Marker name such as cave_floor or cave_ceiling") String marker) {
-        Chunk c = player().getLocation().getChunk();
-
-        if (IrisToolbelt.isIrisWorld(c.getWorld())) {
-            int m = 1;
-            AtomicInteger v = new AtomicInteger(0);
-
-            for (int xxx = c.getX() - 4; xxx <= c.getX() + 4; xxx++) {
-                for (int zzz = c.getZ() - 4; zzz <= c.getZ() + 4; zzz++) {
-                    IrisToolbelt.access(c.getWorld()).getEngine().getMantle().findMarkers(xxx, zzz, new MatterMarker(marker))
-                            .convert((i) -> BukkitPlatform.toLocation(i, c.getWorld())).forEach((i) -> {
-                                BlockSignal.of(i.getWorld(), i.getBlockX(), i.getBlockY(), i.getBlockZ(), 100);
-                                v.incrementAndGet();
-                            });
-                }
-            }
-
-            sender().sendMessage("Found " + v.get() + " Nearby Markers (" + marker + ")");
-        } else {
-            sender().sendMessage(C.IRIS + "Iris worlds only.");
-        }
-    }
-
-    private NamespacedKey resolveBiomeKey(Biome biome) {
-        Object keyOrNullValue = invokeNoThrow(biome, "getKeyOrNull");
-        if (keyOrNullValue instanceof NamespacedKey namespacedKey) {
-            return namespacedKey;
-        }
-
-        Object keyOrThrowValue = invokeNoThrow(biome, "getKeyOrThrow");
-        if (keyOrThrowValue instanceof NamespacedKey namespacedKey) {
-            return namespacedKey;
-        }
-
-        Object keyValue = invokeNoThrow(biome, "getKey");
-        if (keyValue instanceof NamespacedKey namespacedKey) {
-            return namespacedKey;
-        }
-
-        return null;
-    }
-
-    private Object invokeNoThrow(Biome biome, String methodName) {
-        if (biome == null) {
-            return null;
-        }
-
-        try {
-            Method method = biome.getClass().getMethod(methodName);
-            return method.invoke(biome);
-        } catch (Throwable ignored) {
-            return null;
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/edit/BukkitBlockEditor.java

@@ -1,77 +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 art.arcane.iris.core.edit;
-
-import art.arcane.volmlib.util.math.M;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.block.data.BlockData;
-
-@SuppressWarnings("ClassCanBeRecord")
-public class BukkitBlockEditor implements BlockEditor {
-    private final World world;
-
-    public BukkitBlockEditor(World world) {
-        this.world = world;
-    }
-
-    @Override
-    public void set(int x, int y, int z, BlockData d) {
-        world.getBlockAt(x, y, z).setBlockData(d, false);
-    }
-
-    @Override
-    public BlockData get(int x, int y, int z) {
-        return world.getBlockAt(x, y, z).getBlockData();
-    }
-
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public long last() {
-        return M.ms();
-    }
-
-    @Override
-    public void setBiome(int x, int z, Biome b) {
-        int minHeight = world.getMinHeight();
-        int maxHeight = world.getMaxHeight();
-        for (int y = minHeight; y < maxHeight; y++) {
-            world.setBiome(x, y, z, b);
-        }
-    }
-
-    @Override
-    public void setBiome(int x, int y, int z, Biome b) {
-        world.setBiome(x, y, z, b);
-    }
-
-    @Override
-    public Biome getBiome(int x, int y, int z) {
-        return world.getBiome(x, y, z);
-    }
-
-    @Override
-    public Biome getBiome(int x, int z) {
-        return world.getBiome(x, world.getMinHeight(), z);
-    }
-}

core/src/main/java/art/arcane/iris/core/edit/DustRevealer.java

@@ -18,7 +18,8 @@
 
 package art.arcane.iris.core.edit;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.platform.bukkit.BukkitPlatform;
+import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.core.nms.INMS;
 import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.iris.engine.framework.Engine;
@@ -101,7 +102,7 @@ public class DustRevealer {
                     is(new BlockPosition(block.getX() + 1, block.getY() - 1, block.getZ() - 1));
                     is(new BlockPosition(block.getX() + 1, block.getY() - 1, block.getZ() + 1));
                 } catch (Throwable e) {
-                    Iris.reportError(e);
+                    IrisLogging.reportError(e);
                     e.printStackTrace();
                 }
             });
@@ -195,7 +196,7 @@ public class DustRevealer {
             lines.add("Server biome: " + INMS.get().getTrueBiomeBaseKey(block.getLocation())
                     + " (ID: " + INMS.get().getTrueBiomeBaseId(INMS.get().getTrueBiomeBase(block.getLocation())) + ")");
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
         }
 
         if (region != null) {
@@ -255,7 +256,7 @@ public class DustRevealer {
         try {
             return supplier.get();
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             return null;
         }
     }
@@ -269,9 +270,9 @@ public class DustRevealer {
                     .color(NamedTextColor.GREEN)
                     .clickEvent(ClickEvent.copyToClipboard(payload))
                     .hoverEvent(HoverEvent.showText(Component.text("Copy block stats to clipboard")));
-            Iris.audiences.player(sender.player()).sendMessage(button);
+            BukkitPlatform.audiences().player(sender.player()).sendMessage(button);
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
         }
     }
 

core/src/main/java/art/arcane/iris/core/gui/NoiseExplorerGUI.java

@@ -1,554 +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 art.arcane.iris.core.gui;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.events.IrisEngineHotloadEvent;
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisGenerator;
-import art.arcane.iris.engine.object.NoiseStyle;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.volmlib.util.function.Function2;
-import art.arcane.volmlib.util.math.M;
-import art.arcane.volmlib.util.math.RNG;
-import art.arcane.volmlib.util.math.RollingSequence;
-import art.arcane.iris.util.project.noise.CNG;
-import art.arcane.iris.util.common.parallel.BurstExecutor;
-import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
-import java.util.*;
-import java.util.List;
-import java.util.function.Supplier;
-
-public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, Listener {
-
-    private static final long serialVersionUID = 2094606939770332040L;
-    private static final Color BG = new Color(24, 24, 28);
-    private static final Color SIDEBAR_BG = new Color(20, 20, 24);
-    private static final Color SIDEBAR_SELECTED = new Color(40, 50, 70);
-    private static final Color SIDEBAR_ITEM_COLOR = new Color(170, 170, 185);
-    private static final Color SEARCH_BG = new Color(30, 30, 38);
-    private static final Color SEARCH_FG = new Color(180, 180, 190);
-    private static final Color STATUS_BG = new Color(32, 32, 38, 230);
-    private static final Color STATUS_TEXT = new Color(180, 180, 190);
-    private static final Color ACCENT = new Color(90, 140, 255);
-    private static final Color SEPARATOR = new Color(40, 40, 50);
-    private static final Font STATUS_FONT = new Font(Font.MONOSPACED, Font.PLAIN, 12);
-    private static final Font SIDEBAR_HEADER_FONT = new Font(Font.SANS_SERIF, Font.BOLD, 11);
-    private static final Font SIDEBAR_ITEM_FONT = new Font(Font.SANS_SERIF, Font.PLAIN, 12);
-    private static final Font SEARCH_FONT = new Font(Font.SANS_SERIF, Font.PLAIN, 13);
-    private static final int SIDEBAR_WIDTH = 240;
-    private static final int[] HSB_LUT = new int[256];
-
-    private static final String[] CATEGORY_ORDER = {
-            "Pack Generators", "Simplex", "Perlin", "Cellular", "Iris", "Clover",
-            "Hexagon", "Vascular", "Globe", "Cubic", "Fractal", "Static",
-            "Nowhere", "Sierpinski", "Utility", "Other"
-    };
-
-    static {
-        for (int i = 0; i < 256; i++) {
-            float n = i / 255f;
-            HSB_LUT[i] = Color.HSBtoRGB(0.666f - n * 0.666f, 1f, 1f - n * 0.8f);
-        }
-    }
-
-    private final RollingSequence fpsHistory = new RollingSequence(60);
-    private final boolean colorMode = IrisSettings.get().getGui().colorMode;
-    private final MultiBurst gx = MultiBurst.burst;
-    private double scale = 1;
-    private double animScale = 10;
-    private double ox = 0;
-    private double oz = 0;
-    private double animOx = 0;
-    private double animOz = 0;
-    private double lastMouseX = Double.MAX_VALUE;
-    private double lastMouseZ = Double.MAX_VALUE;
-    private double time = 0;
-    private double animTime = 0;
-    private int imgWidth = 0;
-    private int imgHeight = 0;
-    private BufferedImage img;
-    private CNG cng = NoiseStyle.STATIC.create(new RNG(RNG.r.nextLong()));
-    private Function2<Double, Double, Double> generator;
-    private Supplier<Function2<Double, Double, Double>> loader;
-    private String currentName = "STATIC";
-
-    public NoiseExplorerGUI() {
-        Iris.instance.registerListener(this);
-        setBackground(BG);
-        addMouseWheelListener(this);
-        addMouseMotionListener(new MouseMotionListener() {
-            @Override
-            public void mouseMoved(MouseEvent e) {
-                Point cp = e.getPoint();
-                lastMouseX = cp.getX();
-                lastMouseZ = cp.getY();
-            }
-
-            @Override
-            public void mouseDragged(MouseEvent e) {
-                Point cp = e.getPoint();
-                ox += (lastMouseX - cp.getX()) * scale;
-                oz += (lastMouseZ - cp.getY()) * scale;
-                lastMouseX = cp.getX();
-                lastMouseZ = cp.getY();
-            }
-        });
-    }
-
-    public static void launch() {
-        Engine engine = findActiveEngine();
-        EventQueue.invokeLater(() -> {
-            NoiseExplorerGUI nv = new NoiseExplorerGUI();
-            buildFrame("Noise Explorer", nv, engine, null, null);
-        });
-    }
-
-    public static void launch(Supplier<Function2<Double, Double, Double>> gen, String genName) {
-        Engine engine = findActiveEngine();
-        EventQueue.invokeLater(() -> {
-            NoiseExplorerGUI nv = new NoiseExplorerGUI();
-            nv.loader = gen;
-            nv.generator = gen.get();
-            nv.currentName = genName;
-            buildFrame("Noise Explorer: " + genName, nv, engine, gen, genName);
-        });
-    }
-
-    private static Engine findActiveEngine() {
-        try {
-            for (World w : new ArrayList<>(Bukkit.getWorlds())) {
-                try {
-                    PlatformChunkGenerator access = IrisToolbelt.access(w);
-                    if (access != null && access.getEngine() != null && !access.getEngine().isClosed()) {
-                        return access.getEngine();
-                    }
-                } catch (Throwable ignored) {}
-            }
-        } catch (Throwable ignored) {}
-        return null;
-    }
-
-    private static JFrame buildFrame(String title, NoiseExplorerGUI nv, Engine engine,
-                                     Supplier<Function2<Double, Double, Double>> customGen, String customName) {
-        JFrame frame = new JFrame(title);
-        frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-        frame.getContentPane().setBackground(BG);
-        frame.setLayout(new BorderLayout());
-
-        JPanel sidebar = buildSidebar(nv, engine, customGen, customName);
-        frame.add(sidebar, BorderLayout.WEST);
-        frame.add(nv, BorderLayout.CENTER);
-
-        frame.setSize(1440, 820);
-        frame.setMinimumSize(new Dimension(640, 480));
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                Iris.instance.unregisterListener(nv);
-            }
-        });
-        return frame;
-    }
-
-    private static JPanel buildSidebar(NoiseExplorerGUI nv, Engine engine,
-                                       Supplier<Function2<Double, Double, Double>> customGen, String customName) {
-        JPanel sidebar = new JPanel(new BorderLayout());
-        sidebar.setPreferredSize(new Dimension(SIDEBAR_WIDTH, 0));
-        sidebar.setBackground(SIDEBAR_BG);
-        sidebar.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, SEPARATOR));
-
-        JTextField search = new JTextField();
-        search.setBackground(SEARCH_BG);
-        search.setForeground(SEARCH_FG);
-        search.setCaretColor(SEARCH_FG);
-        search.setFont(SEARCH_FONT);
-        search.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createMatteBorder(0, 0, 1, 0, SEPARATOR),
-                BorderFactory.createEmptyBorder(8, 10, 8, 10)
-        ));
-        search.putClientProperty("JTextField.placeholderText", "Search...");
-
-        LinkedHashMap<String, List<ListItem>> categories = buildCategoryMap(nv, engine, customGen, customName);
-        DefaultListModel<ListItem> model = new DefaultListModel<>();
-        populateModel(model, categories, "");
-
-        JList<ListItem> list = new JList<>(model);
-        list.setBackground(SIDEBAR_BG);
-        list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        list.setCellRenderer(new SidebarCellRenderer());
-        list.setFixedCellHeight(-1);
-
-        list.addListSelectionListener(e -> {
-            if (e.getValueIsAdjusting()) return;
-            ListItem selected = list.getSelectedValue();
-            if (selected != null && !selected.header && selected.action != null) {
-                selected.action.run();
-            }
-        });
-
-        search.getDocument().addDocumentListener(new DocumentListener() {
-            private void filter() {
-                String text = search.getText().trim();
-                populateModel(model, categories, text);
-            }
-
-            public void insertUpdate(DocumentEvent e) { filter(); }
-            public void removeUpdate(DocumentEvent e) { filter(); }
-            public void changedUpdate(DocumentEvent e) { filter(); }
-        });
-
-        JScrollPane scrollPane = new JScrollPane(list);
-        scrollPane.setBorder(BorderFactory.createEmptyBorder());
-        scrollPane.getVerticalScrollBar().setUnitIncrement(16);
-        scrollPane.getVerticalScrollBar().setBackground(SIDEBAR_BG);
-
-        sidebar.add(search, BorderLayout.NORTH);
-        sidebar.add(scrollPane, BorderLayout.CENTER);
-        return sidebar;
-    }
-
-    private static void populateModel(DefaultListModel<ListItem> model, LinkedHashMap<String, List<ListItem>> categories, String filter) {
-        model.clear();
-        String lower = filter.toLowerCase();
-        for (Map.Entry<String, List<ListItem>> entry : categories.entrySet()) {
-            List<ListItem> matching = new ArrayList<>();
-            for (ListItem item : entry.getValue()) {
-                if (lower.isEmpty() || item.text.toLowerCase().contains(lower) || item.rawName.toLowerCase().contains(lower)) {
-                    matching.add(item);
-                }
-            }
-            if (!matching.isEmpty()) {
-                model.addElement(new ListItem(entry.getKey(), entry.getKey(), true, null));
-                for (ListItem item : matching) {
-                    model.addElement(item);
-                }
-            }
-        }
-    }
-
-    private static LinkedHashMap<String, List<ListItem>> buildCategoryMap(NoiseExplorerGUI nv, Engine engine,
-                                                                          Supplier<Function2<Double, Double, Double>> customGen, String customName) {
-        LinkedHashMap<String, List<ListItem>> categories = new LinkedHashMap<>();
-
-        if (customGen != null && customName != null) {
-            List<ListItem> custom = new ArrayList<>();
-            custom.add(new ListItem(customName, customName, false, () -> {
-                nv.generator = customGen.get();
-                nv.loader = customGen;
-                nv.currentName = customName;
-            }));
-            categories.put("Custom", custom);
-        }
-
-        Map<String, List<NoiseStyle>> styleGroups = new LinkedHashMap<>();
-        for (NoiseStyle style : NoiseStyle.values()) {
-            String cat = categorize(style);
-            styleGroups.computeIfAbsent(cat, k -> new ArrayList<>()).add(style);
-        }
-
-        if (engine != null && !engine.isClosed()) {
-            List<ListItem> genItems = new ArrayList<>();
-            try {
-                IrisData data = engine.getData();
-                String[] keys = data.getGeneratorLoader().getPossibleKeys();
-                Arrays.sort(keys);
-                for (String key : keys) {
-                    IrisGenerator gen = data.getGeneratorLoader().load(key);
-                    if (gen != null) {
-                        long seed = new RNG(12345).nextParallelRNG(3245).lmax();
-                        genItems.add(new ListItem(formatName(key), key, false, () -> {
-                            nv.generator = (x, z) -> gen.getHeight(x, z, seed);
-                            nv.loader = null;
-                            nv.currentName = key;
-                        }));
-                    }
-                }
-            } catch (Throwable ignored) {}
-            if (!genItems.isEmpty()) {
-                categories.put("Pack Generators", genItems);
-            }
-        }
-
-        for (String cat : CATEGORY_ORDER) {
-            if ("Pack Generators".equals(cat)) continue;
-            List<NoiseStyle> styles = styleGroups.get(cat);
-            if (styles != null && !styles.isEmpty()) {
-                List<ListItem> items = new ArrayList<>();
-                for (NoiseStyle style : styles) {
-                    items.add(new ListItem(formatName(style.name()), style.name(), false, () -> {
-                        nv.cng = style.create(RNG.r.nextParallelRNG(RNG.r.imax()));
-                        nv.generator = null;
-                        nv.loader = null;
-                        nv.currentName = style.name();
-                    }));
-                }
-                categories.put(cat, items);
-            }
-        }
-
-        for (Map.Entry<String, List<NoiseStyle>> entry : styleGroups.entrySet()) {
-            if (!categories.containsKey(entry.getKey())) {
-                List<ListItem> items = new ArrayList<>();
-                for (NoiseStyle style : entry.getValue()) {
-                    items.add(new ListItem(formatName(style.name()), style.name(), false, () -> {
-                        nv.cng = style.create(RNG.r.nextParallelRNG(RNG.r.imax()));
-                        nv.generator = null;
-                        nv.loader = null;
-                        nv.currentName = style.name();
-                    }));
-                }
-                categories.put(entry.getKey(), items);
-            }
-        }
-
-        return categories;
-    }
-
-    private static String categorize(NoiseStyle style) {
-        String n = style.name();
-        if (n.startsWith("STATIC")) return "Static";
-        if (n.startsWith("IRIS")) return "Iris";
-        if (n.startsWith("CLOVER")) return "Clover";
-        if (n.startsWith("VASCULAR")) return "Vascular";
-        if (n.equals("FLAT")) return "Utility";
-        if (n.startsWith("CELLULAR")) return "Cellular";
-        if (n.startsWith("HEX") || n.equals("HEXAGON")) return "Hexagon";
-        if (n.startsWith("SIERPINSKI")) return "Sierpinski";
-        if (n.startsWith("NOWHERE")) return "Nowhere";
-        if (n.startsWith("GLOB")) return "Globe";
-        if (n.startsWith("PERLIN")) return "Perlin";
-        if (n.startsWith("CUBIC") || (n.startsWith("FRACTAL") && n.contains("CUBIC"))) return "Cubic";
-        if (n.contains("SIMPLEX") && !n.startsWith("FRACTAL")) return "Simplex";
-        if (n.startsWith("FRACTAL")) return "Fractal";
-        return "Other";
-    }
-
-    private static String formatName(String enumName) {
-        String lower = enumName.toLowerCase().replace('_', ' ');
-        return Character.toUpperCase(lower.charAt(0)) + lower.substring(1);
-    }
-
-    @EventHandler
-    public void on(IrisEngineHotloadEvent e) {
-        if (generator != null && loader != null) {
-            generator = loader.get();
-        }
-    }
-
-    @Override
-    public void mouseWheelMoved(MouseWheelEvent e) {
-        int notches = e.getWheelRotation();
-        if (e.isControlDown()) {
-            time = time + ((0.0025 * time) * notches);
-            return;
-        }
-        scale = scale + ((0.044 * scale) * notches);
-        scale = Math.max(scale, 0.00001);
-    }
-
-    private double lerp(double current, double target, double speed) {
-        double diff = target - current;
-        if (Math.abs(diff) < 0.001) return target;
-        return current + diff * speed;
-    }
-
-    @Override
-    public void paint(Graphics g) {
-        animScale = lerp(animScale, scale, 0.16);
-        animTime = lerp(animTime, time, 0.29);
-        animOx = lerp(animOx, ox, 0.16);
-        animOz = lerp(animOz, oz, 0.16);
-
-        PrecisionStopwatch p = PrecisionStopwatch.start();
-
-        if (g instanceof Graphics2D gg) {
-            gg.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
-            gg.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-
-            int pw = getWidth();
-            int ph = getHeight();
-
-            if (pw != imgWidth || ph != imgHeight || img == null) {
-                imgWidth = pw;
-                imgHeight = ph;
-                img = null;
-            }
-
-            int accuracy = M.clip((fpsHistory.getAverage() / 14D), 1D, 64D).intValue();
-            int rw = Math.max(1, pw / accuracy);
-            int rh = Math.max(1, ph / accuracy);
-
-            if (img == null || img.getWidth() != rw || img.getHeight() != rh) {
-                img = new BufferedImage(rw, rh, BufferedImage.TYPE_INT_RGB);
-            }
-
-            int[] pixels = ((DataBufferInt) img.getRaster().getDataBuffer()).getData();
-
-            BurstExecutor burst = gx.burst(rw);
-            for (int x = 0; x < rw; x++) {
-                int xx = x;
-                burst.queue(() -> {
-                    for (int z = 0; z < rh; z++) {
-                        double worldX = (xx * accuracy * animScale) + animOx;
-                        double worldZ = (z * accuracy * animScale) + animOz;
-                        double n = generator != null
-                                ? generator.apply(worldX, worldZ)
-                                : cng.noise(worldX, worldZ);
-                        n = Math.max(0, Math.min(1, n));
-
-                        int rgb;
-                        if (colorMode) {
-                            rgb = HSB_LUT[(int) (n * 255)];
-                        } else {
-                            int v = (int) (n * 255);
-                            rgb = (v << 16) | (v << 8) | v;
-                        }
-                        pixels[z * rw + xx] = rgb;
-                    }
-                });
-            }
-            burst.complete();
-
-            gg.setColor(BG);
-            gg.fillRect(0, 0, pw, ph);
-            gg.drawImage(img, 0, 0, pw, ph, null);
-
-            renderStatusBar(gg, pw, ph, p.getMilliseconds());
-            renderCrosshair(gg, pw, ph);
-        }
-
-        p.end();
-        time += 1D;
-        fpsHistory.put(p.getMilliseconds());
-
-        if (!isVisible() || !getParent().isVisible()) {
-            return;
-        }
-
-        long sleepMs = Math.max(1, 16 - (long) p.getMilliseconds());
-        EventQueue.invokeLater(() -> {
-            J.sleep(sleepMs);
-            repaint();
-        });
-    }
-
-    private void renderCrosshair(Graphics2D g, int w, int h) {
-        int cx = w / 2;
-        int cy = h / 2;
-        g.setColor(new Color(255, 255, 255, 40));
-        g.drawLine(cx - 8, cy, cx + 8, cy);
-        g.drawLine(cx, cy - 8, cx, cy + 8);
-    }
-
-    private void renderStatusBar(Graphics2D g, int w, int h, double frameMs) {
-        int barHeight = 28;
-        int y = h - barHeight;
-
-        g.setColor(STATUS_BG);
-        g.fillRect(0, y, w, barHeight);
-        g.setColor(new Color(50, 50, 60));
-        g.drawLine(0, y, w, y);
-
-        g.setFont(STATUS_FONT);
-        g.setColor(STATUS_TEXT);
-
-        double worldX = (w / 2.0 * animScale) + animOx;
-        double worldZ = (h / 2.0 * animScale) + animOz;
-        double noiseVal = generator != null
-                ? generator.apply(worldX, worldZ)
-                : cng.noise(worldX, worldZ);
-        noiseVal = Math.max(0, Math.min(1, noiseVal));
-
-        int fps = frameMs > 0 ? (int) (1000.0 / frameMs) : 0;
-
-        String status = String.format("  %s  |  X: %.1f  Z: %.1f  |  Zoom: %.4f  |  Value: %.4f  |  %d FPS",
-                currentName, worldX, worldZ, animScale, noiseVal, fps);
-        g.drawString(status, 8, y + 18);
-
-        int barW = 60;
-        int barX = w - barW - 12;
-        int barY = y + 6;
-        int barH = barHeight - 12;
-        g.setColor(new Color(40, 40, 48));
-        g.fillRoundRect(barX, barY, barW, barH, 4, 4);
-        int fillW = (int) (noiseVal * (barW - 2));
-        g.setColor(ACCENT);
-        g.fillRoundRect(barX + 1, barY + 1, fillW, barH - 2, 3, 3);
-    }
-
-    private static final class ListItem {
-        final String text;
-        final String rawName;
-        final boolean header;
-        final Runnable action;
-
-        ListItem(String text, String rawName, boolean header, Runnable action) {
-            this.text = text;
-            this.rawName = rawName;
-            this.header = header;
-            this.action = action;
-        }
-
-        @Override
-        public String toString() {
-            return text;
-        }
-    }
-
-    private static final class SidebarCellRenderer extends DefaultListCellRenderer {
-        @Override
-        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean selected, boolean focus) {
-            ListItem item = (ListItem) value;
-            super.getListCellRendererComponent(list, item.text, index, !item.header && selected, false);
-            setOpaque(true);
-            if (item.header) {
-                setFont(SIDEBAR_HEADER_FONT);
-                setForeground(ACCENT);
-                setBackground(SIDEBAR_BG);
-                setBorder(BorderFactory.createEmptyBorder(10, 10, 4, 10));
-            } else {
-                setFont(SIDEBAR_ITEM_FONT);
-                setForeground(selected ? Color.WHITE : SIDEBAR_ITEM_COLOR);
-                setBackground(selected ? SIDEBAR_SELECTED : SIDEBAR_BG);
-                setBorder(BorderFactory.createEmptyBorder(3, 20, 3, 10));
-            }
-            return this;
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/gui/PregeneratorJob.java

@@ -18,7 +18,9 @@
 
 package art.arcane.iris.core.gui;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.IrisSettings;
 import art.arcane.iris.core.pregenerator.IrisPregenerator;
 import art.arcane.iris.core.pregenerator.PregenListener;
@@ -183,8 +185,8 @@ public class PregeneratorJob implements PregenListener {
         try {
             return Color.decode(v);
         } catch (Throwable e) {
-            Iris.reportError(e);
-            Iris.error("Error Parsing 'color', (" + c + ")");
+            IrisLogging.reportError(e);
+            IrisLogging.error("Error Parsing 'color', (" + c + ")");
         }
 
         return Color.RED;
@@ -217,7 +219,7 @@ public class PregeneratorJob implements PregenListener {
                 renderer.func.accept(new Position2(x, z), color);
             }
         } catch (Throwable ignored) {
-            Iris.error("Failed to draw pregen");
+            IrisLogging.error("Failed to draw pregen");
         }
     }
 
@@ -236,7 +238,7 @@ public class PregeneratorJob implements PregenListener {
                 J.sleep(3000);
                 frame.setVisible(false);
             } catch (Throwable ignored) {
-                Iris.error("Error closing pregen gui");
+                IrisLogging.error("Error closing pregen gui");
             }
         });
     }
@@ -259,7 +261,7 @@ public class PregeneratorJob implements PregenListener {
                 frame.setSize(1000, 1000);
                 frame.setVisible(true);
             } catch (Throwable ignored) {
-                Iris.error("Error opening pregen gui");
+                IrisLogging.error("Error opening pregen gui");
             }
         });
     }
@@ -421,7 +423,7 @@ public class PregeneratorJob implements PregenListener {
                 try {
                     order.pop().run();
                 } catch (Throwable e) {
-                    Iris.reportError(e);
+                    IrisLogging.reportError(e);
 
                 }
             }

core/src/main/java/art/arcane/iris/core/gui/VisionGUI.java

@@ -1,915 +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 art.arcane.iris.core.gui;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.engine.framework.render.IrisRenderer;
-import art.arcane.iris.engine.framework.render.RenderType;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisRegion;
-import art.arcane.iris.engine.object.IrisWorld;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.volmlib.util.collection.KSet;
-import art.arcane.volmlib.util.format.Form;
-import art.arcane.volmlib.util.math.BlockPosition;
-import art.arcane.volmlib.util.math.M;
-import art.arcane.volmlib.util.math.RollingSequence;
-import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.scheduling.O;
-import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import org.bukkit.Location;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-
-import javax.swing.*;
-import javax.swing.event.MouseInputListener;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static art.arcane.iris.util.common.data.registry.Attributes.MAX_HEALTH;
-
-public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener, MouseMotionListener, MouseInputListener {
-    private static final long serialVersionUID = 2094606939770332040L;
-
-    private static final Color BG = new Color(18, 18, 22);
-    private static final Color CARD_BG = new Color(28, 28, 36, 220);
-    private static final Color CARD_BORDER = new Color(60, 60, 75, 180);
-    private static final Color TEXT_PRIMARY = new Color(220, 220, 230);
-    private static final Color TEXT_SECONDARY = new Color(140, 140, 155);
-    private static final Color TEXT_DIM = new Color(90, 90, 105);
-    private static final Color ACCENT = new Color(90, 140, 255);
-    private static final Color ACCENT_DIM = new Color(60, 100, 200, 100);
-    private static final Color PLAYER_COLOR = new Color(80, 200, 120);
-    private static final Color MOB_COLOR = new Color(220, 80, 80);
-    private static final Color STATUS_BG = new Color(24, 24, 30, 240);
-    private static final Color GRID_COLOR = new Color(255, 255, 255, 12);
-    private static final Font FONT_STATUS = new Font(Font.MONOSPACED, Font.PLAIN, 12);
-    private static final Font FONT_CARD_TITLE = new Font(Font.SANS_SERIF, Font.BOLD, 13);
-    private static final Font FONT_CARD_BODY = new Font(Font.SANS_SERIF, Font.PLAIN, 12);
-    private static final Font FONT_HELP_KEY = new Font(Font.MONOSPACED, Font.BOLD, 12);
-    private static final Font FONT_NOTIFICATION = new Font(Font.SANS_SERIF, Font.BOLD, 14);
-    private static final int CARD_RADIUS = 8;
-    private static final int CARD_PAD = 12;
-    private static final int STATUS_HEIGHT = 26;
-
-    private final KList<LivingEntity> lastEntities = new KList<>();
-    private final KMap<String, Long> notifications = new KMap<>();
-    private final ChronoLatch centities = new ChronoLatch(1000);
-    private final RollingSequence rs = new RollingSequence(512);
-    private final O<Integer> m = new O<>();
-    private final KMap<BlockPosition, BufferedImage> positions = new KMap<>();
-    private final KMap<BlockPosition, BufferedImage> fastpositions = new KMap<>();
-    private final KSet<BlockPosition> working = new KSet<>();
-    private final KSet<BlockPosition> workingfast = new KSet<>();
-
-    private RenderType currentType = RenderType.BIOME;
-    private boolean help = true;
-    private boolean helpIgnored = false;
-    private boolean shift = false;
-    private Player player = null;
-    private boolean debug = false;
-    private boolean control = false;
-    private boolean eco = false;
-    private boolean lowtile = false;
-    private boolean follow = false;
-    private boolean alt = false;
-    private boolean grid = false;
-    private IrisRenderer renderer;
-    private IrisWorld world;
-    private double velocity = 0;
-    private int lowq = 12;
-    private double scale = 128;
-    private double mscale = 4D;
-    private int w = 0;
-    private int h = 0;
-    private double lx = 0;
-    private double lz = 0;
-    private double ox = 0;
-    private double oz = 0;
-    private double hx = 0;
-    private double hz = 0;
-    private double oxp = 0;
-    private double ozp = 0;
-    private Engine engine;
-    private int tid = 0;
-    private Map<RenderType, JToggleButton> modeButtons;
-
-    private final ExecutorService e = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), r -> {
-        tid++;
-        Thread t = new Thread(r);
-        t.setName("Iris HD Renderer " + tid);
-        t.setPriority(Thread.MIN_PRIORITY);
-        t.setUncaughtExceptionHandler((et, ex) -> {
-            Iris.info("Exception encountered in " + et.getName());
-            ex.printStackTrace();
-        });
-        return t;
-    });
-
-    private final ExecutorService eh = Executors.newFixedThreadPool(3, r -> {
-        tid++;
-        Thread t = new Thread(r);
-        t.setName("Iris Renderer " + tid);
-        t.setPriority(Thread.NORM_PRIORITY);
-        t.setUncaughtExceptionHandler((et, ex) -> {
-            Iris.info("Exception encountered in " + et.getName());
-            ex.printStackTrace();
-        });
-        return t;
-    });
-
-    public VisionGUI(JFrame frame) {
-        m.set(8);
-        rs.put(1);
-        setBackground(BG);
-        addMouseWheelListener(this);
-        addMouseMotionListener(this);
-        addMouseListener(this);
-        frame.addKeyListener(this);
-        J.a(() -> {
-            J.sleep(10000);
-            if (!helpIgnored && help) {
-                help = false;
-            }
-        });
-        frame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent windowEvent) {
-                e.shutdown();
-                eh.shutdown();
-            }
-        });
-    }
-
-    private static void createAndShowGUI(Engine r, int s, IrisWorld world) {
-        JFrame frame = new JFrame("Iris Vision");
-        VisionGUI nv = new VisionGUI(frame);
-        nv.world = world;
-        nv.engine = r;
-        nv.renderer = new IrisRenderer(r);
-        frame.getContentPane().setBackground(BG);
-        frame.setLayout(new BorderLayout());
-        frame.add(buildToolbar(nv), BorderLayout.NORTH);
-        frame.add(nv, BorderLayout.CENTER);
-        frame.setSize(1440, 820);
-        frame.setMinimumSize(new Dimension(640, 480));
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
-    }
-
-    private static JPanel buildToolbar(VisionGUI nv) {
-        JPanel toolbar = new JPanel(new FlowLayout(FlowLayout.LEFT, 3, 3));
-        toolbar.setBackground(new Color(22, 22, 28));
-        toolbar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, new Color(45, 45, 55)));
-
-        JLabel modeLabel = new JLabel("View:");
-        modeLabel.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 11));
-        modeLabel.setForeground(TEXT_SECONDARY);
-        modeLabel.setBorder(BorderFactory.createEmptyBorder(0, 6, 0, 2));
-        toolbar.add(modeLabel);
-
-        ButtonGroup modeGroup = new ButtonGroup();
-        Map<RenderType, JToggleButton> modeButtons = new LinkedHashMap<>();
-        for (RenderType type : RenderType.values()) {
-            JToggleButton btn = createToolbarToggle(modeName(type), type == nv.currentType);
-            btn.addActionListener(e -> {
-                nv.setRenderType(type);
-                for (Map.Entry<RenderType, JToggleButton> entry : modeButtons.entrySet()) {
-                    entry.getValue().setSelected(entry.getKey() == type);
-                }
-            });
-            modeGroup.add(btn);
-            modeButtons.put(type, btn);
-            toolbar.add(btn);
-        }
-        nv.modeButtons = modeButtons;
-
-        toolbar.add(createToolbarSeparator());
-
-        JToggleButton gridBtn = createToolbarToggle("Grid", nv.grid);
-        gridBtn.addActionListener(e -> { nv.toggleGrid(); gridBtn.setSelected(nv.grid); });
-        toolbar.add(gridBtn);
-
-        JToggleButton followBtn = createToolbarToggle("Follow", nv.follow);
-        followBtn.addActionListener(e -> { nv.toggleFollow(); followBtn.setSelected(nv.follow); });
-        toolbar.add(followBtn);
-
-        JToggleButton qualityBtn = createToolbarToggle("LQ", nv.lowtile);
-        qualityBtn.addActionListener(e -> { nv.toggleQuality(); qualityBtn.setSelected(nv.lowtile); });
-        toolbar.add(qualityBtn);
-
-        return toolbar;
-    }
-
-    private static JToggleButton createToolbarToggle(String text, boolean selected) {
-        JToggleButton btn = new JToggleButton(text, selected);
-        btn.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 11));
-        btn.setFocusable(false);
-        btn.setForeground(new Color(170, 170, 185));
-        btn.setBackground(new Color(32, 32, 40));
-        btn.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createLineBorder(new Color(50, 50, 60)),
-                BorderFactory.createEmptyBorder(3, 8, 3, 8)
-        ));
-        btn.setOpaque(true);
-        btn.addChangeListener(e -> {
-            if (btn.isSelected()) {
-                btn.setBackground(new Color(50, 60, 85));
-                btn.setForeground(Color.WHITE);
-            } else {
-                btn.setBackground(new Color(32, 32, 40));
-                btn.setForeground(new Color(170, 170, 185));
-            }
-        });
-        return btn;
-    }
-
-    private static JSeparator createToolbarSeparator() {
-        JSeparator sep = new JSeparator(SwingConstants.VERTICAL);
-        sep.setPreferredSize(new Dimension(1, 24));
-        sep.setForeground(new Color(50, 50, 60));
-        sep.setBackground(new Color(22, 22, 28));
-        return sep;
-    }
-
-    public static void launch(Engine g, int i) {
-        J.a(() -> createAndShowGUI(g, i, g.getWorld()));
-    }
-
-    public boolean updateEngine() {
-        if (engine.isClosed()) {
-            if (world.hasRealWorld()) {
-                try {
-                    engine = IrisToolbelt.access(world.realWorld()).getEngine();
-                    return !engine.isClosed();
-                } catch (Throwable ignored) {
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void mouseMoved(MouseEvent e) {
-        Point cp = e.getPoint();
-        lx = cp.getX();
-        lz = cp.getY();
-    }
-
-    @Override
-    public void mouseDragged(MouseEvent e) {
-        Point cp = e.getPoint();
-        ox += (lx - cp.getX()) * scale;
-        oz += (lz - cp.getY()) * scale;
-        lx = cp.getX();
-        lz = cp.getY();
-    }
-
-    public void notify(String s) {
-        notifications.put(s, M.ms() + 2500);
-    }
-
-    @Override
-    public void keyTyped(KeyEvent e) {
-    }
-
-    @Override
-    public void keyPressed(KeyEvent e) {
-        if (e.getKeyCode() == KeyEvent.VK_SHIFT) shift = true;
-        if (e.getKeyCode() == KeyEvent.VK_CONTROL) control = true;
-        if (e.getKeyCode() == KeyEvent.VK_SEMICOLON) debug = true;
-        if (e.getKeyCode() == KeyEvent.VK_SLASH) { help = true; helpIgnored = true; }
-        if (e.getKeyCode() == KeyEvent.VK_ALT) alt = true;
-    }
-
-    @Override
-    public void keyReleased(KeyEvent e) {
-        if (e.getKeyCode() == KeyEvent.VK_SEMICOLON) debug = false;
-        if (e.getKeyCode() == KeyEvent.VK_SHIFT) shift = false;
-        if (e.getKeyCode() == KeyEvent.VK_CONTROL) control = false;
-        if (e.getKeyCode() == KeyEvent.VK_SLASH) { help = false; helpIgnored = true; }
-        if (e.getKeyCode() == KeyEvent.VK_ALT) alt = false;
-
-        if (e.getKeyCode() == KeyEvent.VK_F) { toggleFollow(); return; }
-        if (e.getKeyCode() == KeyEvent.VK_R) { dump(); notify("Refreshing"); return; }
-        if (e.getKeyCode() == KeyEvent.VK_P) { toggleQuality(); return; }
-        if (e.getKeyCode() == KeyEvent.VK_E) { eco = !eco; dump(); notify((eco ? "30" : "60") + " FPS"); return; }
-        if (e.getKeyCode() == KeyEvent.VK_G) { toggleGrid(); return; }
-
-        if (e.getKeyCode() == KeyEvent.VK_EQUALS) {
-            mscale = mscale + ((0.044 * mscale) * -3);
-            mscale = Math.max(mscale, 0.00001);
-            dump();
-            return;
-        }
-        if (e.getKeyCode() == KeyEvent.VK_MINUS) {
-            mscale = mscale + ((0.044 * mscale) * 3);
-            mscale = Math.max(mscale, 0.00001);
-            dump();
-            return;
-        }
-        if (e.getKeyCode() == KeyEvent.VK_BACK_SLASH) {
-            mscale = 1D;
-            dump();
-            notify("Zoom Reset");
-            return;
-        }
-
-        int currentMode = currentType.ordinal();
-        for (RenderType i : RenderType.values()) {
-            if (e.getKeyChar() == String.valueOf(i.ordinal() + 1).charAt(0)) {
-                if (i.ordinal() != currentMode) {
-                    setRenderType(i);
-                    syncModeButtons();
-                    return;
-                }
-            }
-        }
-
-        if (e.getKeyCode() == KeyEvent.VK_M) {
-            setRenderType(RenderType.values()[(currentMode + 1) % RenderType.values().length]);
-            syncModeButtons();
-        }
-    }
-
-    private static String modeName(RenderType type) {
-        return Form.capitalizeWords(type.name().toLowerCase().replaceAll("\\Q_\\E", " "));
-    }
-
-    void setRenderType(RenderType type) {
-        currentType = type;
-        dump();
-        notify(modeName(type));
-    }
-
-    void toggleGrid() {
-        grid = !grid;
-        notify("Grid " + (grid ? "On" : "Off"));
-    }
-
-    void toggleFollow() {
-        follow = !follow;
-        if (player != null && follow) {
-            notify("Following " + player.getName());
-        } else if (follow) {
-            notify("No player in world");
-            follow = false;
-        } else {
-            notify("Follow disabled");
-        }
-    }
-
-    void toggleQuality() {
-        lowtile = !lowtile;
-        dump();
-        notify((lowtile ? "Low" : "High") + " Quality");
-    }
-
-    private void syncModeButtons() {
-        if (modeButtons == null) return;
-        for (Map.Entry<RenderType, JToggleButton> entry : modeButtons.entrySet()) {
-            entry.getValue().setSelected(entry.getKey() == currentType);
-        }
-    }
-
-    private void dump() {
-        positions.clear();
-        fastpositions.clear();
-    }
-
-    public BufferedImage getTile(KSet<BlockPosition> fg, int div, int x, int z, O<Integer> m) {
-        BlockPosition key = new BlockPosition((int) mscale, Math.floorDiv(x, div), Math.floorDiv(z, div));
-        fg.add(key);
-
-        if (positions.containsKey(key)) {
-            return positions.get(key);
-        }
-
-        if (fastpositions.containsKey(key)) {
-            if (!working.contains(key) && working.size() < 9) {
-                m.set(m.get() - 1);
-                if (m.get() >= 0 && velocity < 50) {
-                    working.add(key);
-                    double mk = mscale;
-                    double mkd = scale;
-                    e.submit(() -> {
-                        PrecisionStopwatch ps = PrecisionStopwatch.start();
-                        BufferedImage b = renderer.render(x * mscale, z * mscale, div * mscale, div / (lowtile ? 3 : 1), currentType);
-                        rs.put(ps.getMilliseconds());
-                        working.remove(key);
-                        if (mk == mscale && mkd == scale) {
-                            positions.put(key, b);
-                        }
-                    });
-                }
-            }
-            return fastpositions.get(key);
-        }
-
-        if (workingfast.contains(key) || workingfast.size() > Runtime.getRuntime().availableProcessors()) {
-            return null;
-        }
-
-        workingfast.add(key);
-        double mk = mscale;
-        double mkd = scale;
-        eh.submit(() -> {
-            PrecisionStopwatch ps = PrecisionStopwatch.start();
-            BufferedImage b = renderer.render(x * mscale, z * mscale, div * mscale, div / lowq, currentType);
-            rs.put(ps.getMilliseconds());
-            workingfast.remove(key);
-            if (mk == mscale && mkd == scale) {
-                fastpositions.put(key, b);
-            }
-        });
-        return null;
-    }
-
-    private double getWorldX(double screenX) {
-        return (mscale * screenX) + ((oxp / scale) * mscale);
-    }
-
-    private double getWorldZ(double screenZ) {
-        return (mscale * screenZ) + ((ozp / scale) * mscale);
-    }
-
-    private double getScreenX(double x) {
-        return (x / mscale) - (oxp / scale);
-    }
-
-    private double getScreenZ(double z) {
-        return (z / mscale) - (ozp / scale);
-    }
-
-    private double lerp(double current, double target, double speed) {
-        double diff = target - current;
-        if (Math.abs(diff) < 0.5) return target;
-        return current + diff * speed;
-    }
-
-    @Override
-    public void paint(Graphics gx) {
-        if (engine.isClosed()) {
-            EventQueue.invokeLater(() -> {
-                try { setVisible(false); } catch (Throwable ignored) { }
-            });
-            return;
-        }
-
-        if (updateEngine()) {
-            dump();
-        }
-
-        velocity = Math.abs(ox - oxp) * 0.36 + Math.abs(oz - ozp) * 0.36;
-        oxp = lerp(oxp, ox, 0.36);
-        ozp = lerp(ozp, oz, 0.36);
-        hx = lerp(hx, lx, 0.36);
-        hz = lerp(hz, lz, 0.36);
-
-        if (centities.flip()) {
-            J.s(() -> {
-                synchronized (lastEntities) {
-                    lastEntities.clear();
-                    lastEntities.addAll(world.getEntitiesByClass(LivingEntity.class));
-                }
-            });
-        }
-
-        lowq = Math.max(Math.min((int) M.lerp(8, 28, velocity / 1000D), 28), 8);
-        PrecisionStopwatch p = PrecisionStopwatch.start();
-        Graphics2D g = (Graphics2D) gx;
-        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-
-        w = getWidth();
-        h = getHeight();
-        double vscale = scale;
-        scale = w / 12D;
-
-        if (scale != vscale) {
-            positions.clear();
-        }
-
-        KSet<BlockPosition> gg = new KSet<>();
-        int iscale = (int) scale;
-        g.setColor(BG);
-        g.fillRect(0, 0, w, h);
-        double offsetX = oxp / scale;
-        double offsetZ = ozp / scale;
-        m.set(3);
-
-        for (int r = 0; r < Math.max(w, h); r += iscale) {
-            for (int i = -iscale; i < w + iscale; i += iscale) {
-                for (int j = -iscale; j < h + iscale; j += iscale) {
-                    int a = i - (w / 2);
-                    int b = j - (h / 2);
-                    if (a * a + b * b <= r * r) {
-                        int tx = (int) (Math.floor((offsetX + i) / iscale) * iscale);
-                        int tz = (int) (Math.floor((offsetZ + j) / iscale) * iscale);
-                        BufferedImage t = getTile(gg, iscale, tx, tz, m);
-
-                        if (t != null) {
-                            int rx = Math.floorMod((int) Math.floor(offsetX), iscale);
-                            int rz = Math.floorMod((int) Math.floor(offsetZ), iscale);
-                            g.drawImage(t, i - rx, j - rz, iscale, iscale, null);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (grid) {
-            renderGrid(g, iscale, offsetX, offsetZ);
-        }
-
-        p.end();
-
-        for (BlockPosition i : positions.k()) {
-            if (!gg.contains(i)) {
-                positions.remove(i);
-            }
-        }
-
-        handleFollow();
-        renderOverlays(g, p.getMilliseconds());
-
-        if (!isVisible() || !getParent().isVisible()) {
-            return;
-        }
-
-        long targetMs = eco ? 32 : 16;
-        long sleepMs = Math.max(1, targetMs - (long) p.getMilliseconds());
-        J.a(() -> {
-            J.sleep(sleepMs);
-            repaint();
-        });
-    }
-
-    private void renderGrid(Graphics2D g, int tileSize, double offsetX, double offsetZ) {
-        g.setColor(GRID_COLOR);
-        int rx = Math.floorMod((int) Math.floor(offsetX), tileSize);
-        int rz = Math.floorMod((int) Math.floor(offsetZ), tileSize);
-        for (int i = -tileSize; i < w + tileSize; i += tileSize) {
-            g.drawLine(i - rx, 0, i - rx, h);
-        }
-        for (int j = -tileSize; j < h + tileSize; j += tileSize) {
-            g.drawLine(0, j - rz, w, j - rz);
-        }
-    }
-
-    private void handleFollow() {
-        if (follow && player != null) {
-            animateTo(player.getLocation().getX(), player.getLocation().getZ());
-        }
-    }
-
-    private void renderOverlays(Graphics2D g, double frameMs) {
-        renderEntities(g);
-
-        if (help) {
-            renderOverlayHelp(g);
-        } else if (debug) {
-            renderOverlayDebug(g);
-        }
-
-        renderStatusBar(g, frameMs);
-        renderHoverOverlay(g, shift);
-
-        if (!notifications.isEmpty()) {
-            renderNotification(g);
-        }
-    }
-
-    private void renderStatusBar(Graphics2D g, double frameMs) {
-        int y = h - STATUS_HEIGHT;
-        g.setColor(STATUS_BG);
-        g.fillRect(0, y, w, STATUS_HEIGHT);
-        g.setColor(CARD_BORDER);
-        g.drawLine(0, y, w, y);
-
-        g.setFont(FONT_STATUS);
-        g.setColor(TEXT_SECONDARY);
-
-        double wx = getWorldX(w / 2.0);
-        double wz = getWorldZ(h / 2.0);
-        int fps = frameMs > 0 ? (int) (1000.0 / frameMs) : 0;
-
-        String left = String.format("  %s  |  %.1f bpp  |  %s x %s blocks",
-                modeName(currentType), mscale,
-                Form.f((int) (mscale * w)), Form.f((int) (mscale * h)));
-        g.drawString(left, 8, y + 17);
-
-        String right = String.format("X: %s  Z: %s  |  %d FPS  ",
-                Form.f((int) wx), Form.f((int) wz), fps);
-        int rw = g.getFontMetrics().stringWidth(right);
-        g.drawString(right, w - rw - 8, y + 17);
-
-        g.setColor(ACCENT);
-        int modeW = g.getFontMetrics().stringWidth("  " + modeName(currentType));
-        g.fillRect(0, y + 1, 3, STATUS_HEIGHT - 1);
-    }
-
-    private void renderEntities(Graphics2D g) {
-        Player b = null;
-
-        for (Player i : world.getPlayers()) {
-            b = i;
-            renderPlayerMarker(g, i.getLocation().getX(), i.getLocation().getZ(), i.getName());
-        }
-
-        synchronized (lastEntities) {
-            double dist = Double.MAX_VALUE;
-            LivingEntity nearest = null;
-
-            for (LivingEntity i : lastEntities) {
-                if (i instanceof Player) continue;
-                renderMobMarker(g, i.getLocation().getX(), i.getLocation().getZ());
-                if (shift) {
-                    double d = i.getLocation().distanceSquared(
-                            new Location(i.getWorld(), getWorldX(hx), i.getLocation().getY(), getWorldZ(hz)));
-                    if (d < dist) {
-                        dist = d;
-                        nearest = i;
-                    }
-                }
-            }
-
-            if (nearest != null && shift) {
-                double sx = getScreenX(nearest.getLocation().getX());
-                double sz = getScreenZ(nearest.getLocation().getZ());
-                g.setColor(MOB_COLOR);
-                g.fillOval((int) sx - 6, (int) sz - 6, 12, 12);
-                g.setColor(new Color(220, 80, 80, 60));
-                g.fillOval((int) sx - 10, (int) sz - 10, 20, 20);
-
-                KList<String> k = new KList<>();
-                k.add(Form.capitalizeWords(nearest.getType().name().toLowerCase(Locale.ROOT).replaceAll("\\Q_\\E", " ")));
-                k.add("Pos: " + nearest.getLocation().getBlockX() + ", " + nearest.getLocation().getBlockY() + ", " + nearest.getLocation().getBlockZ());
-                k.add("HP: " + Form.f(nearest.getHealth(), 1) + " / " + Form.f(nearest.getAttribute(MAX_HEALTH).getValue(), 1));
-                drawCard(w - CARD_PAD, CARD_PAD, 1, 0, g, k);
-            }
-        }
-
-        player = b;
-    }
-
-    private void renderPlayerMarker(Graphics2D g, double x, double z, String name) {
-        int sx = (int) getScreenX(x);
-        int sz = (int) getScreenZ(z);
-        g.setColor(new Color(80, 200, 120, 40));
-        g.fillOval(sx - 12, sz - 12, 24, 24);
-        g.setColor(PLAYER_COLOR);
-        g.fillOval(sx - 5, sz - 5, 10, 10);
-        g.setColor(new Color(40, 160, 80));
-        g.drawOval(sx - 5, sz - 5, 10, 10);
-
-        g.setFont(FONT_CARD_BODY);
-        g.setColor(TEXT_PRIMARY);
-        int nw = g.getFontMetrics().stringWidth(name);
-        g.drawString(name, sx - nw / 2, sz - 14);
-    }
-
-    private void renderMobMarker(Graphics2D g, double x, double z) {
-        int sx = (int) getScreenX(x);
-        int sz = (int) getScreenZ(z);
-        g.setColor(MOB_COLOR);
-        g.fillRect(sx - 2, sz - 2, 4, 4);
-    }
-
-    private void animateTo(double wx, double wz) {
-        double cx = getWorldX(getWidth() / 2.0);
-        double cz = getWorldZ(getHeight() / 2.0);
-        ox += ((wx - cx) / mscale) * scale;
-        oz += ((wz - cz) / mscale) * scale;
-    }
-
-    private void renderHoverOverlay(Graphics2D g, boolean detailed) {
-        IrisBiome biome = engine.getComplex().getTrueBiomeStream().get(getWorldX(hx), getWorldZ(hz));
-        IrisRegion region = engine.getComplex().getRegionStream().get(getWorldX(hx), getWorldZ(hz));
-        KList<String> l = new KList<>();
-        l.add(biome.getName());
-        l.add(region.getName());
-        l.add("Block " + (int) getWorldX(hx) + ", " + (int) getWorldZ(hz));
-        if (detailed) {
-            l.add("Chunk " + ((int) getWorldX(hx) >> 4) + ", " + ((int) getWorldZ(hz) >> 4));
-            l.add("Region " + (((int) getWorldX(hx) >> 4) >> 5) + ", " + (((int) getWorldZ(hz) >> 4) >> 5));
-            l.add("Key: " + biome.getLoadKey());
-            l.add("File: " + biome.getLoadFile());
-        }
-        drawCard((float) hx + 16, (float) hz, 0, 0, g, l);
-    }
-
-    private void renderOverlayDebug(Graphics2D g) {
-        KList<String> l = new KList<>();
-        l.add("Velocity: " + (int) velocity);
-        l.add("Tiles: " + positions.size() + " HD / " + fastpositions.size() + " LQ");
-        l.add("Workers: " + working.size() + " HD / " + workingfast.size() + " LQ");
-        l.add("Center: " + Form.f((int) getWorldX(getWidth() / 2.0)) + ", " + Form.f((int) getWorldZ(getHeight() / 2.0)));
-        drawCard(CARD_PAD, h - STATUS_HEIGHT - CARD_PAD, 0, 1, g, l);
-    }
-
-    private void renderOverlayHelp(Graphics2D g) {
-        KList<String> keys = new KList<>();
-        KList<String> descs = new KList<>();
-        keys.add("/");      descs.add("Toggle help");
-        keys.add("R");      descs.add("Refresh tiles");
-        keys.add("F");      descs.add("Follow player");
-        keys.add("+/-");    descs.add("Zoom in/out");
-        keys.add("\\");     descs.add("Reset zoom");
-        keys.add("M");      descs.add("Cycle render mode");
-        keys.add("P");      descs.add("Toggle tile quality");
-        keys.add("E");      descs.add("Toggle 30/60 FPS");
-        keys.add("G");      descs.add("Toggle grid");
-
-        int ff = 0;
-        for (RenderType i : RenderType.values()) {
-            ff++;
-            keys.add(String.valueOf(ff));
-            descs.add(modeName(i));
-        }
-
-        keys.add("Shift");     descs.add("Detailed biome info");
-        keys.add("Ctrl+Click"); descs.add("Teleport to cursor");
-        keys.add("Alt+Click");  descs.add("Open biome in editor");
-
-        int maxKeyW = 0;
-        g.setFont(FONT_HELP_KEY);
-        for (String k : keys) {
-            maxKeyW = Math.max(maxKeyW, g.getFontMetrics().stringWidth(k));
-        }
-
-        int lineH = 20;
-        int totalH = keys.size() * lineH + CARD_PAD * 2 + 4;
-        int totalW = maxKeyW + 180 + CARD_PAD * 2;
-
-        drawCardBackground(g, CARD_PAD, CARD_PAD, totalW, totalH);
-
-        for (int i = 0; i < keys.size(); i++) {
-            int y = CARD_PAD + 16 + i * lineH;
-
-            g.setFont(FONT_HELP_KEY);
-            g.setColor(ACCENT);
-            g.drawString(keys.get(i), CARD_PAD * 2, y);
-
-            g.setFont(FONT_CARD_BODY);
-            g.setColor(TEXT_SECONDARY);
-            g.drawString(descs.get(i), CARD_PAD * 2 + maxKeyW + 16, y);
-        }
-    }
-
-    private void renderNotification(Graphics2D g) {
-        int y = h - STATUS_HEIGHT - 50;
-        g.setFont(FONT_NOTIFICATION);
-
-        KList<String> active = new KList<>();
-        for (String i : notifications.k()) {
-            if (M.ms() > notifications.get(i)) {
-                notifications.remove(i);
-            } else {
-                active.add(i);
-            }
-        }
-
-        if (active.isEmpty()) return;
-
-        String text = String.join(" | ", active);
-        int tw = g.getFontMetrics().stringWidth(text);
-        int th = g.getFontMetrics().getHeight();
-        int px = (w - tw) / 2 - 16;
-        int py = y - th / 2 - 8;
-        int bw = tw + 32;
-        int bh = th + 16;
-
-        drawCardBackground(g, px, py, bw, bh);
-        g.setColor(TEXT_PRIMARY);
-        g.drawString(text, px + 16, py + th + 4);
-    }
-
-    private void drawCardBackground(Graphics2D g, int x, int y, int w, int h) {
-        RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, w, h, CARD_RADIUS, CARD_RADIUS);
-        g.setColor(CARD_BG);
-        g.fill(rect);
-        g.setColor(CARD_BORDER);
-        g.draw(rect);
-    }
-
-    private void drawCard(float x, float y, double pushX, double pushZ, Graphics2D g, KList<String> text) {
-        g.setFont(FONT_CARD_BODY);
-        int lineH = g.getFontMetrics().getHeight();
-        int cardW = 0;
-        for (String i : text) {
-            cardW = Math.max(cardW, g.getFontMetrics().stringWidth(i));
-        }
-        cardW += CARD_PAD * 2;
-        int cardH = text.size() * lineH + CARD_PAD * 2 - 4;
-
-        int cx = (int) (x - cardW * pushX);
-        int cy = (int) (y - cardH * pushZ);
-
-        drawCardBackground(g, cx, cy, cardW, cardH);
-
-        int ty = cy + CARD_PAD + lineH - 4;
-        for (int i = 0; i < text.size(); i++) {
-            g.setColor(i == 0 ? TEXT_PRIMARY : TEXT_SECONDARY);
-            g.setFont(i == 0 ? FONT_CARD_TITLE : FONT_CARD_BODY);
-            g.drawString(text.get(i), cx + CARD_PAD, ty + i * lineH);
-        }
-    }
-
-    public void mouseWheelMoved(MouseWheelEvent e) {
-        int notches = e.getWheelRotation();
-        if (e.isControlDown()) return;
-
-        double m0 = mscale;
-        double m1 = m0 + ((0.25 * m0) * notches);
-        m1 = Math.max(m1, 0.00001);
-        if (m1 == m0) return;
-
-        positions.clear();
-        fastpositions.clear();
-
-        Point p = e.getPoint();
-        double sx = p.getX();
-        double sz = p.getY();
-
-        double newOxp = scale * ((m0 / m1) * (sx + (oxp / scale)) - sx);
-        double newOzp = scale * ((m0 / m1) * (sz + (ozp / scale)) - sz);
-
-        mscale = m1;
-        oxp = newOxp;
-        ozp = newOzp;
-        ox = oxp;
-        oz = ozp;
-    }
-
-    @Override
-    public void mouseClicked(MouseEvent e) {
-        if (control) teleport();
-        else if (alt) open();
-    }
-
-    @Override public void mousePressed(MouseEvent e) { }
-    @Override public void mouseReleased(MouseEvent e) { }
-    @Override public void mouseEntered(MouseEvent e) { }
-    @Override public void mouseExited(MouseEvent e) { }
-
-    private void open() {
-        IrisComplex complex = engine.getComplex();
-        File r = null;
-        switch (currentType) {
-            case BIOME, LAYER_LOAD, DECORATOR_LOAD, OBJECT_LOAD, HEIGHT ->
-                    r = complex.getTrueBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
-            case BIOME_LAND -> r = complex.getLandBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
-            case BIOME_SEA -> r = complex.getSeaBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
-            case REGION -> r = complex.getRegionStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
-            case CAVE_LAND -> r = complex.getCaveBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
-        }
-        if (r != null) {
-            notify("Opened " + r.getName());
-        }
-    }
-
-    private void teleport() {
-        J.s(() -> {
-            if (player != null) {
-                int xx = (int) getWorldX(hx);
-                int zz = (int) getWorldZ(hz);
-                int yy = player.getWorld().getHighestBlockYAt(xx, zz) + 1;
-                player.teleport(new Location(player.getWorld(), xx, yy, zz));
-                notify("Teleported to " + xx + ", " + yy + ", " + zz);
-            } else {
-                notify("No player in world");
-            }
-        });
-    }
-}

core/src/main/java/art/arcane/iris/core/lifecycle/PaperLibBootstrap.java

@@ -1,6 +1,8 @@
 package art.arcane.iris.core.lifecycle;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import io.papermc.lib.PaperLib;
 import io.papermc.lib.environments.PaperEnvironment;
 import org.bukkit.Bukkit;
@@ -30,7 +32,7 @@ public final class PaperLibBootstrap {
         }
 
         PaperLib.setCustomEnvironment(new ModernPaperEnvironment());
-        Iris.info("PaperLib version detection failed for MC " + bukkitVersion + "; forced modern Paper environment");
+        IrisLogging.info("PaperLib version detection failed for MC " + bukkitVersion + "; forced modern Paper environment");
     }
 
     static boolean isModernVersionScheme(String bukkitVersion) {

core/src/main/java/art/arcane/iris/core/lifecycle/PaperLikeRuntimeBackend.java

@@ -1,6 +1,8 @@
 package art.arcane.iris.core.lifecycle;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
@@ -44,7 +46,7 @@ final class PaperLikeRuntimeBackend implements WorldLifecycleBackend {
             WorldLifecycleStaging.stageGenerator(request.worldName(), request.generator(), request.biomeProvider());
             WorldLifecycleSupport.stageRuntimeConfiguration(request.worldName());
 
-            Iris.debug("WorldLifecycle runtime LevelStem: world=" + request.worldName()
+            IrisLogging.debug("WorldLifecycle runtime LevelStem: world=" + request.worldName()
                     + ", backend=paper_like_runtime, flavor=" + capabilities.paperLikeFlavor().name().toLowerCase(Locale.ROOT)
                     + ", registrySource=" + WorldLifecycleSupport.runtimeLevelStemRegistrySource(request));
             Object levelStem = WorldLifecycleSupport.resolveRuntimeLevelStem(capabilities, request);

core/src/main/java/art/arcane/iris/core/lifecycle/WorldLifecycleService.java

@@ -1,6 +1,8 @@
 package art.arcane.iris.core.lifecycle;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.World;
 
@@ -42,7 +44,7 @@ public final class WorldLifecycleService {
 
             CapabilitySnapshot capabilities = CapabilitySnapshot.probe();
             instance = new WorldLifecycleService(capabilities);
-            Iris.info("WorldLifecycle capabilities: %s", capabilities.describe());
+            IrisLogging.info("WorldLifecycle capabilities: %s", capabilities.describe());
             return instance;
         }
     }
@@ -56,18 +58,18 @@ public final class WorldLifecycleService {
         try {
             backend = selectCreateBackend(request);
         } catch (Throwable e) {
-            Iris.reportError("WorldLifecycle create backend selection failed for world=\"" + request.worldName()
+            IrisLogging.reportError("WorldLifecycle create backend selection failed for world=\"" + request.worldName()
                     + "\", caller=" + request.callerKind().name().toLowerCase() + ".", e);
             return CompletableFuture.failedFuture(e);
         }
-        Iris.info("WorldLifecycle create: world=%s, caller=%s, backend=%s",
+        IrisLogging.info("WorldLifecycle create: world=%s, caller=%s, backend=%s",
                 request.worldName(),
                 request.callerKind().name().toLowerCase(),
                 backend.backendName());
         return backend.create(request).whenComplete((world, throwable) -> {
             if (throwable != null) {
                 Throwable cause = WorldLifecycleSupport.unwrap(throwable);
-                Iris.reportError("WorldLifecycle create failed: world=\"" + request.worldName()
+                IrisLogging.reportError("WorldLifecycle create failed: world=\"" + request.worldName()
                         + "\", caller=" + request.callerKind().name().toLowerCase()
                         + ", backend=" + backend.backendName()
                         + ", family=" + capabilities.serverFamily().id() + ".", cause);
@@ -105,14 +107,14 @@ public final class WorldLifecycleService {
 
     private boolean unloadDirect(World world, boolean save) {
         WorldLifecycleBackend backend = selectUnloadBackend(world.getName());
-        Iris.info("WorldLifecycle unload: world=%s, backend=%s",
+        IrisLogging.info("WorldLifecycle unload: world=%s, backend=%s",
                 world.getName(),
                 backend.backendName());
         boolean unloaded;
         try {
             unloaded = backend.unload(world, save);
         } catch (Throwable e) {
-            Iris.reportError("WorldLifecycle unload failed: world=\"" + world.getName()
+            IrisLogging.reportError("WorldLifecycle unload failed: world=\"" + world.getName()
                     + "\", backend=" + backend.backendName()
                     + ", family=" + capabilities.serverFamily().id() + ".", e);
             if (e instanceof RuntimeException runtimeException) {

core/src/main/java/art/arcane/iris/core/lifecycle/WorldLifecycleSupport.java

@@ -1,6 +1,8 @@
 package art.arcane.iris.core.lifecycle;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.link.Identifier;
 import art.arcane.iris.core.nms.INMS;
 import art.arcane.iris.core.nms.INMSBinding;

core/src/main/java/art/arcane/iris/core/link/IrisPapiExpansion.java

@@ -1,116 +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 art.arcane.iris.core.link;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
-
-// See/update https://app.gitbook.com/@volmitsoftware/s/iris/compatability/papi/
-public class IrisPapiExpansion extends PlaceholderExpansion {
-    @Override
-    public @NotNull String getIdentifier() {
-        return "iris";
-    }
-
-    @Override
-    public @NotNull String getAuthor() {
-        return "Volmit Software";
-    }
-
-    @Override
-    public @NotNull String getVersion() {
-        return Iris.instance.getDescription().getVersion();
-    }
-
-    @Override
-    public boolean persist() {
-        return true;
-    }
-
-    @Override
-    public String onRequest(OfflinePlayer player, String p) {
-        Location l = null;
-        PlatformChunkGenerator a = null;
-
-        if (player.isOnline() && player.getPlayer() != null) {
-            l = player.getPlayer().getLocation().add(0, 2, 0);
-            a = IrisToolbelt.access(l.getWorld());
-        }
-
-        if (p.equalsIgnoreCase("biome_name")) {
-            if (a != null) {
-                return getBiome(a, l).getName();
-            }
-        } else if (p.equalsIgnoreCase("biome_id")) {
-            if (a != null) {
-                return getBiome(a, l).getLoadKey();
-            }
-        } else if (p.equalsIgnoreCase("biome_file")) {
-            if (a != null) {
-                return getBiome(a, l).getLoadFile().getPath();
-            }
-        } else if (p.equalsIgnoreCase("region_name")) {
-            if (a != null) {
-                return a.getEngine().getRegion(l).getName();
-            }
-        } else if (p.equalsIgnoreCase("region_id")) {
-            if (a != null) {
-                return a.getEngine().getRegion(l).getLoadKey();
-            }
-        } else if (p.equalsIgnoreCase("region_file")) {
-            if (a != null) {
-                return a.getEngine().getRegion(l).getLoadFile().getPath();
-            }
-        } else if (p.equalsIgnoreCase("terrain_slope")) {
-            if (a != null) {
-                return (a.getEngine())
-                        .getComplex().getSlopeStream()
-                        .get(l.getX(), l.getZ()) + "";
-            }
-        } else if (p.equalsIgnoreCase("terrain_height")) {
-            if (a != null) {
-                return Math.round(a.getEngine().getHeight(l.getBlockX(), l.getBlockZ())) + "";
-            }
-        } else if (p.equalsIgnoreCase("world_mode")) {
-            if (a != null) {
-                return a.isStudio() ? "Studio" : "Production";
-            }
-        } else if (p.equalsIgnoreCase("world_seed")) {
-            if (a != null) {
-                return a.getEngine().getSeedManager().getSeed() + "";
-            }
-        } else if (p.equalsIgnoreCase("world_speed")) {
-            if (a != null) {
-                return a.getEngine().getGeneratedPerSecond() + "/s";
-            }
-        }
-
-        return null;
-    }
-
-    private IrisBiome getBiome(PlatformChunkGenerator a, Location l) {
-        return a.getEngine().getBiome(l.getBlockX(), l.getBlockY() - l.getWorld().getMinHeight(), l.getBlockZ());
-    }
-}

core/src/main/java/art/arcane/iris/core/runtime/StudioOpenCoordinator.java

@@ -1,6 +1,8 @@
 package art.arcane.iris.core.runtime;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.lifecycle.WorldLifecycleService;
 import art.arcane.iris.core.project.IrisProject;
 import art.arcane.iris.core.tools.IrisCreator;
@@ -87,7 +89,7 @@ public final class StudioOpenCoordinator {
         try {
             long openStart = System.currentTimeMillis();
             long t = openStart;
-            Iris.debug("[Studio timing] ===== studio open START: " + request.worldName() + " =====");
+            IrisLogging.debug("[Studio timing] ===== studio open START: " + request.worldName() + " =====");
             updateStage(request, "resolve_dimension", 0.04D);
             if (IrisToolbelt.getDimension(request.dimensionKey()) == null) {
                 throw new IrisException("Dimension cannot be found for id " + request.dimensionKey() + ".");
@@ -186,16 +188,16 @@ public final class StudioOpenCoordinator {
             }
             t = logStudioPhase("finalize + openVSCode", t, openStart);
 
-            Iris.info("Studio open: " + world.getName() + " ready in " + (System.currentTimeMillis() - openStart) + "ms");
+            IrisLogging.info("Studio open: " + world.getName() + " ready in " + (System.currentTimeMillis() - openStart) + "ms");
             future.complete(new StudioOpenResult(world, safeEntry));
         } catch (Throwable e) {
-            Iris.reportError("Studio open failed for world \"" + request.worldName() + "\".", e);
+            IrisLogging.reportError("Studio open failed for world \"" + request.worldName() + "\".", e);
             if (!request.retainOnFailure()) {
                 try {
                     updateStage(request, "cleanup", 1.00D);
                     closeWorld(provider, request.worldName(), world, true, request.project());
                 } catch (Throwable cleanupError) {
-                    Iris.reportError("Studio cleanup failed for world \"" + request.worldName() + "\".", cleanupError);
+                    IrisLogging.reportError("Studio cleanup failed for world \"" + request.worldName() + "\".", cleanupError);
                 }
             }
             future.completeExceptionally(e);
@@ -204,7 +206,7 @@ public final class StudioOpenCoordinator {
 
     private long logStudioPhase(String phase, long t, long openStart) {
         long now = System.currentTimeMillis();
-        Iris.debug("[Studio timing] " + phase + " = " + (now - t) + "ms  (cumulative " + (now - openStart) + "ms)");
+        IrisLogging.debug("[Studio timing] " + phase + " = " + (now - t) + "ms  (cumulative " + (now - openStart) + "ms)");
         return now;
     }
 
@@ -219,7 +221,7 @@ public final class StudioOpenCoordinator {
         CompletableFuture<Void> loaded = new CompletableFuture<>();
         J.s(() -> {
             try {
-                world.addPluginChunkTicket(chunkX, chunkZ, Iris.instance);
+                world.addPluginChunkTicket(chunkX, chunkZ, art.arcane.iris.platform.bukkit.BukkitPlatform.plugin());
             } catch (Throwable t) {
                 loaded.completeExceptionally(t);
                 return;
@@ -331,7 +333,7 @@ public final class StudioOpenCoordinator {
                 continue;
             }
 
-            Iris.linkMultiverseCore.removeFromConfig(familyWorld);
+            IrisServices.get(art.arcane.iris.core.link.MultiverseCoreLink.class).removeFromConfig(familyWorld);
             WorldLifecycleService.get().unload(familyWorld, false);
         }
     }
@@ -353,7 +355,7 @@ public final class StudioOpenCoordinator {
                 deleteWorldFolderAsync(folder, 40).get(15L, TimeUnit.SECONDS);
             } catch (Throwable e) {
                 liveDeleted = false;
-                Iris.reportError("Studio folder deletion retries failed for \"" + folder.getAbsolutePath() + "\".", unwrapFailure(e));
+                IrisLogging.reportError("Studio folder deletion retries failed for \"" + folder.getAbsolutePath() + "\".", unwrapFailure(e));
             }
 
             if (folder.exists()) {
@@ -366,11 +368,11 @@ public final class StudioOpenCoordinator {
         }
 
         try {
-            Iris.queueWorldDeletionOnStartup(Collections.singleton(worldName));
+            IrisServices.get(WorldDeletionQueue.class).queueForStartupDeletion(Collections.singleton(worldName));
             return new WorldFamilyDeleteResult(false, true);
         } catch (IOException e) {
             if (unloadCompletedLive) {
-                Iris.reportError("Failed to queue deferred deletion for world \"" + worldName + "\".", e);
+                IrisLogging.reportError("Failed to queue deferred deletion for world \"" + worldName + "\".", e);
             }
             return new WorldFamilyDeleteResult(false, false);
         }

core/src/main/java/art/arcane/iris/core/runtime/WorldDeletionQueue.java

@@ -1,6 +1,6 @@
 /*
  * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2022 Arcane Arts (Volmit Software)
+ * Copyright (c) 2026 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
@@ -16,28 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.edit;
+package art.arcane.iris.core.runtime;
 
-import org.bukkit.block.Biome;
-import org.bukkit.block.data.BlockData;
+import java.io.IOException;
+import java.util.Collection;
 
-import java.io.Closeable;
-
-public interface BlockEditor extends Closeable {
-    long last();
-
-    void set(int x, int y, int z, BlockData d);
-
-    BlockData get(int x, int y, int z);
-
-    void setBiome(int x, int z, Biome b);
-
-    void setBiome(int x, int y, int z, Biome b);
-
-    @Override
-    void close();
-
-    Biome getBiome(int x, int y, int z);
-
-    Biome getBiome(int x, int z);
+/**
+ * Queues world folders for deletion at next startup.
+ */
+public interface WorldDeletionQueue {
+    int queueForStartupDeletion(Collection<String> worldNames) throws IOException;
 }

core/src/main/java/art/arcane/iris/core/runtime/WorldRuntimeControlService.java

@@ -1,6 +1,8 @@
 package art.arcane.iris.core.runtime;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.IrisSettings;
 import art.arcane.iris.core.lifecycle.CapabilitySnapshot;
 import art.arcane.iris.core.lifecycle.ServerFamily;
@@ -58,7 +60,7 @@ public final class WorldRuntimeControlService {
 
             CapabilitySnapshot capabilities = WorldLifecycleService.get().capabilities();
             instance = new WorldRuntimeControlService(capabilities);
-            Iris.info("WorldRuntimeControl capabilities: %s", instance.capabilityDescription);
+            IrisLogging.info("WorldRuntimeControl capabilities: %s", instance.capabilityDescription);
             return instance;
         }
     }
@@ -80,7 +82,7 @@ public final class WorldRuntimeControlService {
             return false;
         }
 
-        Iris.linkMultiverseCore.removeFromConfig(world);
+        IrisServices.get(art.arcane.iris.core.link.MultiverseCoreLink.class).removeFromConfig(world);
         setIntGameRule(world, 0, "SPAWN_CHUNK_RADIUS", "spawnChunkRadius");
         if (!IrisSettings.get().getStudio().isDisableTimeAndWeather()) {
             return true;
@@ -157,7 +159,7 @@ public final class WorldRuntimeControlService {
             backend.syncTime(world);
             return true;
         } catch (Throwable e) {
-            Iris.reportError("Runtime time control failed for world \"" + world.getName() + "\".", e);
+            IrisLogging.reportError("Runtime time control failed for world \"" + world.getName() + "\".", e);
             return false;
         }
     }
@@ -185,7 +187,7 @@ public final class WorldRuntimeControlService {
             engine.getMantle().getComponents();
             engine.getMantle().getRealRadius();
         } catch (Throwable e) {
-            Iris.reportError("Failed to prepare generator state for world \"" + world.getName() + "\".", e);
+            IrisLogging.reportError("Failed to prepare generator state for world \"" + world.getName() + "\".", e);
         }
     }
 
@@ -263,7 +265,7 @@ public final class WorldRuntimeControlService {
                     }
 
                     if (Boolean.TRUE.equals(success)) {
-                        J.runEntity(player, () -> Iris.service(BoardSVC.class).updatePlayer(player));
+                        J.runEntity(player, () -> IrisServices.get(BoardSVC.class).updatePlayer(player));
                         future.complete(true);
                         return;
                     }

core/src/main/java/art/arcane/iris/core/safeguard/task/Diagnostic.java

@@ -1,6 +1,6 @@
 package art.arcane.iris.core.safeguard.task;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.util.common.format.C;
 
 import java.io.ByteArrayOutputStream;
@@ -82,11 +82,11 @@ public class Diagnostic {
     }
 
     public enum Logger {
-        DEBUG(Iris::debug),
-        RAW(Iris::msg),
-        INFO(Iris::info),
-        WARN(Iris::warn),
-        ERROR(Iris::error);
+        DEBUG(IrisLogging::debug),
+        RAW(IrisLogging::msg),
+        INFO(IrisLogging::info),
+        WARN(IrisLogging::warn),
+        ERROR(IrisLogging::error);
 
         private final Consumer<String> logger;
 

core/src/main/java/art/arcane/iris/core/safeguard/task/Tasks.java

@@ -1,6 +1,6 @@
 package art.arcane.iris.core.safeguard.task;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.platform.bukkit.BukkitPlatform;
 import art.arcane.iris.core.IrisWorlds;
 import art.arcane.iris.core.nms.INMS;
 import art.arcane.iris.core.nms.v1X.NMSBinding1X;
@@ -85,7 +85,7 @@ public final class Tasks {
     });
 
     private static final Task VERSION = Task.of("version", () -> {
-        String[] parts = Iris.instance.getDescription().getVersion().split("-");
+        String[] parts = BukkitPlatform.plugin().getDescription().getVersion().split("-");
         String supportedVersions;
         if (parts.length >= 3) {
             String minVersion = parts[1];
@@ -147,7 +147,7 @@ public final class Tasks {
     });
 
     private static final Task JAVA = Task.of("java", () -> {
-        int version = Iris.getJavaVersion();
+        int version = javaVersion();
         if (version == 25) {
             return withDiagnostics(Mode.STABLE);
         }
@@ -208,4 +208,17 @@ public final class Tasks {
     private static ValueWithDiagnostics<Mode> withDiagnostics(Mode mode, List<Diagnostic> diagnostics) {
         return new ValueWithDiagnostics<>(mode, diagnostics);
     }
+
+    private static int javaVersion() {
+        String version = System.getProperty("java.version");
+        if (version.startsWith("1.")) {
+            version = version.substring(2, 3);
+        } else {
+            int dot = version.indexOf(".");
+            if (dot != -1) {
+                version = version.substring(0, dot);
+            }
+        }
+        return Integer.parseInt(version);
+    }
 }

core/src/main/java/art/arcane/iris/core/service/BoardSVC.java

@@ -18,7 +18,9 @@
 
 package art.arcane.iris.core.service;
 
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.IrisSettings;
 import art.arcane.iris.core.loader.IrisData;
 import art.arcane.iris.core.tools.IrisToolbelt;
@@ -65,7 +67,7 @@ public class BoardSVC implements IrisService, BoardProvider {
 
         cleanupLeakedMainScoreboard();
 
-        for (Player player : Iris.instance.getServer().getOnlinePlayers()) {
+        for (Player player : art.arcane.iris.platform.bukkit.BukkitPlatform.volmitPlugin().getServer().getOnlinePlayers()) {
             J.runEntity(player, () -> updatePlayer(player));
         }
     }
@@ -95,7 +97,7 @@ public class BoardSVC implements IrisService, BoardProvider {
                 team.unregister();
             }
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
         }
     }
 

core/src/main/java/art/arcane/iris/core/service/CommandSVC.java

@@ -1,260 +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 art.arcane.iris.core.service;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.commands.CommandIris;
-import art.arcane.iris.engine.data.cache.AtomicCache;
-import art.arcane.iris.util.common.director.DirectorContext;
-import art.arcane.iris.util.common.director.DirectorContextHandler;
-import art.arcane.iris.util.common.director.DirectorSystem;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.director.compat.DirectorEngineFactory;
-import art.arcane.volmlib.util.director.context.DirectorContextRegistry;
-import art.arcane.volmlib.util.director.runtime.DirectorExecutionMode;
-import art.arcane.volmlib.util.director.runtime.DirectorExecutionResult;
-import art.arcane.volmlib.util.director.runtime.DirectorInvocation;
-import art.arcane.volmlib.util.director.runtime.DirectorInvocationHook;
-import art.arcane.volmlib.util.director.runtime.DirectorRuntimeEngine;
-import art.arcane.volmlib.util.director.runtime.DirectorRuntimeNode;
-import art.arcane.volmlib.util.director.runtime.DirectorSender;
-import art.arcane.volmlib.util.director.visual.DirectorVisualCommand;
-import art.arcane.volmlib.util.math.RNG;
-import org.bukkit.Sound;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-public class CommandSVC implements IrisService, CommandExecutor, TabCompleter, DirectorInvocationHook {
-    private static final String ROOT_COMMAND = "iris";
-    private static final String ROOT_PERMISSION = "iris.all";
-
-    private final transient AtomicCache<DirectorRuntimeEngine> directorCache = new AtomicCache<>();
-    private final transient AtomicCache<DirectorVisualCommand> helpCache = new AtomicCache<>();
-
-    @Override
-    public void onEnable() {
-        PluginCommand command = Iris.instance.getCommand(ROOT_COMMAND);
-        if (command == null) {
-            Iris.warn("Failed to find command '" + ROOT_COMMAND + "'");
-            return;
-        }
-
-        command.setExecutor(this);
-        command.setTabCompleter(this);
-        J.a(this::getDirector);
-    }
-
-    @Override
-    public void onDisable() {
-
-    }
-
-    public DirectorRuntimeEngine getDirector() {
-        return directorCache.aquireNastyPrint(() -> DirectorEngineFactory.create(
-                new CommandIris(),
-                null,
-                buildDirectorContexts(),
-                this::dispatchDirector,
-                this,
-                DirectorSystem.handlers
-        ));
-    }
-
-    private DirectorContextRegistry buildDirectorContexts() {
-        DirectorContextRegistry contexts = new DirectorContextRegistry();
-
-        for (Map.Entry<Class<?>, DirectorContextHandler<?>> entry : DirectorContextHandler.contextHandlers.entrySet()) {
-            registerContextHandler(contexts, entry.getKey(), entry.getValue());
-        }
-
-        return contexts;
-    }
-
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    private void registerContextHandler(DirectorContextRegistry contexts, Class<?> type, DirectorContextHandler<?> handler) {
-        contexts.register((Class) type, (invocation, map) -> {
-            if (invocation.getSender() instanceof BukkitDirectorSender sender) {
-                return ((DirectorContextHandler) handler).handle(new VolmitSender(sender.sender()));
-            }
-
-            return null;
-        });
-    }
-
-    private void dispatchDirector(DirectorExecutionMode mode, Runnable runnable) {
-        if (mode == DirectorExecutionMode.SYNC) {
-            J.s(runnable);
-        } else {
-            runnable.run();
-        }
-    }
-
-    @Override
-    public void beforeInvoke(DirectorInvocation invocation, DirectorRuntimeNode node) {
-        if (invocation.getSender() instanceof BukkitDirectorSender sender) {
-            DirectorContext.touch(new VolmitSender(sender.sender()));
-        }
-    }
-
-    @Override
-    public void afterInvoke(DirectorInvocation invocation, DirectorRuntimeNode node) {
-        DirectorContext.remove();
-    }
-
-    @Nullable
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
-        if (!command.getName().equalsIgnoreCase(ROOT_COMMAND)) {
-            return List.of();
-        }
-
-        List<String> v = runDirectorTab(sender, alias, args);
-        if (sender instanceof Player player && IrisSettings.get().getGeneral().isCommandSounds()) {
-            player.playSound(player.getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 0.25f, RNG.r.f(0.125f, 1.95f));
-        }
-
-        return v;
-    }
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!command.getName().equalsIgnoreCase(ROOT_COMMAND)) {
-            return false;
-        }
-
-        if (!sender.hasPermission(ROOT_PERMISSION)) {
-            sender.sendMessage("You lack the Permission '" + ROOT_PERMISSION + "'");
-            return true;
-        }
-
-        J.aBukkit(() -> executeCommand(sender, label, args));
-        return true;
-    }
-
-    private void executeCommand(CommandSender sender, String label, String[] args) {
-        if (sendHelpIfRequested(sender, args)) {
-            playSuccessSound(sender);
-            return;
-        }
-
-        DirectorExecutionResult result = runDirector(sender, label, args);
-
-        if (result.isSuccess()) {
-            playSuccessSound(sender);
-            return;
-        }
-
-        playFailureSound(sender);
-        if (result.getMessage() == null || result.getMessage().trim().isEmpty()) {
-            new VolmitSender(sender).sendMessage(C.RED + "Unknown Iris Command");
-        }
-    }
-
-    private boolean sendHelpIfRequested(CommandSender sender, String[] args) {
-        Optional<DirectorVisualCommand.HelpRequest> request = DirectorVisualCommand.resolveHelp(getHelpRoot(), Arrays.asList(args));
-        if (request.isEmpty()) {
-            return false;
-        }
-
-        VolmitSender volmitSender = new VolmitSender(sender);
-        volmitSender.sendDirectorHelp(request.get().command(), request.get().page());
-        return true;
-    }
-
-    private DirectorVisualCommand getHelpRoot() {
-        return helpCache.aquireNastyPrint(() -> DirectorVisualCommand.createRoot(getDirector()));
-    }
-
-    private DirectorExecutionResult runDirector(CommandSender sender, String label, String[] args) {
-        try {
-            return getDirector().execute(new DirectorInvocation(new BukkitDirectorSender(sender), label, Arrays.asList(args)));
-        } catch (Throwable e) {
-            Iris.warn("Director command execution failed: " + e.getClass().getSimpleName() + " " + e.getMessage());
-            return DirectorExecutionResult.notHandled();
-        }
-    }
-
-    private List<String> runDirectorTab(CommandSender sender, String alias, String[] args) {
-        DirectorContext.touch(new VolmitSender(sender));
-        try {
-            return getDirector().tabComplete(new DirectorInvocation(new BukkitDirectorSender(sender), alias, Arrays.asList(args)));
-        } catch (Throwable e) {
-            Iris.warn("Director tab completion failed: " + e.getClass().getSimpleName() + " " + e.getMessage());
-            return List.of();
-        } finally {
-            DirectorContext.remove();
-        }
-    }
-
-    private void playFailureSound(CommandSender sender) {
-        if (!IrisSettings.get().getGeneral().isCommandSounds()) {
-            return;
-        }
-
-        if (sender instanceof Player player) {
-            player.playSound(player.getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 0.25f);
-            player.playSound(player.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.2f, 0.45f);
-        }
-    }
-
-    private void playSuccessSound(CommandSender sender) {
-        if (!IrisSettings.get().getGeneral().isCommandSounds()) {
-            return;
-        }
-
-        if (sender instanceof Player player) {
-            player.playSound(player.getLocation(), Sound.BLOCK_AMETHYST_CLUSTER_BREAK, 0.77f, 1.65f);
-            player.playSound(player.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 0.125f, 2.99f);
-        }
-    }
-
-    private record BukkitDirectorSender(CommandSender sender) implements DirectorSender {
-        @Override
-        public String getName() {
-            return sender.getName();
-        }
-
-        @Override
-        public boolean isPlayer() {
-            return sender instanceof Player;
-        }
-
-        @Override
-        public void sendMessage(String message) {
-            if (message != null && !message.trim().isEmpty()) {
-                sender.sendMessage(message);
-            }
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/service/EditSVC.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 art.arcane.iris.core.service;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.edit.BlockEditor;
-import art.arcane.iris.core.edit.BukkitBlockEditor;
-import art.arcane.iris.engine.framework.BlockEditAccess;
-import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.volmlib.util.math.M;
-import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.common.scheduling.J;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.world.WorldUnloadEvent;
-
-public class EditSVC implements IrisService, BlockEditAccess<World, BlockData, Biome> {
-    private KMap<World, BlockEditor> editors;
-    private int updateTaskId = -1;
-    public static boolean deletingWorld = false;
-
-    @Override
-    public void onEnable() {
-        this.editors = new KMap<>();
-        updateTaskId = J.sr(this::update, 1000);
-    }
-
-    @Override
-    public void onDisable() {
-        if (updateTaskId != -1) {
-            J.csr(updateTaskId);
-            updateTaskId = -1;
-        }
-        if (editors == null) {
-            return;
-        }
-        flushNow();
-    }
-
-    public BlockData get(World world, int x, int y, int z) {
-        return open(world).get(x, y, z);
-    }
-
-    public void set(World world, int x, int y, int z, BlockData d) {
-        open(world).set(x, y, z, d);
-    }
-
-    public void setBiome(World world, int x, int y, int z, Biome d) {
-        open(world).setBiome(x, y, z, d);
-    }
-
-    public void setBiome(World world, int x, int z, Biome d) {
-        open(world).setBiome(x, z, d);
-    }
-
-    public Biome getBiome(World world, int x, int y, int z) {
-        return open(world).getBiome(x, y, z);
-    }
-
-    public Biome getBiome(World world, int x, int z) {
-        return open(world).getBiome(x, z);
-    }
-
-    @EventHandler
-    public void on(WorldUnloadEvent e) {
-        if (editors == null) {
-            return;
-        }
-        if (editors.containsKey(e.getWorld()) && !deletingWorld) {
-            editors.remove(e.getWorld()).close();
-        }
-    }
-
-
-    public void update() {
-        if (editors == null) {
-            return;
-        }
-        for (World i : editors.k()) {
-            if (M.ms() - editors.get(i).last() > 1000) {
-                editors.remove(i).close();
-            }
-        }
-    }
-
-    public void flushNow() {
-        if (editors == null) {
-            return;
-        }
-        for (World i : editors.k()) {
-            editors.remove(i).close();
-        }
-    }
-
-    public BlockEditor open(World world) {
-        if (editors == null) {
-            editors = new KMap<>();
-        }
-        if (editors.containsKey(world)) {
-            return editors.get(world);
-        }
-
-        BlockEditor e = new BukkitBlockEditor(world);
-        editors.put(world, e);
-
-        return e;
-    }
-
-}

core/src/main/java/art/arcane/iris/core/service/IrisEngineSVC.java

@@ -1,440 +0,0 @@
-package art.arcane.iris.core.service;
-
-import com.google.common.util.concurrent.AtomicDouble;
-import art.arcane.iris.spi.IrisLogging;
-import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.loader.ResourceLoader;
-import art.arcane.iris.core.runtime.GoldenHashScanner;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.format.Form;
-import art.arcane.volmlib.util.math.RNG;
-import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.volmlib.util.scheduling.Looper;
-import art.arcane.iris.util.project.stream.utility.CachedDoubleStream2D;
-import art.arcane.iris.util.project.stream.utility.CachedStream2D;
-import art.arcane.iris.util.project.stream.utility.CachedStream3D;
-import art.arcane.iris.core.gui.PregeneratorJob;
-import lombok.Synchronized;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.event.world.WorldUnloadEvent;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Locale;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class IrisEngineSVC implements IrisService {
-    private static final int TRIM_PERIOD = 2_000;
-    private final AtomicInteger tectonicLimit = new AtomicInteger(30);
-    private final AtomicInteger tectonicPlates = new AtomicInteger();
-    private final AtomicInteger queuedTectonicPlates = new AtomicInteger();
-    private final AtomicInteger trimmerAlive = new AtomicInteger();
-    private final AtomicInteger unloaderAlive = new AtomicInteger();
-    private final AtomicInteger totalWorlds = new AtomicInteger();
-    private final AtomicDouble maxIdleDuration = new AtomicDouble();
-    private final AtomicDouble minIdleDuration = new AtomicDouble();
-    private final AtomicLong loadedChunks = new AtomicLong();
-    private final KMap<World, Registered> worlds = new KMap<>();
-    private ScheduledExecutorService service;
-    private Looper updateTicker;
-
-    @Override
-    public void onEnable() {
-        var settings = IrisSettings.get().getPerformance();
-        var engine = settings.getEngineSVC();
-        service = Executors.newScheduledThreadPool(0,
-                (engine.isUseVirtualThreads()
-                        ? Thread.ofVirtual()
-                        : Thread.ofPlatform().priority(engine.getPriority()))
-                        .name("Iris EngineSVC-", 0)
-                        .factory());
-        tectonicLimit.set(settings.getTectonicPlateSize());
-        Bukkit.getWorlds().forEach(this::add);
-        setup();
-    }
-
-    @Override
-    public void onDisable() {
-        for (World world : worlds.keySet()) {
-            PlatformChunkGenerator gen = IrisToolbelt.access(world);
-            if (gen == null) continue;
-            try {
-                gen.close();
-            } catch (Throwable t) {
-                IrisLogging.reportError(t);
-            }
-        }
-        if (service != null) {
-            service.shutdown();
-        }
-        if (updateTicker != null) {
-            updateTicker.interrupt();
-        }
-        worlds.keySet().forEach(this::remove);
-        worlds.clear();
-    }
-
-    public int getQueuedTectonicPlateCount() {
-        return queuedTectonicPlates.get();
-    }
-
-    public double getAverageIdleDuration() {
-        double min = minIdleDuration.get();
-        double max = maxIdleDuration.get();
-        if (!Double.isFinite(min) || !Double.isFinite(max) || min < 0D || max < 0D) {
-            return 0D;
-        }
-
-        if (max < min) {
-            return max;
-        }
-
-        return (min + max) / 2D;
-    }
-
-    public double getBiomeCacheUsageRatio() {
-        PreservationSVC preservation = IrisServices.get(PreservationSVC.class);
-        if (preservation == null) {
-            return 0D;
-        }
-
-        double total = 0D;
-        int count = 0;
-        for (var cache : preservation.getCaches()) {
-            if (!(cache instanceof CachedStream2D<?>) && !(cache instanceof CachedDoubleStream2D)) {
-                continue;
-            }
-
-            double usage = cache.getUsage();
-            if (!Double.isFinite(usage)) {
-                continue;
-            }
-
-            total += Math.max(0D, Math.min(1D, usage));
-            count++;
-        }
-
-        if (count <= 0) {
-            return 0D;
-        }
-
-        return total / count;
-    }
-
-    public void engineStatus(VolmitSender sender) {
-        long[] sizes = new long[4];
-        long[] count = new long[4];
-
-        for (var cache : IrisServices.get(PreservationSVC.class).getCaches()) {
-            var type = switch (cache) {
-                case ResourceLoader<?> ignored -> 0;
-                case CachedStream2D<?> ignored -> 1;
-                case CachedDoubleStream2D ignored -> 1;
-                case CachedStream3D<?> ignored -> 2;
-                default -> 3;
-            };
-
-            sizes[type] += cache.getSize();
-            count[type]++;
-        }
-
-        sender.sendMessage(C.DARK_PURPLE + "-------------------------");
-        sender.sendMessage(C.DARK_PURPLE + "Status:");
-        sender.sendMessage(C.DARK_PURPLE + "- Service: " + C.LIGHT_PURPLE + (service.isShutdown() ? "Shutdown" : "Running"));
-        sender.sendMessage(C.DARK_PURPLE + "- Updater: " + C.LIGHT_PURPLE + (updateTicker.isAlive() ? "Running" : "Stopped"));
-        sender.sendMessage(C.DARK_PURPLE + "- Period: " + C.LIGHT_PURPLE + Form.duration(TRIM_PERIOD));
-        sender.sendMessage(C.DARK_PURPLE + "- Trimmers: " + C.LIGHT_PURPLE + trimmerAlive.get());
-        sender.sendMessage(C.DARK_PURPLE + "- Unloaders: " + C.LIGHT_PURPLE + unloaderAlive.get());
-        sender.sendMessage(C.DARK_PURPLE + "Tectonic Plates:");
-        sender.sendMessage(C.DARK_PURPLE + "- Limit: " + C.LIGHT_PURPLE + tectonicLimit.get());
-        sender.sendMessage(C.DARK_PURPLE + "- Total: " + C.LIGHT_PURPLE + tectonicPlates.get());
-        sender.sendMessage(C.DARK_PURPLE + "- Queued: " + C.LIGHT_PURPLE + queuedTectonicPlates.get());
-        sender.sendMessage(C.DARK_PURPLE + "- Max Idle Duration: " + C.LIGHT_PURPLE + Form.duration(maxIdleDuration.get(), 2));
-        sender.sendMessage(C.DARK_PURPLE + "- Min Idle Duration: " + C.LIGHT_PURPLE + Form.duration(minIdleDuration.get(), 2));
-        sender.sendMessage(C.DARK_PURPLE + "Caches:");
-        sender.sendMessage(C.DARK_PURPLE + "- Resource: " + C.LIGHT_PURPLE + sizes[0] + " (" + count[0] + ")");
-        sender.sendMessage(C.DARK_PURPLE + "- 2D Stream: " + C.LIGHT_PURPLE + sizes[1] + " (" + count[1] + ")");
-        sender.sendMessage(C.DARK_PURPLE + "- 3D Stream: " + C.LIGHT_PURPLE + sizes[2] + " (" + count[2] + ")");
-        sender.sendMessage(C.DARK_PURPLE + "- Other: " + C.LIGHT_PURPLE + sizes[3] + " (" + count[3] + ")");
-        sender.sendMessage(C.DARK_PURPLE + "Other:");
-        sender.sendMessage(C.DARK_PURPLE + "- Iris Worlds: " + C.LIGHT_PURPLE + totalWorlds.get());
-        sender.sendMessage(C.DARK_PURPLE + "- Loaded Chunks: " + C.LIGHT_PURPLE + loadedChunks.get());
-        sender.sendMessage(C.DARK_PURPLE + "-------------------------");
-    }
-
-    @EventHandler
-    public void onWorldUnload(WorldUnloadEvent event) {
-        remove(event.getWorld());
-    }
-
-    @EventHandler
-    public void onWorldLoad(WorldLoadEvent event) {
-        add(event.getWorld());
-    }
-
-    private void remove(World world) {
-        var entry = worlds.remove(world);
-        if (entry == null) return;
-        entry.close();
-    }
-
-    private void add(World world) {
-        if (world == null || worlds.containsKey(world)) return;
-        PlatformChunkGenerator access = IrisToolbelt.access(world);
-        if (access == null) return;
-        worlds.put(world, new Registered(world.getName(), access));
-    }
-
-    private synchronized void setup() {
-        if (updateTicker != null && updateTicker.isAlive())
-            return;
-
-        updateTicker = new Looper() {
-            @Override
-            protected long loop() {
-                try {
-                    for (World world : Bukkit.getWorlds()) {
-                        add(world);
-                    }
-
-                    int queuedPlates = 0;
-                    int totalPlates = 0;
-                    long chunks = 0;
-                    int unloaders = 0;
-                    int trimmers = 0;
-                    int iris = 0;
-
-                    double maxDuration = Long.MIN_VALUE;
-                    double minDuration = Long.MAX_VALUE;
-                    for (var entry : worlds.entrySet()) {
-                        var registered = entry.getValue();
-                        if (registered.closed) continue;
-
-                        iris++;
-                        if (registered.unloaderAlive()) unloaders++;
-                        if (registered.trimmerAlive()) trimmers++;
-
-                        var engine = registered.getEngine();
-                        if (engine == null) continue;
-
-                        queuedPlates += engine.getMantle().getUnloadRegionCount();
-                        totalPlates += engine.getMantle().getLoadedRegionCount();
-                        chunks += entry.getKey().getLoadedChunks().length;
-
-                        double duration = engine.getMantle().getAdjustedIdleDuration();
-                        if (duration > maxDuration) maxDuration = duration;
-                        if (duration < minDuration) minDuration = duration;
-                    }
-
-                    trimmerAlive.set(trimmers);
-                    unloaderAlive.set(unloaders);
-                    tectonicPlates.set(totalPlates);
-                    queuedTectonicPlates.set(queuedPlates);
-                    maxIdleDuration.set(maxDuration);
-                    minIdleDuration.set(minDuration);
-                    loadedChunks.set(chunks);
-                    totalWorlds.set(iris);
-
-                    worlds.values().forEach(Registered::update);
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                }
-                return 1000;
-            }
-        };
-        updateTicker.start();
-    }
-
-    private static boolean isMantleClosed(Throwable throwable) {
-        Throwable current = throwable;
-        while (current != null) {
-            String message = current.getMessage();
-            if (message != null && message.toLowerCase(Locale.ROOT).contains("mantle is closed")) {
-                return true;
-            }
-
-            current = current.getCause();
-        }
-
-        return false;
-    }
-
-    static boolean shouldSkipMantleReductionForMaintenance(boolean maintenanceActive, boolean pregeneratorTargetsWorld) {
-        return maintenanceActive && !pregeneratorTargetsWorld;
-    }
-
-    private final class Registered {
-        private final String name;
-        private final PlatformChunkGenerator access;
-        private final int offset = RNG.r.nextInt(TRIM_PERIOD);
-        private transient ScheduledFuture<?> trimmer;
-        private transient ScheduledFuture<?> unloader;
-        private transient boolean closed;
-
-        private Registered(String name, PlatformChunkGenerator access) {
-            this.name = name;
-            this.access = access;
-            update();
-        }
-
-        private boolean unloaderAlive() {
-            return unloader != null && !unloader.isDone() && !unloader.isCancelled();
-        }
-
-        private boolean trimmerAlive() {
-            return trimmer != null && !trimmer.isDone() && !trimmer.isCancelled();
-        }
-
-        @Synchronized
-        private void update() {
-            if (closed || service == null || service.isShutdown())
-                return;
-
-            if (trimmer == null || trimmer.isDone() || trimmer.isCancelled()) {
-                trimmer = service.scheduleAtFixedRate(() -> {
-                    Engine engine = getEngine();
-                    if (engine == null
-                            || engine.isClosed()
-                            || engine.getMantle().getMantle().isClosed()
-                            || !shouldReduce(engine))
-                        return;
-                    World engineWorld = engine.getWorld().realWorld();
-                    if (shouldSkipForMaintenance(engineWorld)) {
-                        return;
-                    }
-                    if (GoldenHashScanner.isScanActive()) {
-                        return;
-                    }
-
-                    try {
-                        engine.getMantle().trim(activeIdleDuration(engine), activeTectonicLimit(engine));
-                    } catch (Throwable e) {
-                        if (isMantleClosed(e)) {
-                            close();
-                            return;
-                        }
-                        IrisLogging.reportError(e);
-                        IrisLogging.error("EngineSVC: Failed to trim for " + name);
-                        e.printStackTrace();
-                    }
-                }, offset, TRIM_PERIOD, TimeUnit.MILLISECONDS);
-            }
-
-            if (unloader == null || unloader.isDone() || unloader.isCancelled()) {
-                unloader = service.scheduleAtFixedRate(() -> {
-                    Engine engine = getEngine();
-                    if (engine == null
-                            || engine.isClosed()
-                            || engine.getMantle().getMantle().isClosed()
-                            || !shouldReduce(engine))
-                        return;
-                    World engineWorld = engine.getWorld().realWorld();
-                    if (shouldSkipForMaintenance(engineWorld)) {
-                        return;
-                    }
-
-                    if (GoldenHashScanner.isScanActive()) {
-                        return;
-                    }
-
-                    try {
-                        long unloadStart = System.currentTimeMillis();
-                        int count = engine.getMantle().unloadTectonicPlate(IrisSettings.get().getPerformance().getEngineSVC().forceMulticoreWrite ? 0 : activeTectonicLimit(engine));
-                        if (count > 0) {
-                            IrisLogging.debug(C.GOLD + "Unloaded " + C.YELLOW + count + " TectonicPlates in " + C.RED + Form.duration(System.currentTimeMillis() - unloadStart, 2));
-                        }
-                    } catch (Throwable e) {
-                        if (isMantleClosed(e)) {
-                            close();
-                            return;
-                        }
-                        IrisLogging.reportError(e);
-                        IrisLogging.error("EngineSVC: Failed to unload for " + name);
-                        e.printStackTrace();
-                    }
-                }, offset + TRIM_PERIOD / 2, TRIM_PERIOD, TimeUnit.MILLISECONDS);
-            }
-        }
-
-        private int tectonicLimit() {
-            return tectonicLimit.get() / Math.max(worlds.size(), 1);
-        }
-
-        private boolean pregenTargets(Engine engine) {
-            if (engine == null || engine.getWorld() == null) {
-                return false;
-            }
-
-            PregeneratorJob pregeneratorJob = PregeneratorJob.getInstance();
-            return pregeneratorJob != null && pregeneratorJob.targetsWorldName(engine.getWorld().name());
-        }
-
-        private int activeTectonicLimit(Engine engine) {
-            int limit = tectonicLimit();
-            if (!pregenTargets(engine)) {
-                return limit;
-            }
-
-            return Math.max(limit, IrisSettings.get().getPregen().getMaxResidentTectonicPlates());
-        }
-
-        private long activeIdleDuration(Engine engine) {
-            return TimeUnit.SECONDS.toMillis(IrisSettings.get().getPerformance().getMantleKeepAlive());
-        }
-
-        @Synchronized
-        private void close() {
-            if (closed) return;
-            closed = true;
-
-            if (trimmer != null) {
-                trimmer.cancel(false);
-                trimmer = null;
-            }
-
-            if (unloader != null) {
-                unloader.cancel(false);
-                unloader = null;
-            }
-        }
-
-        @Nullable
-        private Engine getEngine() {
-            if (closed) return null;
-            return access.getEngine();
-        }
-
-        private boolean shouldReduce(Engine engine) {
-            if (!engine.isStudio() || IrisSettings.get().getPerformance().isTrimMantleInStudio()) {
-                return true;
-            }
-
-            return pregenTargets(engine);
-        }
-
-        private boolean shouldSkipForMaintenance(@Nullable World world) {
-            if (world == null) {
-                return false;
-            }
-
-            boolean maintenanceActive = IrisToolbelt.isWorldMaintenanceActive(world);
-            if (!maintenanceActive) {
-                return false;
-            }
-
-            PregeneratorJob pregeneratorJob = PregeneratorJob.getInstance();
-            boolean pregeneratorTargetsWorld = pregeneratorJob != null && pregeneratorJob.targetsWorld(world);
-            return shouldSkipMantleReductionForMaintenance(maintenanceActive, pregeneratorTargetsWorld);
-        }
-    }
-}

core/src/main/java/art/arcane/iris/core/service/IrisIntegrationService.java

@@ -1,210 +0,0 @@
-package art.arcane.iris.core.service;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.gui.PregeneratorJob;
-import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.volmlib.integration.IntegrationHandshakeRequest;
-import art.arcane.volmlib.integration.IntegrationHandshakeResponse;
-import art.arcane.volmlib.integration.IntegrationHeartbeat;
-import art.arcane.volmlib.integration.IntegrationMetricDescriptor;
-import art.arcane.volmlib.integration.IntegrationMetricSample;
-import art.arcane.volmlib.integration.IntegrationMetricSchema;
-import art.arcane.volmlib.integration.IntegrationProtocolNegotiator;
-import art.arcane.volmlib.integration.IntegrationProtocolVersion;
-import art.arcane.volmlib.integration.IntegrationServiceContract;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.ServicePriority;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-public class IrisIntegrationService implements IrisService, IntegrationServiceContract {
-    private static final Set<IntegrationProtocolVersion> SUPPORTED_PROTOCOLS = Set.of(
-            new IntegrationProtocolVersion(1, 0),
-            new IntegrationProtocolVersion(1, 1)
-    );
-
-    private static final Set<String> CAPABILITIES = Set.of(
-            "handshake",
-            "heartbeat",
-            "metrics",
-            "iris-engine-metrics"
-    );
-
-    private volatile IntegrationProtocolVersion negotiatedProtocol = new IntegrationProtocolVersion(1, 1);
-
-    @Override
-    public void onEnable() {
-        Bukkit.getServicesManager().register(IntegrationServiceContract.class, this, Iris.instance, ServicePriority.Normal);
-        Iris.verbose("Integration provider registered for Iris");
-    }
-
-    @Override
-    public void onDisable() {
-        Bukkit.getServicesManager().unregister(IntegrationServiceContract.class, this);
-    }
-
-    @Override
-    public String pluginId() {
-        return "iris";
-    }
-
-    @Override
-    public String pluginVersion() {
-        return Iris.instance.getDescription().getVersion();
-    }
-
-    @Override
-    public Set<IntegrationProtocolVersion> supportedProtocols() {
-        return SUPPORTED_PROTOCOLS;
-    }
-
-    @Override
-    public Set<String> capabilities() {
-        return CAPABILITIES;
-    }
-
-    @Override
-    public Set<IntegrationMetricDescriptor> metricDescriptors() {
-        return IntegrationMetricSchema.descriptors().stream()
-                .filter(descriptor -> descriptor.key().startsWith("iris."))
-                .collect(java.util.stream.Collectors.toSet());
-    }
-
-    @Override
-    public IntegrationHandshakeResponse handshake(IntegrationHandshakeRequest request) {
-        long now = System.currentTimeMillis();
-        if (request == null) {
-            return new IntegrationHandshakeResponse(
-                    pluginId(),
-                    pluginVersion(),
-                    false,
-                    null,
-                    SUPPORTED_PROTOCOLS,
-                    CAPABILITIES,
-                    "missing request",
-                    now
-            );
-        }
-
-        Optional<IntegrationProtocolVersion> negotiated = IntegrationProtocolNegotiator.negotiate(
-                SUPPORTED_PROTOCOLS,
-                request.supportedProtocols()
-        );
-        if (negotiated.isEmpty()) {
-            return new IntegrationHandshakeResponse(
-                    pluginId(),
-                    pluginVersion(),
-                    false,
-                    null,
-                    SUPPORTED_PROTOCOLS,
-                    CAPABILITIES,
-                    "no-common-protocol",
-                    now
-            );
-        }
-
-        negotiatedProtocol = negotiated.get();
-        return new IntegrationHandshakeResponse(
-                pluginId(),
-                pluginVersion(),
-                true,
-                negotiatedProtocol,
-                SUPPORTED_PROTOCOLS,
-                CAPABILITIES,
-                "ok",
-                now
-        );
-    }
-
-    @Override
-    public IntegrationHeartbeat heartbeat() {
-        long now = System.currentTimeMillis();
-        return new IntegrationHeartbeat(negotiatedProtocol, true, now, "ok");
-    }
-
-    @Override
-    public Map<String, IntegrationMetricSample> sampleMetrics(Set<String> metricKeys) {
-        Set<String> requested = metricKeys == null || metricKeys.isEmpty()
-                ? IntegrationMetricSchema.irisKeys()
-                : metricKeys;
-        long now = System.currentTimeMillis();
-        Map<String, IntegrationMetricSample> out = new HashMap<>();
-
-        for (String key : requested) {
-            switch (key) {
-                case IntegrationMetricSchema.IRIS_CHUNK_STREAM_MS -> out.put(key, sampleChunkStreamMetric(now));
-                case IntegrationMetricSchema.IRIS_PREGEN_QUEUE -> out.put(key, samplePregenQueueMetric(now));
-                case IntegrationMetricSchema.IRIS_BIOME_CACHE_HIT_RATE -> out.put(key, sampleBiomeCacheHitRateMetric(now));
-                default -> out.put(key, IntegrationMetricSample.unavailable(
-                        IntegrationMetricSchema.descriptor(key),
-                        "unsupported-key",
-                        now
-                ));
-            }
-        }
-
-        return out;
-    }
-
-    private IntegrationMetricSample sampleChunkStreamMetric(long now) {
-        IntegrationMetricDescriptor descriptor = IntegrationMetricSchema.descriptor(IntegrationMetricSchema.IRIS_CHUNK_STREAM_MS);
-
-        double chunksPerSecond = PregeneratorJob.chunksPerSecond();
-
-        if (chunksPerSecond > 0D) {
-            return IntegrationMetricSample.available(descriptor, 1000D / chunksPerSecond, now);
-        }
-
-        IrisEngineSVC engineService = Iris.service(IrisEngineSVC.class);
-        if (engineService != null) {
-            double idle = engineService.getAverageIdleDuration();
-            if (idle > 0D && Double.isFinite(idle)) {
-                return IntegrationMetricSample.available(descriptor, idle, now);
-            }
-        }
-
-        return IntegrationMetricSample.available(descriptor, 0D, now);
-    }
-
-    private IntegrationMetricSample samplePregenQueueMetric(long now) {
-        IntegrationMetricDescriptor descriptor = IntegrationMetricSchema.descriptor(IntegrationMetricSchema.IRIS_PREGEN_QUEUE);
-        long totalQueue = 0L;
-        boolean hasAnySource = false;
-
-        long pregenRemaining = PregeneratorJob.chunksRemaining();
-        if (pregenRemaining >= 0L) {
-            totalQueue += pregenRemaining;
-            hasAnySource = true;
-        }
-
-        IrisEngineSVC engineService = Iris.service(IrisEngineSVC.class);
-        if (engineService != null) {
-            totalQueue += Math.max(0, engineService.getQueuedTectonicPlateCount());
-            hasAnySource = true;
-        }
-
-        if (!hasAnySource) {
-            return IntegrationMetricSample.unavailable(descriptor, "queue-not-available", now);
-        }
-
-        return IntegrationMetricSample.available(descriptor, totalQueue, now);
-    }
-
-    private IntegrationMetricSample sampleBiomeCacheHitRateMetric(long now) {
-        IntegrationMetricDescriptor descriptor = IntegrationMetricSchema.descriptor(IntegrationMetricSchema.IRIS_BIOME_CACHE_HIT_RATE);
-        IrisEngineSVC engineService = Iris.service(IrisEngineSVC.class);
-        if (engineService == null) {
-            return IntegrationMetricSample.unavailable(descriptor, "engine-service-unavailable", now);
-        }
-
-        double ratio = engineService.getBiomeCacheUsageRatio();
-        if (!Double.isFinite(ratio)) {
-            return IntegrationMetricSample.unavailable(descriptor, "biome-cache-ratio-invalid", now);
-        }
-
-        return IntegrationMetricSample.available(descriptor, Math.max(0D, Math.min(1D, ratio)), now);
-    }
-}

core/src/main/java/art/arcane/iris/core/service/StudioSVC.java

@@ -19,7 +19,9 @@
 package art.arcane.iris.core.service;
 
 import com.google.gson.JsonSyntaxException;
-import art.arcane.iris.Iris;
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisServices;
+import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.core.IrisSettings;
 import art.arcane.iris.core.ServerConfigurator;
 import art.arcane.iris.core.lifecycle.WorldLifecycleService;
@@ -71,11 +73,11 @@ public class StudioSVC implements IrisService {
 
             if (!f.exists()) {
                 if (pack.equals("overworld")) {
-                    Iris.info("Downloading Default Pack " + pack + " (latest on master)");
-                    Iris.service(StudioSVC.class).downloadBranch(Iris.getSender(), "IrisDimensions/overworld", "master", false);
+                    IrisLogging.info("Downloading Default Pack " + pack + " (latest on master)");
+                    IrisServices.get(StudioSVC.class).downloadBranch(art.arcane.iris.platform.bukkit.BukkitPlatform.console(), "IrisDimensions/overworld", "master", false);
                     ServerConfigurator.installDataPacksIfChanged(true);
                 } else {
-                    Iris.warn("Default pack '" + pack + "' is not installed. Please download it manually with /iris download " + pack);
+                    IrisLogging.warn("Default pack '" + pack + "' is not installed. Please download it manually with /iris download " + pack);
                 }
             }
         });
@@ -83,7 +85,7 @@ public class StudioSVC implements IrisService {
 
     @Override
     public void onDisable() {
-        Iris.debug("Studio Mode Active: Closing Projects");
+        IrisLogging.debug("Studio Mode Active: Closing Projects");
         boolean stopping = IrisToolbelt.isServerStopping();
         LinkedHashSet<String> worldNamesToDelete = new LinkedHashSet<>(TransientWorldCleanupSupport.collectTransientStudioWorldNames(Bukkit.getWorldContainer()));
 
@@ -113,7 +115,7 @@ public class StudioSVC implements IrisService {
                 try {
                     generator.close();
                 } catch (Throwable e) {
-                    Iris.reportError("Failed to close studio generator for \"" + i.getName() + "\" during shutdown.", e);
+                    IrisLogging.reportError("Failed to close studio generator for \"" + i.getName() + "\" during shutdown.", e);
                 }
             }
         }
@@ -123,7 +125,7 @@ public class StudioSVC implements IrisService {
         try {
             art.arcane.iris.core.tools.IrisCreator.removeTransientStudioWorldsFromBukkitYml();
         } catch (Throwable e) {
-            Iris.reportError("Failed to unregister transient studio worlds from bukkit.yml during shutdown.", e);
+            IrisLogging.reportError("Failed to unregister transient studio worlds from bukkit.yml during shutdown.", e);
         }
 
         queueStudioWorldDeletionOnStartup(worldNamesToDelete);
@@ -155,7 +157,7 @@ public class StudioSVC implements IrisService {
             try {
                 FileUtils.copyDirectory(f, folder);
             } catch (IOException e) {
-                Iris.reportError(e);
+                IrisLogging.reportError(e);
             }
         }
 
@@ -173,14 +175,14 @@ public class StudioSVC implements IrisService {
                             FileUtils.copyFile(i, new File(folder, i.getName()));
                         } catch (IOException e) {
                             e.printStackTrace();
-                            Iris.reportError(e);
+                            IrisLogging.reportError(e);
                         }
                     } else {
                         try {
                             FileUtils.copyDirectory(i, new File(folder, i.getName()));
                         } catch (IOException e) {
                             e.printStackTrace();
-                            Iris.reportError(e);
+                            IrisLogging.reportError(e);
                         }
                     }
                 }
@@ -221,13 +223,13 @@ public class StudioSVC implements IrisService {
                 return;
             }
 
-            Iris.info("Resolved pack '" + key + "' to " + url);
+            IrisLogging.info("Resolved pack '" + key + "' to " + url);
             String[] nodes = url.split("\\Q/\\E");
             String repo = nodes.length == 1 ? "IrisDimensions/" + nodes[0] : nodes[0] + "/" + nodes[1];
             String branch = nodes.length > 2 ? nodes[2] : "stable";
             download(sender, repo, branch, forceOverwrite, false);
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
             sender.sendMessage("Failed to download '" + key + "'.");
         }
@@ -237,7 +239,7 @@ public class StudioSVC implements IrisService {
         try {
             download(sender, "IrisDimensions", url, forceOverwrite, true);
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
             sender.sendMessage("Failed to download 'IrisDimensions/overworld' from " + url + ".");
         }
@@ -247,7 +249,7 @@ public class StudioSVC implements IrisService {
         try {
             download(sender, repo, branch, forceOverwrite, false);
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
             sender.sendMessage("Failed to download '" + repo + "' (branch " + branch + ").");
         }
@@ -260,8 +262,8 @@ public class StudioSVC implements IrisService {
     public void download(VolmitSender sender, String repo, String branch, boolean forceOverwrite, boolean directUrl) throws JsonSyntaxException, IOException {
         String url = directUrl ? branch : "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch;
         sender.sendMessage("Downloading " + url + " "); //The extra space stops a bug in adventure API from repeating the last letter of the URL
-        File zip = Iris.getNonCachedFile("pack-" + repo, url);
-        File temp = Iris.getTemp();
+        File zip = art.arcane.iris.util.common.misc.WebCache.getNonCachedFile("pack-" + repo, url);
+        File temp = art.arcane.iris.util.common.misc.WebCache.getTemp();
         File work = new File(temp, "dl-" + UUID.randomUUID());
         File packs = getWorkspaceFolder();
 
@@ -275,7 +277,7 @@ public class StudioSVC implements IrisService {
         try {
             ZipUtil.unpack(zip, work);
         } catch (Throwable e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
             sender.sendMessage(
                     """
@@ -298,7 +300,7 @@ public class StudioSVC implements IrisService {
         try {
             dir = zipFiles.length > 1 ? work : zipFiles[0].isDirectory() ? zipFiles[0] : null;
         } catch (NullPointerException e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             sender.sendMessage("Error when finding home directory. Are there any non-text characters in the file name?");
             return;
         }
@@ -358,9 +360,9 @@ public class StudioSVC implements IrisService {
         JSONObject a;
 
         if (cached) {
-            a = new JSONObject(Iris.getCached("cachedlisting", LISTING));
+            a = new JSONObject(art.arcane.iris.util.common.misc.WebCache.getCached("cachedlisting", LISTING));
         } else {
-            a = new JSONObject(Iris.getNonCached(true + "listing", LISTING));
+            a = new JSONObject(art.arcane.iris.util.common.misc.WebCache.getNonCached(true + "listing", LISTING));
         }
 
         KMap<String, String> l = new KMap<>();
@@ -386,7 +388,7 @@ public class StudioSVC implements IrisService {
             open(sender, seed, dimm, (w) -> {
             });
         } catch (Exception e) {
-            Iris.reportError("Failed to open studio world \"" + dimm + "\".", e);
+            IrisLogging.reportError("Failed to open studio world \"" + dimm + "\".", e);
             sender.sendMessage("Failed to open studio world: " + e.getMessage());
         }
     }
@@ -411,14 +413,14 @@ public class StudioSVC implements IrisService {
         CompletableFuture<art.arcane.iris.core.runtime.StudioOpenCoordinator.StudioCloseResult> pendingClose = close();
         pendingClose.whenComplete((closeResult, closeThrowable) -> {
             if (closeThrowable != null) {
-                Iris.reportError("Failed while closing an existing studio project before opening \"" + dimm + "\".", closeThrowable);
+                IrisLogging.reportError("Failed while closing an existing studio project before opening \"" + dimm + "\".", closeThrowable);
                 J.s(() -> sender.sendMessage("Failed to close the existing studio project: " + closeThrowable.getMessage()));
                 return;
             }
 
             if (closeResult != null && closeResult.failureCause() != null) {
                 Throwable failure = closeResult.failureCause();
-                Iris.reportError("Failed while closing an existing studio project before opening \"" + dimm + "\".", failure);
+                IrisLogging.reportError("Failed while closing an existing studio project before opening \"" + dimm + "\".", failure);
                 J.s(() -> sender.sendMessage("Failed to close the existing studio project: " + failure.getMessage()));
                 return;
             }
@@ -449,11 +451,11 @@ public class StudioSVC implements IrisService {
     }
 
     public File getWorkspaceFolder(String... sub) {
-        return Iris.instance.getDataFolderList(WORKSPACE_NAME, sub);
+        return art.arcane.iris.platform.bukkit.BukkitPlatform.volmitPlugin().getDataFolderList(WORKSPACE_NAME, sub);
     }
 
     public File getWorkspaceFile(String... sub) {
-        return Iris.instance.getDataFileList(WORKSPACE_NAME, sub);
+        return art.arcane.iris.platform.bukkit.BukkitPlatform.volmitPlugin().getDataFileList(WORKSPACE_NAME, sub);
     }
 
     public CompletableFuture<art.arcane.iris.core.runtime.StudioOpenCoordinator.StudioCloseResult> close() {
@@ -465,7 +467,7 @@ public class StudioSVC implements IrisService {
             return CompletableFuture.completedFuture(new art.arcane.iris.core.runtime.StudioOpenCoordinator.StudioCloseResult(null, true, true, false, null));
         }
 
-        Iris.debug("Closing Active Project");
+        IrisLogging.debug("Closing Active Project");
         IrisProject project = activeProject;
         activeProject = null;
         activeClose = project.close();
@@ -477,21 +479,21 @@ public class StudioSVC implements IrisService {
         try {
             IrisToolbelt.evacuate(world);
         } catch (Throwable e) {
-            Iris.reportError("Failed to evacuate studio world \"" + world.getName() + "\" during shutdown cleanup.", e);
+            IrisLogging.reportError("Failed to evacuate studio world \"" + world.getName() + "\" during shutdown cleanup.", e);
         }
 
         if (generator != null) {
             try {
                 generator.close();
             } catch (Throwable e) {
-                Iris.reportError("Failed to close studio generator for \"" + world.getName() + "\" during shutdown cleanup.", e);
+                IrisLogging.reportError("Failed to close studio generator for \"" + world.getName() + "\" during shutdown cleanup.", e);
             }
         }
 
         try {
             WorldLifecycleService.get().unload(world, false);
         } catch (Throwable e) {
-            Iris.reportError("Failed to unload studio world \"" + world.getName() + "\" during shutdown cleanup.", e);
+            IrisLogging.reportError("Failed to unload studio world \"" + world.getName() + "\" during shutdown cleanup.", e);
         }
 
         deleteTransientStudioFolders(world.getName());
@@ -536,9 +538,9 @@ public class StudioSVC implements IrisService {
         }
 
         try {
-            Iris.queueWorldDeletionOnStartup(List.copyOf(normalizedNames));
+            IrisServices.get(art.arcane.iris.core.runtime.WorldDeletionQueue.class).queueForStartupDeletion(List.copyOf(normalizedNames));
         } catch (IOException e) {
-            Iris.reportError("Failed to queue studio world deletion on startup.", e);
+            IrisLogging.reportError("Failed to queue studio world deletion on startup.", e);
         }
     }
 
@@ -551,14 +553,14 @@ public class StudioSVC implements IrisService {
         File newPack = getWorkspaceFolder(newName);
 
         if (importPack.listFiles().length == 0) {
-            Iris.warn("Couldn't find the pack to create a new dimension from.");
+            IrisLogging.warn("Couldn't find the pack to create a new dimension from.");
             return;
         }
 
         try {
             FileUtils.copyDirectory(importPack, newPack, pathname -> !pathname.getAbsolutePath().contains(".git"), false);
         } catch (IOException e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
         }
 
@@ -569,7 +571,7 @@ public class StudioSVC implements IrisService {
         try {
             FileUtils.copyFile(dimFile, newDimFile);
         } catch (IOException e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
         }
 
@@ -583,7 +585,7 @@ public class StudioSVC implements IrisService {
                 IO.writeAll(newDimFile, json.toString(4));
             }
         } catch (JSONException | IOException e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
         }
 
@@ -592,7 +594,7 @@ public class StudioSVC implements IrisService {
             JSONObject ws = p.createCodeWorkspaceConfig();
             IO.writeAll(getWorkspaceFile(newName, newName + ".code-workspace"), ws.toString(0));
         } catch (JSONException | IOException e) {
-            Iris.reportError(e);
+            IrisLogging.reportError(e);
             e.printStackTrace();
         }
     }

core/src/main/java/art/arcane/iris/core/service/WandSVC.java

@@ -1,537 +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 art.arcane.iris.core.service;
-
-import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.core.edit.DustRevealer;
-import art.arcane.iris.core.link.WorldEditLink;
-import art.arcane.iris.core.wand.WandSelection;
-import art.arcane.iris.engine.object.IrisObject;
-import art.arcane.iris.util.project.matter.WorldMatter;
-import art.arcane.volmlib.util.collection.KList;
-import art.arcane.volmlib.util.data.Cuboid;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.math.M;
-import art.arcane.volmlib.util.matter.Matter;
-import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.volmlib.util.scheduling.SR;
-import art.arcane.iris.util.common.scheduling.jobs.Job;
-import org.bukkit.*;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.EquipmentSlot;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemFlag;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.util.BlockVector;
-import org.bukkit.util.Vector;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.concurrent.CountDownLatch;
-
-import static art.arcane.iris.util.common.data.registry.Particles.CRIT_MAGIC;
-import static art.arcane.iris.util.common.data.registry.Particles.REDSTONE;
-
-public class WandSVC implements IrisService {
-    private static final int MS_PER_TICK = Integer.parseInt(System.getProperty("iris.ms_per_tick", "30"));
-
-    private static ItemStack dust;
-    private static ItemStack wand;
-
-    public static void pasteSchematic(IrisObject s, Location at) {
-        s.place(at);
-    }
-
-    /**
-     * Creates an Iris Object from the 2 coordinates selected with a wand
-     *
-     * @param p The wand player
-     * @return The new object
-     */
-    public static IrisObject createSchematic(Player p, boolean legacy) {
-        if (!isHoldingWand(p)) {
-            return null;
-        }
-
-        try {
-            Location[] f = getCuboid(p);
-            if (f == null || f[0] == null || f[1] == null)
-                return null;
-            Cuboid c = new Cuboid(f[0], f[1]);
-            IrisObject s = new IrisObject(c.getSizeX(), c.getSizeY(), c.getSizeZ());
-
-            var it = c.chunkedIterator();
-
-            int total = c.getSizeX() * c.getSizeY() * c.getSizeZ();
-            var latch = new CountDownLatch(1);
-            var holder = Iris.tickets.getHolder(p.getWorld());
-            new Job() {
-                private int i;
-                private Chunk chunk;
-
-                @Override
-                public String getName() {
-                    return "Scanning Selection";
-                }
-
-                @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) {
-                                        holder.removeTicket(chunk);
-                                        chunk = null;
-                                    }
-
-                                    cancel();
-                                    latch.countDown();
-                                    return;
-                                }
-
-                                try {
-                                    var b = it.next();
-                                    var bChunk = b.getChunk();
-                                    if (chunk == null) {
-                                        chunk = bChunk;
-                                        holder.addTicket(chunk);
-                                    } else if (chunk != bChunk) {
-                                        holder.removeTicket(chunk);
-                                        holder.addTicket(bChunk);
-                                        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) {
-            e.printStackTrace();
-            Iris.reportError(e);
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates an Iris Object from the 2 coordinates selected with a wand
-     *
-     * @return The new object
-     */
-    public static Matter createMatterSchem(Player p) {
-        if (!isHoldingWand(p)) {
-            return null;
-        }
-
-        try {
-            Location[] f = getCuboid(p);
-
-            return WorldMatter.createMatter(p.getName(), f[0], f[1]);
-        } catch (Throwable e) {
-            e.printStackTrace();
-            Iris.reportError(e);
-        }
-
-        return null;
-    }
-
-    /**
-     * Converts a user friendly location string to an actual Location
-     *
-     * @param s The string
-     * @return The location
-     */
-    public static Location stringToLocation(String s) {
-        try {
-            String[] f = s.split("\\Q in \\E");
-            if (f.length != 2) return null;
-            String[] g = f[0].split("\\Q,\\E");
-            if (g.length != 3) return null;
-            return new Location(Bukkit.getWorld(f[1]), Integer.parseInt(g[0]), Integer.parseInt(g[1]), Integer.parseInt(g[2]));
-        } catch (Throwable e) {
-            Iris.reportError(e);
-            return null;
-        }
-    }
-
-    /**
-     * Get a user friendly string of a location
-     *
-     * @param loc The location
-     * @return The string
-     */
-    public static String locationToString(Location loc) {
-        if (loc == null) {
-            return "<#>";
-        }
-
-        return loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ() + " in " + loc.getWorld().getName();
-    }
-
-    /**
-     * Create a new blank Iris wand
-     *
-     * @return The wand itemstack
-     */
-    public static ItemStack createWand() {
-        return createWand(null, null);
-    }
-
-    /**
-     * Create a new dust itemstack
-     *
-     * @return The stack
-     */
-    public static ItemStack createDust() {
-        ItemStack is = new ItemStack(Material.GLOWSTONE_DUST);
-        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.values());
-        im.setLore(new KList<String>().qadd("Right click on a block to reveal it's placement structure!"));
-        is.setItemMeta(im);
-
-        return is;
-    }
-
-    /**
-     * Finds an existing wand in a users inventory
-     *
-     * @param inventory The inventory to search
-     * @return The slot number the wand is in. Or -1 if none are found
-     */
-    public static int findWand(Inventory inventory) {
-        ItemStack wand = createWand(); //Create blank wand
-        ItemMeta meta = wand.getItemMeta();
-        meta.setLore(new ArrayList<>()); //We are resetting the lore as the lore differs between wands
-        wand.setItemMeta(meta);
-
-        for (int s = 0; s < inventory.getSize(); s++) {
-            ItemStack stack = inventory.getItem(s);
-            if (stack == null) continue;
-            meta = stack.getItemMeta();
-            meta.setLore(new ArrayList<>()); //Reset the lore on this too so we can compare them
-            stack.setItemMeta(meta);         //We dont need to clone the item as items from .get are cloned
-
-            if (wand.isSimilar(stack)) return s; //If the name, material and NBT is the same
-        }
-        return -1;
-    }
-
-    /**
-     * Creates an Iris wand. The locations should be the currently selected locations, or null
-     *
-     * @param a Location A
-     * @param b Location B
-     * @return A new wand
-     */
-    public static ItemStack createWand(Location a, Location b) {
-        ItemStack is = new ItemStack(Material.BLAZE_ROD);
-        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.values());
-        im.setLore(new KList<String>().add(locationToString(a), locationToString(b)));
-        is.setItemMeta(im);
-
-        return is;
-    }
-
-    public static Location[] getCuboidFromItem(ItemStack is) {
-        ItemMeta im = is.getItemMeta();
-        return new Location[]{stringToLocation(im.getLore().get(0)), stringToLocation(im.getLore().get(1))};
-    }
-
-    public static Location[] getCuboid(Player p) {
-        if (isHoldingIrisWand(p)) {
-            return getCuboidFromItem(p.getInventory().getItemInMainHand());
-        }
-
-        if (IrisSettings.get().getWorld().worldEditWandCUI) {
-            Cuboid c = WorldEditLink.getSelection(p);
-
-            if (c != null) {
-                return new Location[]{c.getLowerNE(), c.getUpperSW()};
-            }
-        }
-
-        return null;
-    }
-
-    public static boolean isHoldingWand(Player p) {
-        return isHoldingIrisWand(p) || (IrisSettings.get().getWorld().worldEditWandCUI && WorldEditLink.getSelection(p) != null);
-    }
-
-    public static boolean isHoldingIrisWand(Player p) {
-        ItemStack is = p.getInventory().getItemInMainHand();
-        return is != null && isWand(is);
-    }
-
-    /**
-     * Is the itemstack passed an Iris wand
-     *
-     * @param is The itemstack
-     * @return True if it is
-     */
-    public static boolean isWand(ItemStack is) {
-        if (is.getItemMeta() == null) return false;
-        return is.getType().equals(wand.getType()) &&
-                is.getItemMeta().getDisplayName().equals(wand.getItemMeta().getDisplayName()) &&
-                is.getItemMeta().getEnchants().equals(wand.getItemMeta().getEnchants()) &&
-                is.getItemMeta().getItemFlags().equals(wand.getItemMeta().getItemFlags());
-    }
-
-    @Override
-    public void onEnable() {
-        wand = createWand();
-        dust = createDust();
-
-        J.ar(() -> {
-            for (Player i : Bukkit.getOnlinePlayers()) {
-                tick(i);
-            }
-        }, 0);
-    }
-
-    @Override
-    public void onDisable() {
-
-    }
-
-    public void tick(Player p) {
-        try {
-            try {
-                if ((IrisSettings.get().getWorld().worldEditWandCUI && isHoldingWand(p)) || isWand(p.getInventory().getItemInMainHand())) {
-                    Location[] d = getCuboid(p);
-                    if (d == null || d[0] == null || d[1] == null) return;
-                    new WandSelection(new Cuboid(d[0], d[1]), p).draw();
-                }
-            } catch (Throwable e) {
-                Iris.reportError(e);
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Draw the outline of a selected region
-     *
-     * @param d The cuboid
-     * @param p The player to show it to
-     */
-    public void draw(Cuboid d, Player p) {
-        draw(new Location[]{d.getLowerNE(), d.getUpperSW()}, p);
-    }
-
-    /**
-     * Draw the outline of a selected region
-     *
-     * @param d A pair of locations
-     * @param p The player to show them to
-     */
-    public void draw(Location[] d, Player p) {
-        Vector gx = Vector.getRandom().subtract(Vector.getRandom()).normalize().clone().multiply(0.65);
-        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(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;
-        }
-
-        if (d[0].distanceSquared(d[1]) > 64 * 64) {
-            return;
-        }
-
-        int minx = Math.min(d[0].getBlockX(), d[1].getBlockX());
-        int miny = Math.min(d[0].getBlockY(), d[1].getBlockY());
-        int minz = Math.min(d[0].getBlockZ(), d[1].getBlockZ());
-        int maxx = Math.max(d[0].getBlockX(), d[1].getBlockX());
-        int maxy = Math.max(d[0].getBlockY(), d[1].getBlockY());
-        int maxz = Math.max(d[0].getBlockZ(), d[1].getBlockZ());
-
-        for (double j = minx - 1; j < maxx + 1; j += 0.25) {
-            for (double k = miny - 1; k < maxy + 1; k += 0.25) {
-                for (double l = minz - 1; l < maxz + 1; l += 0.25) {
-                    if (M.r(0.2)) {
-                        boolean jj = j == minx || j == maxx;
-                        boolean kk = k == miny || k == maxy;
-                        boolean ll = l == minz || l == maxz;
-
-                        if ((jj && kk) || (jj && ll) || (ll && kk)) {
-                            Vector push = new Vector(0, 0, 0);
-
-                            if (j == minx) {
-                                push.add(new Vector(-0.55, 0, 0));
-                            }
-
-                            if (k == miny) {
-                                push.add(new Vector(0, -0.55, 0));
-                            }
-
-                            if (l == minz) {
-                                push.add(new Vector(0, 0, -0.55));
-                            }
-
-                            if (j == maxx) {
-                                push.add(new Vector(0.55, 0, 0));
-                            }
-
-                            if (k == maxy) {
-                                push.add(new Vector(0, 0.55, 0));
-                            }
-
-                            if (l == maxz) {
-                                push.add(new Vector(0, 0, 0.55));
-                            }
-
-                            Location lv = new Location(d[0].getWorld(), j, k, l).clone().add(0.5, 0.5, 0.5).clone().add(push);
-                            Color color = Color.getHSBColor((float) (0.5f + (Math.sin((j + k + l + (p.getTicksLived() / 2f)) / 20f) / 2)), 1, 1);
-                            int r = color.getRed();
-                            int g = color.getGreen();
-                            int b = color.getBlue();
-                            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));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler
-    public void on(PlayerInteractEvent e) {
-        if (e.getHand() != EquipmentSlot.HAND)
-            return;
-        try {
-            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()));
-                    e.getPlayer().playSound(e.getClickedBlock().getLocation(), Sound.BLOCK_END_PORTAL_FRAME_FILL, 1f, 0.67f);
-                    e.getPlayer().updateInventory();
-                } else if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
-                    e.setCancelled(true);
-                    e.getPlayer().getInventory().setItemInMainHand(update(false, Objects.requireNonNull(e.getClickedBlock()).getLocation(), e.getPlayer().getInventory().getItemInMainHand()));
-                    e.getPlayer().playSound(e.getClickedBlock().getLocation(), Sound.BLOCK_END_PORTAL_FRAME_FILL, 1f, 1.17f);
-                    e.getPlayer().updateInventory();
-                }
-            }
-
-            if (isHoldingDust(e.getPlayer())) {
-                if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
-                    e.setCancelled(true);
-                    e.getPlayer().playSound(Objects.requireNonNull(e.getClickedBlock()).getLocation(), Sound.ENTITY_ENDER_EYE_DEATH, 2f, 1.97f);
-                    DustRevealer.spawn(e.getClickedBlock(), new VolmitSender(e.getPlayer(), Iris.instance.getTag()));
-                }
-            }
-        } catch (Throwable xx) {
-            Iris.reportError(xx);
-        }
-    }
-
-    /**
-     * Is the player holding Dust?
-     *
-     * @param p The player
-     * @return True if they are
-     */
-    public boolean isHoldingDust(Player p) {
-        ItemStack is = p.getInventory().getItemInMainHand();
-        return is != null && isDust(is);
-    }
-
-    /**
-     * Is the itemstack passed Iris dust?
-     *
-     * @param is The itemstack
-     * @return True if it is
-     */
-    public boolean isDust(ItemStack is) {
-        return is.isSimilar(dust);
-    }
-
-    /**
-     * Update the location on an Iris wand
-     *
-     * @param left True for first location, false for second
-     * @param a    The location
-     * @param item The wand
-     * @return The updated wand
-     */
-    public ItemStack update(boolean left, Location a, ItemStack item) {
-        if (!isWand(item)) {
-            return item;
-        }
-
-        Location[] f = getCuboidFromItem(item);
-        Location other = left ? f[1] : f[0];
-
-        if (other != null && !other.getWorld().getName().equals(a.getWorld().getName())) {
-            other = null;
-        }
-
-        return createWand(left ? a : other, left ? other : a);
-    }
-}

core/src/main/java/art/arcane/iris/core/wand/WandSelection.java

@@ -1,97 +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 art.arcane.iris.core.wand;
-
-import art.arcane.volmlib.util.data.Cuboid;
-import art.arcane.volmlib.util.math.M;
-import org.bukkit.Location;
-import org.bukkit.Particle;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-import java.awt.*;
-
-import static art.arcane.iris.util.common.data.registry.Particles.REDSTONE;
-
-public class WandSelection {
-    private final Cuboid c;
-    private final Player p;
-    private static final double STEP = 0.10;
-
-    public WandSelection(Cuboid c, Player p) {
-        this.c = c;
-        this.p = p;
-    }
-
-    public void draw() {
-        Location playerLoc = p.getLocation();
-        double maxDistanceSquared = 256 * 256;
-        int particleCount = 0;
-
-        // 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)}
-        };
-
-        for (Location[] edge : edges) {
-            Vector direction = edge[1].toVector().subtract(edge[0].toVector());
-            double length = direction.length();
-            direction.normalize();
-
-            for (double d = 0; d <= length; d += STEP) {
-                Location particleLoc = edge[0].clone().add(direction.clone().multiply(d));
-
-                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));
-    }
-}

core/src/main/java/art/arcane/iris/engine/object/IrisObject.java

@@ -952,7 +952,6 @@ public class IrisObject extends IrisRegistrant {
                         String key = o.getLoadKey();
                         if (key != null) {
                             if (config.getForbiddenCollisions().contains(key) && !config.getAllowedCollisions().contains(key)) {
-                                // Iris.debug("%s collides with %s (%s / %s / %s)", getLoadKey(), key, i, j, k);
                                 return -1;
                             }
                         }

core/src/main/java/art/arcane/iris/platform/bukkit/BukkitPlatform.java

@@ -209,6 +209,18 @@ public final class BukkitPlatform implements IrisPlatform {
         return INMS.get().getDataVersion().getPackFormat();
     }
 
+    public static java.util.concurrent.CompletableFuture<Boolean> teleportAsync(Entity entity, Location destination) {
+        return io.papermc.lib.PaperLib.teleportAsync(entity, destination);
+    }
+
+    public static boolean isPaperServer() {
+        return io.papermc.lib.PaperLib.isPaper();
+    }
+
+    public static java.util.concurrent.CompletableFuture<org.bukkit.Chunk> chunkAtAsync(World world, int x, int z, boolean generate) {
+        return io.papermc.lib.PaperLib.getChunkAtAsync(world, x, z, generate);
+    }
+
     @Override
     public String platformName() {
         return "bukkit";

core/src/main/java/art/arcane/iris/util/common/misc/WebCache.java

@@ -0,0 +1,97 @@
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2026 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 art.arcane.iris.util.common.misc;
+
+import art.arcane.iris.spi.IrisLogging;
+import art.arcane.iris.spi.IrisPlatforms;
+import art.arcane.volmlib.util.io.IO;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * Download cache helpers over the platform data folder.
+ */
+public final class WebCache {
+    private WebCache() {
+    }
+
+    public static File getTemp() {
+        return IrisPlatforms.get().dataFolder("cache", "temp");
+    }
+
+    public static File getCached(String name, String url) {
+        String h = IO.hash(name + "@" + url);
+        File f = IrisPlatforms.get().dataFile("cache", h.substring(0, 2), h.substring(3, 5), h);
+
+        if (!f.exists()) {
+            try (BufferedInputStream in = new BufferedInputStream(URI.create(url).toURL().openStream()); FileOutputStream fileOutputStream = new FileOutputStream(f)) {
+                byte[] dataBuffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) {
+                    fileOutputStream.write(dataBuffer, 0, bytesRead);
+                    IrisLogging.debug("Aquiring " + name);
+                }
+            } catch (IOException e) {
+                IrisLogging.reportError(e);
+            }
+        }
+
+        return f.exists() ? f : null;
+    }
+
+    public static String getNonCached(String name, String url) {
+        String h = IO.hash(name + "*" + url);
+        File f = IrisPlatforms.get().dataFile("cache", h.substring(0, 2), h.substring(3, 5), h);
+
+        try (BufferedInputStream in = new BufferedInputStream(URI.create(url).toURL().openStream()); FileOutputStream fileOutputStream = new FileOutputStream(f)) {
+            byte[] dataBuffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) {
+                fileOutputStream.write(dataBuffer, 0, bytesRead);
+            }
+        } catch (IOException e) {
+            IrisLogging.reportError(e);
+        }
+
+        return "";
+    }
+
+    public static File getNonCachedFile(String name, String url) {
+        String h = IO.hash(name + "*" + url);
+        File f = IrisPlatforms.get().dataFile("cache", h.substring(0, 2), h.substring(3, 5), h);
+        IrisLogging.debug("Download " + name + " -> " + url);
+        try (BufferedInputStream in = new BufferedInputStream(URI.create(url).toURL().openStream()); FileOutputStream fileOutputStream = new FileOutputStream(f)) {
+            byte[] dataBuffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) {
+                fileOutputStream.write(dataBuffer, 0, bytesRead);
+            }
+
+            fileOutputStream.flush();
+        } catch (IOException e) {
+            IrisLogging.reportError(e);
+        }
+
+        return f;
+    }
+}

core/src/main/resources/plugin.yml

@@ -1,12 +0,0 @@
-name: ${name}
-version: ${version}
-main: ${main}
-folia-supported: true
-load: STARTUP
-authors: [ cyberpwn, NextdoorPsycho, Vatuu ]
-website: volmit.com
-description: More than a Dimension!
-commands:
-  iris:
-    aliases: [ ir, irs ]
-api-version: '${apiVersion}'

core/src/test/java/art/arcane/iris/IrisDiagnosticsTest.java

@@ -1,74 +0,0 @@
-package art.arcane.iris;
-
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class IrisDiagnosticsTest {
-    @Test
-    public void reportErrorWithContextPrintsFullStacktrace() {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        PrintStream originalErr = System.err;
-        System.setErr(new PrintStream(output, true, StandardCharsets.UTF_8));
-        try {
-            Iris.reportError("Runtime world creation failed.", new IllegalStateException("outer", new IllegalArgumentException("inner")));
-        } finally {
-            System.setErr(originalErr);
-        }
-
-        String text = output.toString(StandardCharsets.UTF_8);
-        assertTrue(text.contains("Runtime world creation failed."));
-        assertTrue(text.contains("IllegalStateException"));
-        assertTrue(text.contains("IllegalArgumentException"));
-        assertTrue(text.contains("inner"));
-    }
-
-    @Test
-    public void collectSplashPacksSkipsInternalAndInvalidFolders() throws Exception {
-        Path root = Files.createTempDirectory("iris-splash");
-        try {
-            Path validPack = root.resolve("overworld");
-            Files.createDirectories(validPack.resolve("dimensions"));
-            Files.writeString(validPack.resolve("dimensions").resolve("overworld.json"), "{\"version\":\"4000\"}");
-
-            Files.createDirectories(root.resolve("datapack-imports"));
-
-            Path brokenPack = root.resolve("broken");
-            Files.createDirectories(brokenPack.resolve("dimensions"));
-            Files.writeString(brokenPack.resolve("dimensions").resolve("broken.json"), "{");
-
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            PrintStream originalErr = System.err;
-            System.setErr(new PrintStream(output, true, StandardCharsets.UTF_8));
-            List<Iris.SplashPackMetadata> packs;
-            try {
-                packs = Iris.collectSplashPacks(root.toFile());
-            } finally {
-                System.setErr(originalErr);
-            }
-
-            assertEquals(1, packs.size());
-            assertEquals("overworld", packs.get(0).name());
-            assertEquals("4000", packs.get(0).version());
-
-            String text = output.toString(StandardCharsets.UTF_8);
-            assertTrue(text.contains("Failed to read splash metadata for dimension pack \"broken\"."));
-            assertTrue(text.contains("Json"));
-        } finally {
-            Files.walk(root)
-                    .sorted(Comparator.reverseOrder())
-                    .map(Path::toFile)
-                    .forEach(File::delete);
-        }
-    }
-}

core/src/test/java/art/arcane/iris/core/StudioRuntimeCleanupTest.java

@@ -1,47 +0,0 @@
-package art.arcane.iris.core;
-
-import art.arcane.iris.core.commands.CommandStudio;
-import art.arcane.iris.core.tools.IrisCreator;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertFalse;
-
-public class StudioRuntimeCleanupTest {
-    @Test
-    public void pregenSettingsNoLongerExposeStartupNoisemapPrebake() {
-        boolean found = Arrays.stream(IrisSettings.IrisSettingsPregen.class.getDeclaredFields())
-                .anyMatch(field -> field.getName().equals("startupNoisemapPrebake"));
-
-        assertFalse(found);
-    }
-
-    @Test
-    public void studioCommandNoLongerExposesProfilecache() {
-        boolean found = Arrays.stream(CommandStudio.class.getDeclaredMethods())
-                .anyMatch(method -> method.getName().equals("profilecache"));
-
-        assertFalse(found);
-    }
-
-    @Test
-    public void studioCreatorNoLongerContainsPrewarmOrPrebakeHelpers() {
-        boolean found = Arrays.stream(IrisCreator.class.getDeclaredMethods())
-                .map(method -> method.getName().toLowerCase())
-                .anyMatch(name -> name.contains("prewarm") || name.contains("prebake"));
-
-        assertFalse(found);
-    }
-
-    @Test
-    public void noisemapPrebakePipelineClassIsRemoved() {
-        try {
-            Class.forName("art.arcane.iris.engine.IrisNoisemapPrebakePipeline");
-        } catch (ClassNotFoundException ignored) {
-            return;
-        }
-
-        throw new AssertionError("IrisNoisemapPrebakePipeline should not exist.");
-    }
-}

core/src/test/java/art/arcane/iris/core/service/IrisEngineSVCTest.java

@@ -1,24 +0,0 @@
-package art.arcane.iris.core.service;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class IrisEngineSVCTest {
-    @Test
-    public void maintenanceSkipsReductionWhenPregenDoesNotTargetWorld() {
-        assertTrue(IrisEngineSVC.shouldSkipMantleReductionForMaintenance(true, false));
-    }
-
-    @Test
-    public void maintenanceDoesNotSkipReductionForActivePregenWorld() {
-        assertFalse(IrisEngineSVC.shouldSkipMantleReductionForMaintenance(true, true));
-    }
-
-    @Test
-    public void noMaintenanceNeverSkipsReduction() {
-        assertFalse(IrisEngineSVC.shouldSkipMantleReductionForMaintenance(false, false));
-        assertFalse(IrisEngineSVC.shouldSkipMantleReductionForMaintenance(false, true));
-    }
-}

core/src/test/java/art/arcane/iris/util/project/context/ChunkContextPrefillPlanTest.java

@@ -1,6 +1,5 @@
 package art.arcane.iris.util.project.context;
 
-import art.arcane.iris.Iris;
 import art.arcane.iris.engine.IrisComplex;
 import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisRegion;
@@ -167,14 +166,12 @@ public class ChunkContextPrefillPlanTest {
     }
 
     private void assertPrefillAsyncDecision(String threadName, boolean expected) throws InterruptedException, ExecutionException, java.util.concurrent.TimeoutException {
-        Iris previous = Iris.instance;
         ExecutorService executor = Executors.newSingleThreadExecutor(runnable -> {
             Thread thread = new Thread(runnable);
             thread.setName(threadName);
             return thread;
         });
         try {
-            Iris.instance = mock(Iris.class);
             Future<Boolean> future = executor.submit(() -> ChunkContext.shouldPrefillAsync(2));
             boolean actual = future.get(10, TimeUnit.SECONDS);
             if (expected) {
@@ -183,7 +180,6 @@ public class ChunkContextPrefillPlanTest {
                 assertFalse(actual);
             }
         } finally {
-            Iris.instance = previous;
             executor.shutdownNow();
         }
     }