FIXES

kinda need this

.gitignore

@@ -10,4 +10,4 @@ libs/
 
 collection/
 
-/core/src/main/java/com/volmit/iris/util/uniques/
+/core/src/main/java/art/arcane/iris/util/uniques/

README.md

@@ -45,7 +45,7 @@ Consider supporting our development by buying Iris on spigot! We work hard to ma
 Everyone needs a tool-belt.
 
 ```java
-package com.volmit.iris.core.tools;
+package art.arcane.iris.core.tools;
 
 // Get IrisDataManager from a world
 IrisToolbelt.access(anyWorld).getCompound().getData();

build.gradle.kts

@@ -1,4 +1,5 @@
 import de.undercouch.gradle.tasks.download.Download
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 import xyz.jpenilla.runpaper.task.RunServer
 import kotlin.system.exitProcess
 
@@ -32,8 +33,8 @@ plugins {
     alias(libs.plugins.runPaper)
 }
 
-group = "com.volmit"
-version = "3.9.0-1.20.1-1.21.11"
+group = "art.arcane"
+version = "4.0.0-1.20.1-1.21.11-Dev1"
 
 apply<ApiGenerator>()
 
@@ -50,7 +51,7 @@ registerCustomOutputTask("PixelFury", "C://Users/repix/workplace/Iris/1.21.3 - D
 registerCustomOutputTask("PixelFuryDev", "C://Users/repix/workplace/Iris/1.21 - Development-v3/plugins")
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix("CyberpwnLT", "/Users/danielmills/development/server/plugins")
-registerCustomOutputTaskUnix("PsychoLT", "/Users/brianfopiano/Developer/RemoteGit/Server/plugins")
+registerCustomOutputTaskUnix("PsychoLT", "/Users/brianfopiano/Developer/RemoteGit/[Minecraft Server]/plugins")
 registerCustomOutputTaskUnix("PixelMac", "/Users/test/Desktop/mcserver/plugins")
 registerCustomOutputTaskUnix("CrazyDev22LT", "/home/julian/Desktop/server/plugins")
 // ==============================================================
@@ -187,6 +188,12 @@ configurations.configureEach {
 allprojects {
     apply<JavaPlugin>()
 
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
+
     repositories {
         mavenCentral()
         maven("https://repo.papermc.io/repository/maven-public/")
@@ -234,14 +241,14 @@ allprojects {
     }
 }
 
-if (JavaVersion.current().toString() != "21") {
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
     System.err.println()
     System.err.println("=========================================================================================================")
-    System.err.println("You must run gradle on Java 21. You are using " + JavaVersion.current())
+    System.err.println("You must run gradle on Java 21 or newer. You are using " + JavaVersion.current())
     System.err.println()
     System.err.println("=== For IDEs ===")
-    System.err.println("1. Configure the project for Java 21")
-    System.err.println("2. Configure the bundled gradle to use Java 21 in settings")
+    System.err.println("1. Configure the project for Java 21 toolchain")
+    System.err.println("2. Configure the bundled gradle to use Java 21+ in settings")
     System.err.println()
     System.err.println("=== For Command Line (gradlew) ===")
     System.err.println("1. Install JDK 21 from https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html")

buildSrc/build.gradle.kts

@@ -1,7 +1,23 @@
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("jvm") version embeddedKotlinVersion
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+kotlin {
+    jvmToolchain(21)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+    }
+}
+
 repositories {
     mavenCentral()
     gradlePluginPortal()
@@ -13,4 +29,4 @@ dependencies {
     implementation("com.github.VolmitSoftware:NMSTools:c88961416f")
     implementation("io.papermc.paperweight:paperweight-userdev:2.0.0-beta.18")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
-}
+}

buildSrc/src/main/kotlin/NMSBinding.kt

@@ -179,4 +179,4 @@ fun Project.nmsBinding(action: Config.() -> Unit) {
     plugins.apply(NMSBinding::class.java)
 }
 
-private inline fun <reified T : Named> ObjectFactory.named(name: String): T = named(T::class.java, name)
+private inline fun <reified T : Named> ObjectFactory.named(name: String): T = named(T::class.java, name)

core/agent/build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
 
 tasks.jar {
     manifest.attributes(
-        "Agent-Class" to "com.volmit.iris.util.agent.Installer",
-        "Premain-Class" to "com.volmit.iris.util.agent.Installer",
+        "Agent-Class" to "art.arcane.iris.util.agent.Installer",
+        "Premain-Class" to "art.arcane.iris.util.agent.Installer",
         "Can-Redefine-Classes" to true,
         "Can-Retransform-Classes" to true
     )

core/agent/src/main/java/art/arcane/iris/util/agent/Installer.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.util.agent;
+package art.arcane.iris.util.agent;
 
 import java.lang.instrument.Instrumentation;
 

core/build.gradle.kts

@@ -1,6 +1,8 @@
 import io.github.slimjar.func.slimjarHelper
 import io.github.slimjar.resolver.data.Mirror
 import org.ajoberstar.grgit.Grgit
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.net.URI
 
 /*
@@ -33,8 +35,8 @@ plugins {
 }
 
 val apiVersion = "1.19"
-val main = "com.volmit.iris.Iris"
-val lib = "com.volmit.iris.util"
+val main = "art.arcane.iris.Iris"
+val lib = "art.arcane.iris.util"
 
 /**
  * Dependencies.
@@ -112,6 +114,16 @@ dependencies {
 
 java {
     disableAutoTargetJvm()
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+kotlin {
+    jvmToolchain(21)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+    }
 }
 
 sentry {
@@ -202,7 +214,7 @@ val generateTemplates = tasks.register<Copy>("generateTemplates") {
 
     from(templateSource)
     into(templateDest)
-    rename { "com/volmit/iris/$it" }
+    rename { "art/arcane/iris/$it" }
     expand(inputs.properties)
 }
 
@@ -215,5 +227,10 @@ rootProject.tasks.named("prepareKotlinBuildScriptModel") {
 }
 
 sourceSets.main {
+    java.srcDir("../../VolmLib/shared/src/main/java")
     java.srcDir(generateTemplates.map { it.outputs })
-}
+}
+
+kotlin.sourceSets.named("main") {
+    kotlin.srcDir("../../VolmLib/shared/src/main/kotlin")
+}

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

@@ -16,49 +16,49 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris;
+package art.arcane.iris;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.IrisWorlds;
-import com.volmit.iris.core.ServerConfigurator;
-import com.volmit.iris.core.link.IrisPapiExpansion;
-import com.volmit.iris.core.link.MultiverseCoreLink;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.pregenerator.LazyPregenerator;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.EnginePanic;
-import com.volmit.iris.engine.object.IrisCompat;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.platform.BukkitChunkGenerator;
-import com.volmit.iris.core.safeguard.IrisSafeguard;
-import com.volmit.iris.engine.platform.PlatformChunkGenerator;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.exceptions.IrisException;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.function.NastyRunnable;
-import com.volmit.iris.util.io.FileWatcher;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.io.InstanceState;
-import com.volmit.iris.util.io.JarScanner;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.misc.Bindings;
-import com.volmit.iris.util.misc.SlimJar;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.plugin.IrisService;
-import com.volmit.iris.util.plugin.VolmitPlugin;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.plugin.chunk.ChunkTickets;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.Queue;
-import com.volmit.iris.util.scheduling.ShurikenQueue;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.IrisWorlds;
+import art.arcane.iris.core.ServerConfigurator;
+import art.arcane.iris.core.link.IrisPapiExpansion;
+import art.arcane.iris.core.link.MultiverseCoreLink;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.core.pregenerator.LazyPregenerator;
+import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.engine.EnginePanic;
+import art.arcane.iris.engine.object.IrisCompat;
+import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.engine.object.IrisWorld;
+import art.arcane.iris.engine.platform.BukkitChunkGenerator;
+import art.arcane.iris.core.safeguard.IrisSafeguard;
+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.exceptions.IrisException;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.function.NastyRunnable;
+import art.arcane.volmlib.util.hotload.ConfigHotloadEngine;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.io.InstanceState;
+import art.arcane.volmlib.util.io.JarScanner;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.volmlib.util.math.RNG;
+import art.arcane.iris.util.misc.Bindings;
+import art.arcane.iris.util.misc.SlimJar;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.plugin.VolmitPlugin;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.plugin.chunk.ChunkTickets;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.Queue;
+import art.arcane.volmlib.util.scheduling.ShurikenQueue;
 import lombok.NonNull;
 import org.bukkit.*;
 import org.bukkit.block.data.BlockData;
@@ -89,10 +89,11 @@ public class Iris extends VolmitPlugin implements Listener {
     public static Bindings.Adventure audiences;
     public static MultiverseCoreLink linkMultiverseCore;
     public static IrisCompat compat;
-    public static FileWatcher configWatcher;
+    public static ConfigHotloadEngine configHotloadEngine;
     public static ChunkTickets tickets;
     private static VolmitSender sender;
     private static Thread shutdownHook;
+    private static File settingsFile;
 
     static {
         try {
@@ -437,7 +438,7 @@ public class Iris extends VolmitPlugin implements Listener {
         services = new KMap<>();
         setupAudience();
         Bindings.setupSentry();
-        initialize("com.volmit.iris.core.service").forEach((i) -> services.put((Class<? extends IrisService>) i.getClass(), (IrisService) i));
+        initialize("art.arcane.iris.core.service").forEach((i) -> services.put((Class<? extends IrisService>) i.getClass(), (IrisService) i));
         IO.delete(new File("iris"));
         compat = IrisCompat.configured(getDataFile("compat.json"));
         ServerConfigurator.configure();
@@ -446,7 +447,14 @@ public class Iris extends VolmitPlugin implements Listener {
         IrisSafeguard.splash();
         tickets = new ChunkTickets();
         linkMultiverseCore = new MultiverseCoreLink();
-        configWatcher = new FileWatcher(getDataFile("settings.json"));
+        settingsFile = getDataFile("settings.json");
+        configHotloadEngine = new ConfigHotloadEngine(
+                Iris::isSettingsFile,
+                Iris::knownSettingsFiles,
+                Iris::readSettingsContent,
+                Iris::normalizeSettingsContent
+        );
+        configHotloadEngine.configure(3_000L, List.of(settingsFile), List.of());
         services.values().forEach(IrisService::onEnable);
         services.values().forEach(this::registerListener);
         addShutdownHook();
@@ -556,6 +564,10 @@ public class Iris extends VolmitPlugin implements Listener {
     public void onDisable() {
         if (IrisSafeguard.isForceShutdown()) return;
         services.values().forEach(IrisService::onDisable);
+        if (configHotloadEngine != null) {
+            configHotloadEngine.clear();
+            configHotloadEngine = null;
+        }
         Bukkit.getScheduler().cancelTasks(this);
         HandlerList.unregisterAll((Plugin) this);
         postShutdown.forEach(Runnable::run);
@@ -586,12 +598,51 @@ public class Iris extends VolmitPlugin implements Listener {
     }
 
     private void checkConfigHotload() {
-        if (configWatcher.checkModified()) {
-            IrisSettings.invalidate();
-            IrisSettings.get();
-            configWatcher.checkModified();
-            Iris.info("Hotloaded settings.json ");
+        if (configHotloadEngine == null) {
+            return;
         }
+
+        for (File file : configHotloadEngine.pollTouchedFiles()) {
+            configHotloadEngine.processFileChange(file, ignored -> {
+                IrisSettings.invalidate();
+                IrisSettings.get();
+                return true;
+            }, ignored -> Iris.info("Hotloaded settings.json "));
+        }
+    }
+
+    private static boolean isSettingsFile(File file) {
+        if (file == null || settingsFile == null) {
+            return false;
+        }
+        return settingsFile.getAbsoluteFile().equals(file.getAbsoluteFile());
+    }
+
+    private static List<File> knownSettingsFiles() {
+        if (settingsFile == null) {
+            return List.of();
+        }
+        return List.of(settingsFile);
+    }
+
+    private static String readSettingsContent(File file) {
+        if (file == null || !file.exists() || !file.isFile()) {
+            return null;
+        }
+
+        try {
+            return IO.readAll(file);
+        } catch (Throwable ignored) {
+            return null;
+        }
+    }
+
+    private static String normalizeSettingsContent(String text) {
+        if (text == null) {
+            return null;
+        }
+
+        return text.replace("\r\n", "\n").trim();
     }
 
     private void tickQueue() {

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

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core;
+package art.arcane.iris.core;
 
 import com.google.gson.Gson;
-import com.volmit.iris.Iris;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.json.JSONException;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.misc.getHardware;
-import com.volmit.iris.util.plugin.VolmitSender;
+import art.arcane.iris.Iris;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.json.JSONException;
+import art.arcane.volmlib.util.json.JSONObject;
+import art.arcane.iris.util.misc.getHardware;
+import art.arcane.iris.util.plugin.VolmitSender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,15 +1,15 @@
-package com.volmit.iris.core;
+package art.arcane.iris.core;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.misc.ServerProperties;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.iris.util.misc.ServerProperties;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
 

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

@@ -16,21 +16,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core;
+package art.arcane.iris.core;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.datapack.DataVersion;
-import com.volmit.iris.core.nms.datapack.IDataFixer;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.misc.ServerProperties;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.core.nms.datapack.DataVersion;
+import art.arcane.iris.core.nms.datapack.IDataFixer;
+import art.arcane.iris.engine.object.*;
+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.format.C;
+import art.arcane.iris.util.misc.ServerProperties;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.scheduling.J;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import org.bukkit.Bukkit;

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

@@ -16,45 +16,47 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.ServerConfigurator;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.datapack.DataVersion;
-import com.volmit.iris.core.service.IrisEngineSVC;
-import com.volmit.iris.core.tools.IrisPackBenchmarking;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.annotations.Snippet;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.context.IrisContext;
-import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.decree.specialhandlers.NullableDimensionHandler;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.CountingDataInputStream;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.mantle.TectonicPlate;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.matter.Matter;
-import com.volmit.iris.util.nbt.mca.MCAFile;
-import com.volmit.iris.util.nbt.mca.MCAUtil;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.jobs.Job;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.ServerConfigurator;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.core.nms.datapack.DataVersion;
+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.framework.Engine;
+import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.engine.object.IrisPosition;
+import art.arcane.iris.engine.object.annotations.Snippet;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.volmlib.util.collection.KSet;
+import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.engine.object.IrisJigsawStructurePlacement;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.decree.specialhandlers.NullableDimensionHandler;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.io.CountingDataInputStream;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.iris.util.mantle.TectonicPlate;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.matter.Matter;
+import art.arcane.iris.util.nbt.mca.MCAFile;
+import art.arcane.iris.util.nbt.mca.MCAUtil;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.scheduling.jobs.Job;
 import lombok.SneakyThrows;
 import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;
@@ -95,6 +97,89 @@ public class CommandDeveloper implements DecreeExecutor {
         Iris.reportError(new Exception("This is a test"));
     }
 
+    @Decree(description = "QOL command to open an overworld studio world", sync = true)
+    public void so() {
+        sender().sendMessage(C.GREEN + "Opening studio for the \"Overworld\" pack (seed: 1337)");
+        Iris.service(StudioSVC.class).open(sender(), 1337, "overworld");
+    }
+
+    @Decree(description = "Set aura spins")
+    public void aura(
+            @Param(description = "The h color value", defaultValue = "-20")
+            int h,
+            @Param(description = "The s color value", defaultValue = "7")
+            int s,
+            @Param(description = "The b color value", defaultValue = "8")
+            int b
+    ) {
+        IrisSettings.get().getGeneral().setSpinh(h);
+        IrisSettings.get().getGeneral().setSpins(s);
+        IrisSettings.get().getGeneral().setSpinb(b);
+        IrisSettings.get().forceSave();
+        sender().sendMessage("<rainbow>Aura Spins updated to " + h + " " + s + " " + b);
+    }
+
+    @Decree(description = "Bitwise calculations")
+    public void bitwise(
+            @Param(description = "The first value to run calculations on")
+            int value1,
+            @Param(description = "The operator: | & ^ << >> %")
+            String operator,
+            @Param(description = "The second value to run calculations on")
+            int value2
+    ) {
+        Integer v = null;
+        switch (operator) {
+            case "|" -> v = value1 | value2;
+            case "&" -> v = value1 & value2;
+            case "^" -> v = value1 ^ value2;
+            case "%" -> v = value1 % value2;
+            case ">>" -> v = value1 >> value2;
+            case "<<" -> v = value1 << value2;
+        }
+        if (v == null) {
+            sender().sendMessage(C.RED + "The operator you entered: (" + operator + ") is invalid!");
+            return;
+        }
+        sender().sendMessage(C.GREEN + "" + value1 + " " + C.GREEN + operator.replaceAll("<", "≺").replaceAll(">", "≻").replaceAll("%", "％") + " " + C.GREEN + value2 + C.GREEN + " returns " + C.GREEN + v);
+    }
+
+    @Decree(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(), false, true);
+        }
+
+        Iris.service(StudioSVC.class).installIntoWorld(sender(), pack.getLoadKey(), folder);
+    }
+
     @Decree(description = "Dev cmd to fix all the broken objects caused by faulty shrinkwarp")
     public void fixObjects(
             @Param(aliases = "dimension", description = "The dimension type to create the world with")
@@ -577,4 +662,3 @@ public class CommandDeveloper implements DecreeExecutor {
     }
 }
 
-

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

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.engine.object.*;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.format.C;
 
 import java.awt.*;
 

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

@@ -16,18 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.decree.specialhandlers.ObjectHandler;
-import com.volmit.iris.util.format.C;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.engine.object.IrisJigsawStructure;
+import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.decree.specialhandlers.ObjectHandler;
+import art.arcane.iris.util.format.C;
 
 @Decree(name = "find", origin = DecreeOrigin.PLAYER, description = "Iris Find commands", aliases = "goto")
 public class CommandFind implements DecreeExecutor {

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

@@ -16,26 +16,26 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.decree.specialhandlers.NullablePlayerHandler;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.misc.ServerProperties;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.nms.INMS;
+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.volmlib.util.collection.KList;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.decree.specialhandlers.NullablePlayerHandler;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.iris.util.misc.ServerProperties;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.scheduling.J;
 import lombok.SneakyThrows;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -48,8 +48,8 @@ import java.io.*;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.volmit.iris.core.service.EditSVC.deletingWorld;
-import static com.volmit.iris.util.misc.ServerProperties.BUKKIT_YML;
+import static art.arcane.iris.core.service.EditSVC.deletingWorld;
+import static art.arcane.iris.util.misc.ServerProperties.BUKKIT_YML;
 import static org.bukkit.Bukkit.getServer;
 
 @Decree(name = "iris", aliases = {"ir", "irs"}, description = "Basic Command")
@@ -74,8 +74,8 @@ public class CommandIris implements DecreeExecutor {
     public void create(
             @Param(aliases = "world-name", description = "The name of the world to create")
             String name,
-            @Param(aliases = "dimension", description = "The dimension type to create the world with", defaultValue = "default")
-            IrisDimension type,
+            @Param(aliases = {"dimension", "pack"}, description = "The dimension/pack to create the world with", defaultValue = "default")
+            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")
@@ -98,10 +98,22 @@ public class CommandIris implements DecreeExecutor {
             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 IrisDimensions/" + resolvedType);
+            return;
+        }
+
         try {
             worldCreation = true;
             IrisToolbelt.createWorld()
-                    .dimension(type.getLoadKey())
+                    .dimension(dimension.getLoadKey())
                     .name(name)
                     .seed(seed)
                     .sender(sender())
@@ -197,12 +209,6 @@ public class CommandIris implements DecreeExecutor {
         }
     }
 
-    @Decree(description = "QOL command to open a overworld studio world.", sync = true)
-    public void so() {
-        sender().sendMessage(C.GREEN + "Opening studio for the \"Overworld\" pack (seed: 1337)");
-        Iris.service(StudioSVC.class).open(sender(), 1337, "overworld");
-    }
-
     @Decree(description = "Check access of all worlds.", aliases = {"accesslist"})
     public void worlds() {
         KList<World> IrisWorlds = new KList<>();
@@ -317,47 +323,6 @@ public class CommandIris implements DecreeExecutor {
         return dir.delete();
     }
 
-    @Decree(description = "Set aura spins")
-    public void aura(
-            @Param(description = "The h color value", defaultValue = "-20")
-            int h,
-            @Param(description = "The s color value", defaultValue = "7")
-            int s,
-            @Param(description = "The b color value", defaultValue = "8")
-            int b
-    ) {
-        IrisSettings.get().getGeneral().setSpinh(h);
-        IrisSettings.get().getGeneral().setSpins(s);
-        IrisSettings.get().getGeneral().setSpinb(b);
-        IrisSettings.get().forceSave();
-        sender().sendMessage("<rainbow>Aura Spins updated to " + h + " " + s + " " + b);
-    }
-
-    @Decree(description = "Bitwise calculations")
-    public void bitwise(
-            @Param(description = "The first value to run calculations on")
-            int value1,
-            @Param(description = "The operator: | & ^ ≺≺ ≻≻ ％")
-            String operator,
-            @Param(description = "The second value to run calculations on")
-            int value2
-    ) {
-        Integer v = null;
-        switch (operator) {
-            case "|" -> v = value1 | value2;
-            case "&" -> v = value1 & value2;
-            case "^" -> v = value1 ^ value2;
-            case "%" -> v = value1 % value2;
-            case ">>" -> v = value1 >> value2;
-            case "<<" -> v = value1 << value2;
-        }
-        if (v == null) {
-            sender().sendMessage(C.RED + "The operator you entered: (" + operator + ") is invalid!");
-            return;
-        }
-        sender().sendMessage(C.GREEN + "" + value1 + " " + C.GREEN + operator.replaceAll("<", "≺").replaceAll(">", "≻").replaceAll("%", "％") + " " + C.GREEN + value2 + C.GREEN + " returns " + C.GREEN + v);
-    }
-
     @Decree(description = "Toggle debug")
     public void debug(
             @Param(name = "on", description = "Whether or not debug should be on", defaultValue = "other")
@@ -408,42 +373,6 @@ public class CommandIris implements DecreeExecutor {
         sender().sendMessage(C.GREEN + "Hotloaded settings");
     }
 
-    @Decree(description = "Update the pack of a world (UNSAFE!)", name = "^world", aliases = "update-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 ^world " + world.getName() + " " + pack.getLoadKey() + " confirm=true"
-            });
-            return;
-        }
-
-        File folder = world.getWorldFolder();
-        folder.mkdirs();
-
-        if (freshDownload) {
-            Iris.service(StudioSVC.class).downloadSearch(sender(), pack.getLoadKey(), false, true);
-        }
-
-        Iris.service(StudioSVC.class).installIntoWorld(sender(), pack.getLoadKey(), folder);
-    }
-
     @Decree(description = "Unload an Iris World", origin = DecreeOrigin.PLAYER, sync = true)
     public void unloadWorld(
             @Param(description = "The world to unload")

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

@@ -16,27 +16,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.edit.JigsawEditor;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.framework.placer.WorldObjectPlacer;
-import com.volmit.iris.engine.jigsaw.PlannedStructure;
-import com.volmit.iris.engine.object.IrisJigsawPiece;
-import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.decree.specialhandlers.ObjectHandler;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.edit.JigsawEditor;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.engine.framework.placer.WorldObjectPlacer;
+import art.arcane.iris.engine.jigsaw.PlannedStructure;
+import art.arcane.iris.engine.object.IrisJigsawPiece;
+import art.arcane.iris.engine.object.IrisJigsawStructure;
+import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.engine.object.IrisPosition;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.decree.specialhandlers.ObjectHandler;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.math.RNG;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import java.io.File;
 

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

@@ -16,19 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.gui.PregeneratorJob;
-import com.volmit.iris.core.pregenerator.LazyPregenerator;
-import com.volmit.iris.core.pregenerator.PregenTask;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.math.Position2;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.gui.PregeneratorJob;
+import art.arcane.iris.core.pregenerator.LazyPregenerator;
+import art.arcane.iris.core.pregenerator.PregenTask;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.math.Position2;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.util.Vector;

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

@@ -16,28 +16,28 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.WorldEditLink;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.service.ObjectSVC;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.core.service.WandSVC;
-import com.volmit.iris.core.tools.IrisConverter;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.util.data.Cuboid;
-import com.volmit.iris.util.data.IrisCustomData;
-import com.volmit.iris.util.data.registry.Materials;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.decree.specialhandlers.ObjectHandler;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.math.Direction;
-import com.volmit.iris.util.math.RNG;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.WorldEditLink;
+import art.arcane.iris.core.loader.IrisData;
+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.engine.framework.Engine;
+import art.arcane.iris.engine.object.*;
+import art.arcane.volmlib.util.data.Cuboid;
+import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.data.registry.Materials;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.decree.specialhandlers.ObjectHandler;
+import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.math.Direction;
+import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -259,7 +259,7 @@ public class CommandObject implements DecreeExecutor {
         Cuboid cursor = new Cuboid(a1, a2);
         Direction d = Direction.closest(player().getLocation().getDirection()).reverse();
         assert d != null;
-        cursor = cursor.expand(d, -amount);
+        cursor = cursor.expand(d.f(), -amount);
         b[0] = cursor.getLowerNE();
         b[1] = cursor.getUpperSW();
         player().getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));

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

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.gui.PregeneratorJob;
-import com.volmit.iris.core.pregenerator.PregenTask;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.math.Position2;
+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.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.math.Position2;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 

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

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.util.decree.DecreeExecutor;
+import art.arcane.iris.util.decree.DecreeExecutor;
 
 public class CommandSettings implements DecreeExecutor {
 

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

@@ -16,49 +16,51 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.gui.NoiseExplorerGUI;
-import com.volmit.iris.core.gui.VisionGUI;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.IrisProject;
-import com.volmit.iris.core.service.ConversionSVC;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.platform.PlatformChunkGenerator;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.decree.DecreeContext;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.function.Function2;
-import com.volmit.iris.util.function.NoiseProvider;
-import com.volmit.iris.util.interpolation.InterpolationMethod;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.mantle.MantleChunk;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.math.Spiraler;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.parallel.SyncExecutor;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.O;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
-import com.volmit.iris.util.scheduling.jobs.ParallelRadiusJob;
+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.ConversionSVC;
+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.*;
+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.decree.DecreeContext;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.iris.util.decree.handlers.DimensionHandler;
+import art.arcane.iris.util.decree.specialhandlers.NullableDimensionHandler;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.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.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.iris.util.mantle.MantleChunk;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.RNG;
+import art.arcane.volmlib.util.math.Spiraler;
+import art.arcane.iris.util.noise.CNG;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.parallel.SyncExecutor;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.O;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.util.scheduling.jobs.ParallelRadiusJob;
 import io.papermc.lib.PaperLib;
 import org.bukkit.*;
 import org.bukkit.event.inventory.InventoryType;
@@ -109,7 +111,7 @@ public class CommandStudio implements DecreeExecutor {
 
     @Decree(description = "Open a new studio world", aliases = "o", sync = true)
     public void open(
-            @Param(defaultValue = "default", description = "The dimension to open a studio for", aliases = "dim")
+            @Param(defaultValue = "default", description = "The dimension 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) {
@@ -119,7 +121,7 @@ public class CommandStudio implements DecreeExecutor {
 
     @Decree(description = "Open VSCode for a dimension", aliases = {"vsc", "edit"})
     public void vscode(
-            @Param(defaultValue = "default", description = "The dimension to open VSCode for", aliases = "dim")
+            @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");
@@ -141,7 +143,11 @@ public class CommandStudio implements DecreeExecutor {
     public void create(
             @Param(description = "The name of this new Iris Project.")
             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)
+            @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) {
         if (template != null) {
             Iris.service(StudioSVC.class).create(sender(), name, template.getLoadKey());
@@ -152,7 +158,7 @@ public class CommandStudio implements DecreeExecutor {
 
     @Decree(description = "Get the version of a pack")
     public void version(
-            @Param(defaultValue = "default", description = "The dimension get the version of", aliases = "dim", contextual = true)
+            @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());
@@ -463,7 +469,7 @@ public class CommandStudio implements DecreeExecutor {
 
     @Decree(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")
+            @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,
@@ -475,7 +481,7 @@ public class CommandStudio implements DecreeExecutor {
 
     @Decree(description = "Profiles the performance of a dimension", origin = DecreeOrigin.PLAYER)
     public void profile(
-            @Param(description = "The dimension to profile", contextual = true, defaultValue = "default")
+            @Param(description = "The dimension to profile", contextual = true, defaultValue = "default", customHandler = DimensionHandler.class)
             IrisDimension dimension
     ) {
         // Todo: Make this more accurate
@@ -700,7 +706,7 @@ public class CommandStudio implements DecreeExecutor {
 
     @Decree(description = "Update your dimension projects VSCode workspace")
     public void update(
-            @Param(description = "The dimension to update the workspace of", contextual = true, defaultValue = "default")
+            @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() + "...");

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

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.pregenerator.LazyPregenerator;
-import com.volmit.iris.core.pregenerator.TurboPregenerator;
-import com.volmit.iris.core.pregenerator.TurboPregenerator;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.pregenerator.LazyPregenerator;
+import art.arcane.iris.core.pregenerator.TurboPregenerator;
+import art.arcane.iris.core.pregenerator.TurboPregenerator;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.format.C;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.util.Vector;

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

@@ -16,20 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
 import lombok.Synchronized;
 import org.bukkit.World;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.pregenerator.ChunkUpdater;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.pregenerator.ChunkUpdater;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
 
 @Decree(name = "updater", origin = DecreeOrigin.BOTH, description = "Iris World Updater")
 public class CommandUpdater implements DecreeExecutor {

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

@@ -16,23 +16,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.commands;
+package art.arcane.iris.core.commands;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.edit.BlockSignal;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.decree.DecreeExecutor;
-import com.volmit.iris.util.decree.DecreeOrigin;
-import com.volmit.iris.util.decree.annotations.Decree;
-import com.volmit.iris.util.decree.annotations.Param;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.matter.MatterMarker;
-import com.volmit.iris.util.scheduling.J;
+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.data.B;
+import art.arcane.iris.util.decree.DecreeExecutor;
+import art.arcane.volmlib.util.decree.DecreeOrigin;
+import art.arcane.volmlib.util.decree.annotations.Decree;
+import art.arcane.volmlib.util.decree.annotations.Param;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.matter.MatterMarker;
+import art.arcane.iris.util.scheduling.J;
 import org.bukkit.Chunk;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.edit;
+package art.arcane.iris.core.edit;
 
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;

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

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.edit;
+package art.arcane.iris.core.edit;
 
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.SR;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.SR;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;

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

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.edit;
+package art.arcane.iris.core.edit;
 
-import com.volmit.iris.util.math.M;
+import art.arcane.volmlib.util.math.M;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;

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

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.edit;
+package art.arcane.iris.core.edit;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.math.BlockPosition;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.math.BlockPosition;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.volmlib.util.math.RNG;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.scheduling.J;
 import lombok.Data;
 import org.bukkit.Sound;
 import org.bukkit.World;

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

@@ -16,20 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.edit;
+package art.arcane.iris.core.edit;
 
 import com.google.gson.Gson;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.service.WandSVC;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.Cuboid;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.service.WandSVC;
+import art.arcane.iris.engine.object.*;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.volmlib.util.data.Cuboid;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.json.JSONObject;
+import art.arcane.volmlib.util.math.RNG;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;

core/src/main/java/art/arcane/iris/core/events/IrisEngineEvent.java

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.events;
+package art.arcane.iris.core.events;
 
-import com.volmit.iris.engine.framework.Engine;
+import art.arcane.iris.engine.framework.Engine;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/art/arcane/iris/core/events/IrisEngineHotloadEvent.java

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.events;
+package art.arcane.iris.core.events;
 
-import com.volmit.iris.engine.framework.Engine;
+import art.arcane.iris.engine.framework.Engine;
 import org.bukkit.event.HandlerList;
 
 public class IrisEngineHotloadEvent extends IrisEngineEvent {

core/src/main/java/art/arcane/iris/core/events/IrisLootEvent.java

@@ -1,11 +1,11 @@
-package com.volmit.iris.core.events;
+package art.arcane.iris.core.events;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.InventorySlotType;
-import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.object.InventorySlotType;
+import art.arcane.iris.engine.object.IrisLootTable;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.iris.util.scheduling.J;
 import lombok.Getter;
 import org.bukkit.*;
 import org.bukkit.block.Block;

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

@@ -16,22 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui;
+package art.arcane.iris.core.gui;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.events.IrisEngineHotloadEvent;
-import com.volmit.iris.engine.object.NoiseStyle;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.function.Function2;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.noise.CNG;
-import com.volmit.iris.util.parallel.BurstExecutor;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.events.IrisEngineHotloadEvent;
+import art.arcane.iris.engine.object.NoiseStyle;
+import art.arcane.volmlib.util.collection.KList;
+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.noise.CNG;
+import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 

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

@@ -16,24 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui;
+package art.arcane.iris.core.gui;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.pregenerator.IrisPregenerator;
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregenTask;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.format.MemoryMonitor;
-import com.volmit.iris.util.function.Consumer2;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.pregenerator.IrisPregenerator;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregenTask;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.format.MemoryMonitor;
+import art.arcane.volmlib.util.function.Consumer2;
+import art.arcane.iris.util.mantle.Mantle;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
 
 import javax.swing.*;
 import java.awt.*;
@@ -72,6 +72,8 @@ public class PregeneratorJob implements PregenListener {
     private PregenRenderer renderer;
     private int rgc = 0;
     private String[] info;
+    private volatile double lastChunksPerSecond = 0D;
+    private volatile long lastChunksRemaining = 0L;
 
     public PregeneratorJob(PregenTask task, PregeneratorMethod method, Engine engine) {
         instance.updateAndGet(old -> {
@@ -146,6 +148,16 @@ public class PregeneratorJob implements PregenListener {
         return inst.paused();
     }
 
+    public static double chunksPerSecond() {
+        PregeneratorJob inst = instance.get();
+        return inst == null ? 0D : Math.max(0D, inst.lastChunksPerSecond);
+    }
+
+    public static long chunksRemaining() {
+        PregeneratorJob inst = instance.get();
+        return inst == null ? -1L : Math.max(0L, inst.lastChunksRemaining);
+    }
+
     private static Color parseColor(String c) {
         String v = (c.startsWith("#") ? c : "#" + c).trim();
         try {
@@ -234,6 +246,9 @@ public class PregeneratorJob implements PregenListener {
 
     @Override
     public void onTick(double chunksPerSecond, double chunksPerMinute, double regionsPerMinute, double percent, long generated, long totalChunks, long chunksRemaining, long eta, long elapsed, String method, boolean cached) {
+        lastChunksPerSecond = chunksPerSecond;
+        lastChunksRemaining = chunksRemaining;
+
         info = new String[]{
                 (paused() ? "PAUSED" : (saving ? "Saving... " : "Generating")) + " " + Form.f(generated) + " of " + Form.f(totalChunks) + " (" + Form.pc(percent, 0) + " Complete)",
                 "Speed: " + (cached ? "Cached " : "") + Form.f(chunksPerSecond, 0) + " Chunks/s, " + Form.f(regionsPerMinute, 1) + " Regions/m, " + Form.f(chunksPerMinute, 0) + " Chunks/m",

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

@@ -16,28 +16,28 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui;
+package art.arcane.iris.core.gui;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.gui.components.IrisRenderer;
-import com.volmit.iris.core.gui.components.RenderType;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.IrisComplex;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.math.BlockPosition;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.O;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.gui.components.IrisRenderer;
+import art.arcane.iris.core.gui.components.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.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;
@@ -55,7 +55,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiFunction;
 
-import static com.volmit.iris.util.data.registry.Attributes.MAX_HEALTH;
+import static art.arcane.iris.util.data.registry.Attributes.MAX_HEALTH;
 
 public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener, MouseMotionListener, MouseInputListener {
     private static final long serialVersionUID = 2094606939770332040L;

core/src/main/java/art/arcane/iris/core/gui/components/IrisRenderer.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui.components;
+package art.arcane.iris.core.gui.components;
 
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.IrisBiomeGeneratorLink;
-import com.volmit.iris.util.interpolation.IrisInterpolation;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.engine.object.IrisBiomeGeneratorLink;
+import art.arcane.iris.util.interpolation.IrisInterpolation;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;

core/src/main/java/art/arcane/iris/core/gui/components/RenderType.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui.components;
+package art.arcane.iris.core.gui.components;
 
 public enum RenderType {
     BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, CONTINENT, LAYER_LOAD

core/src/main/java/art/arcane/iris/core/gui/components/Renderer.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui.components;
+package art.arcane.iris.core.gui.components;
 
 import java.awt.*;
 

core/src/main/java/art/arcane/iris/core/gui/components/TileRender.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.gui.components;
+package art.arcane.iris.core.gui.components;
 
 import lombok.Builder;
 import lombok.Data;

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

@@ -1,12 +1,12 @@
-//package com.volmit.iris.core.link;
+//package art.arcane.iris.core.link;
 //
 //import com.jojodmo.customitems.api.CustomItemsAPI;
 //import com.jojodmo.customitems.item.custom.CustomItem;
 //import com.jojodmo.customitems.item.custom.block.CustomMushroomBlock;
 //import com.jojodmo.customitems.version.SafeMaterial;
-//import com.volmit.iris.util.collection.KList;
-//import com.volmit.iris.util.reflect.WrappedField;
-//import com.volmit.iris.util.reflect.WrappedReturningMethod;
+//import art.arcane.volmlib.util.collection.KList;
+//import art.arcane.iris.util.reflect.WrappedField;
+//import art.arcane.iris.util.reflect.WrappedReturningMethod;
 //import org.bukkit.block.BlockFace;
 //import org.bukkit.block.data.BlockData;
 //import org.bukkit.block.data.MultipleFacing;

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

@@ -1,14 +1,14 @@
-package com.volmit.iris.core.link;
+package art.arcane.iris.core.link;
 
-import com.volmit.iris.core.link.data.DataType;
-import com.volmit.iris.core.nms.container.BiomeColor;
-import com.volmit.iris.core.nms.container.BlockProperty;
-import com.volmit.iris.core.nms.container.Pair;
-import com.volmit.iris.engine.data.cache.Cache;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.IrisCustomData;
-import com.volmit.iris.util.math.RNG;
+import art.arcane.iris.core.link.data.DataType;
+import art.arcane.iris.core.nms.container.BiomeColor;
+import art.arcane.iris.core.nms.container.BlockProperty;
+import art.arcane.iris.core.nms.container.Pair;
+import art.arcane.iris.engine.data.cache.Cache;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.volmlib.util.math.RNG;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.volmit.iris.core.link;
+package art.arcane.iris.core.link;
 
 import org.bukkit.NamespacedKey;
 

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

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.link;
+package art.arcane.iris.core.link;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.platform.PlatformChunkGenerator;
+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;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.link;
+package art.arcane.iris.core.link;
 
 import lombok.SneakyThrows;
 import org.bukkit.Bukkit;

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

@@ -1,9 +1,9 @@
-package com.volmit.iris.core.link;
+package art.arcane.iris.core.link;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.util.data.Cuboid;
-import com.volmit.iris.util.data.KCache;
+import art.arcane.iris.Iris;
+import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.volmlib.util.data.Cuboid;
+import art.arcane.volmlib.util.data.KCache;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

core/src/main/java/art/arcane/iris/core/link/data/DataType.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
 
 import java.util.MissingResourceException;
 import java.util.function.BiPredicate;

core/src/main/java/art/arcane/iris/core/link/data/EcoItemsDataProvider.java

@@ -1,10 +1,10 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.reflect.WrappedField;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.reflect.WrappedField;
 import com.willfp.ecoitems.items.EcoItem;
 import com.willfp.ecoitems.items.EcoItems;
 import org.bukkit.NamespacedKey;

core/src/main/java/art/arcane/iris/core/link/data/ExecutableItemsDataProvider.java

@@ -1,10 +1,10 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
 import com.ssomar.score.api.executableitems.ExecutableItemsAPI;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.util.collection.KMap;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.volmlib.util.collection.KMap;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 

core/src/main/java/art/arcane/iris/core/link/data/HMCLeavesDataProvider.java

@@ -1,15 +1,15 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.service.ExternalDataSVC;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.IrisCustomData;
-import com.volmit.iris.util.reflect.WrappedField;
-import com.volmit.iris.util.reflect.WrappedReturningMethod;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.reflect.WrappedField;
+import art.arcane.iris.util.reflect.WrappedReturningMethod;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;

core/src/main/java/art/arcane/iris/core/link/data/ItemAdderDataProvider.java

@@ -1,11 +1,11 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.IrisCustomData;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.IrisCustomData;
 import dev.lone.itemsadder.api.CustomBlock;
 import dev.lone.itemsadder.api.CustomStack;
 import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;

core/src/main/java/art/arcane/iris/core/link/data/KGeneratorsDataProvider.java

@@ -1,12 +1,12 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.service.ExternalDataSVC;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.data.IrisCustomData;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.data.IrisCustomData;
 import me.kryniowesegryderiusz.kgenerators.Main;
 import me.kryniowesegryderiusz.kgenerators.api.KGeneratorsAPI;
 import me.kryniowesegryderiusz.kgenerators.generators.locations.objects.GeneratorLocation;

core/src/main/java/art/arcane/iris/core/link/data/MMOItemsDataProvider.java

@@ -1,10 +1,10 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.scheduling.J;
 import net.Indyuce.mmoitems.MMOItems;
 import net.Indyuce.mmoitems.api.ItemTier;
 import net.Indyuce.mmoitems.api.block.CustomBlock;

core/src/main/java/art/arcane/iris/core/link/data/MythicCrucibleDataProvider.java

@@ -16,19 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.container.BiomeColor;
-import com.volmit.iris.core.nms.container.BlockProperty;
-import com.volmit.iris.core.service.ExternalDataSVC;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.data.IrisCustomData;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.core.nms.container.BiomeColor;
+import art.arcane.iris.core.nms.container.BlockProperty;
+import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.data.IrisCustomData;
 import io.lumine.mythic.bukkit.BukkitAdapter;
 import io.lumine.mythic.bukkit.utils.serialize.Chroma;
 import io.lumine.mythiccrucible.MythicCrucible;

core/src/main/java/art/arcane/iris/core/link/data/MythicMobsDataProvider.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.tools.IrisToolbelt;
 import io.lumine.mythic.api.adapters.AbstractLocation;
 import io.lumine.mythic.api.config.MythicLineConfig;
 import io.lumine.mythic.api.mobs.entities.SpawnReason;

core/src/main/java/art/arcane/iris/core/link/data/NexoDataProvider.java

@@ -1,19 +1,19 @@
-package com.volmit.iris.core.link.data;
+package art.arcane.iris.core.link.data;
 
 import com.nexomc.nexo.api.NexoBlocks;
 import com.nexomc.nexo.api.NexoFurniture;
 import com.nexomc.nexo.api.NexoItems;
 import com.nexomc.nexo.items.ItemBuilder;
-import com.volmit.iris.core.link.ExternalDataProvider;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.container.BiomeColor;
-import com.volmit.iris.core.nms.container.BlockProperty;
-import com.volmit.iris.core.service.ExternalDataSVC;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.data.IrisCustomData;
+import art.arcane.iris.core.link.ExternalDataProvider;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.core.nms.container.BiomeColor;
+import art.arcane.iris.core.nms.container.BlockProperty;
+import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.data.IrisCustomData;
 import org.bukkit.Color;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;

core/src/main/java/art/arcane/iris/core/loader/ImageResourceLoader.java

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.engine.object.IrisImage;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.data.KCache;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.engine.object.IrisImage;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KSet;
+import art.arcane.volmlib.util.data.KCache;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

core/src/main/java/art/arcane/iris/core/loader/IrisData.java

@@ -16,32 +16,32 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.scripting.environment.PackEnvironment;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.object.annotations.Snippet;
-import com.volmit.iris.engine.object.matter.IrisMatterObject;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.context.IrisContext;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.mantle.flag.MantleFlagAdapter;
-import com.volmit.iris.util.mantle.flag.MantleFlag;
-import com.volmit.iris.util.math.RNG;
-import com.volmit.iris.util.parallel.BurstExecutor;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.reflect.KeyedType;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.scripting.environment.PackEnvironment;
+import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.object.*;
+import art.arcane.iris.engine.object.annotations.Snippet;
+import art.arcane.iris.engine.object.matter.IrisMatterObject;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.mantle.flag.MantleFlagAdapter;
+import art.arcane.volmlib.util.mantle.flag.MantleFlag;
+import art.arcane.volmlib.util.math.RNG;
+import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.reflect.KeyedType;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
 import lombok.Data;
 import org.jetbrains.annotations.Nullable;
 

core/src/main/java/art/arcane/iris/core/loader/IrisRegistrant.java

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
 import com.google.gson.GsonBuilder;
-import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.IrisScript;
-import com.volmit.iris.engine.object.annotations.ArrayType;
-import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListResource;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.plugin.VolmitSender;
+import art.arcane.iris.Iris;
+import art.arcane.iris.engine.object.IrisScript;
+import art.arcane.iris.engine.object.annotations.ArrayType;
+import art.arcane.iris.engine.object.annotations.Desc;
+import art.arcane.iris.engine.object.annotations.RegistryListResource;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.json.JSONObject;
+import art.arcane.iris.util.plugin.VolmitSender;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

core/src/main/java/art/arcane/iris/core/loader/MatterObjectResourceLoader.java

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.engine.object.matter.IrisMatterObject;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.data.KCache;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.engine.object.matter.IrisMatterObject;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KSet;
+import art.arcane.volmlib.util.data.KCache;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import java.io.File;
 

core/src/main/java/art/arcane/iris/core/loader/ObjectResourceLoader.java

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.data.KCache;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KSet;
+import art.arcane.volmlib.util.data.KCache;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import java.io.File;
 

core/src/main/java/art/arcane/iris/core/loader/ResourceLoader.java

@@ -16,30 +16,30 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
 import com.google.common.util.concurrent.AtomicDouble;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.SchemaBuilder;
-import com.volmit.iris.core.service.PreservationSVC;
-import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.framework.MeteredCache;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.data.KCache;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.CustomOutputStream;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.parallel.BurstExecutor;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.project.SchemaBuilder;
+import art.arcane.iris.core.service.PreservationSVC;
+import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.framework.MeteredCache;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KSet;
+import art.arcane.volmlib.util.data.KCache;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.io.CustomOutputStream;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
+import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

core/src/main/java/art/arcane/iris/core/loader/ScriptResourceLoader.java

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.loader;
+package art.arcane.iris.core.loader;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.engine.object.IrisScript;
-import com.volmit.iris.util.data.KCache;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.engine.object.IrisScript;
+import art.arcane.volmlib.util.data.KCache;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import java.io.File;
 import java.util.HashSet;

core/src/main/java/art/arcane/iris/core/nms/BiomeBaseInjector.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms;
+package art.arcane.iris.core.nms;
 
 @FunctionalInterface
 public interface BiomeBaseInjector {

core/src/main/java/art/arcane/iris/core/nms/INMS.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms;
+package art.arcane.iris.core.nms;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.nms.v1X.NMSBinding1X;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.nms.v1X.NMSBinding1X;
 import org.bukkit.Bukkit;
 
 import java.util.List;
@@ -82,7 +82,7 @@ public class INMS {
         Iris.info("Locating NMS Binding for " + code);
 
         try {
-            Class<?> clazz = Class.forName("com.volmit.iris.core.nms."+code+".NMSBinding");
+            Class<?> clazz = Class.forName("art.arcane.iris.core.nms."+code+".NMSBinding");
             try {
                 Object b = clazz.getConstructor().newInstance();
                 if (b instanceof INMSBinding binding) {

core/src/main/java/art/arcane/iris/core/nms/INMSBinding.java

@@ -16,22 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms;
+package art.arcane.iris.core.nms;
 
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.nms.container.BiomeColor;
-import com.volmit.iris.core.nms.container.BlockProperty;
-import com.volmit.iris.core.nms.container.StructurePlacement;
-import com.volmit.iris.core.nms.datapack.DataVersion;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.platform.PlatformChunkGenerator;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.math.Vector3d;
-import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
-import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
-import com.volmit.iris.util.nbt.tag.CompoundTag;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.nms.container.BiomeColor;
+import art.arcane.iris.core.nms.container.BlockProperty;
+import art.arcane.iris.core.nms.container.StructurePlacement;
+import art.arcane.iris.core.nms.datapack.DataVersion;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.mantle.Mantle;
+import art.arcane.volmlib.util.math.Vector3d;
+import art.arcane.volmlib.util.nbt.mca.palette.MCABiomeContainer;
+import art.arcane.volmlib.util.nbt.mca.palette.MCAPaletteAccess;
+import art.arcane.volmlib.util.nbt.tag.CompoundTag;
 import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.Entity;

core/src/main/java/art/arcane/iris/core/nms/container/AutoClosing.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.core.nms.container;
+package art.arcane.iris.core.nms.container;
 
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.function.NastyRunnable;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.volmlib.util.function.NastyRunnable;
 import lombok.AllArgsConstructor;
 
 import java.util.concurrent.atomic.AtomicBoolean;

core/src/main/java/art/arcane/iris/core/nms/container/BiomeColor.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.core.nms.container;
+package art.arcane.iris.core.nms.container;
 
 public enum BiomeColor {
     FOG,

core/src/main/java/art/arcane/iris/core/nms/container/BlockPos.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.core.nms.container;
+package art.arcane.iris.core.nms.container;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

core/src/main/java/art/arcane/iris/core/nms/container/BlockProperty.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.core.nms.container;
+package art.arcane.iris.core.nms.container;
 
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

core/src/main/java/art/arcane/iris/core/nms/container/Pair.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.core.nms.container;
+package art.arcane.iris.core.nms.container;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

core/src/main/java/art/arcane/iris/core/nms/container/StructurePlacement.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.core.nms.container;
+package art.arcane.iris.core.nms.container;
 
 import com.google.gson.JsonObject;
-import com.volmit.iris.engine.object.IrisJigsawStructurePlacement.SpreadType;
+import art.arcane.iris.engine.object.IrisJigsawStructurePlacement.SpreadType;
 import lombok.*;
 import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;

core/src/main/java/art/arcane/iris/core/nms/datapack/DataVersion.java

@@ -1,10 +1,11 @@
-package com.volmit.iris.core.nms.datapack;
+package art.arcane.iris.core.nms.datapack;
 
-import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.nms.datapack.v1192.DataFixerV1192;
-import com.volmit.iris.core.nms.datapack.v1206.DataFixerV1206;
-import com.volmit.iris.core.nms.datapack.v1213.DataFixerV1213;
-import com.volmit.iris.util.collection.KMap;
+import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.core.nms.datapack.v1192.DataFixerV1192;
+import art.arcane.iris.core.nms.datapack.v1206.DataFixerV1206;
+import art.arcane.iris.core.nms.datapack.v1213.DataFixerV1213;
+import art.arcane.iris.core.nms.datapack.v1217.DataFixerV1217;
+import art.arcane.volmlib.util.collection.KMap;
 import lombok.AccessLevel;
 import lombok.Getter;
 
@@ -17,7 +18,7 @@ public enum DataVersion {
     V1_19_2("1.19.2", 10, DataFixerV1192::new),
     V1_20_5("1.20.6", 41, DataFixerV1206::new),
     V1_21_3("1.21.3", 57, DataFixerV1213::new),
-    V1_21_11("1.21.11", 75, DataFixerV1213::new);
+    V1_21_11("1.21.11", 75, DataFixerV1217::new);
     private static final KMap<DataVersion, IDataFixer> cache = new KMap<>();
     @Getter(AccessLevel.NONE)
     private final Supplier<IDataFixer> constructor;

core/src/main/java/art/arcane/iris/core/nms/datapack/IDataFixer.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.core.nms.datapack;
+package art.arcane.iris.core.nms.datapack;
 
-import com.volmit.iris.engine.object.IrisBiomeCustom;
-import com.volmit.iris.engine.object.IrisDimensionTypeOptions;
-import com.volmit.iris.util.json.JSONObject;
+import art.arcane.iris.engine.object.IrisBiomeCustom;
+import art.arcane.iris.engine.object.IrisDimensionTypeOptions;
+import art.arcane.volmlib.util.json.JSONObject;
 import org.jetbrains.annotations.Nullable;
 
 public interface IDataFixer {

core/src/main/java/art/arcane/iris/core/nms/datapack/v1192/DataFixerV1192.java

@@ -1,13 +1,13 @@
-package com.volmit.iris.core.nms.datapack.v1192;
+package art.arcane.iris.core.nms.datapack.v1192;
 
-import com.volmit.iris.core.nms.datapack.IDataFixer;
-import com.volmit.iris.engine.object.IrisDimensionTypeOptions;
-import com.volmit.iris.util.json.JSONObject;
+import art.arcane.iris.core.nms.datapack.IDataFixer;
+import art.arcane.iris.engine.object.IrisDimensionTypeOptions;
+import art.arcane.volmlib.util.json.JSONObject;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 
-import static com.volmit.iris.engine.object.IrisDimensionTypeOptions.TriState.*;
+import static art.arcane.iris.engine.object.IrisDimensionTypeOptions.TriState.*;
 
 public class DataFixerV1192 implements IDataFixer {
     private static final Map<Dimension, IrisDimensionTypeOptions> OPTIONS = Map.of(

core/src/main/java/art/arcane/iris/core/nms/datapack/v1206/DataFixerV1206.java

@@ -1,12 +1,12 @@
-package com.volmit.iris.core.nms.datapack.v1206;
+package art.arcane.iris.core.nms.datapack.v1206;
 
-import com.volmit.iris.core.nms.datapack.v1192.DataFixerV1192;
-import com.volmit.iris.engine.object.IrisBiomeCustom;
-import com.volmit.iris.engine.object.IrisBiomeCustomSpawn;
-import com.volmit.iris.engine.object.IrisBiomeCustomSpawnType;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
+import art.arcane.iris.core.nms.datapack.v1192.DataFixerV1192;
+import art.arcane.iris.engine.object.IrisBiomeCustom;
+import art.arcane.iris.engine.object.IrisBiomeCustomSpawn;
+import art.arcane.iris.engine.object.IrisBiomeCustomSpawnType;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
 
 import java.util.Locale;
 

core/src/main/java/art/arcane/iris/core/nms/datapack/v1213/DataFixerV1213.java

@@ -1,9 +1,9 @@
-package com.volmit.iris.core.nms.datapack.v1213;
+package art.arcane.iris.core.nms.datapack.v1213;
 
-import com.volmit.iris.core.nms.datapack.v1206.DataFixerV1206;
-import com.volmit.iris.engine.object.IrisBiomeCustom;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
+import art.arcane.iris.core.nms.datapack.v1206.DataFixerV1206;
+import art.arcane.iris.engine.object.IrisBiomeCustom;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
 
 public class DataFixerV1213 extends DataFixerV1206 {
 

core/src/main/java/art/arcane/iris/core/nms/datapack/v1217/DataFixerV1217.java

@@ -1,9 +1,9 @@
-package com.volmit.iris.core.nms.datapack.v1217;
+package art.arcane.iris.core.nms.datapack.v1217;
 
-import com.volmit.iris.core.nms.datapack.v1213.DataFixerV1213;
-import com.volmit.iris.engine.object.IrisBiomeCustom;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
+import art.arcane.iris.core.nms.datapack.v1213.DataFixerV1213;
+import art.arcane.iris.engine.object.IrisBiomeCustom;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
 
 import java.util.Map;
 
@@ -100,6 +100,7 @@ public class DataFixerV1217 extends DataFixerV1213 {
                     .put(particle.getJSONObject("options")
                             .put("probability", particle.get("probability"))));
         }
+        json.put("attributes", attributes);
 
         return json;
     }
@@ -154,10 +155,10 @@ public class DataFixerV1217 extends DataFixerV1213 {
 
     private void merge(JSONObject base, JSONObject override) {
         for (String key : override.keySet()) {
-            switch (base.get(key)) {
-                case null -> base.put(key, override.get(key));
-                case JSONObject base1 when override.get(key) instanceof JSONObject override1 -> merge(base1, override1);
-                case JSONArray base1 when override.get(key) instanceof JSONArray override1 -> {
+            switch (base.opt(key)) {
+                case null -> base.put(key, override.opt(key));
+                case JSONObject base1 when override.opt(key) instanceof JSONObject override1 -> merge(base1, override1);
+                case JSONArray base1 when override.opt(key) instanceof JSONArray override1 -> {
                     for (Object o : override1) {
                         base1.put(o);
                     }

core/src/main/java/art/arcane/iris/core/nms/v1X/NMSBinding1X.java

@@ -16,24 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.nms.v1X;
+package art.arcane.iris.core.nms.v1X;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.nms.INMSBinding;
-import com.volmit.iris.core.nms.container.BiomeColor;
-import com.volmit.iris.core.nms.container.BlockProperty;
-import com.volmit.iris.core.nms.datapack.DataVersion;
-import com.volmit.iris.core.nms.container.Pair;
-import com.volmit.iris.core.nms.container.StructurePlacement;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.math.Vector3d;
-import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
-import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
-import com.volmit.iris.util.nbt.tag.CompoundTag;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.nms.INMSBinding;
+import art.arcane.iris.core.nms.container.BiomeColor;
+import art.arcane.iris.core.nms.container.BlockProperty;
+import art.arcane.iris.core.nms.datapack.DataVersion;
+import art.arcane.iris.core.nms.container.Pair;
+import art.arcane.iris.core.nms.container.StructurePlacement;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.mantle.Mantle;
+import art.arcane.volmlib.util.math.Vector3d;
+import art.arcane.volmlib.util.nbt.mca.palette.MCABiomeContainer;
+import art.arcane.volmlib.util.nbt.mca.palette.MCAPaletteAccess;
+import art.arcane.volmlib.util.nbt.tag.CompoundTag;
 import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.Entity;

core/src/main/java/art/arcane/iris/core/pack/IrisPack.java

@@ -16,22 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pack;
+package art.arcane.iris.core.pack;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.loader.ResourceLoader;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.exceptions.IrisException;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.core.loader.ResourceLoader;
+import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.engine.object.IrisWorld;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.exceptions.IrisException;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Data;
 import org.bukkit.World;
 import org.zeroturnaround.zip.commons.FileUtils;

core/src/main/java/art/arcane/iris/core/pack/IrisPackRepository.java

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pack;
+package art.arcane.iris.core.pack;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.jobs.DownloadJob;
-import com.volmit.iris.util.scheduling.jobs.JobCollection;
-import com.volmit.iris.util.scheduling.jobs.SingleJob;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.scheduling.jobs.DownloadJob;
+import art.arcane.iris.util.scheduling.jobs.JobCollection;
+import art.arcane.iris.util.scheduling.jobs.SingleJob;
 import lombok.Builder;
 import lombok.Data;
 import org.zeroturnaround.zip.ZipUtil;

core/src/main/java/art/arcane/iris/core/pregenerator/ChunkUpdater.java

@@ -1,18 +1,18 @@
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.service.PreservationSVC;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.mantle.flag.MantleFlag;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.plugin.chunk.TicketHolder;
-import com.volmit.iris.util.profile.LoadBalancer;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.service.PreservationSVC;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.mantle.flag.MantleFlag;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.RollingSequence;
+import art.arcane.iris.util.plugin.chunk.TicketHolder;
+import art.arcane.iris.util.profile.LoadBalancer;
+import art.arcane.iris.util.scheduling.J;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;

core/src/main/java/art/arcane/iris/core/pregenerator/DeepSearchPregenerator.java

@@ -1,20 +1,20 @@
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
 import com.google.gson.Gson;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.math.Spiraler;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.RollingSequence;
+import art.arcane.volmlib.util.math.Spiraler;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
 import lombok.Data;
 import lombok.Getter;
 import org.bukkit.Bukkit;

core/src/main/java/art/arcane/iris/core/pregenerator/IrisPregenerator.java

@@ -16,22 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.tools.IrisPackBenchmarking;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.Looper;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.tools.IrisPackBenchmarking;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KSet;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.iris.util.mantle.Mantle;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.RollingSequence;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.Looper;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;

core/src/main/java/art/arcane/iris/core/pregenerator/LazyPregenerator.java

@@ -1,16 +1,16 @@
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
 import com.google.gson.Gson;
-import com.volmit.iris.Iris;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.math.Spiraler;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.RollingSequence;
+import art.arcane.volmlib.util.math.Spiraler;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
 import io.papermc.lib.PaperLib;
 import lombok.Data;
 import lombok.Getter;
@@ -221,6 +221,25 @@ public class LazyPregenerator extends Thread implements Listener {
         return job != null && job.isPaused();
     }
 
+    public static long remainingChunks() {
+        LazyPregenerator local = instance;
+        AtomicInteger generated = lazyGeneratedChunks;
+        if (local == null || generated == null) {
+            return -1L;
+        }
+
+        return Math.max(0L, local.lazyTotalChunks.get() - generated.get());
+    }
+
+    public static double chunksPerSecond() {
+        LazyPregenerator local = instance;
+        if (local == null) {
+            return 0D;
+        }
+
+        return Math.max(0D, local.chunksPerMinute.getAverage() / 60D);
+    }
+
     public void shutdownInstance(World world) throws IOException {
         Iris.info("LazyGen: " + C.IRIS + world.getName() + C.BLUE + " Shutting down..");
         LazyPregenJob job = jobs.get(world.getName());
@@ -282,4 +301,3 @@ public class LazyPregenerator extends Thread implements Listener {
         boolean paused = false;
     }
 }
-

core/src/main/java/art/arcane/iris/core/pregenerator/PregenListener.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
 public interface PregenListener {
     void onTick(double chunksPerSecond, double chunksPerMinute, double regionsPerMinute, double percent, long generated, long totalChunks, long chunksRemaining, long eta, long elapsed, String method, boolean cached);

core/src/main/java/art/arcane/iris/core/pregenerator/PregenTask.java

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.Spiraled;
-import com.volmit.iris.util.math.Spiraler;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.Spiraled;
+import art.arcane.volmlib.util.math.Spiraler;
 import lombok.Builder;
 import lombok.Data;
 

core/src/main/java/art/arcane/iris/core/pregenerator/PregeneratorMethod.java

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
-import com.volmit.iris.util.mantle.Mantle;
+import art.arcane.iris.util.mantle.Mantle;
 
 /**
  * Represents something that is capable of generating in chunks or regions, or both

core/src/main/java/art/arcane/iris/core/pregenerator/TurboPregenerator.java

@@ -1,22 +1,22 @@
-package com.volmit.iris.core.pregenerator;
+package art.arcane.iris.core.pregenerator;
 
 import com.google.gson.Gson;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RollingSequence;
-import com.volmit.iris.util.math.Spiraler;
-import com.volmit.iris.util.parallel.BurstExecutor;
-import com.volmit.iris.util.parallel.HyperLock;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.iris.util.format.C;
+import art.arcane.volmlib.util.format.Form;
+import art.arcane.volmlib.util.io.IO;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.math.Position2;
+import art.arcane.volmlib.util.math.RollingSequence;
+import art.arcane.volmlib.util.math.Spiraler;
+import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.parallel.HyperLock;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import io.papermc.lib.PaperLib;
 import lombok.Data;
 import lombok.Getter;
@@ -285,6 +285,25 @@ public class TurboPregenerator extends Thread implements Listener {
         return job != null && job.isPaused();
     }
 
+    public static long remainingChunks() {
+        TurboPregenerator local = instance;
+        AtomicInteger generated = turboGeneratedChunks;
+        if (local == null || generated == null) {
+            return -1L;
+        }
+
+        return Math.max(0L, local.turboTotalChunks.get() - generated.get());
+    }
+
+    public static double chunksPerSecond() {
+        TurboPregenerator local = instance;
+        if (local == null) {
+            return 0D;
+        }
+
+        return Math.max(0D, local.chunksPerSecond.getAverage());
+    }
+
     public void shutdownInstance(World world) throws IOException {
         Iris.info("turboGen: " + C.IRIS + world.getName() + C.BLUE + " Shutting down..");
         TurboPregenJob job = jobs.get(world.getName());
@@ -338,4 +357,3 @@ public class TurboPregenerator extends Thread implements Listener {
         boolean paused = false;
     }
 }
-

core/src/main/java/art/arcane/iris/core/pregenerator/cache/PregenCache.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.core.pregenerator.cache;
+package art.arcane.iris.core.pregenerator.cache;
 
-import com.volmit.iris.util.documentation.ChunkCoordinates;
-import com.volmit.iris.util.documentation.RegionCoordinates;
+import art.arcane.volmlib.util.documentation.ChunkCoordinates;
+import art.arcane.volmlib.util.documentation.RegionCoordinates;
 
 import java.io.File;
 

core/src/main/java/art/arcane/iris/core/pregenerator/cache/SynchronizedCache.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.core.pregenerator.cache;
+package art.arcane.iris.core.pregenerator.cache;
 
 record SynchronizedCache(PregenCache cache) implements PregenCache {
     @Override

core/src/main/java/art/arcane/iris/core/pregenerator/methods/AsyncOrMedievalPregenMethod.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator.methods;
+package art.arcane.iris.core.pregenerator.methods;
 
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.util.mantle.Mantle;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.util.mantle.Mantle;
 import io.papermc.lib.PaperLib;
 import org.bukkit.World;
 

core/src/main/java/art/arcane/iris/core/pregenerator/methods/AsyncPregenMethod.java

@@ -16,18 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator.methods;
+package art.arcane.iris.core.pregenerator.methods;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.parallel.MultiBurst;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.mantle.Mantle;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.scheduling.J;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.World;

core/src/main/java/art/arcane/iris/core/pregenerator/methods/CachedPregenMethod.java

@@ -1,11 +1,11 @@
-package com.volmit.iris.core.pregenerator.methods;
+package art.arcane.iris.core.pregenerator.methods;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.core.pregenerator.cache.PregenCache;
-import com.volmit.iris.core.service.GlobalCacheSVC;
-import com.volmit.iris.util.mantle.Mantle;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.core.pregenerator.cache.PregenCache;
+import art.arcane.iris.core.service.GlobalCacheSVC;
+import art.arcane.iris.util.mantle.Mantle;
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor

core/src/main/java/art/arcane/iris/core/pregenerator/methods/DummyPregenMethod.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator.methods;
+package art.arcane.iris.core.pregenerator.methods;
 
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.util.mantle.Mantle;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.util.mantle.Mantle;
 
 public class DummyPregenMethod implements PregeneratorMethod {
     @Override

core/src/main/java/art/arcane/iris/core/pregenerator/methods/HybridPregenMethod.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator.methods;
+package art.arcane.iris.core.pregenerator.methods;
 
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.util.mantle.Mantle;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.util.mantle.Mantle;
 import org.bukkit.World;
 
 public class HybridPregenMethod implements PregeneratorMethod {

core/src/main/java/art/arcane/iris/core/pregenerator/methods/MedievalPregenMethod.java

@@ -16,18 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.pregenerator.methods;
+package art.arcane.iris.core.pregenerator.methods;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.pregenerator.PregenListener;
-import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.mantle.Mantle;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.scheduling.J;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.pregenerator.PregenListener;
+import art.arcane.iris.core.pregenerator.PregeneratorMethod;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.mantle.Mantle;
+import art.arcane.volmlib.util.math.M;
+import art.arcane.iris.util.scheduling.J;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;

core/src/main/java/art/arcane/iris/core/project/Gradle.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.core.project;
+package art.arcane.iris.core.project;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.util.io.IO;
+import art.arcane.iris.Iris;
+import art.arcane.volmlib.util.io.IO;
 import org.zeroturnaround.zip.ZipUtil;
 
 import java.io.BufferedInputStream;

core/src/main/java/art/arcane/iris/core/project/IrisProject.java

@@ -16,35 +16,35 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.project;
+package art.arcane.iris.core.project;
 
 import com.google.gson.Gson;
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.core.loader.ResourceLoader;
-import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.object.annotations.Snippet;
-import com.volmit.iris.engine.platform.PlatformChunkGenerator;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.exceptions.IrisException;
-import com.volmit.iris.util.format.Form;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.math.M;
-import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.ChronoLatch;
-import com.volmit.iris.util.scheduling.J;
-import com.volmit.iris.util.scheduling.O;
-import com.volmit.iris.util.scheduling.PrecisionStopwatch;
-import com.volmit.iris.util.scheduling.jobs.Job;
-import com.volmit.iris.util.scheduling.jobs.JobCollection;
-import com.volmit.iris.util.scheduling.jobs.ParallelQueueJob;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.core.loader.IrisRegistrant;
+import art.arcane.iris.core.loader.ResourceLoader;
+import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.engine.object.*;
+import art.arcane.iris.engine.object.annotations.Snippet;
+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.volmlib.util.exceptions.IrisException;
+import art.arcane.volmlib.util.format.Form;
+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.math.M;
+import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.volmlib.util.scheduling.ChronoLatch;
+import art.arcane.iris.util.scheduling.J;
+import art.arcane.volmlib.util.scheduling.O;
+import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
+import art.arcane.iris.util.scheduling.jobs.Job;
+import art.arcane.iris.util.scheduling.jobs.JobCollection;
+import art.arcane.iris.util.scheduling.jobs.ParallelQueueJob;
 import lombok.Data;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;

core/src/main/java/art/arcane/iris/core/project/SchemaBuilder.java

@@ -16,22 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.project;
+package art.arcane.iris.core.project;
 
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.link.Identifier;
-import com.volmit.iris.core.link.data.DataType;
-import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.core.loader.ResourceLoader;
-import com.volmit.iris.core.service.ExternalDataSVC;
-import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.collection.KMap;
-import com.volmit.iris.util.data.B;
-import com.volmit.iris.util.json.JSONArray;
-import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.reflect.KeyedType;
+import art.arcane.iris.Iris;
+import art.arcane.iris.core.link.Identifier;
+import art.arcane.iris.core.link.data.DataType;
+import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.core.loader.IrisRegistrant;
+import art.arcane.iris.core.loader.ResourceLoader;
+import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.engine.object.annotations.*;
+import art.arcane.volmlib.util.collection.KList;
+import art.arcane.volmlib.util.collection.KMap;
+import art.arcane.iris.util.data.B;
+import art.arcane.volmlib.util.json.JSONArray;
+import art.arcane.volmlib.util.json.JSONObject;
+import art.arcane.iris.util.reflect.KeyedType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
@@ -732,7 +732,7 @@ public class SchemaBuilder {
             return "object";
         }
 
-        if (!c.isAnnotationPresent(Desc.class) && c.getCanonicalName().startsWith("com.volmit.iris.")) {
+        if (!c.isAnnotationPresent(Desc.class) && c.getCanonicalName().startsWith("art.arcane.iris.")) {
             warnings.addIfMissing("Unsupported Type: " + c.getCanonicalName() + " Did you forget @Desc?");
         }
 
@@ -759,7 +759,7 @@ public class SchemaBuilder {
             return r.getDeclaredAnnotation(Desc.class).value();
         }
 
-        if (!r.isPrimitive() && !r.equals(KList.class) && !r.equals(KMap.class) && r.getCanonicalName().startsWith("com.volmit.")) {
+        if (!r.isPrimitive() && !r.equals(KList.class) && !r.equals(KMap.class) && r.getCanonicalName().startsWith("art.arcane.")) {
             warnings.addIfMissing("Missing @Desc on " + r.getSimpleName() + " in " + (r.getDeclaringClass() != null ? r.getDeclaringClass().getCanonicalName() : " NOSRC"));
         }
         return "";