V

build.gradle.kts

@@ -1,6 +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
 
 /*
@@ -30,11 +29,10 @@ plugins {
     java
     `java-library`
     alias(libs.plugins.download)
-    alias(libs.plugins.runPaper)
 }
 
 group = "art.arcane"
-version = "4.0.0-1.20.1-1.21.11-Dev1"
+version = "4.0.0-1.21.11"
 val volmLibCoordinate: String = providers.gradleProperty("volmLibCoordinate")
     .orElse("com.github.VolmitSoftware:VolmLib:master-SNAPSHOT")
     .get()
@@ -59,33 +57,15 @@ registerCustomOutputTaskUnix("PixelMac", "/Users/test/Desktop/mcserver/plugins")
 registerCustomOutputTaskUnix("CrazyDev22LT", "/home/julian/Desktop/server/plugins")
 // ==============================================================
 
-val serverMinHeap = "10G"
-val serverMaxHeap = "10G"
-val additionalFlags = "-XX:+AlwaysPreTouch"
-//Valid values are: none, truecolor, indexed256, indexed16, indexed8
-val color = "truecolor"
-val errorReporting = "true" == findProperty("errorReporting")
-
 val nmsBindings = mapOf(
     "v1_21_R7" to "1.21.11-R0.1-SNAPSHOT",
-    "v1_21_R6" to "1.21.10-R0.1-SNAPSHOT",
-    "v1_21_R5" to "1.21.8-R0.1-SNAPSHOT",
-    "v1_21_R4" to "1.21.5-R0.1-SNAPSHOT",
-    "v1_21_R3" to "1.21.4-R0.1-SNAPSHOT",
-    "v1_21_R2" to "1.21.3-R0.1-SNAPSHOT",
-    "v1_21_R1" to "1.21.1-R0.1-SNAPSHOT",
-    "v1_20_R4" to "1.20.6-R0.1-SNAPSHOT",
-    "v1_20_R3" to "1.20.4-R0.1-SNAPSHOT",
-    "v1_20_R2" to "1.20.2-R0.1-SNAPSHOT",
-    "v1_20_R1" to "1.20.1-R0.1-SNAPSHOT",
 )
-val jvmVersion = mapOf<String, Int>()
 nmsBindings.forEach { (key, value) ->
     project(":nms:$key") {
         apply<JavaPlugin>()
 
         nmsBinding {
-            jvm = jvmVersion.getOrDefault(key, 21)
+            jvm = 21
             version = value
             type = NMSBinding.Type.DIRECT
         }
@@ -100,22 +80,6 @@ nmsBindings.forEach { (key, value) ->
             compileOnly(rootProject.libs.byteBuddy.core)
         }
     }
-
-    tasks.register<RunServer>("runServer-$key") {
-        group = "servers"
-        minecraftVersion(value.split("-")[0])
-        minHeapSize = serverMinHeap
-        maxHeapSize = serverMaxHeap
-        pluginJars(tasks.jar.flatMap { it.archiveFile })
-        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(jvmVersion.getOrDefault(key, 21))}
-        runDirectory.convention(layout.buildDirectory.dir("run/$key"))
-        systemProperty("disable.watchdog", "true")
-        systemProperty("net.kyori.ansi.colorLevel", color)
-        systemProperty("com.mojang.eula.agree", true)
-        systemProperty("iris.suppressReporting", !errorReporting)
-        jvmArgs("-javaagent:${project(":core:agent").tasks.jar.flatMap { it.archiveFile }.get().asFile.absolutePath}")
-        jvmArgs(additionalFlags.split(' '))
-    }
 }
 
 val included: Configuration by configurations.creating

core/agent/build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
 
 tasks.jar {
     manifest.attributes(
-        "Agent-Class" to "art.arcane.iris.util.agent.Installer",
+        "Agent-Class" to "art.arcane.iris.util.project.agent.Installer",
-        "Premain-Class" to "art.arcane.iris.util.agent.Installer",
+        "Premain-Class" to "art.arcane.iris.util.project.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 art.arcane.iris.util.agent;
+package art.arcane.iris.util.project.agent;
 
 import java.lang.instrument.Instrumentation;
 

core/build.gradle.kts

@@ -35,7 +35,7 @@ plugins {
     alias(libs.plugins.kotlin.lombok)
 }
 
-val apiVersion = "1.19"
+val apiVersion = "1.21"
 val main = "art.arcane.iris.Iris"
 val lib = "art.arcane.iris.util"
 val volmLibCoordinate: String = providers.gradleProperty("volmLibCoordinate")

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

@@ -41,7 +41,7 @@ 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.iris.util.common.format.C;
 import art.arcane.volmlib.util.function.NastyRunnable;
 import art.arcane.volmlib.util.hotload.ConfigHotloadEngine;
 import art.arcane.volmlib.util.io.IO;
@@ -49,15 +49,15 @@ 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.common.misc.Bindings;
-import art.arcane.iris.util.misc.SlimJar;
+import art.arcane.iris.util.common.misc.SlimJar;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.plugin.VolmitPlugin;
+import art.arcane.iris.util.common.plugin.VolmitPlugin;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.plugin.chunk.ChunkTickets;
+import art.arcane.iris.util.common.plugin.chunk.ChunkTickets;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.iris.util.misc.ServerProperties;
+import art.arcane.iris.util.common.misc.ServerProperties;
 import art.arcane.volmlib.util.scheduling.Queue;
 import art.arcane.volmlib.util.scheduling.ShurikenQueue;
 import lombok.NonNull;

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

@@ -23,8 +23,8 @@ 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.common.misc.getHardware;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -9,7 +9,7 @@ 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 art.arcane.iris.util.common.misc.ServerProperties;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
 

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

@@ -27,10 +27,10 @@ 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.common.format.C;
-import art.arcane.iris.util.misc.ServerProperties;
+import art.arcane.iris.util.common.misc.ServerProperties;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import org.bukkit.Bukkit;

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

@@ -39,15 +39,15 @@ import art.arcane.iris.engine.platform.PlatformChunkGenerator;
 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.util.project.context.IrisContext;
 import art.arcane.iris.engine.object.IrisJigsawStructurePlacement;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.director.specialhandlers.NullableDimensionHandler;
+import art.arcane.iris.util.common.director.specialhandlers.NullableDimensionHandler;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.io.CountingDataInputStream;
 import art.arcane.volmlib.util.io.IO;
@@ -55,12 +55,12 @@ import art.arcane.volmlib.util.mantle.runtime.TectonicPlate;
 import art.arcane.volmlib.util.math.Position2;
 import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.matter.Matter;
-import art.arcane.iris.util.nbt.mca.MCAFile;
+import art.arcane.iris.util.nbt.common.mca.MCAFile;
-import art.arcane.iris.util.nbt.mca.MCAUtil;
+import art.arcane.iris.util.nbt.common.mca.MCAUtil;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.iris.util.scheduling.jobs.Job;
+import art.arcane.iris.util.common.scheduling.jobs.Job;
 import lombok.SneakyThrows;
 import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;

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

@@ -21,11 +21,11 @@ package art.arcane.iris.core.commands;
 import art.arcane.iris.Iris;
 import art.arcane.iris.core.service.StudioSVC;
 import art.arcane.iris.engine.object.*;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 
 import java.awt.*;
 

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

@@ -22,12 +22,12 @@ 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.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.director.specialhandlers.ObjectHandler;
+import art.arcane.iris.util.common.director.specialhandlers.ObjectHandler;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 
 @Director(name = "find", origin = DirectorOrigin.PLAYER, description = "Iris Find commands", aliases = "goto")
 public class CommandFind implements DirectorExecutor {

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

@@ -29,25 +29,25 @@ import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.object.IrisDimension;
 import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.util.project.matter.TileWrapper;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.director.DirectorContext;
+import art.arcane.iris.util.common.director.DirectorContext;
 import art.arcane.volmlib.util.director.DirectorParameterHandler;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
-import art.arcane.iris.util.director.specialhandlers.NullablePlayerHandler;
+import art.arcane.iris.util.common.director.specialhandlers.NullablePlayerHandler;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.io.IO;
 import art.arcane.volmlib.util.math.Position2;
-import art.arcane.iris.util.parallel.SyncExecutor;
+import art.arcane.iris.util.common.parallel.SyncExecutor;
-import art.arcane.iris.util.misc.ServerProperties;
+import art.arcane.iris.util.common.misc.ServerProperties;
-import art.arcane.iris.util.misc.RegenRuntime;
+import art.arcane.iris.util.common.misc.RegenRuntime;
 import art.arcane.volmlib.util.mantle.runtime.MantleChunk;
-import art.arcane.iris.util.matter.TileWrapper;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.iris.util.scheduling.J;
 import art.arcane.volmlib.util.matter.Matter;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -87,7 +87,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static art.arcane.iris.core.service.EditSVC.deletingWorld;
-import static art.arcane.iris.util.misc.ServerProperties.BUKKIT_YML;
+import static art.arcane.iris.util.common.misc.ServerProperties.BUKKIT_YML;
 import static org.bukkit.Bukkit.getServer;
 
 @Director(name = "iris", aliases = {"ir", "irs"}, description = "Basic Command")

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

@@ -27,15 +27,15 @@ 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.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.director.specialhandlers.ObjectHandler;
+import art.arcane.iris.util.common.director.specialhandlers.ObjectHandler;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.math.RNG;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 
 import java.io.File;

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

@@ -24,10 +24,10 @@ 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.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.math.Position2;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

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

@@ -28,15 +28,15 @@ 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.common.data.IrisCustomData;
-import art.arcane.iris.util.data.registry.Materials;
+import art.arcane.iris.util.common.data.registry.Materials;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.director.specialhandlers.ObjectHandler;
+import art.arcane.iris.util.common.director.specialhandlers.ObjectHandler;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.math.Direction;
+import art.arcane.iris.util.common.math.Direction;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.*;
 import org.bukkit.block.Block;

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

@@ -22,10 +22,10 @@ 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.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.math.Position2;
 import org.bukkit.World;
 import org.bukkit.util.Vector;

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

@@ -18,7 +18,7 @@
 
 package art.arcane.iris.core.commands;
 
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 
 public class CommandSettings implements DirectorExecutor {
 

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

@@ -33,18 +33,18 @@ 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.director.DirectorContext;
+import art.arcane.iris.util.common.director.DirectorContext;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
-import art.arcane.iris.util.director.handlers.DimensionHandler;
+import art.arcane.iris.util.common.director.handlers.DimensionHandler;
-import art.arcane.iris.util.director.specialhandlers.NullableDimensionHandler;
+import art.arcane.iris.util.common.director.specialhandlers.NullableDimensionHandler;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.function.Function2;
 import art.arcane.volmlib.util.function.NoiseProvider;
-import art.arcane.iris.util.interpolation.InterpolationMethod;
+import art.arcane.iris.util.project.interpolation.InterpolationMethod;
 import art.arcane.volmlib.util.io.IO;
 import art.arcane.volmlib.util.json.JSONArray;
 import art.arcane.volmlib.util.json.JSONObject;
@@ -53,14 +53,14 @@ import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.math.Position2;
 import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.math.Spiraler;
-import art.arcane.iris.util.noise.CNG;
+import art.arcane.iris.util.project.noise.CNG;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.parallel.SyncExecutor;
+import art.arcane.iris.util.common.parallel.SyncExecutor;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.O;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import art.arcane.iris.util.scheduling.jobs.ParallelRadiusJob;
+import art.arcane.iris.util.common.scheduling.jobs.ParallelRadiusJob;
 import io.papermc.lib.PaperLib;
 import org.bukkit.*;
 import org.bukkit.event.inventory.InventoryType;

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

@@ -22,10 +22,10 @@ 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.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.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

@@ -24,11 +24,11 @@ import org.bukkit.World;
 import art.arcane.iris.Iris;
 import art.arcane.iris.core.pregenerator.ChunkUpdater;
 import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 
 @Director(name = "updater", origin = DirectorOrigin.BOTH, description = "Iris World Updater")

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

@@ -25,14 +25,14 @@ 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.common.data.B;
-import art.arcane.iris.util.director.DirectorExecutor;
+import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.matter.MatterMarker;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.Chunk;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;

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

@@ -18,8 +18,8 @@
 
 package art.arcane.iris.core.edit;
 
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.SR;
 import org.bukkit.Location;
 import org.bukkit.block.Block;

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

@@ -25,8 +25,8 @@ 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.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import lombok.Data;
 import org.bukkit.Sound;
 import org.bukkit.World;

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

@@ -29,7 +29,7 @@ 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 art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;

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

@@ -5,7 +5,7 @@ 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 art.arcane.iris.util.common.scheduling.J;
 import lombok.Getter;
 import org.bukkit.*;
 import org.bukkit.block.Block;

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

@@ -27,10 +27,10 @@ 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.project.noise.CNG;
-import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.common.parallel.BurstExecutor;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.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

@@ -34,7 +34,7 @@ import art.arcane.volmlib.util.matter.Matter;
 import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.math.Position2;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.World;
 
 import javax.swing.*;

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

@@ -35,7 +35,7 @@ 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.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.O;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Location;
@@ -55,7 +55,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiFunction;
 
-import static art.arcane.iris.util.data.registry.Attributes.MAX_HEALTH;
+import static art.arcane.iris.util.common.data.registry.Attributes.MAX_HEALTH;
 
 public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener, MouseMotionListener, MouseInputListener {
     private static final long serialVersionUID = 2094606939770332040L;

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

@@ -21,7 +21,7 @@ package art.arcane.iris.core.gui.components;
 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 art.arcane.iris.util.project.interpolation.IrisInterpolation;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.function.BiFunction;

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

@@ -5,8 +5,8 @@
 //import com.jojodmo.customitems.item.custom.block.CustomMushroomBlock;
 //import com.jojodmo.customitems.version.SafeMaterial;
 //import art.arcane.volmlib.util.collection.KList;
-//import art.arcane.iris.util.reflect.WrappedField;
+//import art.arcane.iris.util.common.reflect.WrappedField;
-//import art.arcane.iris.util.reflect.WrappedReturningMethod;
+//import art.arcane.iris.util.common.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

@@ -7,7 +7,7 @@ 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.iris.util.common.data.IrisCustomData;
 import art.arcane.volmlib.util.math.RNG;
 import lombok.Getter;
 import lombok.NonNull;

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

@@ -1,7 +1,7 @@
 package art.arcane.iris.core.link;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;

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

@@ -4,7 +4,7 @@ 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 art.arcane.iris.util.common.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/HMCLeavesDataProvider.java

@@ -7,9 +7,9 @@ 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.common.data.IrisCustomData;
-import art.arcane.iris.util.reflect.WrappedField;
+import art.arcane.iris.util.common.reflect.WrappedField;
-import art.arcane.iris.util.reflect.WrappedReturningMethod;
+import art.arcane.iris.util.common.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

@@ -5,7 +5,7 @@ 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 art.arcane.iris.util.common.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

@@ -5,8 +5,8 @@ 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.common.data.B;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.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

@@ -4,7 +4,7 @@ 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 art.arcane.iris.util.common.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

@@ -27,8 +27,8 @@ 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.common.data.B;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.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/NexoDataProvider.java

@@ -12,8 +12,8 @@ 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.common.data.B;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.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/IrisData.java

@@ -32,16 +32,16 @@ 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.project.context.IrisContext;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.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.common.parallel.BurstExecutor;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.reflect.KeyedType;
+import art.arcane.iris.util.common.reflect.KeyedType;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import lombok.Data;
 import org.jetbrains.annotations.Nullable;
 

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

@@ -26,7 +26,7 @@ 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 art.arcane.iris.util.common.plugin.VolmitSender;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -29,16 +29,16 @@ 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.iris.util.common.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.common.parallel.BurstExecutor;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -31,26 +31,16 @@ public class INMS {
             new Version(21, 11, null);
 
     private static final List<Version> REVISION = List.of(
-            new Version(21, 11, "v1_21_R7"),
+            new Version(21, 11, "v1_21_R7")
-            new Version(21, 9, "v1_21_R6"),
-            new Version(21, 6, "v1_21_R5"),
-            new Version(21, 5, "v1_21_R4"),
-            new Version(21, 4, "v1_21_R3"),
-            new Version(21, 2, "v1_21_R2"),
-            new Version(21, 0, "v1_21_R1"),
-            new Version(20, 5, "v1_20_R4")
     );
 
     private static final List<Version> PACKS = List.of(
-            new Version(21, 5, "31100"),
+            new Version(21, 11, "31100")
-            new Version(21, 4, "31020"),
-            new Version(21, 2, "31000"),
-            new Version(20, 1, "3910")
     );
 
     //@done
     private static final INMSBinding binding = bind();
-    public static final String OVERWORLD_TAG = getTag(PACKS, "3910");
+    public static final String OVERWORLD_TAG = getTag(PACKS, "31100");
 
     public static INMSBinding get() {
         return binding;
@@ -82,7 +72,7 @@ public class INMS {
         Iris.info("Locating NMS Binding for " + code);
 
         try {
-            Class<?> clazz = Class.forName("art.arcane.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) {
@@ -93,19 +83,22 @@ public class INMS {
                 Iris.reportError(e);
                 e.printStackTrace();
             }
-        } catch (ClassNotFoundException|NoClassDefFoundError classNotFoundException) {
+        } catch (ClassNotFoundException | NoClassDefFoundError classNotFoundException) {
             Iris.warn("Failed to load NMS binding class for " + code + ": " + classNotFoundException.getMessage());
         }
 
-        Iris.info("Craftbukkit " + code + " <-> " + NMSBinding1X.class.getSimpleName() + " Successfully Bound");
+        if (IrisSettings.get().getGeneral().isDisableNMS()) {
-        Iris.warn("Note: Some features of Iris may not work the same since you are on an unsupported version of Minecraft.");
+            Iris.info("Craftbukkit " + code + " <-> " + NMSBinding1X.class.getSimpleName() + " Successfully Bound");
-        Iris.warn("Note: If this is a new version, expect an update soon.");
+            Iris.warn("Note: NMS support is disabled. Iris is running in limited Bukkit fallback mode.");
+            return new NMSBinding1X();
+        }
 
-        return new NMSBinding1X();
+        String serverVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
+        throw new IllegalStateException("Iris requires Minecraft 1.21.11 or newer. Detected server version: " + serverVersion);
     }
 
     private static String getTag(List<Version> versions, String def) {
-        var version = Bukkit.getServer().getBukkitVersion().split("-")[0].split("\\.", 3);
+        String[] version = Bukkit.getServer().getBukkitVersion().split("-")[0].split("\\.", 3);
         int major = 0;
         int minor = 0;
 
@@ -119,9 +112,10 @@ public class INMS {
             return versions.getFirst().tag;
         }
 
-        for (var p : versions) {
+        for (Version p : versions) {
-            if (p.major > major || p.minor > minor)
+            if (p.major > major || p.minor > minor) {
                 continue;
+            }
             return p.tag;
         }
         return def;

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

@@ -30,7 +30,7 @@ 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.iris.util.common.plugin.VolmitSender;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Data;
 import org.bukkit.World;

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

@@ -21,10 +21,10 @@ package art.arcane.iris.core.pack;
 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.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.jobs.DownloadJob;
+import art.arcane.iris.util.common.scheduling.jobs.DownloadJob;
-import art.arcane.iris.util.scheduling.jobs.JobCollection;
+import art.arcane.iris.util.common.scheduling.jobs.JobCollection;
-import art.arcane.iris.util.scheduling.jobs.SingleJob;
+import art.arcane.iris.util.common.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

@@ -5,14 +5,14 @@ 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.iris.util.project.profile.LoadBalancer;
 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.volmlib.util.math.Position2;
 import art.arcane.volmlib.util.math.RollingSequence;
-import art.arcane.iris.util.plugin.chunk.TicketHolder;
+import art.arcane.iris.util.common.plugin.chunk.TicketHolder;
-import art.arcane.iris.util.profile.LoadBalancer;
+import art.arcane.iris.util.common.scheduling.J;
-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

@@ -6,7 +6,7 @@ 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.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.io.IO;
 import art.arcane.volmlib.util.math.M;
@@ -14,7 +14,7 @@ import art.arcane.volmlib.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 art.arcane.iris.util.common.scheduling.J;
 import lombok.Data;
 import lombok.Getter;
 import org.bukkit.Bukkit;

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

@@ -22,7 +22,7 @@ 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.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.mantle.runtime.Mantle;
 import art.arcane.volmlib.util.matter.Matter;
@@ -30,7 +30,7 @@ import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.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.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.Looper;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 

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

@@ -2,7 +2,7 @@ package art.arcane.iris.core.pregenerator;
 
 import com.google.gson.Gson;
 import art.arcane.iris.Iris;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.io.IO;
 import art.arcane.volmlib.util.math.M;
@@ -10,7 +10,7 @@ import art.arcane.volmlib.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 art.arcane.iris.util.common.scheduling.J;
 import io.papermc.lib.PaperLib;
 import lombok.Data;
 import lombok.Getter;

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

@@ -4,18 +4,18 @@ import com.google.gson.Gson;
 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.iris.util.common.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.volmlib.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.common.parallel.BurstExecutor;
-import art.arcane.iris.util.parallel.HyperLock;
+import art.arcane.iris.util.common.parallel.HyperLock;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import io.papermc.lib.PaperLib;
 import lombok.Data;

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

@@ -26,8 +26,8 @@ import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.volmlib.util.mantle.runtime.Mantle;
 import art.arcane.volmlib.util.matter.Matter;
 import art.arcane.volmlib.util.math.M;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.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/MedievalPregenMethod.java

@@ -27,7 +27,7 @@ import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.mantle.runtime.Mantle;
 import art.arcane.volmlib.util.matter.Matter;
 import art.arcane.volmlib.util.math.M;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;

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

@@ -38,14 +38,14 @@ 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.iris.util.common.plugin.VolmitSender;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.O;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import art.arcane.iris.util.scheduling.jobs.Job;
+import art.arcane.iris.util.common.scheduling.jobs.Job;
-import art.arcane.iris.util.scheduling.jobs.JobCollection;
+import art.arcane.iris.util.common.scheduling.jobs.JobCollection;
-import art.arcane.iris.util.scheduling.jobs.ParallelQueueJob;
+import art.arcane.iris.util.common.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

@@ -28,10 +28,10 @@ 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.iris.util.common.data.B;
 import art.arcane.volmlib.util.json.JSONArray;
 import art.arcane.volmlib.util.json.JSONObject;
-import art.arcane.iris.util.reflect.KeyedType;
+import art.arcane.iris.util.common.reflect.KeyedType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;

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

@@ -27,10 +27,10 @@ import art.arcane.volmlib.util.board.BoardProvider;
 import art.arcane.volmlib.util.board.BoardSettings;
 import art.arcane.volmlib.util.board.ScoreDirection;
 import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import lombok.Data;
 import org.bukkit.Location;
 import org.bukkit.World;

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

@@ -23,13 +23,13 @@ import art.arcane.iris.core.IrisSettings;
 import art.arcane.iris.core.commands.CommandIris;
 import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.iris.engine.data.cache.AtomicCache;
-import art.arcane.iris.util.director.DirectorContext;
+import art.arcane.iris.util.common.director.DirectorContext;
-import art.arcane.iris.util.director.DirectorContextHandler;
+import art.arcane.iris.util.common.director.DirectorContextHandler;
-import art.arcane.iris.util.director.DirectorSystem;
+import art.arcane.iris.util.common.director.DirectorSystem;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.director.compat.DirectorEngineFactory;
 import art.arcane.volmlib.util.director.context.DirectorContextRegistry;
 import art.arcane.volmlib.util.director.runtime.DirectorExecutionMode;

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

@@ -30,13 +30,13 @@ import art.arcane.volmlib.util.io.IO;
 import art.arcane.volmlib.util.json.JSONObject;
 import art.arcane.volmlib.util.nbt.io.NBTUtil;
 import art.arcane.volmlib.util.nbt.io.NamedTag;
-import art.arcane.iris.util.nbt.mca.NBTWorld;
+import art.arcane.iris.util.nbt.common.mca.NBTWorld;
 import art.arcane.volmlib.util.nbt.tag.CompoundTag;
 import art.arcane.volmlib.util.nbt.tag.IntTag;
 import art.arcane.volmlib.util.nbt.tag.ListTag;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Jigsaw;

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

@@ -23,8 +23,8 @@ import art.arcane.iris.core.edit.BlockEditor;
 import art.arcane.iris.core.edit.BukkitBlockEditor;
 import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.math.M;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;

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

@@ -27,8 +27,8 @@ import art.arcane.iris.engine.framework.Engine;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.io.JarScanner;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import lombok.Data;
 import lombok.NonNull;
 import org.bukkit.Bukkit;

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

@@ -4,7 +4,7 @@ import art.arcane.iris.core.IrisSettings;
 import art.arcane.iris.core.pregenerator.cache.PregenCache;
 import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
 import art.arcane.volmlib.util.scheduling.Looper;
 import lombok.NonNull;
 import org.bukkit.Bukkit;

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

@@ -8,14 +8,14 @@ import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.platform.PlatformChunkGenerator;
 import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.math.RNG;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
 import art.arcane.volmlib.util.scheduling.Looper;
-import art.arcane.iris.util.stream.utility.CachedStream2D;
+import art.arcane.iris.util.project.stream.utility.CachedStream2D;
-import art.arcane.iris.util.stream.utility.CachedStream3D;
+import art.arcane.iris.util.project.stream.utility.CachedStream3D;
 import lombok.Synchronized;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

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

@@ -4,7 +4,7 @@ import art.arcane.iris.Iris;
 import art.arcane.iris.core.gui.PregeneratorJob;
 import art.arcane.iris.core.pregenerator.LazyPregenerator;
 import art.arcane.iris.core.pregenerator.TurboPregenerator;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
 import art.arcane.volmlib.integration.IntegrationHandshakeRequest;
 import art.arcane.volmlib.integration.IntegrationHandshakeResponse;
 import art.arcane.volmlib.integration.IntegrationHeartbeat;

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

@@ -1,7 +1,7 @@
 package art.arcane.iris.core.service;
 
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Marker;

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

@@ -19,8 +19,8 @@
 package art.arcane.iris.core.service;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import lombok.Getter;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;

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

@@ -21,10 +21,10 @@ package art.arcane.iris.core.service;
 import art.arcane.iris.Iris;
 import art.arcane.iris.core.loader.IrisData;
 import art.arcane.iris.engine.framework.MeteredCache;
-import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.util.project.context.IrisContext;
 import art.arcane.volmlib.util.data.KCache;
 import art.arcane.volmlib.util.format.Form;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
 import art.arcane.volmlib.util.scheduling.Looper;
 import org.jetbrains.annotations.Unmodifiable;
 

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

@@ -35,9 +35,9 @@ import art.arcane.volmlib.util.format.Form;
 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.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.zeroturnaround.zip.ZipUtil;

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

@@ -27,11 +27,11 @@ 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.data.Cuboid;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.data.IrisCustomData;
 import art.arcane.volmlib.util.math.BlockPosition;
 import art.arcane.volmlib.util.math.RNG;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;

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

@@ -24,17 +24,17 @@ import art.arcane.iris.core.edit.DustRevealer;
 import art.arcane.iris.core.link.WorldEditLink;
 import art.arcane.iris.core.wand.WandSelection;
 import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.util.project.matter.WorldMatter;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.data.Cuboid;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.matter.Matter;
-import art.arcane.iris.util.matter.WorldMatter;
+import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.plugin.IrisService;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.iris.util.scheduling.J;
 import art.arcane.volmlib.util.scheduling.SR;
-import art.arcane.iris.util.scheduling.jobs.Job;
+import art.arcane.iris.util.common.scheduling.jobs.Job;
 import org.bukkit.*;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -55,8 +55,8 @@ import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 
-import static art.arcane.iris.util.data.registry.Particles.CRIT_MAGIC;
+import static art.arcane.iris.util.common.data.registry.Particles.CRIT_MAGIC;
-import static art.arcane.iris.util.data.registry.Particles.REDSTONE;
+import static art.arcane.iris.util.common.data.registry.Particles.REDSTONE;
 
 public class WandSVC implements IrisService {
     private static final int MS_PER_TICK = Integer.parseInt(System.getProperty("iris.ms_per_tick", "30"));

core/src/main/java/art/arcane/iris/core/tools/IrisConverter.java

@@ -3,13 +3,13 @@ package art.arcane.iris.core.tools;
 import art.arcane.iris.Iris;
 import art.arcane.iris.engine.object.*;
 import art.arcane.volmlib.util.data.Varint;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.nbt.io.NBTUtil;
 import art.arcane.volmlib.util.nbt.io.NamedTag;
 import art.arcane.volmlib.util.nbt.tag.*;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;

core/src/main/java/art/arcane/iris/core/tools/IrisCreator.java

@@ -30,11 +30,11 @@ import art.arcane.iris.core.service.StudioSVC;
 import art.arcane.iris.engine.object.IrisDimension;
 import art.arcane.iris.engine.platform.PlatformChunkGenerator;
 import art.arcane.volmlib.util.exceptions.IrisException;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.io.IO;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.O;
 import io.papermc.lib.PaperLib;
 import lombok.Data;
@@ -52,7 +52,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.function.IntSupplier;
 
-import static art.arcane.iris.util.misc.ServerProperties.BUKKIT_YML;
+import static art.arcane.iris.util.common.misc.ServerProperties.BUKKIT_YML;
 
 /**
  * Makes it a lot easier to setup an engine, world, studio or whatever
@@ -231,8 +231,8 @@ public class IrisCreator {
                 Iris.linkMultiverseCore.removeFromConfig(world);
 
                 if (IrisSettings.get().getStudio().isDisableTimeAndWeather()) {
-                    world.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
+                    world.setGameRule(GameRule.ADVANCE_WEATHER, false);
-                    world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
+                    world.setGameRule(GameRule.ADVANCE_TIME, false);
                     world.setTime(6000);
                 }
             };

core/src/main/java/art/arcane/iris/core/tools/IrisPackBenchmarking.java

@@ -11,7 +11,7 @@ import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.exceptions.IrisException;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.io.IO;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Bukkit;
 

core/src/main/java/art/arcane/iris/core/tools/IrisReflectiveAPI.java

@@ -1,6 +1,6 @@
 package art.arcane.iris.core.tools;
 
-import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.common.data.B;
 import org.bukkit.World;
 import org.bukkit.block.data.BlockData;
 

core/src/main/java/art/arcane/iris/core/tools/IrisToolbelt.java

@@ -31,8 +31,8 @@ import art.arcane.iris.core.service.StudioSVC;
 import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.object.IrisDimension;
 import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

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

@@ -27,7 +27,7 @@ import org.bukkit.util.Vector;
 
 import java.awt.*;
 
-import static art.arcane.iris.util.data.registry.Particles.REDSTONE;
+import static art.arcane.iris.util.common.data.registry.Particles.REDSTONE;
 
 public class WandSelection {
     private final Cuboid c;

core/src/main/java/art/arcane/iris/engine/IrisComplex.java

@@ -25,14 +25,14 @@ import art.arcane.iris.engine.data.cache.Cache;
 import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.object.*;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.util.project.context.IrisContext;
-import art.arcane.iris.util.data.DataProvider;
+import art.arcane.iris.util.common.data.DataProvider;
-import art.arcane.iris.util.interpolation.IrisInterpolation.NoiseKey;
+import art.arcane.iris.util.project.interpolation.IrisInterpolation.NoiseKey;
 import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.math.RNG;
-import art.arcane.iris.util.noise.CNG;
+import art.arcane.iris.util.project.noise.CNG;
-import art.arcane.iris.util.stream.ProceduralStream;
+import art.arcane.iris.util.project.stream.ProceduralStream;
-import art.arcane.iris.util.stream.interpolation.Interpolated;
+import art.arcane.iris.util.project.stream.interpolation.Interpolated;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

core/src/main/java/art/arcane/iris/engine/IrisEngine.java

@@ -37,12 +37,12 @@ import art.arcane.iris.engine.mantle.EngineMantle;
 import art.arcane.iris.engine.object.*;
 import art.arcane.volmlib.util.atomics.AtomicRollingSequence;
 import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
-import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.util.project.context.IrisContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.format.Form;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.io.IO;
 import art.arcane.volmlib.util.mantle.flag.MantleFlag;
 import art.arcane.volmlib.util.math.M;
@@ -50,7 +50,7 @@ import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.matter.MatterStructurePOI;
 import art.arcane.volmlib.util.matter.slices.container.JigsawStructureContainer;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/art/arcane/iris/engine/IrisEngineMantle.java

@@ -31,6 +31,7 @@ import art.arcane.iris.engine.mantle.components.MantleCarvingComponent;
 import art.arcane.iris.engine.mantle.components.MantleFluidBodyComponent;
 import art.arcane.iris.engine.mantle.components.MantleJigsawComponent;
 import art.arcane.iris.engine.mantle.components.MantleObjectComponent;
+import art.arcane.iris.util.project.matter.IrisMatterSupport;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.format.Form;
@@ -42,13 +43,12 @@ import art.arcane.volmlib.util.mantle.runtime.MantleHooks;
 import art.arcane.volmlib.util.mantle.runtime.TectonicPlate;
 import art.arcane.volmlib.util.mantle.flag.MantleFlag;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.matter.IrisMatterSupport;
 import art.arcane.volmlib.util.matter.IrisMatter;
 import art.arcane.volmlib.util.matter.Matter;
 import art.arcane.volmlib.util.matter.MatterSlice;
-import art.arcane.iris.util.parallel.HyperLock;
+import art.arcane.iris.util.common.parallel.HyperLock;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
 import lombok.*;
 import org.bukkit.World;
 import org.bukkit.block.data.BlockData;

core/src/main/java/art/arcane/iris/engine/IrisWorldManager.java

@@ -41,13 +41,13 @@ import art.arcane.volmlib.util.math.Position2;
 import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.matter.Matter;
 import art.arcane.volmlib.util.matter.MatterMarker;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.plugin.Chunks;
+import art.arcane.iris.util.common.plugin.Chunks;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.Looper;
-import art.arcane.iris.util.scheduling.jobs.QueueJob;
+import art.arcane.iris.util.common.scheduling.jobs.QueueJob;
 import io.papermc.lib.PaperLib;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/art/arcane/iris/engine/actuator/IrisBiomeActuator.java

@@ -23,9 +23,9 @@ import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.framework.EngineAssignedActuator;
 import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisBiomeCustom;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.matter.MatterBiomeInject;
 import art.arcane.volmlib.util.matter.slices.BiomeInjectMatter;

core/src/main/java/art/arcane/iris/engine/actuator/IrisDecorantActuator.java

@@ -23,9 +23,9 @@ import art.arcane.iris.engine.framework.Engine;
 import art.arcane.iris.engine.framework.EngineAssignedActuator;
 import art.arcane.iris.engine.framework.EngineDecorator;
 import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;

core/src/main/java/art/arcane/iris/engine/actuator/IrisTerrainNormalActuator.java

@@ -23,9 +23,9 @@ import art.arcane.iris.engine.framework.EngineAssignedActuator;
 import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisRegion;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import lombok.Getter;

core/src/main/java/art/arcane/iris/engine/data/chunk/LinkedTerrainChunk.java

@@ -21,7 +21,7 @@ package art.arcane.iris.engine.data.chunk;
 import art.arcane.iris.core.nms.BiomeBaseInjector;
 import art.arcane.iris.core.nms.INMS;
 import art.arcane.volmlib.util.data.IrisBiomeStorage;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.data.IrisCustomData;
 import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

core/src/main/java/art/arcane/iris/engine/data/chunk/MCATerrainChunk.java

@@ -20,9 +20,9 @@ package art.arcane.iris.engine.data.chunk;
 
 import art.arcane.iris.Iris;
 import art.arcane.iris.core.nms.BiomeBaseInjector;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.data.IrisCustomData;
-import art.arcane.iris.util.nbt.mca.Chunk;
+import art.arcane.iris.util.nbt.common.mca.Chunk;
-import art.arcane.iris.util.nbt.mca.NBTWorld;
+import art.arcane.iris.util.nbt.common.mca.NBTWorld;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import org.bukkit.Material;

core/src/main/java/art/arcane/iris/engine/decorator/IrisCeilingDecorator.java

@@ -23,7 +23,7 @@ import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisDecorationPart;
 import art.arcane.iris.engine.object.IrisDecorator;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;

core/src/main/java/art/arcane/iris/engine/decorator/IrisEngineDecorator.java

@@ -26,8 +26,8 @@ import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisDecorationPart;
 import art.arcane.iris.engine.object.IrisDecorator;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.common.data.B;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
 import art.arcane.volmlib.util.math.RNG;
 import lombok.Getter;

core/src/main/java/art/arcane/iris/engine/decorator/IrisSeaFloorDecorator.java

@@ -23,7 +23,7 @@ import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisDecorationPart;
 import art.arcane.iris.engine.object.IrisDecorator;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.block.data.BlockData;
 

core/src/main/java/art/arcane/iris/engine/decorator/IrisSeaSurfaceDecorator.java

@@ -23,7 +23,7 @@ import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisDecorationPart;
 import art.arcane.iris.engine.object.IrisDecorator;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.block.data.BlockData;
 

core/src/main/java/art/arcane/iris/engine/decorator/IrisShoreLineDecorator.java

@@ -23,7 +23,7 @@ import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisDecorationPart;
 import art.arcane.iris.engine.object.IrisDecorator;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.block.data.BlockData;
 

core/src/main/java/art/arcane/iris/engine/decorator/IrisSurfaceDecorator.java

@@ -24,9 +24,9 @@ import art.arcane.iris.engine.object.InferredType;
 import art.arcane.iris.engine.object.IrisBiome;
 import art.arcane.iris.engine.object.IrisDecorationPart;
 import art.arcane.iris.engine.object.IrisDecorator;
-import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.common.data.B;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;

core/src/main/java/art/arcane/iris/engine/framework/Engine.java

@@ -37,18 +37,19 @@ import art.arcane.iris.engine.data.cache.Cache;
 import art.arcane.iris.engine.data.chunk.TerrainChunk;
 import art.arcane.iris.engine.mantle.EngineMantle;
 import art.arcane.iris.engine.object.*;
+import art.arcane.iris.util.project.matter.TileWrapper;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
-import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.util.project.context.IrisContext;
-import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.common.data.B;
-import art.arcane.iris.util.data.DataProvider;
+import art.arcane.iris.util.common.data.DataProvider;
-import art.arcane.iris.util.data.IrisCustomData;
+import art.arcane.iris.util.common.data.IrisCustomData;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
 import art.arcane.volmlib.util.documentation.ChunkCoordinates;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.function.Function2;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.mantle.runtime.MantleChunk;
 import art.arcane.volmlib.util.mantle.flag.MantleFlag;
 import art.arcane.volmlib.util.math.BlockPosition;
@@ -58,15 +59,14 @@ import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.matter.Matter;
 import art.arcane.volmlib.util.matter.MatterCavern;
 import art.arcane.volmlib.util.matter.MatterUpdate;
-import art.arcane.iris.util.matter.TileWrapper;
 import art.arcane.volmlib.util.matter.slices.container.JigsawPieceContainer;
-import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.common.parallel.BurstExecutor;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.reflect.W;
+import art.arcane.iris.util.common.reflect.W;
 import art.arcane.volmlib.util.scheduling.ChronoLatch;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
-import art.arcane.iris.util.stream.ProceduralStream;
+import art.arcane.iris.util.project.stream.ProceduralStream;
 import io.papermc.lib.PaperLib;
 import org.bukkit.*;
 import org.bukkit.block.Biome;

core/src/main/java/art/arcane/iris/engine/framework/EngineActuator.java

@@ -18,9 +18,9 @@
 
 package art.arcane.iris.engine.framework;
 
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 public interface EngineActuator<O> extends EngineComponent {
     @BlockCoordinates
     void actuate(int x, int z, Hunk<O> output, boolean multicore, ChunkContext context);

core/src/main/java/art/arcane/iris/engine/framework/EngineAssignedActuator.java

@@ -18,9 +18,9 @@
 
 package art.arcane.iris.engine.framework;
 
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 public abstract class EngineAssignedActuator<T> extends EngineAssignedComponent implements EngineActuator<T> {
     public EngineAssignedActuator(Engine engine, String name) {
         super(engine, name);

core/src/main/java/art/arcane/iris/engine/framework/EngineAssignedBiModifier.java

@@ -19,7 +19,7 @@
 package art.arcane.iris.engine.framework;
 
 
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 public abstract class EngineAssignedBiModifier<A, B> extends EngineAssignedComponent implements EngineBiModifier<A, B> {
     public EngineAssignedBiModifier(Engine engine, String name) {
         super(engine, name);

core/src/main/java/art/arcane/iris/engine/framework/EngineAssignedModifier.java

@@ -19,9 +19,9 @@
 package art.arcane.iris.engine.framework;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 public abstract class EngineAssignedModifier<T> extends EngineAssignedComponent implements EngineModifier<T> {
     public EngineAssignedModifier(Engine engine, String name) {
         super(engine, name);

core/src/main/java/art/arcane/iris/engine/framework/EngineAssignedWorldManager.java

@@ -21,11 +21,11 @@ package art.arcane.iris.engine.framework;
 import art.arcane.iris.Iris;
 import art.arcane.iris.core.events.IrisEngineHotloadEvent;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.format.C;
+import art.arcane.iris.util.common.format.C;
-import art.arcane.volmlib.util.math.Position2;
+import art.arcane.volmlib.util.math.Position2;
-import art.arcane.iris.util.plugin.VolmitSender;
+import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
-import org.bukkit.*;
+import org.bukkit.*;
 import org.bukkit.entity.EnderSignal;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -51,11 +51,11 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
         taskId = -1;
     }
 
-    public EngineAssignedWorldManager(Engine engine) {
+    public EngineAssignedWorldManager(Engine engine) {
-        super(engine, "World");
+        super(engine, "World");
-        Iris.instance.registerListener(this);
+        Iris.instance.registerListener(this);
-        taskId = J.sr(this::onTick, 1);
+        taskId = J.sr(this::onTick, 1);
-    }
+    }
 
     @EventHandler
     public void on(IrisEngineHotloadEvent e) {
@@ -135,11 +135,11 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
     }
 
     @Override
-    public void close() {
+    public void close() {
-        super.close();
+        super.close();
-        Iris.instance.unregisterListener(this);
+        Iris.instance.unregisterListener(this);
-        if (taskId != -1) {
+        if (taskId != -1) {
-            J.csr(taskId);
+            J.csr(taskId);
-        }
+        }
-    }
+    }
-}
+}

core/src/main/java/art/arcane/iris/engine/framework/EngineBiModifier.java

@@ -19,7 +19,7 @@
 package art.arcane.iris.engine.framework;
 
 
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 public interface EngineBiModifier<A, B> extends EngineComponent {
     void modify(int x, int z, Hunk<A> a, Hunk<B> b);
 }

core/src/main/java/art/arcane/iris/engine/framework/EngineComponent.java

@@ -23,7 +23,7 @@ import art.arcane.iris.core.loader.IrisData;
 import art.arcane.iris.engine.IrisComplex;
 import art.arcane.iris.engine.object.IrisDimension;
 import art.arcane.volmlib.util.math.RollingSequence;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
 import org.bukkit.event.Listener;
 
 public interface EngineComponent {

core/src/main/java/art/arcane/iris/engine/framework/EngineDecorator.java

@@ -19,9 +19,9 @@
 package art.arcane.iris.engine.framework;
 
 import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.util.data.B;
+import art.arcane.iris.util.common.data.B;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public interface EngineDecorator extends EngineComponent {

core/src/main/java/art/arcane/iris/engine/framework/EngineMode.java

@@ -21,14 +21,14 @@ package art.arcane.iris.engine.framework;
 import art.arcane.iris.core.tools.IrisToolbelt;
 import art.arcane.iris.engine.IrisComplex;
 import art.arcane.iris.engine.mantle.EngineMantle;
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
-import art.arcane.iris.util.context.IrisContext;
+import art.arcane.iris.util.project.context.IrisContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 import art.arcane.volmlib.util.math.RollingSequence;
-import art.arcane.iris.util.parallel.BurstExecutor;
+import art.arcane.iris.util.common.parallel.BurstExecutor;
-import art.arcane.iris.util.parallel.MultiBurst;
+import art.arcane.iris.util.common.parallel.MultiBurst;
-import art.arcane.iris.util.scheduling.J;
+import art.arcane.iris.util.common.scheduling.J;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 

core/src/main/java/art/arcane/iris/engine/framework/EngineModifier.java

@@ -18,9 +18,9 @@
 
 package art.arcane.iris.engine.framework;
 
-import art.arcane.iris.util.context.ChunkContext;
+import art.arcane.iris.util.project.context.ChunkContext;
 import art.arcane.volmlib.util.documentation.BlockCoordinates;
-import art.arcane.iris.util.hunk.Hunk;
+import art.arcane.iris.util.project.hunk.Hunk;
 public interface EngineModifier<T> extends EngineComponent {
     @BlockCoordinates
     void modify(int x, int z, Hunk<T> t, boolean multicore, ChunkContext context);