Consolidate source layout

- Packages regrouped by domain: generation, world, pack, studio, structure, platform, command, localization, diagnostics
- Forked VolmLib utilities dropped for the shared library: noise, stream, interpolation, hunk, matter
- Engine-coupled stream decorators moved to generation.stream.GenerationStreams
- Hunk section splits now run on the Iris burst pool through HunkBurst
- Artifact entry lists, purity allowlists and shrink rules follow the new paths

README.md

@@ -14,7 +14,7 @@ Consider supporting development by buying Iris on Spigot.
 
 ## Language and localization
 
-Canonical English is defined in the typed Java catalogs under `core/src/main/java/art/arcane/iris/core/localization`, next to the command, Studio, runtime, and UI surfaces that use it. Iris does not ship an English server translation file; the required Minecraft client asset remains at `assets/irisworldgen/lang/en_us.json`. Complete server bundles and matching client assets are included for German, Spanish, Finnish, French, Hebrew, Italian, Japanese, Korean, Lithuanian, Dutch, Polish, Portuguese, Russian, Turkish, Vietnamese, Simplified Chinese, and Traditional Chinese. Set `language` in Iris settings to select one. A JSON file at `languages/overrides/<locale>.json` can override only selected server messages; omitted entries resolve from the bundle and then code-owned English.
+Canonical English is defined in the typed Java catalogs under `core/src/main/java/art/arcane/iris/localization`, next to the command, Studio, runtime, and UI surfaces that use it. Iris does not ship an English server translation file; the required Minecraft client asset remains at `assets/irisworldgen/lang/en_us.json`. Complete server bundles and matching client assets are included for German, Spanish, Finnish, French, Hebrew, Italian, Japanese, Korean, Lithuanian, Dutch, Polish, Portuguese, Russian, Turkish, Vietnamese, Simplified Chinese, and Traditional Chinese. Set `language` in Iris settings to select one. A JSON file at `languages/overrides/<locale>.json` can override only selected server messages; omitted entries resolve from the bundle and then code-owned English.
 
 ## Platforms
 

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/CustomBiomeSource.java

@@ -1,24 +1,24 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.platform.bukkit.BukkitWorldBinding;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.MapCodec;
 import art.arcane.iris.spi.IrisLogging;
-import art.arcane.iris.engine.DimensionStackContext;
+import art.arcane.iris.generation.runtime.DimensionStackContext;
-import art.arcane.iris.engine.DimensionStackLayout;
+import art.arcane.iris.generation.runtime.DimensionStackLayout;
-import art.arcane.iris.engine.DimensionTerrainContext;
+import art.arcane.iris.generation.runtime.DimensionTerrainContext;
-import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.iris.generation.cache.AtomicCache;
-import art.arcane.iris.engine.IrisEngine;
+import art.arcane.iris.generation.runtime.IrisEngine;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.GenerationSessionException;
+import art.arcane.iris.generation.runtime.GenerationSessionException;
-import art.arcane.iris.engine.framework.GenerationSessionLease;
+import art.arcane.iris.generation.runtime.GenerationSessionLease;
-import art.arcane.iris.engine.history.GenerationHistoryRuntimeRouter;
+import art.arcane.iris.world.history.GenerationHistoryRuntimeRouter;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.object.IrisBiomeCustom;
+import art.arcane.iris.generation.biome.IrisBiomeCustom;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisDimensionCarvingResolver;
+import art.arcane.iris.generation.terrain.IrisDimensionCarvingResolver;
-import art.arcane.iris.engine.platform.BukkitChunkGenerator;
+import art.arcane.iris.platform.generation.BukkitChunkGenerator;
-import art.arcane.iris.util.project.context.IrisContext;
+import art.arcane.iris.generation.context.IrisContext;
 import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.math.RNG;
 import net.minecraft.core.BlockPos;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/DatapackStructureStateFilter.java

@@ -1,8 +1,8 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.core.datapack.DatapackStructureScopeIndex;
+import art.arcane.iris.pack.datapack.DatapackStructureScopeIndex;
-import art.arcane.iris.engine.framework.NativeStructureFrequencyScale;
+import art.arcane.iris.structure.nativegen.NativeStructureFrequencyScale;
-import art.arcane.iris.engine.object.IrisImportedStructureControl;
+import art.arcane.iris.structure.nativegen.IrisImportedStructureControl;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderOwner;
 import net.minecraft.core.Vec3i;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/ImportedFeatureStage.java

@@ -1,16 +1,16 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.DimensionStackContext;
+import art.arcane.iris.generation.runtime.DimensionStackContext;
-import art.arcane.iris.engine.DimensionStackLayout;
+import art.arcane.iris.generation.runtime.DimensionStackLayout;
 import art.arcane.iris.nativegen.NativeGenerationWriteGuard;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.NativeFeatureGenerationPolicy;
+import art.arcane.iris.structure.nativegen.NativeFeatureGenerationPolicy;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.object.IrisBiomeCustom;
+import art.arcane.iris.generation.biome.IrisBiomeCustom;
-import art.arcane.iris.engine.object.IrisDecorationStep;
+import art.arcane.iris.generation.decoration.IrisDecorationStep;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisImportedFeatureControl;
+import art.arcane.iris.structure.nativegen.IrisImportedFeatureControl;
-import art.arcane.iris.engine.object.IrisStaticObjectLayer;
+import art.arcane.iris.structure.object.IrisStaticObjectLayer;
 import art.arcane.iris.spi.IrisLogging;
 import it.unimi.dsi.fastutil.ints.IntArraySet;
 import it.unimi.dsi.fastutil.ints.IntSet;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/IrisChunkGenerator.java

@@ -1,35 +1,35 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.nativegen.NativeTransitionColumn;
 import art.arcane.iris.nativegen.NativeTerrainHeightCache;
-import art.arcane.iris.engine.history.TerrainBoundarySignature;
+import art.arcane.iris.world.history.TerrainBoundarySignature;
 import java.util.Optional;
 import art.arcane.iris.nativegen.NativeGenerationWriteGuard;
 import java.util.function.LongPredicate;
-import art.arcane.iris.engine.DimensionStackContext;
+import art.arcane.iris.generation.runtime.DimensionStackContext;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.EngineLifecycleTasks;
+import art.arcane.iris.generation.runtime.EngineLifecycleTasks;
-import art.arcane.iris.engine.framework.GenerationSessionException;
+import art.arcane.iris.generation.runtime.GenerationSessionException;
-import art.arcane.iris.engine.framework.GenerationSessionLease;
+import art.arcane.iris.generation.runtime.GenerationSessionLease;
-import art.arcane.iris.engine.framework.IrisStructureLocator;
+import art.arcane.iris.structure.placement.IrisStructureLocator;
-import art.arcane.iris.engine.framework.NativeStructureOwnershipRecord;
+import art.arcane.iris.structure.nativegen.NativeStructureOwnershipRecord;
-import art.arcane.iris.engine.framework.NativeStructureOwnershipStore;
+import art.arcane.iris.structure.nativegen.NativeStructureOwnershipStore;
-import art.arcane.iris.engine.framework.NativeStructureStartPlan;
+import art.arcane.iris.structure.nativegen.NativeStructureStartPlan;
-import art.arcane.iris.engine.framework.NativeStructureGenerationPolicy;
+import art.arcane.iris.structure.nativegen.NativeStructureGenerationPolicy;
-import art.arcane.iris.engine.IrisEngine;
+import art.arcane.iris.generation.runtime.IrisEngine;
-import art.arcane.iris.engine.history.GenerationHistoryRuntimeRouter;
+import art.arcane.iris.world.history.GenerationHistoryRuntimeRouter;
-import art.arcane.iris.engine.history.NativeTerrainReceipt;
+import art.arcane.iris.world.history.NativeTerrainReceipt;
-import art.arcane.iris.engine.history.NativeBiomeSpawnSelection;
+import art.arcane.iris.world.history.NativeBiomeSpawnSelection;
-import art.arcane.iris.engine.history.SavedTerrainChunk;
+import art.arcane.iris.world.history.SavedTerrainChunk;
 import org.bukkit.NamespacedKey;
 import org.bukkit.persistence.PersistentDataType;
-import art.arcane.iris.engine.platform.BukkitChunkGenerator;
+import art.arcane.iris.platform.generation.BukkitChunkGenerator;
-import art.arcane.iris.engine.platform.studio.generators.JigsawStudioGenerator;
+import art.arcane.iris.studio.generation.JigsawStudioGenerator;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisDimensionCarvingResolver;
+import art.arcane.iris.generation.terrain.IrisDimensionCarvingResolver;
-import art.arcane.iris.engine.object.IrisMaterialPalette;
+import art.arcane.iris.generation.terrain.IrisMaterialPalette;
-import art.arcane.iris.engine.object.IrisNativeStructureDecision;
+import art.arcane.iris.structure.nativegen.IrisNativeStructureDecision;
-import art.arcane.iris.engine.object.IrisStaticObjectLayer;
+import art.arcane.iris.structure.object.IrisStaticObjectLayer;
 import art.arcane.iris.nativegen.NativeStructureGenerationException;
 import art.arcane.iris.nativegen.NativeStructureStartInjector;
 import art.arcane.iris.nativegen.NativeStructureReferenceEnvelope;
@@ -47,10 +47,10 @@ import art.arcane.iris.nativegen.NativeStructureVolumeIndex;
 import art.arcane.iris.nativegen.WorldgenTerrainHeightmaps;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.common.data.IrisCustomData;
+import art.arcane.iris.generation.block.IrisCustomData;
-import art.arcane.iris.util.common.reflect.WrappedField;
+import art.arcane.iris.platform.reflect.WrappedField;
-import art.arcane.iris.util.common.reflect.WrappedReturningMethod;
+import art.arcane.iris.platform.reflect.WrappedReturningMethod;
-import art.arcane.iris.util.project.context.IrisContext;
+import art.arcane.iris.generation.context.IrisContext;
 import art.arcane.volmlib.util.math.RNG;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.MapCodec;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NMSBinding.java

@@ -1,39 +1,39 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.history.SavedTerrainChunk;
+import art.arcane.iris.world.history.SavedTerrainChunk;
 import ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO;
 import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkHolderManager;
 import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import art.arcane.iris.core.datapack.DatapackStructureScopeIndex;
+import art.arcane.iris.pack.datapack.DatapackStructureScopeIndex;
-import art.arcane.iris.core.nms.DatapackStructureScopeResult;
+import art.arcane.iris.platform.bukkit.nms.DatapackStructureScopeResult;
-import art.arcane.iris.engine.object.IrisImportedStructureControl;
+import art.arcane.iris.structure.nativegen.IrisImportedStructureControl;
 import art.arcane.iris.spi.IrisLogging;
-import art.arcane.iris.core.nms.INMSBinding;
+import art.arcane.iris.platform.bukkit.nms.INMSBinding;
-import art.arcane.iris.core.nms.MinecraftVersion;
+import art.arcane.iris.platform.bukkit.nms.MinecraftVersion;
-import art.arcane.iris.core.nms.ServerShutdownBoundary;
+import art.arcane.iris.platform.bukkit.nms.ServerShutdownBoundary;
-import art.arcane.iris.core.nms.container.BiomeColor;
+import art.arcane.iris.platform.bukkit.nms.container.BiomeColor;
-import art.arcane.iris.core.nms.container.Pair;
+import art.arcane.iris.platform.bukkit.nms.container.Pair;
-import art.arcane.iris.core.nms.container.BlockProperty;
+import art.arcane.iris.platform.bukkit.nms.container.BlockProperty;
-import art.arcane.iris.core.nms.datapack.DataVersion;
+import art.arcane.iris.platform.bukkit.nms.datapack.DataVersion;
-import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.iris.generation.cache.AtomicCache;
-import art.arcane.iris.engine.data.chunk.TerrainChunk;
+import art.arcane.iris.generation.chunk.TerrainChunk;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.NativeStructureVolume;
+import art.arcane.iris.structure.nativegen.NativeStructureVolume;
 import art.arcane.iris.nativegen.NativeStructureVolumeIndex;
-import art.arcane.iris.engine.object.IrisDimensionRuntimeContract;
+import art.arcane.iris.generation.terrain.IrisDimensionRuntimeContract;
-import art.arcane.iris.engine.platform.BukkitChunkGenerator;
+import art.arcane.iris.platform.generation.BukkitChunkGenerator;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
 import art.arcane.iris.nativegen.NativeStructureFactory;
 import art.arcane.iris.nativegen.NativeStructureGenerationException;
 import art.arcane.iris.spi.PlatformStructureHooks.JigsawSourceMetadata;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.collection.KMap;
-import art.arcane.iris.util.project.hunk.Hunk;
+import art.arcane.volmlib.util.hunk.Hunk;
-import art.arcane.iris.util.project.hunk.view.ChunkDataHunkHolder;
+import art.arcane.iris.generation.chunk.ChunkDataHunkHolder;
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.iris.spi.PlatformGenerationRegistry;
-import art.arcane.iris.util.common.data.IrisCustomData;
+import art.arcane.iris.generation.block.IrisCustomData;
 import art.arcane.volmlib.util.json.JSONObject;
 import art.arcane.volmlib.util.mantle.runtime.Mantle;
 import art.arcane.volmlib.util.matter.Matter;
@@ -41,7 +41,7 @@ import art.arcane.volmlib.util.math.Vector3d;
 import art.arcane.volmlib.util.scheduling.FoliaScheduler;
 import art.arcane.volmlib.util.matter.MatterBiomeInject;
 import art.arcane.iris.spi.PlatformBiome;
-import art.arcane.iris.util.nbt.common.mca.NBTWorld;
+import art.arcane.iris.world.storage.region.NBTWorld;
 import art.arcane.volmlib.util.nbt.mca.palette.MCABiomeContainer;
 import art.arcane.volmlib.util.nbt.mca.palette.MCAChunkBiomeContainer;
 import art.arcane.volmlib.util.nbt.mca.palette.MCAGlobalPalette;
@@ -52,7 +52,7 @@ import art.arcane.volmlib.util.nbt.mca.palette.MCAPaletteAccess;
 import art.arcane.volmlib.util.nbt.mca.palette.MCAPalettedContainer;
 import art.arcane.volmlib.util.nbt.mca.palette.MCAWrappedPalettedContainer;
 import art.arcane.volmlib.util.nbt.tag.CompoundTag;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NativeStructurePoiUpdates.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import ca.spottedleaf.moonrise.common.util.TickThread;
 import net.minecraft.core.BlockPos;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NativeStructureWorldgenAccess.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.nativegen.WorldgenTerrainHeightmaps;
 import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsGenerationHooks.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.util.project.agent.Agent;
+import art.arcane.iris.platform.agent.Agent;
 import it.unimi.dsi.fastutil.shorts.ShortList;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.asm.Advice;
@@ -44,7 +44,7 @@ final class NmsGenerationHooks {
             }
             ChunkGenerator generator = region.getLevel().getChunkSource().getGenerator();
             if (generator instanceof LongPredicate predicate
-                    && generator.getClass().getName().equals("art.arcane.iris.core.nms.v26_2_R1.IrisChunkGenerator")
+                    && generator.getClass().getName().equals("art.arcane.iris.platform.bukkit.nms.v26_2_R1.IrisChunkGenerator")
                     && region.getChunk(position.getX() >> 4, position.getZ() >> 4)
                     .getPersistedStatus().isOrAfter(ChunkStatus.FULL)) {
                 allowed = predicate.test(ChunkPos.pack(position.getX() >> 4, position.getZ() >> 4));

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsGenerationRegistry.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.spi.PlatformGenerationRegistry;
 import com.google.gson.JsonElement;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsSavedTerrainCapture.java

@@ -1,8 +1,8 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.history.NativeTerrainReceipt;
+import art.arcane.iris.world.history.NativeTerrainReceipt;
-import art.arcane.iris.engine.history.SavedTerrainChunk;
+import art.arcane.iris.world.history.SavedTerrainChunk;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import ca.spottedleaf.concurrentutil.completable.Completable;
 import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
 import ca.spottedleaf.concurrentutil.util.Priority;

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsWorldLifecycle.java

@@ -1,9 +1,9 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.core.nms.ServerShutdownBoundary;
+import art.arcane.iris.platform.bukkit.nms.ServerShutdownBoundary;
 import art.arcane.iris.spi.IrisLogging;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.project.agent.Agent;
+import art.arcane.iris.platform.agent.Agent;
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
 import net.bytebuddy.asm.Advice;
@@ -219,7 +219,7 @@ final class NmsWorldLifecycle {
         @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class)
         static boolean enter(@Advice.This ClassLoader loader) throws ReflectiveOperationException {
             Class<?> installer = Class.forName(
-                    "art.arcane.iris.util.project.agent.Installer", true, ClassLoader.getSystemClassLoader());
+                    "art.arcane.iris.platform.agent.Installer", true, ClassLoader.getSystemClassLoader());
             return Boolean.TRUE.equals(installer.getMethod("deferClassLoaderClose", ClassLoader.class)
                     .invoke(null, loader));
         }
@@ -244,8 +244,8 @@ final class NmsWorldLifecycle {
                     return;
                 }
                 pluginClassLoader = irisPlugin.getClass().getClassLoader();
-                generatorType = Class.forName("art.arcane.iris.engine.platform.PlatformChunkGenerator", true, pluginClassLoader);
+                generatorType = Class.forName("art.arcane.iris.platform.generation.PlatformChunkGenerator", true, pluginClassLoader);
-                stagingType = Class.forName("art.arcane.iris.core.lifecycle.WorldLifecycleStaging", true, pluginClassLoader);
+                stagingType = Class.forName("art.arcane.iris.world.lifecycle.WorldLifecycleStaging", true, pluginClassLoader);
             } catch (Throwable ignored) {
                 return;
             }
@@ -317,8 +317,8 @@ final class NmsWorldLifecycle {
                     return;
                 }
                 pluginClassLoader = irisPlugin.getClass().getClassLoader();
-                generatorType = Class.forName("art.arcane.iris.engine.platform.PlatformChunkGenerator", true, pluginClassLoader);
+                generatorType = Class.forName("art.arcane.iris.platform.generation.PlatformChunkGenerator", true, pluginClassLoader);
-                stagingType = Class.forName("art.arcane.iris.core.lifecycle.WorldLifecycleStaging", true, pluginClassLoader);
+                stagingType = Class.forName("art.arcane.iris.world.lifecycle.WorldLifecycleStaging", true, pluginClassLoader);
             } catch (Throwable ignored) {
                 // Iris absent or half-loaded: fail OPEN for a world we cannot prove ours.
                 return;
@@ -356,7 +356,7 @@ final class NmsWorldLifecycle {
             // Past the ownership gate the world is Iris-owned; silently handing back the
             // vanilla stem would corrupt generation, so failures from here rethrow.
             try {
-                Object bindings = Class.forName("art.arcane.iris.core.nms.INMS", true, pluginClassLoader)
+                Object bindings = Class.forName("art.arcane.iris.platform.bukkit.nms.INMS", true, pluginClassLoader)
                         .getDeclaredMethod("get")
                         .invoke(null);
                 if (bindings == null) {

adapters/bukkit/nms/v26_2_R1/src/main/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/VanillaStructureBiomes.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.nativegen.NativeStructureGenerationKeys;
 import net.minecraft.core.Holder;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/IrisChunkGeneratorHeightCacheTest.java

@@ -1,11 +1,11 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.core.nms.v26_2_R1.IrisChunkGenerator;
+import art.arcane.iris.platform.bukkit.nms.v26_2_R1.IrisChunkGenerator;
-import art.arcane.iris.engine.IrisComplex;
+import art.arcane.iris.generation.runtime.IrisComplex;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.GenerationSessionLease;
+import art.arcane.iris.generation.runtime.GenerationSessionLease;
-import art.arcane.iris.engine.history.BoundaryColumnGeometry;
+import art.arcane.iris.world.history.BoundaryColumnGeometry;
-import art.arcane.iris.engine.history.TerrainBoundarySignature;
+import art.arcane.iris.world.history.TerrainBoundarySignature;
 import art.arcane.iris.testsupport.PlatformLeakGuard;
 import net.minecraft.SharedConstants;
 import net.minecraft.server.Bootstrap;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeGenerationWriteGuardTest.java

@@ -1,14 +1,14 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.DimensionStackContext;
+import art.arcane.iris.generation.runtime.DimensionStackContext;
-import art.arcane.iris.engine.DimensionStackLayout;
+import art.arcane.iris.generation.runtime.DimensionStackLayout;
-import art.arcane.iris.engine.IrisComplex;
+import art.arcane.iris.generation.runtime.IrisComplex;
-import art.arcane.iris.engine.IrisEngine;
+import art.arcane.iris.generation.runtime.IrisEngine;
-import art.arcane.iris.engine.history.GenerationActivation;
+import art.arcane.iris.world.history.GenerationActivation;
-import art.arcane.iris.engine.history.GenerationHistory;
+import art.arcane.iris.world.history.GenerationHistory;
-import art.arcane.iris.engine.history.GenerationHistoryRuntimeRouter;
+import art.arcane.iris.world.history.GenerationHistoryRuntimeRouter;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.IrisStaticObjectLayer;
+import art.arcane.iris.structure.object.IrisStaticObjectLayer;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.Bootstrap;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructureFactoryTest.java

@@ -1,7 +1,7 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.object.IrisJigsawConfiguration;
+import art.arcane.iris.structure.jigsaw.IrisJigsawConfiguration;
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
 import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.MapCodec;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructureOwnershipFingerprintTest.java

@@ -1,11 +1,11 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.framework.NativeStructureOwnershipRecord;
+import art.arcane.iris.structure.nativegen.NativeStructureOwnershipRecord;
-import art.arcane.iris.engine.framework.NativeStructureStartPlan;
+import art.arcane.iris.structure.nativegen.NativeStructureStartPlan;
-import art.arcane.iris.engine.object.IrisNativeStructure;
+import art.arcane.iris.structure.nativegen.IrisNativeStructure;
-import art.arcane.iris.engine.object.IrisStructurePlacement;
+import art.arcane.iris.structure.placement.IrisStructurePlacement;
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
-import art.arcane.iris.engine.object.IrisStructureTerrainMode;
+import art.arcane.iris.structure.placement.IrisStructureTerrainMode;
 import art.arcane.volmlib.util.collection.KList;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructureOwnershipRecoveryTest.java

@@ -1,12 +1,12 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.framework.NativeStructureOwnershipRecord;
+import art.arcane.iris.structure.nativegen.NativeStructureOwnershipRecord;
-import art.arcane.iris.engine.framework.NativeStructureStartPlan;
+import art.arcane.iris.structure.nativegen.NativeStructureStartPlan;
-import art.arcane.iris.engine.framework.StructurePlacementGrid;
+import art.arcane.iris.structure.placement.StructurePlacementGrid;
-import art.arcane.iris.engine.object.IrisNativeStructure;
+import art.arcane.iris.structure.nativegen.IrisNativeStructure;
-import art.arcane.iris.engine.object.IrisStructurePlacement;
+import art.arcane.iris.structure.placement.IrisStructurePlacement;
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
-import art.arcane.iris.engine.object.IrisStructureTerrainMode;
+import art.arcane.iris.structure.placement.IrisStructureTerrainMode;
 import art.arcane.volmlib.util.collection.KList;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.Direction;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructurePostProcessorEncaseTest.java

@@ -1,9 +1,9 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.object.IrisMaterialPalette;
+import art.arcane.iris.generation.terrain.IrisMaterialPalette;
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
-import art.arcane.iris.engine.object.IrisStructureTerrainMode;
+import art.arcane.iris.structure.placement.IrisStructureTerrainMode;
-import art.arcane.iris.engine.object.IrisStructureYBand;
+import art.arcane.iris.structure.placement.IrisStructureYBand;
 import art.arcane.volmlib.util.math.RNG;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructurePostProcessorMonumentTest.java

@@ -1,7 +1,7 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
-import art.arcane.iris.engine.object.IrisStructureTerrainMode;
+import art.arcane.iris.structure.placement.IrisStructureTerrainMode;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.Direction;
 import net.minecraft.core.HolderSet;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructurePostProcessorSurfaceTerrainTest.java

@@ -1,9 +1,9 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.mantle.components.StructureCarvingFootprint;
+import art.arcane.iris.generation.mantle.StructureCarvingFootprint;
-import art.arcane.iris.engine.object.IrisStructureCarveShape;
+import art.arcane.iris.structure.placement.IrisStructureCarveShape;
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
-import art.arcane.iris.engine.object.IrisStructureTerrainMode;
+import art.arcane.iris.structure.placement.IrisStructureTerrainMode;
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
 import net.minecraft.SharedConstants;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeStructureVolumeIndexTest.java

@@ -1,9 +1,9 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.IrisEngine;
+import art.arcane.iris.generation.runtime.IrisEngine;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.NativeStructureVolume;
+import art.arcane.iris.structure.nativegen.NativeStructureVolume;
-import art.arcane.iris.engine.history.GenerationHistoryRuntimeRouter;
+import art.arcane.iris.world.history.GenerationHistoryRuntimeRouter;
 import art.arcane.volmlib.util.collection.KList;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.HolderSet;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/nativegen/NativeTransitionColumnTest.java

@@ -1,7 +1,7 @@
 package art.arcane.iris.nativegen;
 
-import art.arcane.iris.engine.history.BoundaryColumnGeometry;
+import art.arcane.iris.world.history.BoundaryColumnGeometry;
-import art.arcane.iris.engine.history.TerrainBoundarySignature;
+import art.arcane.iris.world.history.TerrainBoundarySignature;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.PlatformBlockState;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/CustomBiomeSourceStructureContractTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
 import net.minecraft.SharedConstants;
 import net.minecraft.server.Bootstrap;
 import org.junit.BeforeClass;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/IrisChunkGeneratorFailureContractTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import org.junit.Test;
 

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/IrisChunkGeneratorMonumentLocateContractTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.nativegen.NativeStructureLocateResults;
 import com.mojang.datafixers.util.Pair;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/IrisChunkGeneratorSpawnAdmissionTest.java

@@ -1,12 +1,12 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.IrisEngine;
+import art.arcane.iris.generation.runtime.IrisEngine;
-import art.arcane.iris.engine.framework.GenerationSessionManager;
+import art.arcane.iris.generation.runtime.GenerationSessionManager;
-import art.arcane.iris.engine.framework.GenerationTransitionGate;
+import art.arcane.iris.generation.runtime.GenerationTransitionGate;
-import art.arcane.iris.engine.history.GenerationHistoryRuntimeRouter;
+import art.arcane.iris.world.history.GenerationHistoryRuntimeRouter;
-import art.arcane.iris.engine.history.NativeBiomeSpawnSelection;
+import art.arcane.iris.world.history.NativeBiomeSpawnSelection;
-import art.arcane.iris.engine.history.SavedBiomeRuntime;
+import art.arcane.iris.world.history.SavedBiomeRuntime;
-import art.arcane.iris.util.project.context.IrisContext;
+import art.arcane.iris.generation.context.IrisContext;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NMSBindingDatapackStructureScopeTest.java

@@ -1,9 +1,9 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.core.datapack.DatapackIngestService;
+import art.arcane.iris.pack.datapack.DatapackIngestService;
-import art.arcane.iris.core.datapack.DatapackStructureScopeIndex;
+import art.arcane.iris.pack.datapack.DatapackStructureScopeIndex;
-import art.arcane.iris.engine.object.IrisImportedStructureControl;
+import art.arcane.iris.structure.nativegen.IrisImportedStructureControl;
-import art.arcane.iris.engine.object.IrisStructureSetFrequencyOverride;
+import art.arcane.iris.structure.placement.IrisStructureSetFrequencyOverride;
 import art.arcane.volmlib.util.collection.KList;
 import com.mojang.datafixers.util.Either;
 import net.minecraft.SharedConstants;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NativeStructurePoiUpdatesTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import ca.spottedleaf.moonrise.common.util.TickThread;
 import com.mojang.serialization.Codec;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NativeStructureWorldgenAccessTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.object.IrisStructureTerrain;
+import art.arcane.iris.structure.placement.IrisStructureTerrain;
-import art.arcane.iris.engine.object.IrisStructureTerrainMode;
+import art.arcane.iris.structure.placement.IrisStructureTerrainMode;
 import art.arcane.iris.nativegen.NativeStructurePostProcessor;
 import art.arcane.iris.nativegen.NativeStructureTerrainIntegrator;
 import net.minecraft.SharedConstants;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsChunkIOFlushTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController;
 import net.minecraft.SharedConstants;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsChunkTaskPollingTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.volmlib.util.scheduling.FoliaScheduler;
 import net.minecraft.SharedConstants;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsEntitySpawnDifficultyTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import net.minecraft.SharedConstants;
 import net.minecraft.core.registries.BuiltInRegistries;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsSavedTerrainCheckpointTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.engine.history.SavedTerrainChunk;
+import art.arcane.iris.world.history.SavedTerrainChunk;
 import ca.spottedleaf.concurrentutil.util.Priority;
 import ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO;
 import net.minecraft.SharedConstants;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsSavedTerrainSnapshotTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import ca.spottedleaf.concurrentutil.completable.Completable;
 import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
 import ca.spottedleaf.concurrentutil.executor.thread.BalancedPrioritisedThreadPool;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/NmsSavedTerrainWriteBarrierTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import ca.spottedleaf.concurrentutil.executor.thread.BalancedPrioritisedThreadPool;
 import ca.spottedleaf.concurrentutil.util.Priority;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/platform/bukkit/nms/v26_2_R1/WorldgenTerrainHeightmapsTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.nms.v26_2_R1;
+package art.arcane.iris.platform.bukkit.nms.v26_2_R1;
 
 import art.arcane.iris.nativegen.WorldgenTerrainHeightmaps;
 import com.mojang.serialization.Codec;

adapters/bukkit/nms/v26_2_R1/src/test/java/art/arcane/iris/structure/VillageImporterListPoolElementRuntimeContractTest.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.structure;
+package art.arcane.iris.structure;
 
-import art.arcane.iris.core.structure.authoring.StructureCapability;
+import art.arcane.iris.structure.authoring.StructureCapability;
-import art.arcane.iris.core.structure.authoring.StructureLoss;
+import art.arcane.iris.structure.authoring.StructureLoss;
 import net.minecraft.SharedConstants;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.world.level.levelgen.structure.pools.ListPoolElement;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java

@@ -19,77 +19,77 @@
 package art.arcane.iris;
 
 import art.arcane.volmlib.util.diagnostics.BukkitDebugDump;
-import art.arcane.iris.engine.IrisEngineEffects;
+import art.arcane.iris.generation.runtime.IrisEngineEffects;
-import art.arcane.iris.engine.IrisWorldManager;
+import art.arcane.iris.generation.runtime.IrisWorldManager;
 
-import art.arcane.iris.engine.framework.EngineComponentCleanup;
+import art.arcane.iris.generation.runtime.EngineComponentCleanup;
-import art.arcane.iris.engine.framework.EngineEffectsProvider;
+import art.arcane.iris.generation.runtime.EngineEffectsProvider;
-import art.arcane.iris.engine.framework.EnginePlatformHooks;
+import art.arcane.iris.generation.runtime.EnginePlatformHooks;
-import art.arcane.iris.engine.framework.EngineWorldManagerProvider;
+import art.arcane.iris.generation.runtime.EngineWorldManagerProvider;
-import art.arcane.iris.core.splash.IrisSplashComposer;
+import art.arcane.iris.diagnostics.splash.IrisSplashComposer;
-import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.iris.core.IrisStartupValidation;
+import art.arcane.iris.world.IrisStartupValidation;
-import art.arcane.iris.core.IrisStartupAdmissionListener;
+import art.arcane.iris.world.IrisStartupAdmissionListener;
-import art.arcane.iris.core.BukkitWorldReconciler;
+import art.arcane.iris.world.BukkitWorldReconciler;
-import art.arcane.iris.core.IrisWorldGeneratorResolver;
+import art.arcane.iris.world.IrisWorldGeneratorResolver;
-import art.arcane.iris.core.IrisWorldStorage;
+import art.arcane.iris.world.IrisWorldStorage;
-import art.arcane.iris.core.PendingWorldDeleteQueue;
+import art.arcane.iris.world.PendingWorldDeleteQueue;
-import art.arcane.iris.core.PendingWorldReplacementManager;
+import art.arcane.iris.world.PendingWorldReplacementManager;
-import art.arcane.iris.core.SettingsHotloadWatch;
+import art.arcane.iris.configuration.SettingsHotloadWatch;
-import art.arcane.iris.core.ServerConfigurator;
+import art.arcane.iris.pack.datapack.ServerConfigurator;
-import art.arcane.iris.core.datapack.DatapackIngestService;
+import art.arcane.iris.pack.datapack.DatapackIngestService;
-import art.arcane.iris.core.datapack.DatapackIngestService.StartupValidationOutcome;
+import art.arcane.iris.pack.datapack.DatapackIngestService.StartupValidationOutcome;
-import art.arcane.iris.core.lifecycle.IrisRuntimeStatics;
+import art.arcane.iris.world.lifecycle.IrisRuntimeStatics;
-import art.arcane.iris.core.lifecycle.ManagedWorldLoader;
+import art.arcane.iris.world.lifecycle.ManagedWorldLoader;
-import art.arcane.iris.core.lifecycle.MissingWorldStorageLog;
+import art.arcane.iris.world.lifecycle.MissingWorldStorageLog;
-import art.arcane.iris.core.lifecycle.PaperLibBootstrap;
+import art.arcane.iris.world.lifecycle.PaperLibBootstrap;
-import art.arcane.iris.core.lifecycle.WorldLifecycleService;
+import art.arcane.iris.world.lifecycle.WorldLifecycleService;
-import art.arcane.iris.core.runtime.BukkitEnginePlatformHooks;
+import art.arcane.iris.world.runtime.BukkitEnginePlatformHooks;
-import art.arcane.iris.core.runtime.WorldDeletionQueue;
+import art.arcane.iris.world.runtime.WorldDeletionQueue;
-import art.arcane.iris.core.runtime.WorldRuntimeControlService;
+import art.arcane.iris.world.runtime.WorldRuntimeControlService;
 import art.arcane.iris.api.terrain.IrisTerrainService;
-import art.arcane.iris.core.link.IrisPapiInstaller;
+import art.arcane.iris.integration.IrisPapiInstaller;
-import art.arcane.iris.core.link.IrisPapiListener;
+import art.arcane.iris.integration.IrisPapiListener;
-import art.arcane.iris.core.link.IrisPapiState;
+import art.arcane.iris.integration.IrisPapiState;
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
 import art.arcane.volmlib.util.director.help.DirectorMiniMenu;
 import art.arcane.volmlib.util.localization.BukkitLanguageSwitcher;
-import art.arcane.iris.core.link.MultiverseCoreLink;
+import art.arcane.iris.integration.MultiverseCoreLink;
-import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.platform.bukkit.nms.INMS;
-import art.arcane.iris.core.nms.ServerShutdownBoundary;
+import art.arcane.iris.platform.bukkit.nms.ServerShutdownBoundary;
-import art.arcane.iris.core.gui.BukkitGuiHost;
+import art.arcane.iris.studio.view.BukkitGuiHost;
-import art.arcane.iris.core.gui.PregeneratorJob;
+import art.arcane.iris.studio.view.PregeneratorJob;
-import art.arcane.iris.core.service.BoardSVC;
+import art.arcane.iris.platform.bukkit.BoardSVC;
-import art.arcane.iris.core.service.CommandSVC;
+import art.arcane.iris.command.CommandSVC;
-import art.arcane.iris.core.service.DatapackStructureScopeSVC;
+import art.arcane.iris.pack.datapack.DatapackStructureScopeSVC;
-import art.arcane.iris.core.service.EditSVC;
+import art.arcane.iris.studio.edit.EditSVC;
-import art.arcane.iris.core.service.EntityRiseSVC;
+import art.arcane.iris.world.entity.EntityRiseSVC;
-import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.integration.ExternalDataSVC;
-import art.arcane.iris.core.service.GlobalCacheSVC;
+import art.arcane.iris.generation.runtime.GlobalCacheSVC;
-import art.arcane.iris.core.service.IrisApiEventSVC;
+import art.arcane.iris.platform.bukkit.api.IrisApiEventSVC;
-import art.arcane.iris.core.service.IrisEngineSVC;
+import art.arcane.iris.generation.runtime.IrisEngineSVC;
-import art.arcane.iris.core.service.IrisIntegrationService;
+import art.arcane.iris.integration.IrisIntegrationService;
-import art.arcane.iris.core.service.IrisProtocolService;
+import art.arcane.iris.platform.protocol.IrisProtocolService;
-import art.arcane.iris.core.service.IrisTerrainSVC;
+import art.arcane.iris.platform.bukkit.api.IrisTerrainSVC;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-import art.arcane.iris.core.service.LogFilterSVC;
+import art.arcane.iris.diagnostics.LogFilterSVC;
-import art.arcane.iris.core.service.MultiverseSVC;
+import art.arcane.iris.integration.MultiverseSVC;
-import art.arcane.iris.core.service.ObjectSVC;
+import art.arcane.iris.studio.object.ObjectSVC;
-import art.arcane.iris.core.service.ObjectStudioSaveService;
+import art.arcane.iris.studio.object.ObjectStudioSaveService;
-import art.arcane.iris.core.service.PreservationSVC;
+import art.arcane.iris.generation.runtime.PreservationSVC;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.core.service.TreeFellerSVC;
+import art.arcane.iris.world.tree.TreeFellerSVC;
-import art.arcane.iris.core.service.TreeSVC;
+import art.arcane.iris.world.tree.TreeSVC;
-import art.arcane.iris.core.service.WandSVC;
+import art.arcane.iris.studio.wand.WandSVC;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.EnginePanic;
+import art.arcane.iris.generation.runtime.EnginePanic;
-import art.arcane.iris.engine.framework.BlockEditAccess;
+import art.arcane.iris.generation.runtime.BlockEditAccess;
-import art.arcane.iris.engine.framework.PreservationRegistry;
+import art.arcane.iris.generation.runtime.PreservationRegistry;
-import art.arcane.iris.engine.framework.TreeBlockMaterial;
+import art.arcane.iris.generation.decoration.tree.TreeBlockMaterial;
-import art.arcane.iris.engine.object.IrisCompat;
+import art.arcane.iris.pack.validation.IrisCompat;
-import art.arcane.iris.core.safeguard.IrisSafeguard;
+import art.arcane.iris.world.safeguard.IrisSafeguard;
-import art.arcane.iris.core.safeguard.RuntimeLockNotice;
+import art.arcane.iris.world.safeguard.RuntimeLockNotice;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.IrisPlatforms;
@@ -100,7 +100,7 @@ import art.arcane.volmlib.util.bukkit.papi.PlaceholderRegistration;
 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.common.format.C;
+import art.arcane.iris.localization.C;
 import art.arcane.volmlib.util.function.NastyRunnable;
 import art.arcane.volmlib.util.hud.HudActionBar;
 import art.arcane.volmlib.util.hud.HudBossBarLane;
@@ -111,16 +111,16 @@ import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.plugin.ComponentLog;
 import art.arcane.volmlib.util.plugin.ComponentMessenger;
 import art.arcane.volmlib.util.plugin.ComponentText;
-import art.arcane.iris.util.common.misc.Bindings;
+import art.arcane.iris.platform.bootstrap.Bindings;
-import art.arcane.iris.util.common.misc.ServerProperties;
+import art.arcane.iris.platform.bootstrap.ServerProperties;
-import art.arcane.iris.util.common.misc.SlimJar;
+import art.arcane.iris.platform.bootstrap.SlimJar;
-import art.arcane.iris.util.common.parallel.MultiBurst;
+import art.arcane.iris.generation.concurrent.MultiBurst;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitPlugin;
+import art.arcane.iris.platform.bukkit.plugin.VolmitPlugin;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.chunk.ChunkTickets;
+import art.arcane.iris.platform.bukkit.chunk.ChunkTickets;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.simd.SimdSupport;
+import art.arcane.iris.generation.simd.SimdSupport;
 import art.arcane.volmlib.util.scheduling.Queue;
 import art.arcane.volmlib.util.scheduling.ShurikenQueue;
 import org.bukkit.Bukkit;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/IrisBootstrap.java

@@ -1,15 +1,15 @@
 package art.arcane.iris;
 
-import art.arcane.iris.core.lifecycle.BukkitStartupPaths;
+import art.arcane.iris.world.lifecycle.BukkitStartupPaths;
-import art.arcane.iris.core.lifecycle.BukkitWorldConfiguration;
+import art.arcane.iris.world.lifecycle.BukkitWorldConfiguration;
-import art.arcane.iris.core.lifecycle.BukkitWorldConfiguration.IrisWorldStorageEntry;
+import art.arcane.iris.world.lifecycle.BukkitWorldConfiguration.IrisWorldStorageEntry;
-import art.arcane.iris.core.lifecycle.HuskWorldQuarantine;
+import art.arcane.iris.world.lifecycle.HuskWorldQuarantine;
-import art.arcane.iris.core.lifecycle.MissingWorldStorageLog;
+import art.arcane.iris.world.lifecycle.MissingWorldStorageLog;
-import art.arcane.iris.core.lifecycle.WorldReplacementBootstrap;
+import art.arcane.iris.world.lifecycle.WorldReplacementBootstrap;
-import art.arcane.iris.core.lifecycle.WorldReplacementBootstrapMarker;
+import art.arcane.iris.world.lifecycle.WorldReplacementBootstrapMarker;
-import art.arcane.iris.core.pack.DefaultPackBootstrapProvisioner;
+import art.arcane.iris.pack.DefaultPackBootstrapProvisioner;
-import art.arcane.iris.core.pack.DefaultPackBootstrapProvisioner.ProvisionResult;
+import art.arcane.iris.pack.DefaultPackBootstrapProvisioner.ProvisionResult;
-import art.arcane.iris.util.common.misc.SlimJar;
+import art.arcane.iris.platform.bootstrap.SlimJar;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEvent;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/IrisPluginLoader.java

@@ -1,6 +1,6 @@
 package art.arcane.iris;
 
-import art.arcane.iris.util.common.misc.SlimJar;
+import art.arcane.iris.platform.bootstrap.SlimJar;
 import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
 import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
 import io.papermc.paper.plugin.loader.PluginLoader;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandDatapack.java

@@ -16,21 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.datapack.DatapackIngestService;
+import art.arcane.iris.pack.datapack.DatapackIngestService;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
 
 import java.util.List;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
 @Director(name = "datapack", aliases = {"datapacks", "dp"}, description = "Download & manage external datapack imports", descriptionKey = "iris.director.commanddatapack.director.download_manage_external_datapack_imports_modrinth")
 public class CommandDatapack implements DirectorExecutor {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandDeveloper.java

@@ -16,39 +16,38 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import com.google.gson.JsonObject;
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.ServerConfigurator;
+import art.arcane.iris.pack.datapack.ServerConfigurator;
-import art.arcane.iris.core.lifecycle.LifecycleOperationCoordinator;
+import art.arcane.iris.world.lifecycle.LifecycleOperationCoordinator;
-import art.arcane.iris.core.nms.datapack.DataVersion;
+import art.arcane.iris.platform.bukkit.nms.datapack.DataVersion;
-import art.arcane.iris.core.runtime.ChunkClearer;
+import art.arcane.iris.world.runtime.ChunkClearer;
-import art.arcane.iris.core.runtime.GoldenHashScanner;
+import art.arcane.iris.generation.validation.GoldenHashScanner;
-import art.arcane.iris.core.runtime.InPlaceChunkRegenerator;
+import art.arcane.iris.world.runtime.InPlaceChunkRegenerator;
-import art.arcane.iris.core.service.IrisEngineSVC;
+import art.arcane.iris.generation.runtime.IrisEngineSVC;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.core.tools.IrisPackBenchmarking;
+import art.arcane.iris.pack.IrisPackBenchmarking;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.IrisEngineMantle;
+import art.arcane.iris.generation.runtime.IrisEngineMantle;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
-import art.arcane.iris.util.project.matter.IrisMatterContext;
+import art.arcane.iris.world.storage.matter.IrisMatterContext;
-import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.io.CountingDataInputStream;
 import art.arcane.volmlib.util.mantle.runtime.TectonicPlate;
 import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.matter.Matter;
-import art.arcane.iris.util.nbt.common.mca.MCAFile;
+import art.arcane.iris.world.storage.region.MCAFile;
-import art.arcane.iris.util.nbt.common.mca.MCAUtil;
+import art.arcane.iris.world.storage.region.MCAUtil;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -65,11 +64,11 @@ import java.util.Enumeration;
 import java.util.Map;
 import java.util.TreeMap;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
-import art.arcane.iris.core.localization.BukkitRuntimeMessages;
+import art.arcane.iris.localization.BukkitRuntimeMessages;
 @Director(name = "Developer", origin = DirectorOrigin.BOTH, description = "Iris World Manager", descriptionKey = "iris.director.commanddeveloper.director.iris_world_manager", aliases = {"dev"})
 public class CommandDeveloper implements DirectorExecutor {
     @Director(description = "Get Loaded TectonicPlates Count", descriptionKey = "iris.director.commanddeveloper.director.get_loaded_tectonicplates_count", origin = DirectorOrigin.BOTH, sync = true)

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandEdit.java

@@ -16,25 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.generation.terrain.IrisRegion;
-import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
 
 import java.awt.Desktop;
 import java.awt.GraphicsEnvironment;
 
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
 import art.arcane.volmlib.util.localization.MessageArgument;
 @Director(name = "edit", origin = DirectorOrigin.PLAYER, description = "Edit something", descriptionKey = "iris.director.commandedit.director.edit_something")
 public class CommandEdit implements DirectorExecutor {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandFind.java

@@ -16,39 +16,38 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.datapack.DatapackIngestService;
+import art.arcane.iris.pack.datapack.DatapackIngestService;
-import art.arcane.iris.core.service.ObjectStudioSaveService;
+import art.arcane.iris.studio.object.ObjectStudioSaveService;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.IrisStructureLocator;
+import art.arcane.iris.structure.placement.IrisStructureLocator;
-import art.arcane.iris.engine.framework.NativeStructureGenerationPolicy;
+import art.arcane.iris.structure.nativegen.NativeStructureGenerationPolicy;
-import art.arcane.iris.engine.framework.StructureReachability;
+import art.arcane.iris.structure.placement.StructureReachability;
-import art.arcane.iris.engine.history.GenerationSemanticQueries;
+import art.arcane.iris.world.history.GenerationSemanticQueries;
-import art.arcane.iris.engine.hydrology.HydrologyFeatureQuery;
+import art.arcane.iris.generation.hydrology.HydrologyFeatureQuery;
-import art.arcane.iris.engine.hydrology.runtime.IrisHydrologyRuntime;
+import art.arcane.iris.generation.hydrology.runtime.IrisHydrologyRuntime;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.object.IrisNativeStructureDecision;
+import art.arcane.iris.structure.nativegen.IrisNativeStructureDecision;
-import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.generation.terrain.IrisRegion;
-import art.arcane.iris.engine.object.NativeStructureGenerationStatus;
+import art.arcane.iris.structure.nativegen.NativeStructureGenerationStatus;
-import art.arcane.iris.engine.platform.EngineBukkitOps;
+import art.arcane.iris.platform.generation.EngineBukkitOps;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.PlatformStructureHooks;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.command.specialhandlers.HydrologyTypeHandler;
-import art.arcane.iris.util.common.director.specialhandlers.HydrologyTypeHandler;
+import art.arcane.iris.world.history.GenerationFindCatalog;
-import art.arcane.iris.engine.history.GenerationFindCatalog;
+import art.arcane.iris.command.specialhandlers.LocatableObjectHandler;
-import art.arcane.iris.util.common.director.specialhandlers.LocatableObjectHandler;
+import art.arcane.iris.command.specialhandlers.ReachableBiomeHandler;
-import art.arcane.iris.util.common.director.specialhandlers.ReachableBiomeHandler;
+import art.arcane.iris.command.specialhandlers.ReachableRegionHandler;
-import art.arcane.iris.util.common.director.specialhandlers.ReachableRegionHandler;
+import art.arcane.iris.command.specialhandlers.StructureHandler;
-import art.arcane.iris.util.common.director.specialhandlers.StructureHandler;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandIris.java

@@ -16,39 +16,38 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.BukkitWorldReconciler;
+import art.arcane.iris.world.BukkitWorldReconciler;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
-import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.iris.core.IrisWorldStorage;
+import art.arcane.iris.world.IrisWorldStorage;
-import art.arcane.iris.core.IrisWorlds;
+import art.arcane.iris.world.IrisWorlds;
-import art.arcane.iris.core.PendingWorldReplacementManager;
+import art.arcane.iris.world.PendingWorldReplacementManager;
-import art.arcane.iris.core.ServerConfigurator;
+import art.arcane.iris.pack.datapack.ServerConfigurator;
-import art.arcane.iris.core.lifecycle.IrisWorldRemovalService;
+import art.arcane.iris.world.lifecycle.IrisWorldRemovalService;
-import art.arcane.iris.core.lifecycle.LifecycleOperationCoordinator;
+import art.arcane.iris.world.lifecycle.LifecycleOperationCoordinator;
-import art.arcane.iris.core.lifecycle.WorldLifecycleService;
+import art.arcane.iris.world.lifecycle.WorldLifecycleService;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.pack.PackDownloader;
+import art.arcane.iris.pack.PackDownloader;
-import art.arcane.iris.core.pack.PackDirectoryResolver;
+import art.arcane.iris.pack.PackDirectoryResolver;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import art.arcane.volmlib.util.director.DirectorParameterHandler;
-import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
-import art.arcane.iris.util.common.director.specialhandlers.NullablePlayerHandler;
+import art.arcane.iris.command.specialhandlers.NullablePlayerHandler;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.Location;
@@ -68,15 +67,15 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static art.arcane.iris.util.common.misc.ServerProperties.BUKKIT_YML;
+import static art.arcane.iris.platform.bootstrap.ServerProperties.BUKKIT_YML;
 import static org.bukkit.Bukkit.getServer;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.IrisMessages;
+import art.arcane.iris.localization.IrisMessages;
-import art.arcane.iris.core.localization.PackDownloadMessages;
+import art.arcane.iris.localization.PackDownloadMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
 @Director(name = "iris", aliases = {"ir", "irs"}, description = "Basic Command", descriptionKey = "iris.director.commandiris.director.basic_command")
 public class CommandIris implements DirectorExecutor {
     private static final String NO_DOWNLOAD_SOURCE = "__none__";
@@ -479,7 +478,7 @@ public class CommandIris implements DirectorExecutor {
             return;
         }
         sender().sendMessage(IrisLanguage.text(BukkitCommandMessagesExtended.COMMAND_IRIS_SENDING_METRICS));
-        engine().printMetrics(sender());
+        engine().printMetrics(sender()::sendMessage);
     }
 
     @Director(description = "Reload configuration file (this is also done automatically)", descriptionKey = "iris.director.commandiris.director.reload_configuration_file_this_is_also_done_automatically")

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsaw.java

@@ -1,43 +1,42 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.runtime.StudioOpenCoordinator;
+import art.arcane.iris.studio.object.StudioOpenCoordinator;
-import art.arcane.iris.core.runtime.jigsaw.JigsawPlanarArchetype;
+import art.arcane.iris.studio.jigsaw.JigsawPlanarArchetype;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioActivation;
+import art.arcane.iris.studio.jigsaw.JigsawStudioActivation;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioBay;
+import art.arcane.iris.studio.jigsaw.JigsawStudioBay;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCellDimensions;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCellDimensions;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCompatibilityTarget;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCompatibilityTarget;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioGraphMapper;
+import art.arcane.iris.studio.jigsaw.JigsawStudioGraphMapper;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioLayout;
+import art.arcane.iris.studio.jigsaw.JigsawStudioLayout;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioMode;
+import art.arcane.iris.studio.jigsaw.JigsawStudioMode;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioProjectCreator;
+import art.arcane.iris.studio.jigsaw.JigsawStudioProjectCreator;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioSession;
+import art.arcane.iris.studio.jigsaw.JigsawStudioSession;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioVariant;
+import art.arcane.iris.studio.jigsaw.JigsawStudioVariant;
-import art.arcane.iris.core.service.JigsawStudioGraphEvaluation;
+import art.arcane.iris.studio.jigsaw.JigsawStudioGraphEvaluation;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.core.structure.StructureImporter;
+import art.arcane.iris.structure.StructureImporter;
-import art.arcane.iris.core.structure.VillageImporter;
+import art.arcane.iris.structure.VillageImporter;
-import art.arcane.iris.core.structure.authoring.StructureKey;
+import art.arcane.iris.structure.authoring.StructureKey;
-import art.arcane.iris.core.structure.authoring.StructureWriteResult;
+import art.arcane.iris.structure.authoring.StructureWriteResult;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportFormat;
+import art.arcane.iris.structure.export.VanillaJigsawExportFormat;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportRequest;
+import art.arcane.iris.structure.export.VanillaJigsawExportRequest;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportSource;
+import art.arcane.iris.structure.export.VanillaJigsawExportSource;
-import art.arcane.iris.engine.framework.structure.PlanarJigsawWorkcellResolver;
+import art.arcane.iris.structure.graph.PlanarJigsawWorkcellResolver;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisJigsawCompatibility;
+import art.arcane.iris.structure.jigsaw.IrisJigsawCompatibility;
-import art.arcane.iris.engine.object.IrisJigsawPiece;
+import art.arcane.iris.structure.jigsaw.IrisJigsawPiece;
-import art.arcane.iris.engine.object.IrisJigsawThemeSet;
+import art.arcane.iris.structure.jigsaw.IrisJigsawThemeSet;
-import art.arcane.iris.engine.object.IrisJigsawWorkcellArchetype;
+import art.arcane.iris.structure.jigsaw.IrisJigsawWorkcellArchetype;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisPosition;
+import art.arcane.iris.pack.value.IrisPosition;
-import art.arcane.iris.engine.object.IrisStructure;
+import art.arcane.iris.structure.placement.IrisStructure;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.command.specialhandlers.IrisStructureHandler;
-import art.arcane.iris.util.common.director.specialhandlers.IrisStructureHandler;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.DirectorParameterHandler;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawAdopt.java

@@ -1,22 +1,21 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.structure.authoring.StructureKey;
+import art.arcane.iris.structure.authoring.StructureKey;
-import art.arcane.iris.core.structure.authoring.StructureOwnershipManifest;
+import art.arcane.iris.structure.authoring.StructureOwnershipManifest;
-import art.arcane.iris.core.structure.authoring.StructureTransactionWriter;
+import art.arcane.iris.structure.authoring.StructureTransactionWriter;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionDiagnostic;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionDiagnostic;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionInputKind;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionInputKind;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionPlan;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionPlan;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionRequest;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionRequest;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionResult;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionResult;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionService;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionService;
-import art.arcane.iris.core.structure.conversion.IrisStructureAdoptionStrategy;
+import art.arcane.iris.structure.conversion.IrisStructureAdoptionStrategy;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.DirectorParameterHandler;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawConnector.java

@@ -1,12 +1,11 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioBay;
+import art.arcane.iris.studio.jigsaw.JigsawStudioBay;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCellDimensions;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCellDimensions;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioGraphEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioGraphEditor;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioVariant;
+import art.arcane.iris.studio.jigsaw.JigsawStudioVariant;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisPosition;
+import art.arcane.iris.pack.value.IrisPosition;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawExports.java

@@ -1,15 +1,15 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-import art.arcane.iris.core.structure.export.VanillaJigsawDatapackExporter;
+import art.arcane.iris.structure.export.VanillaJigsawDatapackExporter;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportDiagnostic;
+import art.arcane.iris.structure.export.VanillaJigsawExportDiagnostic;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportFormat;
+import art.arcane.iris.structure.export.VanillaJigsawExportFormat;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportRequest;
+import art.arcane.iris.structure.export.VanillaJigsawExportRequest;
-import art.arcane.iris.core.structure.export.VanillaJigsawExportResult;
+import art.arcane.iris.structure.export.VanillaJigsawExportResult;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import org.bukkit.entity.Player;
 
 import java.nio.file.Path;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawOpen.java

@@ -1,23 +1,23 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.pack.BrokenPackException;
+import art.arcane.iris.pack.BrokenPackException;
-import art.arcane.iris.core.runtime.WorldRuntimeControlService;
+import art.arcane.iris.world.runtime.WorldRuntimeControlService;
-import art.arcane.iris.core.runtime.StudioOpenCoordinator;
+import art.arcane.iris.studio.object.StudioOpenCoordinator;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioActivation;
+import art.arcane.iris.studio.jigsaw.JigsawStudioActivation;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioBay;
+import art.arcane.iris.studio.jigsaw.JigsawStudioBay;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioGraphMapper;
+import art.arcane.iris.studio.jigsaw.JigsawStudioGraphMapper;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioLayout;
+import art.arcane.iris.studio.jigsaw.JigsawStudioLayout;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioSession;
+import art.arcane.iris.studio.jigsaw.JigsawStudioSession;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisStructure;
+import art.arcane.iris.structure.placement.IrisStructure;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.World;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawPiece.java

@@ -1,19 +1,18 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.runtime.jigsaw.JigsawPlanarTopology;
+import art.arcane.iris.studio.jigsaw.JigsawPlanarTopology;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioBay;
+import art.arcane.iris.studio.jigsaw.JigsawStudioBay;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCellDimensions;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCellDimensions;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCompatibilityTarget;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCompatibilityTarget;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioGraphEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioGraphEditor;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioLayout;
+import art.arcane.iris.studio.jigsaw.JigsawStudioLayout;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioMode;
+import art.arcane.iris.studio.jigsaw.JigsawStudioMode;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioPoolEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioPoolEditor;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioVariant;
+import art.arcane.iris.studio.jigsaw.JigsawStudioVariant;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-import art.arcane.iris.engine.object.IrisJigsawPiece;
+import art.arcane.iris.structure.jigsaw.IrisJigsawPiece;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisPosition;
+import art.arcane.iris.pack.value.IrisPosition;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawPool.java

@@ -1,7 +1,6 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioGraphEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioGraphEditor;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawPreview.java

@@ -1,7 +1,6 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawRules.java

@@ -1,9 +1,8 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCompatibilityTarget;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCompatibilityTarget;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioPoolEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioPoolEditor;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioStructureEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioStructureEditor;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawVariant.java

@@ -1,11 +1,10 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioBay;
+import art.arcane.iris.studio.jigsaw.JigsawStudioBay;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCellDimensions;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCellDimensions;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioPoolEditor;
+import art.arcane.iris.studio.jigsaw.JigsawStudioPoolEditor;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioVariant;
+import art.arcane.iris.studio.jigsaw.JigsawStudioVariant;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandJigsawWorkcell.java

@@ -1,9 +1,8 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioBay;
+import art.arcane.iris.studio.jigsaw.JigsawStudioBay;
-import art.arcane.iris.core.runtime.jigsaw.JigsawStudioCellDimensions;
+import art.arcane.iris.studio.jigsaw.JigsawStudioCellDimensions;
-import art.arcane.iris.core.service.JigsawStudioService;
+import art.arcane.iris.studio.jigsaw.JigsawStudioService;
-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;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandObject.java

@@ -16,49 +16,48 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
-import art.arcane.iris.core.link.WorldEditLink;
+import art.arcane.iris.integration.WorldEditLink;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.pack.PackDirectoryResolver;
+import art.arcane.iris.pack.PackDirectoryResolver;
-import art.arcane.iris.core.runtime.ObjectStudioActivation;
+import art.arcane.iris.studio.object.ObjectStudioActivation;
-import art.arcane.iris.core.runtime.StudioOpenCoordinator;
+import art.arcane.iris.studio.object.StudioOpenCoordinator;
-import art.arcane.iris.core.runtime.WorldRuntimeControlService;
+import art.arcane.iris.world.runtime.WorldRuntimeControlService;
-import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.integration.ExternalDataSVC;
-import art.arcane.iris.core.service.ObjectSVC;
+import art.arcane.iris.studio.object.ObjectSVC;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.core.service.WandSVC;
+import art.arcane.iris.studio.wand.WandSVC;
-import art.arcane.iris.core.tools.IrisConverter;
+import art.arcane.iris.pack.IrisConverter;
-import art.arcane.iris.core.tools.TreePlausibilizeBatch;
+import art.arcane.iris.studio.tree.TreePlausibilizeBatch;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.IObjectPlacer;
+import art.arcane.iris.structure.object.IObjectPlacer;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisObjectPlacement;
+import art.arcane.iris.structure.object.IrisObjectPlacement;
-import art.arcane.iris.engine.object.IrisObjectPlacementScaleInterpolator;
+import art.arcane.iris.structure.object.IrisObjectPlacementScaleInterpolator;
-import art.arcane.iris.engine.object.IrisObjectRotation;
+import art.arcane.iris.structure.object.IrisObjectRotation;
-import art.arcane.iris.engine.object.IrisObjectScale;
+import art.arcane.iris.structure.object.IrisObjectScale;
-import art.arcane.iris.engine.object.TileData;
+import art.arcane.iris.generation.block.TileData;
 import art.arcane.iris.platform.bukkit.BukkitBlockState;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.IrisServices;
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.volmlib.util.data.Cuboid;
-import art.arcane.iris.util.common.data.IrisCustomData;
+import art.arcane.iris.generation.block.IrisCustomData;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.command.specialhandlers.NullableDimensionHandler;
-import art.arcane.iris.util.common.director.specialhandlers.NullableDimensionHandler;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.director.specialhandlers.ObjectHandler;
+import art.arcane.iris.command.specialhandlers.ObjectHandler;
-import art.arcane.iris.util.common.director.specialhandlers.ObjectScaleHandler;
+import art.arcane.iris.command.specialhandlers.ObjectScaleHandler;
-import art.arcane.iris.util.common.director.specialhandlers.ObjectTargetHandler;
+import art.arcane.iris.command.specialhandlers.ObjectTargetHandler;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.math.Direction;
+import art.arcane.volmlib.util.math.DirectionBasis;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -87,11 +86,11 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
 @Director(name = "object", aliases = "o", origin = DirectorOrigin.PLAYER, description = "Iris object manipulation", descriptionKey = "iris.director.commandobject.director.iris_object_manipulation")
 public class CommandObject implements DirectorExecutor {
     static final Set<Material> PASTE_TRANSPARENT_BLOCKS = Set.of(
@@ -484,9 +483,9 @@ public class CommandObject implements DirectorExecutor {
             Location a1 = b[0].clone();
             Location a2 = b[1].clone();
             Cuboid cursor = new Cuboid(a1, a2);
-            Direction d = Direction.closest(player.getLocation().getDirection()).reverse();
+            DirectionBasis d = DirectionBasis.closest(player.getLocation().getDirection()).reverse();
             assert d != null;
-            cursor = cursor.expand(d.f(), -amount);
+            cursor = cursor.expand(d.getCuboidDirection(), -amount);
             b[0] = cursor.getLowerNE();
             b[1] = cursor.getUpperSW();
             player.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
@@ -710,7 +709,7 @@ public class CommandObject implements DirectorExecutor {
             }
             Location a1 = b[0].clone();
             Location a2 = b[1].clone();
-            Direction d = Direction.closest(player.getLocation().getDirection()).reverse();
+            DirectionBasis d = DirectionBasis.closest(player.getLocation().getDirection()).reverse();
             if (d == null) {
                 return; // HOW DID THIS HAPPEN
             }

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandPack.java

@@ -16,21 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.compat.PackCompatReport;
+import art.arcane.iris.pack.validation.PackCompatReport;
-import art.arcane.iris.core.pack.PackDirectoryResolver;
+import art.arcane.iris.pack.PackDirectoryResolver;
-import art.arcane.iris.core.pack.PackResourceCleanup;
+import art.arcane.iris.pack.PackResourceCleanup;
-import art.arcane.iris.core.pack.PackValidationCache;
+import art.arcane.iris.pack.PackValidationCache;
-import art.arcane.iris.core.pack.PackValidationRegistry;
+import art.arcane.iris.pack.PackValidationRegistry;
-import art.arcane.iris.core.pack.PackValidationResult;
+import art.arcane.iris.pack.PackValidationResult;
-import art.arcane.iris.core.pack.PackValidator;
+import art.arcane.iris.pack.PackValidator;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.command.handlers.DimensionHandler;
-import art.arcane.iris.util.common.director.handlers.DimensionHandler;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
 import art.arcane.volmlib.util.localization.TextKey;
@@ -43,10 +42,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
-import art.arcane.iris.core.localization.BukkitRuntimeMessages;
+import art.arcane.iris.localization.BukkitRuntimeMessages;
 @Director(name = "pack", aliases = {"pk"}, description = "Pack validation and maintenance", descriptionKey = "iris.director.commandpack.director.pack_validation_maintenance")
 public class CommandPack implements DirectorExecutor {
     /**

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandPregen.java

@@ -16,25 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.localization.IrisMessages;
+import art.arcane.iris.localization.IrisMessages;
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.gui.PregeneratorJob;
+import art.arcane.iris.studio.view.PregeneratorJob;
-import art.arcane.iris.core.pregenerator.PregenTask;
+import art.arcane.iris.world.pregen.PregenTask;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.util.common.director.DirectorExecutor;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.math.Position2;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
 @Director(name = "pregen", aliases = "pregenerate", description = "Pregenerate your Iris worlds!", descriptionKey = "iris.director.commandpregen.director.pregenerate_your_iris_worlds")
 public class CommandPregen implements DirectorExecutor {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandSVC.java

@@ -16,19 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.service;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.iris.core.commands.CommandIris;
+import art.arcane.iris.generation.cache.AtomicCache;
-import art.arcane.iris.engine.data.cache.AtomicCache;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.director.DirectorContext;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
-import art.arcane.iris.util.common.director.DirectorContextHandler;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.director.DirectorSystem;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.format.C;
-import art.arcane.iris.util.common.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.director.DirectorEngineOptions;
 import art.arcane.volmlib.util.director.compat.DirectorEngineFactory;
 import art.arcane.volmlib.util.director.context.DirectorContextRegistry;
@@ -61,8 +57,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.IrisMessages;
+import art.arcane.iris.localization.IrisMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
 import art.arcane.volmlib.util.localization.LanguageAudience;
 import art.arcane.volmlib.util.plugin.ComponentMessenger;
@@ -225,7 +221,7 @@ public class CommandSVC implements IrisService, CommandExecutor, TabCompleter, D
     private void registerPaperCommand() {
         try {
             Class<?> registrarType = Class.forName(
-                    "art.arcane.iris.core.commands.PaperCommandRegistrar",
+                    "art.arcane.iris.command.PaperCommandRegistrar",
                     true,
                     getClass().getClassLoader()
             );

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandStructure.java

@@ -16,40 +16,39 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.structure.BulkStructureImporter;
+import art.arcane.iris.structure.BulkStructureImporter;
-import art.arcane.iris.core.structure.StructureCaptureImporter;
+import art.arcane.iris.structure.StructureCaptureImporter;
-import art.arcane.iris.core.structure.StructureImporter;
+import art.arcane.iris.structure.StructureImporter;
-import art.arcane.iris.core.structure.StructureIndexService;
+import art.arcane.iris.structure.StructureIndexService;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.IrisStructureLocator;
+import art.arcane.iris.structure.placement.IrisStructureLocator;
-import art.arcane.iris.engine.framework.NativeStructureGenerationPolicy;
+import art.arcane.iris.structure.nativegen.NativeStructureGenerationPolicy;
-import art.arcane.iris.engine.framework.PlacedStructurePiece;
+import art.arcane.iris.structure.placement.PlacedStructurePiece;
-import art.arcane.iris.engine.framework.StructureAssembler;
+import art.arcane.iris.structure.placement.StructureAssembler;
-import art.arcane.iris.engine.framework.StructureReachability;
+import art.arcane.iris.structure.placement.StructureReachability;
-import art.arcane.iris.engine.framework.structure.StructureAssemblyResult;
+import art.arcane.iris.structure.graph.StructureAssemblyResult;
-import art.arcane.iris.engine.object.IObjectPlacer;
+import art.arcane.iris.structure.object.IObjectPlacer;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisNativeStructureDecision;
+import art.arcane.iris.structure.nativegen.IrisNativeStructureDecision;
-import art.arcane.iris.engine.object.IrisObjectPlacement;
+import art.arcane.iris.structure.object.IrisObjectPlacement;
-import art.arcane.iris.engine.object.IrisPosition;
+import art.arcane.iris.pack.value.IrisPosition;
-import art.arcane.iris.engine.object.IrisStructure;
+import art.arcane.iris.structure.placement.IrisStructure;
-import art.arcane.iris.engine.object.NativeStructureGenerationStatus;
+import art.arcane.iris.structure.nativegen.NativeStructureGenerationStatus;
-import art.arcane.iris.engine.object.ObjectPlaceMode;
+import art.arcane.iris.structure.object.ObjectPlaceMode;
 import art.arcane.volmlib.util.collection.KList;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.format.C;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
 import art.arcane.volmlib.util.math.RNG;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
@@ -67,10 +66,10 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
 @Director(name = "structure", aliases = {"struct", "str"}, description = "Iris structure tools (index, import, info)", descriptionKey = "iris.director.commandstructure.director.iris_structure_tools_index_import_info")
 public class CommandStructure implements DirectorExecutor {
     @Director(description = "Regenerate structure-index.json listing all vanilla, datapack & iris structures", descriptionKey = "iris.director.commandstructure.director.regenerate_structure_index_json_listing_all_vanilla_datapack_iris_structures", aliases = {"ls"}, origin = DirectorOrigin.BOTH)

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandStudio.java

@@ -16,63 +16,62 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
-import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.iris.core.gui.ImageMapStudioGUI;
+import art.arcane.iris.studio.view.ImageMapStudioGUI;
-import art.arcane.iris.core.gui.NoiseExplorerGUI;
+import art.arcane.iris.studio.view.NoiseExplorerGUI;
-import art.arcane.iris.core.gui.VisionGUI;
+import art.arcane.iris.studio.view.VisionGUI;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.project.IrisProject;
+import art.arcane.iris.studio.workspace.IrisProject;
-import art.arcane.iris.core.project.IrisCodeWorkspace;
+import art.arcane.iris.studio.workspace.IrisCodeWorkspace;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
-import art.arcane.iris.core.service.BoardSVC;
+import art.arcane.iris.platform.bukkit.BoardSVC;
-import art.arcane.iris.core.service.StudioSVC;
+import art.arcane.iris.studio.StudioSVC;
-import art.arcane.iris.core.structure.BulkStructureImporter;
+import art.arcane.iris.structure.BulkStructureImporter;
-import art.arcane.iris.core.structure.FeatureImporter;
+import art.arcane.iris.structure.FeatureImporter;
-import art.arcane.iris.core.structure.StructureImporter;
+import art.arcane.iris.structure.StructureImporter;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.InventorySlotType;
+import art.arcane.iris.world.loot.InventorySlotType;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.object.IrisBiomePaletteLayer;
+import art.arcane.iris.generation.biome.IrisBiomePaletteLayer;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisEntity;
+import art.arcane.iris.world.entity.IrisEntity;
-import art.arcane.iris.engine.object.IrisGenerator;
+import art.arcane.iris.generation.noise.IrisGenerator;
-import art.arcane.iris.engine.object.IrisInterpolator;
+import art.arcane.iris.generation.noise.IrisInterpolator;
-import art.arcane.iris.engine.object.IrisLootTable;
+import art.arcane.iris.world.loot.IrisLootTable;
-import art.arcane.iris.engine.object.IrisNoiseGenerator;
+import art.arcane.iris.generation.noise.IrisNoiseGenerator;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisObjectPlacement;
+import art.arcane.iris.structure.object.IrisObjectPlacement;
-import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.generation.terrain.IrisRegion;
-import art.arcane.iris.engine.object.NoiseStyle;
+import art.arcane.iris.generation.noise.NoiseStyle;
-import art.arcane.iris.engine.platform.EngineBukkitOps;
+import art.arcane.iris.platform.generation.EngineBukkitOps;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.collection.KSet;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.command.handlers.DimensionHandler;
-import art.arcane.iris.util.common.director.handlers.DimensionHandler;
+import art.arcane.iris.command.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.common.format.C;
+import art.arcane.iris.localization.C;
 import art.arcane.volmlib.util.format.Form;
 import art.arcane.volmlib.util.function.NoiseProvider;
-import art.arcane.iris.util.project.interpolation.InterpolationMethod;
+import art.arcane.volmlib.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.volmlib.util.math.M;
 import art.arcane.volmlib.util.math.RNG;
 import art.arcane.volmlib.util.math.Spiraler;
-import art.arcane.iris.util.project.noise.CNG;
+import art.arcane.volmlib.util.noise.CNG;
-import art.arcane.iris.util.common.parallel.MultiBurst;
+import art.arcane.iris.generation.concurrent.MultiBurst;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import art.arcane.volmlib.util.scheduling.O;
 import art.arcane.volmlib.util.scheduling.PrecisionStopwatch;
 import org.bukkit.Bukkit;
@@ -101,10 +100,10 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
 @Director(name = "studio", aliases = {"std", "s"}, description = "Studio Commands", descriptionKey = "iris.director.commandstudio.director.studio_commands")
 public class CommandStudio implements DirectorExecutor {
     private static final long CHUNK_SCAN_TIMEOUT_MS = 3_000;
@@ -862,7 +861,7 @@ public class CommandStudio implements DirectorExecutor {
                     }
 
                     File ff = g.getData().getObjectLoader().findFile(i);
-                    art.arcane.iris.util.common.math.IrisBlockVector sz = IrisObject.sampleSize(ff);
+                    art.arcane.iris.generation.geometry.IrisBlockVector sz = IrisObject.sampleSize(ff);
                     nn3 = i + ": size=[" + sz.getBlockX() + "," + sz.getBlockY() + "," + sz.getBlockZ() + "] location=[" + ff.getPath() + "]";
                     stop.add(i);
                 } catch (Throwable e) {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/CommandWhat.java

@@ -16,30 +16,29 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.platform.bukkit.BukkitBlockResolution;
 
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.edit.BlockSignal;
+import art.arcane.iris.studio.edit.BlockSignal;
-import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.platform.bukkit.nms.INMS;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.GenerationSessionException;
+import art.arcane.iris.generation.runtime.GenerationSessionException;
-import art.arcane.iris.engine.framework.GenerationSessionLease;
+import art.arcane.iris.generation.runtime.GenerationSessionLease;
-import art.arcane.iris.engine.platform.EngineBukkitOps;
+import art.arcane.iris.platform.generation.EngineBukkitOps;
-import art.arcane.iris.util.project.context.IrisContext;
+import art.arcane.iris.generation.context.IrisContext;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.history.SavedBiomeUnavailableException;
+import art.arcane.iris.world.history.SavedBiomeUnavailableException;
-import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.generation.terrain.IrisRegion;
-import art.arcane.iris.util.common.director.DirectorExecutor;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.director.DirectorOrigin;
 import art.arcane.volmlib.util.director.annotations.Director;
 import art.arcane.volmlib.util.director.annotations.Param;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.matter.MatterMarker;
 import org.bukkit.Chunk;
@@ -54,9 +53,9 @@ import org.bukkit.entity.Player;
 
 import java.lang.reflect.Method;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessagesExtended;
+import art.arcane.iris.localization.BukkitCommandMessagesExtended;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
 @Director(name = "what", origin = DirectorOrigin.PLAYER, description = "Iris What?", descriptionKey = "iris.director.commandwhat.director.iris_what")
 public class CommandWhat implements DirectorExecutor {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/ObjectPasteBounds.java

@@ -1,8 +1,8 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisObjectRotation;
+import art.arcane.iris.structure.object.IrisObjectRotation;
-import art.arcane.iris.util.common.math.IrisBlockVector;
+import art.arcane.iris.generation.geometry.IrisBlockVector;
 
 import java.util.Objects;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/command/PaperCommandRegistrar.java

@@ -1,7 +1,6 @@
-package art.arcane.iris.core.commands;
+package art.arcane.iris.command;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.service.CommandSVC;
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
@@ -11,7 +10,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * Paper-only command registration. Lives outside {@code art.arcane.iris.core.service} on purpose:
+ * Paper-only command registration. Lives outside {@code art.arcane.iris.generation.runtime} on purpose:
  * that package is eagerly Class.forName-scanned by JarScanner during enable, and resolving this
  * class on plain Spigot throws NoClassDefFoundError for the Paper lifecycle types. CommandSVC
  * loads it reflectively only when the Bukkit plugin.yml command is unavailable (Paper path).

adapters/bukkit/plugin/src/main/java/art/arcane/iris/generation/runtime/IrisEngineSVC.java

@@ -1,24 +1,21 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.generation.runtime;
 
-import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.iris.core.gui.PregeneratorJob;
+import art.arcane.iris.studio.view.PregeneratorJob;
-import art.arcane.iris.core.lifecycle.WorldUnloadBoundaryRegistry;
+import art.arcane.iris.world.lifecycle.WorldUnloadBoundaryRegistry;
-import art.arcane.iris.core.loader.ResourceLoader;
+import art.arcane.iris.pack.loading.ResourceLoader;
-import art.arcane.iris.core.pregenerator.MantleHeapPressure;
+import art.arcane.iris.world.pregen.MantleHeapPressure;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
-import art.arcane.iris.engine.framework.EngineTelemetrySnapshot;
-import art.arcane.iris.engine.framework.MeteredCache;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.project.stream.utility.CachedDoubleStream2D;
+import art.arcane.iris.generation.stream.CachedDoubleStream2D;
-import art.arcane.iris.util.project.stream.utility.CachedStream2D;
+import art.arcane.iris.generation.stream.CachedStream2D;
-import art.arcane.iris.util.project.stream.utility.CachedStream3D;
+import art.arcane.iris.generation.stream.CachedStream3D;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import art.arcane.volmlib.util.format.Form;
 import org.bukkit.Bukkit;
@@ -153,7 +150,7 @@ public final class IrisEngineSVC implements IrisService {
                 metrics.get()));
     }
 
-    IrisTelemetrySnapshot telemetrySnapshot() {
+    public IrisTelemetrySnapshot telemetrySnapshot() {
         return telemetry.get();
     }
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/generation/runtime/IrisEngineStatus.java

@@ -1,19 +1,18 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.generation.runtime;
 
-import art.arcane.iris.core.loader.ResourceLoader;
+import art.arcane.iris.pack.loading.ResourceLoader;
-import art.arcane.iris.engine.framework.MeteredCache;
 import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.project.stream.utility.CachedDoubleStream2D;
+import art.arcane.iris.generation.stream.CachedDoubleStream2D;
-import art.arcane.iris.util.project.stream.utility.CachedStream2D;
+import art.arcane.iris.generation.stream.CachedStream2D;
-import art.arcane.iris.util.project.stream.utility.CachedStream3D;
+import art.arcane.iris.generation.stream.CachedStream3D;
 import art.arcane.volmlib.util.format.Form;
 
 import java.util.List;
 
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.BukkitCommandMessages;
+import art.arcane.iris.localization.BukkitCommandMessages;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
 import art.arcane.volmlib.util.localization.MessageArgument;
 final class IrisEngineStatus {
     private IrisEngineStatus() {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/generation/runtime/IrisTelemetrySnapshot.java

@@ -1,10 +1,9 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.generation.runtime;
 
-import art.arcane.iris.engine.framework.EngineTelemetrySnapshot;
 
 import java.util.List;
 
-record IrisTelemetrySnapshot(
+public record IrisTelemetrySnapshot(
         long sampledAtMs,
         List<EngineTelemetrySnapshot> worlds,
         EngineTelemetrySnapshot.Aggregate aggregate,
@@ -17,7 +16,7 @@ record IrisTelemetrySnapshot(
         CacheSnapshot caches,
         PregenSnapshot pregenerator
 ) {
-    static final IrisTelemetrySnapshot EMPTY = new IrisTelemetrySnapshot(
+    public static final IrisTelemetrySnapshot EMPTY = new IrisTelemetrySnapshot(
             0L,
             List.of(),
             EngineTelemetrySnapshot.aggregate(List.of()),
@@ -31,7 +30,7 @@ record IrisTelemetrySnapshot(
             PregenSnapshot.INACTIVE
     );
 
-    IrisTelemetrySnapshot {
+    public IrisTelemetrySnapshot {
         worlds = worlds == null ? List.of() : List.copyOf(worlds);
         aggregate = aggregate == null ? EngineTelemetrySnapshot.aggregate(worlds) : aggregate;
         maintenanceActiveTasks = Math.max(0, maintenanceActiveTasks);
@@ -48,14 +47,14 @@ record IrisTelemetrySnapshot(
         return Double.isFinite(value) ? Math.max(0D, Math.min(1D, value)) : 0D;
     }
 
-    record CacheSnapshot(
+    public record CacheSnapshot(
             CacheBucket total,
             CacheBucket resource,
             CacheBucket stream2d,
             CacheBucket stream3d,
             CacheBucket other
     ) {
-        static final CacheSnapshot EMPTY = new CacheSnapshot(
+        public static final CacheSnapshot EMPTY = new CacheSnapshot(
                 CacheBucket.EMPTY,
                 CacheBucket.EMPTY,
                 CacheBucket.EMPTY,
@@ -63,7 +62,7 @@ record IrisTelemetrySnapshot(
                 CacheBucket.EMPTY
         );
 
-        CacheSnapshot {
+        public CacheSnapshot {
             total = total == null ? CacheBucket.EMPTY : total;
             resource = resource == null ? CacheBucket.EMPTY : resource;
             stream2d = stream2d == null ? CacheBucket.EMPTY : stream2d;
@@ -72,16 +71,16 @@ record IrisTelemetrySnapshot(
         }
     }
 
-    record CacheBucket(int count, long entries, long capacity) {
+    public record CacheBucket(int count, long entries, long capacity) {
-        static final CacheBucket EMPTY = new CacheBucket(0, 0L, 0L);
+        public static final CacheBucket EMPTY = new CacheBucket(0, 0L, 0L);
 
-        CacheBucket {
+        public CacheBucket {
             count = Math.max(0, count);
             entries = Math.max(0L, entries);
             capacity = Math.max(0L, capacity);
         }
 
-        double usage() {
+        public double usage() {
             return capacity <= 0L ? 0D : Math.min(1D, entries / (double) capacity);
         }
 
@@ -93,7 +92,7 @@ record IrisTelemetrySnapshot(
         }
     }
 
-    record PregenSnapshot(
+    public record PregenSnapshot(
             boolean active,
             String worldIdentity,
             String worldName,
@@ -107,7 +106,7 @@ record IrisTelemetrySnapshot(
             long elapsedMs,
             long failed
     ) {
-        static final PregenSnapshot INACTIVE = new PregenSnapshot(
+        public static final PregenSnapshot INACTIVE = new PregenSnapshot(
                 false,
                 "",
                 "",
@@ -122,7 +121,7 @@ record IrisTelemetrySnapshot(
                 0L
         );
 
-        PregenSnapshot {
+        public PregenSnapshot {
             worldIdentity = worldIdentity == null ? "" : worldIdentity.trim();
             worldName = worldName == null ? "" : worldName.trim();
             progressPercent = Double.isFinite(progressPercent)

adapters/bukkit/plugin/src/main/java/art/arcane/iris/generation/runtime/IrisWorldPhaseLedger.java

@@ -1,4 +1,6 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.generation.runtime;
+
+import art.arcane.iris.platform.bukkit.api.IrisApiEventSVC;
 
 import art.arcane.iris.api.world.IrisWorldPhase;
 import org.bukkit.World;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisIntegrationService.java

@@ -1,9 +1,12 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.integration;
+
+import art.arcane.iris.generation.runtime.IrisEngineSVC;
+import art.arcane.iris.generation.runtime.IrisTelemetrySnapshot;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.engine.framework.EngineTelemetrySnapshot;
+import art.arcane.iris.generation.runtime.EngineTelemetrySnapshot;
 import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
 import art.arcane.volmlib.integration.IntegrationHandshakeRequest;
 import art.arcane.volmlib.integration.IntegrationHandshakeResponse;
 import art.arcane.volmlib.integration.IntegrationHeartbeat;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiExpansion.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import art.arcane.volmlib.util.bukkit.papi.PlaceholderKeyRegistry;
 import art.arcane.volmlib.util.bukkit.papi.VolmitPlaceholderExpansion;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiInstaller.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import art.arcane.volmlib.util.bukkit.papi.PlaceholderRegistration;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiListener.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import art.arcane.iris.api.pregen.IrisPregenerationEvent;
 import org.bukkit.Location;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiPosition.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import org.bukkit.World;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiPregenView.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import art.arcane.iris.api.pregen.IrisPregenProgress;
 import art.arcane.volmlib.util.bukkit.papi.PlaceholderValues;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiState.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import art.arcane.iris.api.pregen.IrisPregenPhase;
 import art.arcane.iris.api.pregen.IrisPregenProgress;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/integration/IrisPapiWorldView.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.link;
+package art.arcane.iris.integration;
 
 import art.arcane.volmlib.util.bukkit.papi.PlaceholderValues;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/pack/datapack/DatapackStructureScopeSVC.java

@@ -1,16 +1,14 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.pack.datapack;
 
-import art.arcane.iris.core.IrisStartupValidation;
+import art.arcane.iris.world.IrisStartupValidation;
-import art.arcane.iris.core.datapack.DatapackIngestService;
+import art.arcane.iris.platform.bukkit.nms.DatapackStructureScopeResult;
-import art.arcane.iris.core.datapack.DatapackStructureScopeIndex;
+import art.arcane.iris.platform.bukkit.nms.INMS;
-import art.arcane.iris.core.nms.DatapackStructureScopeResult;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.platform.generation.BukkitChunkGenerator;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
-import art.arcane.iris.engine.platform.BukkitChunkGenerator;
+import art.arcane.iris.structure.nativegen.IrisImportedStructureControl;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
-import art.arcane.iris.engine.object.IrisImportedStructureControl;
 import art.arcane.iris.spi.IrisLogging;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.event.EventHandler;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/api/IrisApiEventSVC.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.platform.bukkit.api;
 
 import art.arcane.iris.Iris;
 import art.arcane.iris.api.pregen.IrisPregenPhase;
@@ -7,13 +7,13 @@ import art.arcane.iris.api.pregen.IrisPregenerationEvent;
 import art.arcane.iris.api.terrain.IrisWorldInfo;
 import art.arcane.iris.api.world.IrisWorldEngineEvent;
 import art.arcane.iris.api.world.IrisWorldPhase;
-import art.arcane.iris.core.gui.PregeneratorJob;
+import art.arcane.iris.studio.view.PregeneratorJob;
-import art.arcane.iris.core.pregenerator.PregenApiPhase;
+import art.arcane.iris.world.pregen.PregenApiPhase;
-import art.arcane.iris.core.pregenerator.PregenApiSink;
+import art.arcane.iris.world.pregen.PregenApiSink;
-import art.arcane.iris.core.service.terrain.IrisWorldInfoFactory;
+import art.arcane.iris.platform.bukkit.terrain.IrisWorldInfoFactory;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.event.Event;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/api/IrisTerrainSVC.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.platform.bukkit.api;
 
 import art.arcane.iris.api.terrain.IrisColumnField;
 import art.arcane.iris.api.terrain.IrisColumnQuery;
@@ -8,23 +8,23 @@ import art.arcane.iris.api.terrain.IrisRiverState;
 import art.arcane.iris.api.terrain.IrisSurfaceKind;
 import art.arcane.iris.api.terrain.IrisTerrainService;
 import art.arcane.iris.api.terrain.IrisWorldInfo;
-import art.arcane.iris.core.IrisSettings;
+import art.arcane.iris.configuration.IrisSettings;
-import art.arcane.iris.core.service.terrain.IrisApiFaultGuard;
+import art.arcane.iris.platform.bukkit.terrain.IrisApiFaultGuard;
-import art.arcane.iris.core.service.terrain.IrisColumnWalk;
+import art.arcane.iris.platform.bukkit.terrain.IrisColumnWalk;
-import art.arcane.iris.core.service.terrain.IrisSampleLimits;
+import art.arcane.iris.platform.bukkit.terrain.IrisSampleLimits;
-import art.arcane.iris.core.service.terrain.IrisSurfaceClassifier;
+import art.arcane.iris.platform.bukkit.terrain.IrisSurfaceClassifier;
-import art.arcane.iris.core.service.terrain.IrisWorldInfoFactory;
+import art.arcane.iris.platform.bukkit.terrain.IrisWorldInfoFactory;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.hydrology.HydrologyColumnLayer;
+import art.arcane.iris.generation.hydrology.HydrologyColumnLayer;
-import art.arcane.iris.engine.hydrology.HydrologyColumnSample;
+import art.arcane.iris.generation.hydrology.HydrologyColumnSample;
-import art.arcane.iris.engine.object.InferredType;
+import art.arcane.iris.generation.terrain.InferredType;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.biome.IrisBiome;
-import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.generation.terrain.IrisRegion;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.generator.ChunkGenerator;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/terrain/IrisApiFaultGuard.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.service.terrain;
+package art.arcane.iris.platform.bukkit.terrain;
 
 import java.util.concurrent.atomic.AtomicLong;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/terrain/IrisColumnWalk.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.service.terrain;
+package art.arcane.iris.platform.bukkit.terrain;
 
 import art.arcane.iris.api.terrain.IrisColumnQuery;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/terrain/IrisSampleLimits.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.service.terrain;
+package art.arcane.iris.platform.bukkit.terrain;
 
 import art.arcane.iris.api.terrain.IrisColumnQuery;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/terrain/IrisSurfaceClassifier.java

@@ -1,9 +1,9 @@
-package art.arcane.iris.core.service.terrain;
+package art.arcane.iris.platform.bukkit.terrain;
 
 import art.arcane.iris.api.terrain.IrisSurfaceKind;
-import art.arcane.iris.engine.hydrology.HydrologyColumnLayer;
+import art.arcane.iris.generation.hydrology.HydrologyColumnLayer;
-import art.arcane.iris.engine.hydrology.HydrologyColumnSample;
+import art.arcane.iris.generation.hydrology.HydrologyColumnSample;
-import art.arcane.iris.engine.object.InferredType;
+import art.arcane.iris.generation.terrain.InferredType;
 
 public final class IrisSurfaceClassifier {
     private IrisSurfaceClassifier() {

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/bukkit/terrain/IrisWorldInfoFactory.java

@@ -1,10 +1,10 @@
-package art.arcane.iris.core.service.terrain;
+package art.arcane.iris.platform.bukkit.terrain;
 
 import art.arcane.iris.api.terrain.IrisWorldInfo;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisWorld;
+import art.arcane.iris.world.IrisWorld;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
 import org.bukkit.World;
 import org.bukkit.generator.ChunkGenerator;
 

adapters/bukkit/plugin/src/main/java/art/arcane/iris/platform/protocol/IrisProtocolService.java

@@ -16,23 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.service;
+package art.arcane.iris.platform.protocol;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.protocol.EngineResolver;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.core.protocol.IrisCursorRequestService;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.core.protocol.IrisProtocolServer;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
-import art.arcane.iris.core.protocol.IrisServerTransport;
-import art.arcane.iris.core.protocol.IrisSession;
-import art.arcane.iris.core.protocol.IrisSessionRegistry;
-import art.arcane.iris.core.protocol.IrisVisionRequestService;
-import art.arcane.iris.core.tools.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
 import art.arcane.iris.spi.IrisServices;
 import art.arcane.iris.spi.protocol.IrisProtocol;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/edit/BlockEditor.java

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

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/edit/BukkitBlockEditor.java

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

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/edit/EditSVC.java

@@ -16,16 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.service;
+package art.arcane.iris.studio.edit;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.edit.BlockEditor;
+import art.arcane.iris.generation.runtime.BlockEditAccess;
-import art.arcane.iris.core.edit.BukkitBlockEditor;
-import art.arcane.iris.engine.framework.BlockEditAccess;
 import art.arcane.volmlib.util.collection.KMap;
 import art.arcane.volmlib.util.math.M;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/view/BukkitGuiHost.java

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.gui;
+package art.arcane.iris.studio.view;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.events.IrisEngineHotloadEvent;
+import art.arcane.iris.world.event.IrisEngineHotloadEvent;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.world.IrisToolbelt;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.platform.PlatformChunkGenerator;
+import art.arcane.iris.platform.generation.PlatformChunkGenerator;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.event.EventHandler;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/view/BukkitVisionOverlay.java

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.gui;
+package art.arcane.iris.studio.view;
 
-import art.arcane.iris.engine.IrisComplex;
+import art.arcane.iris.generation.runtime.IrisComplex;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
-import art.arcane.iris.engine.framework.render.RenderType;
+import art.arcane.iris.studio.render.RenderType;
-import art.arcane.iris.engine.object.IrisWorld;
+import art.arcane.iris.world.IrisWorld;
 import art.arcane.iris.platform.bukkit.BukkitPlatform;
 import art.arcane.iris.platform.bukkit.BukkitWorldBinding;
 import art.arcane.iris.spi.IrisLogging;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import art.arcane.volmlib.util.format.Form;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
-import static art.arcane.iris.util.common.data.registry.Attributes.MAX_HEALTH;
+import static art.arcane.iris.platform.bukkit.registry.Attributes.MAX_HEALTH;
 
 public final class BukkitVisionOverlay implements GuiOverlay {
     private final Engine engine;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/wand/WandSVC.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.service;
+package art.arcane.iris.studio.wand;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -27,23 +27,22 @@ import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.World;
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisLanguage;
-import art.arcane.iris.core.localization.RuntimeUiMessages;
+import art.arcane.iris.localization.RuntimeUiMessages;
-import art.arcane.iris.core.edit.DustRevealer;
+import art.arcane.iris.studio.edit.DustRevealer;
-import art.arcane.iris.core.wand.WandSelection;
+import art.arcane.iris.structure.object.IrisObject;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.world.storage.matter.WorldMatter;
-import art.arcane.iris.util.project.matter.WorldMatter;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import art.arcane.volmlib.util.data.Cuboid;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
 import art.arcane.volmlib.util.math.M;
 import art.arcane.volmlib.util.matter.Matter;
-import art.arcane.iris.util.common.plugin.IrisService;
+import art.arcane.iris.platform.bukkit.plugin.IrisService;
-import art.arcane.iris.util.common.plugin.VolmitSender;
+import art.arcane.iris.platform.bukkit.plugin.VolmitSender;
-import art.arcane.iris.util.common.scheduling.J;
+import art.arcane.iris.world.task.J;
 import art.arcane.volmlib.util.scheduling.SR;
-import art.arcane.iris.util.common.scheduling.jobs.Job;
+import art.arcane.iris.world.task.jobs.Job;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -68,8 +67,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static art.arcane.iris.util.common.data.registry.Particles.CRIT_MAGIC;
+import static art.arcane.iris.platform.bukkit.registry.Particles.CRIT_MAGIC;
-import static art.arcane.iris.util.common.data.registry.Particles.REDSTONE;
+import static art.arcane.iris.platform.bukkit.registry.Particles.REDSTONE;
 
 public class WandSVC implements IrisService {
     private static final int MS_PER_TICK = Integer.parseInt(System.getProperty("iris.ms_per_tick", "30"));

adapters/bukkit/plugin/src/main/java/art/arcane/iris/studio/wand/WandSelection.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core.wand;
+package art.arcane.iris.studio.wand;
 
 import art.arcane.volmlib.util.data.Cuboid;
 import art.arcane.volmlib.util.math.M;
@@ -26,7 +26,7 @@ import org.bukkit.entity.Player;
 
 import java.awt.Color;
 
-import static art.arcane.iris.util.common.data.registry.Particles.REDSTONE;
+import static art.arcane.iris.platform.bukkit.registry.Particles.REDSTONE;
 
 public class WandSelection {
     private static final double STEP = 0.10;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/BukkitWorldReconciler.java

@@ -16,17 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core;
+package art.arcane.iris.world;
+
+import art.arcane.iris.pack.datapack.ServerConfigurator;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.lifecycle.BukkitWorldConfiguration;
+import art.arcane.iris.world.lifecycle.BukkitWorldConfiguration;
-import art.arcane.iris.core.lifecycle.LifecycleOperationCoordinator;
+import art.arcane.iris.world.lifecycle.LifecycleOperationCoordinator;
-import art.arcane.iris.core.nms.INMS;
+import art.arcane.iris.platform.bukkit.nms.INMS;
-import art.arcane.iris.core.tools.IrisToolbelt;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisDimension;
 import art.arcane.iris.platform.bukkit.BukkitEnvironment;
-import art.arcane.iris.util.common.format.C;
+import art.arcane.iris.localization.C;
-import art.arcane.iris.util.common.misc.ServerProperties;
+import art.arcane.iris.platform.bootstrap.ServerProperties;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/IrisFailClosedChunkGenerator.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core;
+package art.arcane.iris.world;
 
 import org.bukkit.HeightMap;
 import org.bukkit.Location;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/IrisStartupAdmissionListener.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core;
+package art.arcane.iris.world;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/IrisWorldGeneratorResolver.java

@@ -16,38 +16,40 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core;
+package art.arcane.iris.world;
+
+import art.arcane.iris.configuration.IrisSettings;
+import art.arcane.iris.pack.datapack.ServerConfigurator;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.lifecycle.WorldLifecycleStaging;
+import art.arcane.iris.world.lifecycle.WorldLifecycleStaging;
-import art.arcane.iris.core.compat.CompatRegistry;
+import art.arcane.iris.pack.validation.CompatRegistry;
-import art.arcane.iris.core.lifecycle.WorldReplacementSeed;
+import art.arcane.iris.world.lifecycle.WorldReplacementSeed;
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.pack.loading.IrisData;
-import art.arcane.iris.core.pack.BrokenPackException;
+import art.arcane.iris.pack.BrokenPackException;
-import art.arcane.iris.core.pack.PackDownloader;
+import art.arcane.iris.pack.PackDownloader;
-import art.arcane.iris.core.pack.PackDirectoryResolver;
+import art.arcane.iris.pack.PackDirectoryResolver;
-import art.arcane.iris.core.pack.PackValidationCache;
+import art.arcane.iris.pack.PackValidationCache;
-import art.arcane.iris.core.pack.PackValidationRegistry;
+import art.arcane.iris.pack.PackValidationRegistry;
-import art.arcane.iris.core.pack.PackValidationResult;
+import art.arcane.iris.pack.PackValidationResult;
-import art.arcane.iris.core.pack.PackValidator;
+import art.arcane.iris.pack.PackValidator;
-import art.arcane.iris.core.runtime.RuntimeInjection;
+import art.arcane.iris.world.runtime.RuntimeInjection;
-import art.arcane.iris.core.service.ExternalDataSVC;
+import art.arcane.iris.integration.ExternalDataSVC;
 import art.arcane.iris.spi.IrisLogging;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.IrisServices;
-import art.arcane.iris.engine.framework.EngineTarget;
+import art.arcane.iris.generation.runtime.EngineTarget;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimension;
-import art.arcane.iris.engine.object.IrisWorld;
+import art.arcane.iris.world.history.GenerationEpoch;
-import art.arcane.iris.engine.history.GenerationEpoch;
+import art.arcane.iris.world.history.GenerationEpochContractFactory;
-import art.arcane.iris.engine.history.GenerationEpochContractFactory;
+import art.arcane.iris.world.history.GenerationHistory;
-import art.arcane.iris.engine.history.GenerationHistory;
+import art.arcane.iris.world.history.GenerationHistoryPaths;
-import art.arcane.iris.engine.history.GenerationHistoryPaths;
+import art.arcane.iris.world.history.GenerationPackFingerprint;
-import art.arcane.iris.engine.history.GenerationPackFingerprint;
+import art.arcane.iris.world.history.GenerationRegistryContract;
-import art.arcane.iris.engine.history.GenerationRegistryContract;
+import art.arcane.iris.world.history.GenerationRegistryContractFactory;
-import art.arcane.iris.engine.history.GenerationRegistryContractFactory;
+import art.arcane.iris.platform.generation.BukkitChunkGenerator;
-import art.arcane.iris.engine.platform.BukkitChunkGenerator;
+import art.arcane.iris.platform.bukkit.plugin.VolmitPlugin;
-import art.arcane.iris.util.common.plugin.VolmitPlugin;
+import art.arcane.iris.world.task.J;
-import art.arcane.iris.util.common.scheduling.J;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import lombok.NonNull;
 import org.bukkit.Bukkit;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/PaperWorldReplacementEntryListener.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core;
+package art.arcane.iris.world;
 
 import io.papermc.paper.event.player.AsyncPlayerSpawnLocationEvent;
 import net.kyori.adventure.text.Component;

adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/PendingWorldDeleteQueue.java

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.core;
+package art.arcane.iris.world;
 
 import art.arcane.iris.Iris;
-import art.arcane.iris.core.runtime.WorldDeletionQueue;
+import art.arcane.iris.world.runtime.WorldDeletionQueue;
-import art.arcane.iris.core.runtime.TransientWorldCleanupSupport;
+import art.arcane.iris.world.runtime.TransientWorldCleanupSupport;
-import art.arcane.iris.core.tools.IrisCreator;
+import art.arcane.iris.platform.bukkit.plugin.VolmitPlugin;
-import art.arcane.iris.util.common.plugin.VolmitPlugin;
 import art.arcane.volmlib.util.bukkit.WorldIdentity;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;