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

core/src/test/java/art/arcane/iris/command/DirectorAuthoringDataTest.java

@@ -1,9 +1,9 @@
-package art.arcane.iris.util.common.director;
+package art.arcane.iris.command;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.pack.PackDirectoryResolver;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.pack.PackDirectoryResolver;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.terrain.IrisDimension;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.testsupport.PlatformLeakGuard;

core/src/test/java/art/arcane/iris/command/handlers/DataVersionHandlerTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.util.common.director.handlers;
+package art.arcane.iris.command.handlers;
 
-import art.arcane.iris.core.nms.datapack.DataVersion;
+import art.arcane.iris.platform.bukkit.nms.datapack.DataVersion;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/command/handlers/GeneratorHandlerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.util.common.director.handlers;
+package art.arcane.iris.command.handlers;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/command/handlers/PrimitiveHandlerParsingTest.java

@@ -1,6 +1,14 @@
-package art.arcane.iris.util.common.director.handlers;
+package art.arcane.iris.command.handlers;
 
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
+import art.arcane.volmlib.util.director.handlers.base.BooleanHandlerBase;
+import art.arcane.volmlib.util.director.handlers.base.ByteHandlerBase;
+import art.arcane.volmlib.util.director.handlers.base.DoubleHandlerBase;
+import art.arcane.volmlib.util.director.handlers.base.FloatHandlerBase;
+import art.arcane.volmlib.util.director.handlers.base.IntegerHandlerBase;
+import art.arcane.volmlib.util.director.handlers.base.LongHandlerBase;
+import art.arcane.volmlib.util.director.handlers.base.ShortHandlerBase;
+import art.arcane.volmlib.util.director.handlers.StringHandlerBase;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -12,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 public class PrimitiveHandlerParsingTest {
     @Test
     public void integerSuffixesScaleTheParsedValue() throws DirectorParsingException {
-        IntegerHandler handler = new IntegerHandler();
+        IntegerHandlerBase handler = new IntegerHandlerBase();
 
         assertEquals(Integer.valueOf(5), handler.parse("5", false));
         assertEquals(Integer.valueOf(64), handler.parse("4c", false));
@@ -23,20 +31,20 @@ public class PrimitiveHandlerParsingTest {
 
     @Test
     public void stackedIntegerSuffixesMultiplyTogether() throws DirectorParsingException {
-        assertEquals(Integer.valueOf(2_000_000), new IntegerHandler().parse("2kk", false));
+        assertEquals(Integer.valueOf(2_000_000), new IntegerHandlerBase().parse("2kk", false));
     }
 
     @Test
     public void anUnparseableIntegerNamesTheOffendingInput() {
         DirectorParsingException failure =
-                assertThrows(DirectorParsingException.class, () -> new IntegerHandler().parse("abc", false));
+                assertThrows(DirectorParsingException.class, () -> new IntegerHandlerBase().parse("abc", false));
 
         assertTrue(failure.getMessage(), failure.getMessage().contains("abc"));
     }
 
     @Test
     public void anUnscaledLongKeepsFullPrecision() throws DirectorParsingException {
-        LongHandler handler = new LongHandler();
+        LongHandlerBase handler = new LongHandlerBase();
 
         assertEquals(Long.valueOf(9_007_199_254_740_993L), handler.parse("9007199254740993", false));
         assertEquals(Long.valueOf(1_000L), handler.parse("1k", false));
@@ -44,14 +52,14 @@ public class PrimitiveHandlerParsingTest {
 
     @Test
     public void shortAndFloatingPointHandlersShareTheSuffixTable() throws DirectorParsingException {
-        assertEquals(Short.valueOf((short) 32), new ShortHandler().parse("2c", false));
-        assertEquals(1_500F, new FloatHandler().parse("1.5k", false), 0F);
-        assertEquals(1_500D, new DoubleHandler().parse("1.5k", false), 0D);
+        assertEquals(Short.valueOf((short) 32), new ShortHandlerBase().parse("2c", false));
+        assertEquals(1_500F, new FloatHandlerBase().parse("1.5k", false), 0F);
+        assertEquals(1_500D, new DoubleHandlerBase().parse("1.5k", false), 0D);
     }
 
     @Test
     public void byteParsingHasNoSuffixTable() throws DirectorParsingException {
-        ByteHandler handler = new ByteHandler();
+        ByteHandlerBase handler = new ByteHandlerBase();
 
         assertEquals(Byte.valueOf((byte) 12), handler.parse("12", false));
         assertThrows(DirectorParsingException.class, () -> handler.parse("1k", false));
@@ -59,7 +67,7 @@ public class PrimitiveHandlerParsingTest {
 
     @Test
     public void booleanSentinelsAreCaseSensitiveAndEverythingElseFallsBackToFalse() throws DirectorParsingException {
-        BooleanHandler handler = new BooleanHandler();
+        BooleanHandlerBase handler = new BooleanHandlerBase();
 
         assertNull(handler.parse("null", false));
         assertNull(handler.parse("other", false));
@@ -71,7 +79,7 @@ public class PrimitiveHandlerParsingTest {
 
     @Test
     public void stringParsingIsVerbatim() throws DirectorParsingException {
-        StringHandler handler = new StringHandler();
+        StringHandlerBase handler = new StringHandlerBase();
 
         assertEquals("  spaced  ", handler.parse("  spaced  ", false));
         assertEquals("", handler.parse("", false));
@@ -79,16 +87,16 @@ public class PrimitiveHandlerParsingTest {
 
     @Test
     public void eachHandlerClaimsOnlyItsOwnParameterType() {
-        assertTrue(new IntegerHandler().supports(int.class));
-        assertTrue(new IntegerHandler().supports(Integer.class));
-        assertFalse(new IntegerHandler().supports(Long.class));
-        assertTrue(new LongHandler().supports(long.class));
-        assertTrue(new ShortHandler().supports(short.class));
-        assertTrue(new ByteHandler().supports(byte.class));
-        assertTrue(new FloatHandler().supports(float.class));
-        assertTrue(new DoubleHandler().supports(double.class));
-        assertTrue(new BooleanHandler().supports(boolean.class));
-        assertTrue(new StringHandler().supports(String.class));
-        assertFalse(new StringHandler().supports(Object.class));
+        assertTrue(new IntegerHandlerBase().supports(int.class));
+        assertTrue(new IntegerHandlerBase().supports(Integer.class));
+        assertFalse(new IntegerHandlerBase().supports(Long.class));
+        assertTrue(new LongHandlerBase().supports(long.class));
+        assertTrue(new ShortHandlerBase().supports(short.class));
+        assertTrue(new ByteHandlerBase().supports(byte.class));
+        assertTrue(new FloatHandlerBase().supports(float.class));
+        assertTrue(new DoubleHandlerBase().supports(double.class));
+        assertTrue(new BooleanHandlerBase().supports(boolean.class));
+        assertTrue(new StringHandlerBase().supports(String.class));
+        assertFalse(new StringHandlerBase().supports(Object.class));
     }
 }

core/src/test/java/art/arcane/iris/command/handlers/VectorHandlerParsingTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.util.common.director.handlers;
+package art.arcane.iris.command.handlers;
 
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
 import org.bukkit.Location;

core/src/test/java/art/arcane/iris/command/handlers/WorldHandlerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.util.common.director.handlers;
+package art.arcane.iris.command.handlers;
 
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
 import org.bukkit.NamespacedKey;

core/src/test/java/art/arcane/iris/command/specialhandlers/ObjectScaleHandlerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.util.common.director.specialhandlers;
+package art.arcane.iris.command.specialhandlers;
 
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/command/specialhandlers/ReachableBiomeHandlerTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.util.common.director.specialhandlers;
+package art.arcane.iris.command.specialhandlers;
 
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisBiome;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.biome.IrisBiome;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.director.exceptions.DirectorParsingException;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/command/specialhandlers/StructureHandlerTest.java

@@ -1,18 +1,18 @@
-package art.arcane.iris.util.common.director.specialhandlers;
+package art.arcane.iris.command.specialhandlers;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.IrisStructureLocator;
-import art.arcane.iris.engine.framework.StructureReachability;
-import art.arcane.iris.engine.object.IrisDimension;
-import art.arcane.iris.engine.object.IrisImportedStructureControl;
-import art.arcane.iris.engine.object.IrisNativeStructure;
-import art.arcane.iris.engine.object.IrisNativeStructureDecision;
-import art.arcane.iris.engine.object.IrisStructure;
-import art.arcane.iris.engine.object.IrisStructurePlacement;
-import art.arcane.iris.engine.object.IrisWorld;
-import art.arcane.iris.engine.object.NativeStructureGenerationStatus;
-import art.arcane.iris.engine.object.StructureDistribution;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.structure.placement.IrisStructureLocator;
+import art.arcane.iris.structure.placement.StructureReachability;
+import art.arcane.iris.generation.terrain.IrisDimension;
+import art.arcane.iris.structure.nativegen.IrisImportedStructureControl;
+import art.arcane.iris.structure.nativegen.IrisNativeStructure;
+import art.arcane.iris.structure.nativegen.IrisNativeStructureDecision;
+import art.arcane.iris.structure.placement.IrisStructure;
+import art.arcane.iris.structure.placement.IrisStructurePlacement;
+import art.arcane.iris.world.IrisWorld;
+import art.arcane.iris.structure.nativegen.NativeStructureGenerationStatus;
+import art.arcane.iris.structure.placement.StructureDistribution;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.PlatformStructureHooks;

core/src/test/java/art/arcane/iris/configuration/IrisSettingsDefaultsTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core;
+package art.arcane.iris.configuration;
 
 import com.google.gson.Gson;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/configuration/IrisSettingsRewriteFailureTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core;
+package art.arcane.iris.configuration;
 
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;

core/src/test/java/art/arcane/iris/configuration/SettingsHotloadWatchTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.core;
+package art.arcane.iris.configuration;
 
-import art.arcane.iris.core.localization.IrisLanguage;
-import art.arcane.iris.core.localization.IrisMessages;
+import art.arcane.iris.localization.IrisLanguage;
+import art.arcane.iris.localization.IrisMessages;
 import art.arcane.iris.testsupport.Await;
 import art.arcane.volmlib.util.hotload.ConfigHotloadEngine;
 import art.arcane.volmlib.util.localization.MessageArgument;

core/src/test/java/art/arcane/iris/diagnostics/LogFilterSVCTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.service;
+package art.arcane.iris.diagnostics;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Logger;

core/src/test/java/art/arcane/iris/diagnostics/splash/IrisSplashComposerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.core.splash;
+package art.arcane.iris.diagnostics.splash;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/FloatingIslandBoundarySamplerTest.java

@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.util.project.noise.CNG;
+import art.arcane.iris.world.IrisWorld;
+
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.volmlib.util.noise.CNG;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/biome/FloatingIslandSampleBottomYTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.util.project.noise.CNG;
-import art.arcane.iris.util.project.noise.NoiseGenerator;
+import art.arcane.volmlib.util.noise.CNG;
+import art.arcane.volmlib.util.noise.NoiseGenerator;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeCeilingLayerTest.java

@@ -1,4 +1,6 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
+
+import art.arcane.iris.generation.terrain.IrisDimension;
 
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.volmlib.util.collection.KList;

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeCompatChildrenTest.java

@@ -1,17 +1,20 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.compat.CompatAction;
-import art.arcane.iris.core.compat.CompatFinding;
-import art.arcane.iris.core.compat.PackCompatReport;
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.loader.ResourceLoader;
+import art.arcane.iris.generation.terrain.IrisDimensionCarvingEntry;
+import art.arcane.iris.testsupport.PackCompatFixtures;
+
+import art.arcane.iris.pack.validation.CompatAction;
+import art.arcane.iris.pack.validation.CompatFinding;
+import art.arcane.iris.pack.validation.PackCompatReport;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.pack.loading.ResourceLoader;
 import art.arcane.volmlib.util.collection.KList;
 import org.junit.Test;
 
-import static art.arcane.iris.engine.object.PackCompatFixtures.MISSING_BLOCK;
-import static art.arcane.iris.engine.object.PackCompatFixtures.biome;
-import static art.arcane.iris.engine.object.PackCompatFixtures.excludeBlock;
-import static art.arcane.iris.engine.object.PackCompatFixtures.find;
+import static art.arcane.iris.testsupport.PackCompatFixtures.MISSING_BLOCK;
+import static art.arcane.iris.testsupport.PackCompatFixtures.biome;
+import static art.arcane.iris.testsupport.PackCompatFixtures.excludeBlock;
+import static art.arcane.iris.testsupport.PackCompatFixtures.find;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeCustomCompatTest.java

@@ -1,8 +1,10 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.compat.ContentGate;
-import art.arcane.iris.core.compat.PackCompatReport;
-import art.arcane.iris.core.nms.datapack.IDataFixer;
+import art.arcane.iris.generation.terrain.IrisDimensionTypeOptions;
+
+import art.arcane.iris.pack.validation.ContentGate;
+import art.arcane.iris.pack.validation.PackCompatReport;
+import art.arcane.iris.platform.bukkit.nms.datapack.IDataFixer;
 import art.arcane.iris.spi.PlatformRegistries;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.json.JSONArray;
@@ -22,7 +24,7 @@ import static org.mockito.Mockito.when;
 public class IrisBiomeCustomCompatTest {
     private static final IDataFixer PASSTHROUGH = new IDataFixer() {
         @Override
-        public JSONObject resolve(IDataFixer.Dimension dimension, art.arcane.iris.engine.object.IrisDimensionTypeOptions options) {
+        public JSONObject resolve(IDataFixer.Dimension dimension, art.arcane.iris.generation.terrain.IrisDimensionTypeOptions options) {
             return new JSONObject();
         }
 

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeCustomSpawnTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeCustomTagInheritanceTest.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
 import art.arcane.volmlib.util.collection.KList;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeDerivativeCompatTest.java

@@ -1,4 +1,6 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
+
+import art.arcane.iris.testsupport.PackCompatFixtures;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeGeneratorSeedIsolationTest.java

@@ -1,9 +1,9 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.SeedManager;
-import art.arcane.iris.util.project.noise.CNG;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.runtime.SeedManager;
+import art.arcane.volmlib.util.noise.CNG;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeInferenceIsolationTest.java

@@ -1,6 +1,8 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.loader.IrisData;
+import art.arcane.iris.generation.terrain.InferredType;
+
+import art.arcane.iris.pack.loading.IrisData;
 import com.google.gson.Gson;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeLayerSlopeSourceTest.java

@@ -1,10 +1,13 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.IrisComplex;
+import art.arcane.iris.generation.terrain.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisSlopeClip;
+
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.IrisComplex;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.project.noise.CNG;
-import art.arcane.iris.util.project.stream.ProceduralStream;
+import art.arcane.volmlib.util.noise.CNG;
+import art.arcane.volmlib.util.stream.ProceduralStream;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeLockedLayerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.volmlib.util.collection.KList;

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomePaletteLayerGeneratorCacheTest.java

@@ -1,8 +1,10 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.util.project.noise.CNG;
+import art.arcane.iris.generation.noise.IrisGeneratorStyle;
+
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.volmlib.util.noise.CNG;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeStructureDerivativeTest.java

@@ -1,4 +1,6 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
+
+import art.arcane.iris.generation.terrain.InferredType;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/biome/IrisFloatingChildBiomesCarvingResolutionTest.java

@@ -1,8 +1,11 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.core.loader.ResourceLoader;
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.terrain.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisDimensionCarvingEntry;
+
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.pack.loading.ResourceLoader;
+import art.arcane.iris.generation.runtime.Engine;
 import art.arcane.iris.testsupport.BukkitTestServer;
 import art.arcane.volmlib.util.collection.KList;
 import org.junit.BeforeClass;

core/src/test/java/art/arcane/iris/generation/biome/IrisFloatingChildBiomesResolverTest.java

@@ -1,4 +1,7 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
+
+import art.arcane.iris.pack.value.OverrideMode;
+import art.arcane.iris.structure.object.IrisObjectPlacement;
 
 import art.arcane.volmlib.util.collection.KList;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/biome/IslandObjectPlacerAnchorFaceTest.java

@@ -1,7 +1,9 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.biome;
 
-import art.arcane.iris.engine.mantle.components.IslandObjectPlacer;
-import art.arcane.iris.engine.mantle.MantleWriter;
+import art.arcane.iris.generation.biome.FloatingIslandSample;
+
+import art.arcane.iris.generation.mantle.IslandObjectPlacer;
+import art.arcane.iris.generation.mantle.MantleWriter;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

core/src/test/java/art/arcane/iris/generation/block/IrisObjectBlockDataMergeTest.java

@@ -1,4 +1,6 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.block;
+
+import art.arcane.iris.generation.block.BlockDataMergeSupport;
 
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;

core/src/test/java/art/arcane/iris/generation/block/PlatformStateRebindTest.java

@@ -1,12 +1,12 @@
-package art.arcane.iris.util.common.data;
+package art.arcane.iris.generation.block;
 
-import art.arcane.iris.engine.mantle.EngineMantle;
+import art.arcane.iris.generation.mantle.EngineMantle;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.iris.spi.PlatformRegistries;
 import art.arcane.iris.testsupport.PlatformLeakGuard;
-import art.arcane.iris.util.project.hunk.view.ChunkDataHunkHolder;
+import art.arcane.iris.generation.chunk.ChunkDataHunkHolder;
 import org.bukkit.generator.ChunkGenerator;
 import org.junit.After;
 import org.junit.ClassRule;
@@ -30,14 +30,14 @@ public class PlatformStateRebindTest {
     public static final PlatformLeakGuard PLATFORM_GUARD = PlatformLeakGuard.clean();
 
     private static final List<String> CONVERTED = List.of(
-            "art.arcane.iris.engine.actuator.IrisDimensionStackActuator",
-            "art.arcane.iris.engine.actuator.IrisTerrainNormalActuator",
-            "art.arcane.iris.engine.modifier.IrisPerfectionModifier",
-            "art.arcane.iris.engine.modifier.IrisPostModifier",
-            "art.arcane.iris.engine.object.IrisBiomeLayerGenerator",
-            "art.arcane.iris.engine.platform.studio.generators.BiomeBuffetGenerator",
-            "art.arcane.iris.engine.mantle.EngineMantle",
-            "art.arcane.iris.util.project.hunk.view.ChunkDataHunkHolder");
+            "art.arcane.iris.generation.stage.IrisDimensionStackActuator",
+            "art.arcane.iris.generation.stage.IrisTerrainNormalActuator",
+            "art.arcane.iris.generation.stage.IrisPerfectionModifier",
+            "art.arcane.iris.generation.stage.IrisPostModifier",
+            "art.arcane.iris.generation.biome.IrisBiomeLayerGenerator",
+            "art.arcane.iris.studio.generation.BiomeBuffetGenerator",
+            "art.arcane.iris.generation.mantle.EngineMantle",
+            "art.arcane.iris.generation.chunk.ChunkDataHunkHolder");
 
     @After
     public void unbindPlatform() {

core/src/test/java/art/arcane/iris/generation/cache/AtomicCacheTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.data.cache;
+package art.arcane.iris.generation.cache;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/cache/LazyBoundedCacheTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.data.cache;
+package art.arcane.iris.generation.cache;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/concurrent/BurstExecutorSupportReentrantTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.util.common.parallel;
+package art.arcane.iris.generation.concurrent;
 
 import art.arcane.volmlib.util.parallel.BurstExecutorSupport;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/context/ChunkContextPrefillPlanTest.java

@@ -1,12 +1,12 @@
-package art.arcane.iris.util.project.context;
+package art.arcane.iris.generation.context;
 
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.hydrology.runtime.IrisHydrologyRuntime;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisRegion;
+import art.arcane.iris.generation.runtime.IrisComplex;
+import art.arcane.iris.generation.hydrology.runtime.IrisHydrologyRuntime;
+import art.arcane.iris.generation.biome.IrisBiome;
+import art.arcane.iris.generation.terrain.IrisRegion;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.testsupport.PlatformLeakGuard;
-import art.arcane.iris.util.project.stream.ProceduralStream;
+import art.arcane.volmlib.util.stream.ProceduralStream;
 import org.bukkit.block.data.BlockData;
 import org.junit.ClassRule;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/context/ChunkedDoubleDataCacheOverrideTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.util.project.context;
+package art.arcane.iris.generation.context;
 
-import art.arcane.iris.util.project.stream.ProceduralStream;
+import art.arcane.volmlib.util.stream.ProceduralStream;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

core/src/test/java/art/arcane/iris/generation/context/IrisContextIsolationTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.util.project.context;
+package art.arcane.iris.generation.context;
 
-import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.generation.runtime.Engine;
 import org.junit.Test;
 
 import java.util.concurrent.BrokenBarrierException;

core/src/test/java/art/arcane/iris/generation/decoration/DecoratorCoreTest.java

@@ -1,15 +1,12 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisBlockData;
-import art.arcane.iris.engine.object.IrisDecorationPart;
-import art.arcane.iris.engine.object.IrisDecorator;
-import art.arcane.iris.engine.object.IrisProceduralBlocks;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.biome.IrisBiome;
+import art.arcane.iris.generation.block.IrisBlockData;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.project.hunk.Hunk;
-import art.arcane.iris.util.common.data.B;
+import art.arcane.volmlib.util.hunk.Hunk;
+import art.arcane.iris.generation.block.B;
 import art.arcane.volmlib.util.math.RNG;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockSupport;

core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorCaveContextTest.java

@@ -1,21 +1,19 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.mantle.EngineMantle;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.SeedManager;
-import art.arcane.iris.engine.object.InferredType;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisDecorationPart;
-import art.arcane.iris.engine.object.IrisDecorator;
-import art.arcane.iris.engine.object.IrisDimension;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.IrisComplex;
+import art.arcane.iris.generation.mantle.EngineMantle;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.runtime.SeedManager;
+import art.arcane.iris.generation.terrain.InferredType;
+import art.arcane.iris.generation.biome.IrisBiome;
+import art.arcane.iris.generation.terrain.IrisDimension;
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.PlatformRegistries;
 import art.arcane.iris.testsupport.PlatformLeakGuard;
-import art.arcane.iris.util.project.hunk.Hunk;
+import art.arcane.volmlib.util.hunk.Hunk;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.BeforeClass;

core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorHeightTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.util.project.noise.CNG;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.volmlib.util.noise.CNG;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/decoration/IrisDepositTuningTest.java

@@ -1,9 +1,12 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.object.annotations.Desc;
+import art.arcane.iris.generation.biome.IrisBiome;
+import art.arcane.iris.generation.block.IrisBlockData;
+
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.volmlib.util.documentation.Description;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.common.data.B;
+import art.arcane.iris.generation.block.B;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import com.google.gson.Gson;
@@ -31,14 +34,14 @@ public class IrisDepositTuningTest {
                 continue;
             }
 
-            Desc typeDescription = enumType.getAnnotation(Desc.class);
+            Description typeDescription = enumType.getAnnotation(Description.class);
             assertNotNull(enumType.getSimpleName(), typeDescription);
             assertFalse(typeDescription.value().isBlank());
 
             Object[] constants = enumType.getEnumConstants();
             for (Object constant : constants) {
                 String constantName = ((Enum<?>) constant).name();
-                Desc constantDescription = enumType.getField(constantName).getAnnotation(Desc.class);
+                Description constantDescription = enumType.getField(constantName).getAnnotation(Description.class);
                 assertNotNull(enumType.getSimpleName() + "." + constantName, constantDescription);
                 assertFalse(constantDescription.value().isBlank());
             }

core/src/test/java/art/arcane/iris/generation/decoration/IrisOreGeneratorTest.java

@@ -1,7 +1,11 @@
-package art.arcane.iris.engine.object;
+package art.arcane.iris.generation.decoration;
+
+import art.arcane.iris.generation.block.IrisBlockData;
+import art.arcane.iris.generation.noise.IrisGeneratorStyle;
+import art.arcane.iris.generation.terrain.IrisMaterialPalette;
 
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.project.noise.CNG;
+import art.arcane.volmlib.util.noise.CNG;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/decoration/IrisSeaDecoratorBoundsTest.java

@@ -1,11 +1,9 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisDecorationPart;
-import art.arcane.iris.engine.object.IrisDecorator;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.biome.IrisBiome;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.project.hunk.Hunk;
+import art.arcane.volmlib.util.hunk.Hunk;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNull;

core/src/test/java/art/arcane/iris/generation/decoration/IrisShoreLineDecoratorTest.java

@@ -1,22 +1,20 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.core.loader.IrisData;
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.mantle.EngineMantle;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.SeedManager;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisDecorationPart;
-import art.arcane.iris.engine.object.IrisDecorator;
-import art.arcane.iris.engine.object.IrisDimension;
-import art.arcane.iris.engine.object.IrisSlopeClip;
+import art.arcane.iris.pack.loading.IrisData;
+import art.arcane.iris.generation.runtime.IrisComplex;
+import art.arcane.iris.generation.mantle.EngineMantle;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.runtime.SeedManager;
+import art.arcane.iris.generation.biome.IrisBiome;
+import art.arcane.iris.generation.terrain.IrisDimension;
+import art.arcane.iris.generation.terrain.IrisSlopeClip;
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.spi.PlatformRegistries;
 import art.arcane.iris.testsupport.PlatformLeakGuard;
-import art.arcane.iris.util.project.hunk.Hunk;
-import art.arcane.iris.util.project.stream.ProceduralStream;
+import art.arcane.volmlib.util.hunk.Hunk;
+import art.arcane.volmlib.util.stream.ProceduralStream;
 import org.bukkit.block.BlockSupport;
 import org.bukkit.block.data.BlockData;
 import org.junit.ClassRule;

core/src/test/java/art/arcane/iris/generation/decoration/IrisSugarCanePlacementTest.java

@@ -1,15 +1,14 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.hydrology.HydrologyColumnLayer;
-import art.arcane.iris.engine.hydrology.HydrologyColumnSample;
-import art.arcane.iris.engine.hydrology.HydrologyFeatureRef;
-import art.arcane.iris.engine.hydrology.HydrologyFeatureType;
-import art.arcane.iris.engine.mantle.EngineMantle;
-import art.arcane.iris.engine.object.IrisDecorator;
+import art.arcane.iris.generation.runtime.IrisComplex;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.hydrology.HydrologyColumnLayer;
+import art.arcane.iris.generation.hydrology.HydrologyColumnSample;
+import art.arcane.iris.generation.hydrology.HydrologyFeatureRef;
+import art.arcane.iris.generation.hydrology.HydrologyFeatureType;
+import art.arcane.iris.generation.mantle.EngineMantle;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.project.hunk.Hunk;
+import art.arcane.volmlib.util.hunk.Hunk;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/decoration/IrisSugarCaneTest.java

@@ -1,18 +1,17 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.framework.Engine;
-import art.arcane.iris.engine.framework.SeedManager;
-import art.arcane.iris.engine.hydrology.HydrologyColumnLayer;
-import art.arcane.iris.engine.hydrology.HydrologyColumnSample;
-import art.arcane.iris.engine.hydrology.HydrologyFeatureRef;
-import art.arcane.iris.engine.hydrology.HydrologyFeatureType;
-import art.arcane.iris.engine.object.IrisBiome;
-import art.arcane.iris.engine.object.IrisDecorator;
+import art.arcane.iris.generation.runtime.IrisComplex;
+import art.arcane.iris.generation.runtime.Engine;
+import art.arcane.iris.generation.runtime.SeedManager;
+import art.arcane.iris.generation.hydrology.HydrologyColumnLayer;
+import art.arcane.iris.generation.hydrology.HydrologyColumnSample;
+import art.arcane.iris.generation.hydrology.HydrologyFeatureRef;
+import art.arcane.iris.generation.hydrology.HydrologyFeatureType;
+import art.arcane.iris.generation.biome.IrisBiome;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.project.hunk.Hunk;
-import art.arcane.iris.util.project.stream.ProceduralStream;
-import art.arcane.iris.util.project.stream.interpolation.Interpolated;
+import art.arcane.volmlib.util.hunk.Hunk;
+import art.arcane.volmlib.util.stream.ProceduralStream;
+import art.arcane.volmlib.util.stream.interpolation.Interpolated;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/decoration/IrisSurfaceDecoratorSlopeTest.java

@@ -1,9 +1,8 @@
-package art.arcane.iris.engine.decorator;
+package art.arcane.iris.generation.decoration;
 
-import art.arcane.iris.engine.IrisComplex;
-import art.arcane.iris.engine.object.IrisDecorator;
-import art.arcane.iris.engine.object.IrisSlopeClip;
-import art.arcane.iris.util.project.stream.ProceduralStream;
+import art.arcane.iris.generation.runtime.IrisComplex;
+import art.arcane.iris.generation.terrain.IrisSlopeClip;
+import art.arcane.volmlib.util.stream.ProceduralStream;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;

core/src/test/java/art/arcane/iris/generation/decoration/coral/CoralGeneratorTest.java

@@ -1,12 +1,10 @@
-package art.arcane.iris.engine.object.coral;
+package art.arcane.iris.generation.decoration.coral;
 
-import art.arcane.iris.engine.object.IrisBlockData;
-import art.arcane.iris.engine.object.IrisCoral;
-import art.arcane.iris.engine.object.IrisCoralForm;
-import art.arcane.iris.engine.object.IrisMaterialPalette;
-import art.arcane.iris.engine.object.IrisObject;
+import art.arcane.iris.generation.block.IrisBlockData;
+import art.arcane.iris.generation.terrain.IrisMaterialPalette;
+import art.arcane.iris.structure.object.IrisObject;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.common.math.IrisBlockVector;
+import art.arcane.iris.generation.geometry.IrisBlockVector;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/decoration/formation/FormationBlockResolverTest.java

@@ -1,10 +1,9 @@
-package art.arcane.iris.engine.object.formation;
+package art.arcane.iris.generation.decoration.formation;
 
-import art.arcane.iris.engine.object.IrisBlockData;
-import art.arcane.iris.engine.object.IrisFormation;
-import art.arcane.iris.engine.object.IrisMaterialPalette;
+import art.arcane.iris.generation.block.IrisBlockData;
+import art.arcane.iris.generation.terrain.IrisMaterialPalette;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.common.math.Vector3i;
+import art.arcane.volmlib.util.math.Vector3i;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/decoration/formation/FormationShapeBuilderTest.java

@@ -1,7 +1,6 @@
-package art.arcane.iris.engine.object.formation;
+package art.arcane.iris.generation.decoration.formation;
 
-import art.arcane.iris.engine.object.IrisFormation;
-import art.arcane.iris.util.common.math.Vector3i;
+import art.arcane.volmlib.util.math.Vector3i;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/decoration/fungus/FungusStemBuilderTest.java

@@ -1,7 +1,6 @@
-package art.arcane.iris.engine.object.fungi;
+package art.arcane.iris.generation.decoration.fungus;
 
-import art.arcane.iris.engine.object.IrisFungus;
-import art.arcane.iris.util.common.math.Vector3i;
+import art.arcane.volmlib.util.math.Vector3i;
 import org.junit.Test;
 
 import java.util.HashMap;

core/src/test/java/art/arcane/iris/generation/decoration/tree/ProceduralTreeGeneratorTest.java

@@ -1,11 +1,5 @@
-package art.arcane.iris.engine.object.tree;
+package art.arcane.iris.generation.decoration.tree;
 
-import art.arcane.iris.engine.object.IrisProceduralTree;
-import art.arcane.iris.engine.object.IrisTreeBranchProbability;
-import art.arcane.iris.engine.object.IrisTreeBranches;
-import art.arcane.iris.engine.object.IrisTreeFunction;
-import art.arcane.iris.engine.object.IrisTreeLeafMode;
-import art.arcane.iris.engine.object.IrisTreeProfile;
 import art.arcane.iris.spi.PlatformBlockState;
 import org.junit.Test;
 
@@ -127,7 +121,7 @@ public class ProceduralTreeGeneratorTest {
         branches.setProbabilityConstant(1.0);
         branches.setLengthFunction(IrisTreeFunction.CONSTANT);
         branches.setLengthConstant(4);
-        branches.setAzimuthMode(art.arcane.iris.engine.object.IrisTreeAzimuthMode.GOLDEN_ANGLE);
+        branches.setAzimuthMode(art.arcane.iris.generation.decoration.tree.IrisTreeAzimuthMode.GOLDEN_ANGLE);
         tree.getCanopy().setBranches(branches);
 
         TreeBlockCanvas canvas = new TreeBlockCanvas();
@@ -179,7 +173,7 @@ public class ProceduralTreeGeneratorTest {
         branches.setLengthFunction(IrisTreeFunction.CONSTANT);
         branches.setLengthConstant(4);
         branches.setBranchDepth(depth);
-        branches.setSubBranches(new art.arcane.iris.engine.object.IrisTreeSubBranches());
+        branches.setSubBranches(new art.arcane.iris.generation.decoration.tree.IrisTreeSubBranches());
         tree.getCanopy().setBranches(branches);
 
         TreeBlockCanvas canvas = new TreeBlockCanvas();

core/src/test/java/art/arcane/iris/generation/decoration/tree/TreeBlockMaterialTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.framework;
+package art.arcane.iris.generation.decoration.tree;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/decoration/tree/TreeBlockResolverTest.java

@@ -1,11 +1,9 @@
-package art.arcane.iris.engine.object.tree;
+package art.arcane.iris.generation.decoration.tree;
 
-import art.arcane.iris.engine.object.IrisBlockData;
-import art.arcane.iris.engine.object.IrisMaterialPalette;
-import art.arcane.iris.engine.object.IrisProceduralTree;
-import art.arcane.iris.engine.object.IrisTreeSecondaryLeaf;
+import art.arcane.iris.generation.block.IrisBlockData;
+import art.arcane.iris.generation.terrain.IrisMaterialPalette;
 import art.arcane.iris.spi.PlatformBlockState;
-import art.arcane.iris.util.common.data.B;
+import art.arcane.iris.generation.block.B;
 import art.arcane.volmlib.util.collection.KList;
 import art.arcane.volmlib.util.math.RNG;
 import org.junit.Test;

core/src/test/java/art/arcane/iris/generation/decoration/tree/TreeDecoratorApplierTest.java

@@ -1,8 +1,5 @@
-package art.arcane.iris.engine.object.tree;
+package art.arcane.iris.generation.decoration.tree;
 
-import art.arcane.iris.engine.object.IrisProceduralTree;
-import art.arcane.iris.engine.object.IrisTreeDecorator;
-import art.arcane.iris.engine.object.IrisTreeDecoratorTarget;
 import art.arcane.volmlib.util.collection.KList;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyCaveCourseFilterTest.java

@@ -1,13 +1,13 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelPrecondition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveCandidate;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlannerSettings;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelPrecondition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveCandidate;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlannerSettings;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyCaveTerminalAlignmentTest.java

@@ -1,18 +1,18 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelPrecondition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveCandidate;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveFluidPolicy;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveGrottoShape;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveMode;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlannerSettings;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveRejection;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveSource;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelPrecondition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveCandidate;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveFluidPolicy;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveGrottoShape;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveMode;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlannerSettings;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveRejection;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveSource;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyCoastalDropReservoirTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.surface.SurfaceBounds;
+import art.arcane.iris.generation.hydrology.surface.SurfaceBounds;
 import org.junit.Test;
 
 import java.util.List;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyColumnSampleAccessorTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyCrossTileCaveAdmissionTest.java

@@ -1,13 +1,13 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelPrecondition;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveMode;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveRejection;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveSource;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelPrecondition;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveMode;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveRejection;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveSource;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyCrossTileSurfaceAdmissionTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyFootprintCompilerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyForkJoinTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyModelTest.java

@@ -1,13 +1,13 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelPrecondition;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveMode;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveRejection;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveSource;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelPrecondition;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveMode;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveRejection;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveSource;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyMouthDropReservoirTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.surface.SurfaceBounds;
+import art.arcane.iris.generation.hydrology.surface.SurfaceBounds;
 import org.junit.Test;
 
 import java.util.List;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyOceanBoundaryRefinerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyOceanReceiverTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyOutletBoundaryPolicyTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlanHashTest.java

@@ -1,8 +1,8 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
 import org.junit.Test;
 
 import java.nio.charset.StandardCharsets;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerConfinementTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerCrossTileCaveAdmissionIntegrationTest.java

@@ -1,14 +1,14 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelPrecondition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveConflictPolicy;
-import art.arcane.iris.core.IrisSettings;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelPrecondition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveConflictPolicy;
+import art.arcane.iris.configuration.IrisSettings;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
 import art.arcane.iris.spi.IrisPlatform;
 import art.arcane.iris.spi.IrisPlatforms;
 import art.arcane.iris.testsupport.PlatformLeakGuard;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerGlobalInvariantTest.java

@@ -1,13 +1,13 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelPrecondition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelPrecondition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerRoutingSamplerTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerSeaCaveTest.java

@@ -1,8 +1,8 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerSettingsTest.java

@@ -1,7 +1,5 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.object.IrisRiverBedProfile;
-import art.arcane.iris.engine.object.IrisRiverBlendStyle;
 import org.junit.Test;
 
 import java.util.List;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerSurfacePoolTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerTest.java

@@ -1,12 +1,12 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerTributaryTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyPlannerUndergroundKnobsTest.java

@@ -1,10 +1,10 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalAdaptiveBendsTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalBankSupportTest.java

@@ -1,11 +1,11 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.surface.SurfaceCourseBuilder;
-import art.arcane.iris.engine.hydrology.surface.SurfaceCourseResult;
-import art.arcane.iris.engine.hydrology.surface.SurfaceFootprint;
-import art.arcane.iris.engine.hydrology.surface.SurfaceFootprintCompiler;
-import art.arcane.iris.engine.hydrology.surface.SurfaceLayerColumn;
-import art.arcane.iris.engine.hydrology.surface.SurfaceTerminal;
+import art.arcane.iris.generation.hydrology.surface.SurfaceCourseBuilder;
+import art.arcane.iris.generation.hydrology.surface.SurfaceCourseResult;
+import art.arcane.iris.generation.hydrology.surface.SurfaceFootprint;
+import art.arcane.iris.generation.hydrology.surface.SurfaceFootprintCompiler;
+import art.arcane.iris.generation.hydrology.surface.SurfaceLayerColumn;
+import art.arcane.iris.generation.hydrology.surface.SurfaceTerminal;
 import org.junit.Test;
 
 import java.lang.reflect.Method;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalCacheTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalCandidateSelectionTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalConnectivityTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalCourseGraphTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalFallsTest.java

@@ -1,11 +1,11 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.cave.CavePosition;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxel;
-import art.arcane.iris.engine.hydrology.cave.CaveVoxelView;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCaveAction;
-import art.arcane.iris.engine.hydrology.cave.HydrologyCavePlan;
-import art.arcane.iris.engine.hydrology.surface.SurfaceBounds;
+import art.arcane.iris.generation.hydrology.cave.CavePosition;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxel;
+import art.arcane.iris.generation.hydrology.cave.CaveVoxelView;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCaveAction;
+import art.arcane.iris.generation.hydrology.cave.HydrologyCavePlan;
+import art.arcane.iris.generation.hydrology.surface.SurfaceBounds;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalFloodedMouthTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 import org.junit.Test;
 
 import java.lang.reflect.Method;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalGraphTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalHydraulicsTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 import org.junit.Test;
 
 import java.util.List;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalMeanderScaleTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.surface.SurfaceCenterline;
+import art.arcane.iris.generation.hydrology.surface.SurfaceCenterline;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalMorphologyTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalMouthRefinementTest.java

@@ -1,9 +1,9 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
-import art.arcane.iris.engine.hydrology.surface.SurfaceCourseBuilder;
-import art.arcane.iris.engine.hydrology.surface.SurfaceCourseResult;
-import art.arcane.iris.engine.hydrology.surface.SurfaceTerminal;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.surface.SurfaceCourseBuilder;
+import art.arcane.iris.generation.hydrology.surface.SurfaceCourseResult;
+import art.arcane.iris.generation.hydrology.surface.SurfaceTerminal;
 import org.junit.Test;
 
 import java.util.List;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalPlannerTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.surface.SurfaceBounds;
+import art.arcane.iris.generation.hydrology.surface.SurfaceBounds;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalSkippedWaypointTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalSourceTrialsTest.java

@@ -1,4 +1,4 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
 import org.junit.Test;
 

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalSurfacePolicyTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
 import org.junit.Test;
 
 import java.util.ArrayList;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalTerrainRefinerTest.java

@@ -1,7 +1,7 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.policy.SurfaceRiverPolicy;
-import art.arcane.iris.engine.hydrology.surface.SurfaceCenterline;
+import art.arcane.iris.generation.hydrology.policy.SurfaceRiverPolicy;
+import art.arcane.iris.generation.hydrology.surface.SurfaceCenterline;
 import org.junit.Test;
 
 import java.util.List;

core/src/test/java/art/arcane/iris/generation/hydrology/HydrologyRegionalTributariesTest.java

@@ -1,6 +1,6 @@
-package art.arcane.iris.engine.hydrology;
+package art.arcane.iris.generation.hydrology;
 
-import art.arcane.iris.engine.hydrology.surface.SurfaceFootprint;
+import art.arcane.iris.generation.hydrology.surface.SurfaceFootprint;
 import org.junit.Test;
 
 import java.util.ArrayList;