Dimensional composites

.idea/workspace.xml

@@ -16,8 +16,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Enum" />
-        <option value="Interface" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -60,11 +60,11 @@
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.sources" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.volmit.iris.object" />
       <recent name="com.volmit.iris.gen.v2.generator.actuator" />
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.utility" />
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.arithmetic" />
       <recent name="com.volmit.iris.gen.v2.scaffold.stream.convert" />
-      <recent name="com.volmit.iris.gen.v2.scaffold.stream.api" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\cyberpwn\Documents\development\workspace\Iris\src\main\java\com\volmit\iris\gen\v2\scaffold\hunk" />

src/main/java/com/volmit/iris/command/CommandIris.java

@@ -2,7 +2,7 @@ package com.volmit.iris.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.v2.TestGen;
+import com.volmit.iris.v2.TestGen;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java

@@ -31,7 +31,7 @@ import com.volmit.iris.gen.scaffold.Provisioned;
 import com.volmit.iris.gen.scaffold.TerrainChunk;
 import com.volmit.iris.gen.scaffold.TerrainProvider;
 import com.volmit.iris.gen.scaffold.TerrainTarget;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.IrisBiome;

src/main/java/com/volmit/iris/noise/CNG.java

@@ -3,9 +3,9 @@ package com.volmit.iris.noise;
 import java.util.List;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
-import com.volmit.iris.gen.v2.scaffold.stream.sources.CNGStream;
+import com.volmit.iris.v2.scaffold.stream.sources.CNGStream;
-import com.volmit.iris.gen.v2.scaffold.stream.arithmetic.FittedStream;
+import com.volmit.iris.v2.scaffold.stream.arithmetic.FittedStream;
 import com.volmit.iris.util.IRare;
 import com.volmit.iris.util.IrisInterpolation;
 import com.volmit.iris.util.KList;

src/main/java/com/volmit/iris/object/IrisBiome.java

@@ -7,7 +7,7 @@ import org.bukkit.block.Biome;
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;

src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java

@@ -2,7 +2,7 @@ package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.atomics.AtomicCache;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.util.DependsOn;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;

src/main/java/com/volmit/iris/object/IrisDimension.java

@@ -50,6 +50,10 @@ public class IrisDimension extends IrisRegistrant
 	@Desc("The human readable name of this dimension")
 	private String name = "A Dimension";
 
+	@Desc("You can create mutliple dimensions on top of each other taking up less height of the same world. Such as the nether with a floor + ceiling.")
+	@ArrayType(min = 1,type = IrisDimensionIndex.class)
+	private KList<IrisDimensionIndex> dimensionalComposite = new KList<>();
+
 	@DontObfuscate
 	@Desc("Create an inverted dimension in the sky (like the nether)")
 	private IrisDimension sky = null;

src/main/java/com/volmit/iris/object/IrisDimensionIndex.java

@@ -0,0 +1,36 @@
+package com.volmit.iris.object;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.gen.atomics.AtomicCache;
+import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.util.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.bukkit.block.data.BlockData;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Desc("Represents an index for dimensions to take up vertical slots in the same world")
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class IrisDimensionIndex
+{
+	@Required
+	@DontObfuscate
+	@Desc("The weight of this dimension. If there are 2 dimensions, if the weight is the same on both, both dimensions will take up 128 blocks of height.")
+	private double weight = 1D;
+
+	@DontObfuscate
+	@Desc("If inverted is set to true, the dimension will be updide down in the world")
+	private boolean inverted = false;
+
+	@DontObfuscate
+	@Required
+	@RegistryListDimension
+	@MinNumber(1)
+	private String dimension = "";
+}

src/main/java/com/volmit/iris/object/IrisRegion.java

@@ -2,7 +2,7 @@ package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.atomics.AtomicCache;
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;

src/main/java/com/volmit/iris/object/NoiseStyle.java

@@ -1,6 +1,6 @@
 package com.volmit.iris.object;
 
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.noise.CNGFactory;
 import com.volmit.iris.noise.NoiseType;

src/main/java/com/volmit/iris/v2/DataProvider.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2;
+package com.volmit.iris.v2;
 
 import com.volmit.iris.manager.IrisDataManager;
 

src/main/java/com/volmit/iris/v2/IrisTerrainGenerator.java

@@ -1,17 +1,17 @@
-package com.volmit.iris.gen.v2;
+package com.volmit.iris.v2;
 
 import java.util.Random;
 import java.util.function.Predicate;
 
-import com.volmit.iris.gen.v2.generator.IrisComplex;
+import com.volmit.iris.v2.generator.IrisComplex;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDecorator;

src/main/java/com/volmit/iris/v2/TestGen.java

@@ -1,12 +1,10 @@
-package com.volmit.iris.gen.v2;
+package com.volmit.iris.v2;
 
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 
-import com.volmit.iris.util.J;
 import com.volmit.iris.util.KList;
-import net.minecraft.server.v1_16_R2.MinecraftServer;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -16,7 +14,7 @@ import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.Form;
 import com.volmit.iris.util.PrecisionStopwatch;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/volmit/iris/v2/compound/EngineCompound.java

@@ -0,0 +1,13 @@
+package com.volmit.iris.v2.compound;
+
+import com.volmit.iris.v2.scaffold.engine.Engine;
+import org.bukkit.World;
+
+public interface EngineCompound
+{
+    public World getWorld();
+
+    public int getSize();
+
+    public Engine getEngine(int index);
+}

src/main/java/com/volmit/iris/v2/generator/IrisComplex.java

@@ -1,15 +1,15 @@
-package com.volmit.iris.gen.v2.generator;
+package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.gen.v2.DataProvider;
+import com.volmit.iris.v2.DataProvider;
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.Engine;
 import com.volmit.iris.util.B;
 import org.bukkit.Material;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
-import com.volmit.iris.gen.v2.scaffold.stream.interpolation.Interpolated;
+import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.DecorationPart;
@@ -17,7 +17,6 @@ import com.volmit.iris.object.InferredType;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDecorator;
 import com.volmit.iris.object.IrisBiomePaletteLayer;
-import com.volmit.iris.object.IrisDimension;
 import com.volmit.iris.object.IrisGenerator;
 import com.volmit.iris.object.IrisRegion;
 import com.volmit.iris.util.KList;

src/main/java/com/volmit/iris/v2/generator/IrisEngine.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.generator;
+package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineFramework;
+import com.volmit.iris.v2.scaffold.engine.EngineFramework;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineTarget;
+import com.volmit.iris.v2.scaffold.engine.EngineTarget;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java

@@ -1,11 +1,11 @@
-package com.volmit.iris.gen.v2.generator;
+package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.gen.v2.generator.actuator.IrisBiomeActuator;
+import com.volmit.iris.v2.generator.actuator.IrisBiomeActuator;
-import com.volmit.iris.gen.v2.generator.actuator.IrisDecorantActuator;
+import com.volmit.iris.v2.generator.actuator.IrisDecorantActuator;
-import com.volmit.iris.gen.v2.generator.actuator.IrisTerrainActuator;
+import com.volmit.iris.v2.generator.actuator.IrisTerrainActuator;
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineActuator;
+import com.volmit.iris.v2.scaffold.engine.EngineActuator;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineFramework;
+import com.volmit.iris.v2.scaffold.engine.EngineFramework;
 import lombok.Getter;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;

src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java

@@ -1,10 +1,9 @@
-package com.volmit.iris.gen.v2.generator.actuator;
+package com.volmit.iris.v2.generator.actuator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineAssignedActuator;
+import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.Biome;
-import org.bukkit.block.data.BlockData;
 
 public class IrisBiomeActuator extends EngineAssignedActuator<Biome>
 {

src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.generator.actuator;
+package com.volmit.iris.v2.generator.actuator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineAssignedActuator;
+import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDecorator;
 import com.volmit.iris.util.RNG;

src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.generator.actuator;
+package com.volmit.iris.v2.generator.actuator;
 
-import com.volmit.iris.gen.v2.scaffold.engine.Engine;
+import com.volmit.iris.v2.scaffold.engine.Engine;
-import com.volmit.iris.gen.v2.scaffold.engine.EngineAssignedActuator;
+import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public class IrisTerrainActuator extends EngineAssignedActuator<BlockData>

src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold;
+package com.volmit.iris.v2.scaffold;
 
 import com.volmit.iris.util.KList;
 

src/main/java/com/volmit/iris/v2/scaffold/GenStage.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold;
+package com.volmit.iris.v2.scaffold;
 
 public enum GenStage
 {

src/main/java/com/volmit/iris/v2/scaffold/Significance.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold;
+package com.volmit.iris.v2.scaffold;
 
 import com.volmit.iris.util.KList;
 

src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java

@@ -1,8 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.data;
+package com.volmit.iris.v2.scaffold.data;
 
 import com.volmit.iris.util.KList;
 
-import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;

src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java

@@ -1,7 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.data;
+package com.volmit.iris.v2.scaffold.data;
-
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.util.Function3;
 
 import java.io.*;
 

src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.scaffold.parallax.ParallaxAccess;
+import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisDimension;
 import org.bukkit.World;

src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.generator.IrisComplex;
+import com.volmit.iris.v2.generator.IrisComplex;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.parallax.ParallaxAccess;
+import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisDimension;
 

src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.generator.IrisComplex;
+import com.volmit.iris.v2.generator.IrisComplex;
-import com.volmit.iris.gen.v2.generator.IrisEngine;
+import com.volmit.iris.v2.generator.IrisEngine;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 

src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.engine;
+package com.volmit.iris.v2.scaffold.engine;
 
-import com.volmit.iris.gen.v2.scaffold.parallax.ParallaxWorld;
+import com.volmit.iris.v2.scaffold.parallax.ParallaxWorld;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisDimension;
 import lombok.Data;

src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java

@@ -1,15 +1,14 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.v2.scaffold.hunk;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.storage.*;
+import com.volmit.iris.v2.scaffold.hunk.storage.*;
-import com.volmit.iris.gen.v2.scaffold.hunk.view.*;
+import com.volmit.iris.v2.scaffold.hunk.view.*;
 import com.volmit.iris.util.*;
 import org.bukkit.Chunk;
 import org.bukkit.block.Biome;
@@ -17,8 +16,8 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.v2.scaffold.multicore.BurstExecutor;
+import com.volmit.iris.v2.scaffold.parallel.BurstExecutor;
-import com.volmit.iris.gen.v2.scaffold.multicore.MultiBurst;
+import com.volmit.iris.v2.scaffold.parallel.MultiBurst;
 
 public interface Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.v2.scaffold.hunk;
 
 public enum HunkFace
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkView.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk;
+package com.volmit.iris.v2.scaffold.hunk;
 
 public class HunkView<T> implements Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java

@@ -1,8 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.Function3;
-import com.volmit.iris.util.Function4;
 
 import java.io.*;
 import java.util.concurrent.atomic.AtomicBoolean;

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java

@@ -1,7 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import com.volmit.iris.util.B;
-import org.bukkit.Bukkit;
 import org.bukkit.block.data.BlockData;
 
 import java.io.DataInputStream;

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.v2.scaffold.data.IOAdapter;
+import com.volmit.iris.v2.scaffold.data.IOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.ByteArrayTag;
 import com.volmit.iris.util.CustomOutputStream;
 import com.volmit.iris.util.Function3;

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -13,8 +13,6 @@ import com.volmit.iris.util.NBTInputStream;
 import com.volmit.iris.util.NBTOutputStream;
 import com.volmit.iris.util.Tag;
 
-import lombok.Data;
-
 public class HunkRegion
 {
 	private final File folder;

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
 import java.io.IOException;
 
@@ -6,7 +6,7 @@ import com.volmit.iris.util.*;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class HunkRegionSlice<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
 
-import com.volmit.iris.gen.v2.scaffold.data.DataPalette;
+import com.volmit.iris.v2.scaffold.data.DataPalette;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.Function3;
 
 import java.io.*;

src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java

@@ -1,7 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.io;
+package com.volmit.iris.v2.scaffold.hunk.io;
-
-import com.volmit.iris.util.B;
-import org.bukkit.block.data.BlockData;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bouncycastle.util.Arrays;
 
 import lombok.Data;

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import com.google.common.util.concurrent.AtomicDoubleArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
 import java.util.concurrent.atomic.AtomicLongArray;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.util.BlockPosition;
 import com.volmit.iris.util.KMap;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import lombok.Data;
 
 @Data

src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.storage;
+package com.volmit.iris.v2.scaffold.hunk.storage;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bouncycastle.util.Arrays;
 
 import lombok.Data;

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.Chunk;
 import org.bukkit.block.Biome;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.Chunk;
 import org.bukkit.block.data.BlockData;
 

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class DriftHunkView<T> implements Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class InvertedHunkView<T> implements Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class ReadOnlyHunk<T> implements Hunk<T> {
     private final Hunk<T> src;

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class RotatedXHunkView<T> implements Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class RotatedYHunkView<T> implements Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.hunk.view;
+package com.volmit.iris.v2.scaffold.hunk.view;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class RotatedZHunkView<T> implements Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import org.bukkit.block.data.BlockData;
 
 public interface ParallaxAccess

src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.PaletteHunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.PaletteHunkIOAdapter;
 import com.volmit.iris.util.CompoundTag;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java

@@ -1,18 +1,15 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
 import java.io.File;
 import java.io.IOException;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkIOAdapter;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkRegion;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkRegion;
-import com.volmit.iris.gen.v2.scaffold.hunk.io.HunkRegionSlice;
+import com.volmit.iris.v2.scaffold.hunk.io.HunkRegionSlice;
 import com.volmit.iris.util.*;
-import javassist.bytecode.ByteArray;
 import org.bukkit.block.data.BlockData;
 
-import lombok.Getter;
-
 public class ParallaxRegion extends HunkRegion
 {
 	private boolean dirtyMeta;

src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.parallax;
+package com.volmit.iris.v2.scaffold.parallax;
 
 import java.io.File;
 import java.io.IOException;
@@ -6,7 +6,7 @@ import java.io.IOException;
 import com.volmit.iris.util.*;
 import org.bukkit.block.data.BlockData;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public class ParallaxWorld implements ParallaxAccess
 {

src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.multicore;
+package com.volmit.iris.v2.scaffold.parallel;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;

src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java

@@ -1,6 +1,6 @@
-package com.volmit.iris.gen.v2.scaffold.multicore;
+package com.volmit.iris.v2.scaffold.parallel;
 
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
 
 public interface BurstedHunk<T> extends Hunk<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.multicore;
+package com.volmit.iris.v2.scaffold.parallel;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
 public abstract class BasicStream<T> extends BasicLayer implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java

@@ -1,4 +1,4 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
 public interface ProceduralLayer
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java

@@ -1,19 +1,18 @@
-package com.volmit.iris.gen.v2.scaffold.stream;
+package com.volmit.iris.v2.scaffold.stream;
 
-import java.awt.*;
 import java.util.List;
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.Significance;
+import com.volmit.iris.v2.scaffold.Significance;
-import com.volmit.iris.gen.v2.scaffold.hunk.Hunk;
+import com.volmit.iris.v2.scaffold.hunk.Hunk;
-import com.volmit.iris.gen.v2.scaffold.stream.arithmetic.*;
+import com.volmit.iris.v2.scaffold.stream.arithmetic.*;
-import com.volmit.iris.gen.v2.scaffold.stream.convert.*;
+import com.volmit.iris.v2.scaffold.stream.convert.*;
-import com.volmit.iris.gen.v2.scaffold.stream.interpolation.Interpolated;
+import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated;
-import com.volmit.iris.gen.v2.scaffold.stream.sources.FunctionStream;
+import com.volmit.iris.v2.scaffold.stream.sources.FunctionStream;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.CachedStream2D;
+import com.volmit.iris.v2.scaffold.stream.utility.CachedStream2D;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.ProfiledStream;
+import com.volmit.iris.v2.scaffold.stream.utility.ProfiledStream;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.SemaphoreStream;
+import com.volmit.iris.v2.scaffold.stream.utility.SemaphoreStream;
-import com.volmit.iris.gen.v2.scaffold.stream.utility.SynchronizedStream;
+import com.volmit.iris.v2.scaffold.stream.utility.SynchronizedStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 import com.volmit.iris.util.Function4;

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ClampedStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class CoordinateBitShiftLeftStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class CoordinateBitShiftRightStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class FittedStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class OffsetStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class RadialStream<T> extends BasicStream<T> implements ProceduralStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class RoundingDoubleStream extends BasicStream<Double>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class SlopeStream<T> extends BasicStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function2;
 import com.volmit.iris.util.Function3;
 

src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.arithmetic;
+package com.volmit.iris.v2.scaffold.stream.arithmetic;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ZoomStream<T> extends BasicStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function3;
 
 public class AwareConversionStream2D<T, V> extends BasicStream<V>

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.Function4;
 
 public class AwareConversionStream3D<T, V> extends BasicStream<V>

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java

@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicLayer;
+import com.volmit.iris.v2.scaffold.stream.BasicLayer;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.KMap;
 
 public class CachedConversionStream<T, V> extends BasicLayer implements ProceduralStream<V>

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java

@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicLayer;
+import com.volmit.iris.v2.scaffold.stream.BasicLayer;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ConversionStream<T, V> extends BasicLayer implements ProceduralStream<V>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class ForceDoubleStream extends BasicStream<Double>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class RoundingStream extends BasicStream<Integer>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java

@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
 import java.util.List;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class SelectionStream<T> extends BasicStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java

@@ -1,9 +1,9 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.ArraySignificance;
+import com.volmit.iris.v2.scaffold.ArraySignificance;
-import com.volmit.iris.gen.v2.scaffold.Significance;
+import com.volmit.iris.v2.scaffold.Significance;
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.KList;
 
 public class SignificanceStream<K extends Significance<T>, T> extends BasicStream<K>

src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.convert;
+package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class To3DStream<T> extends BasicStream<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class BiHermiteStream<T> extends BasicStream<T> implements Interpolator<T>

src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 
 public class BiStarcastStream<T> extends BasicStream<T> implements Interpolator<T>
 {

src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class BicubicStream<T> extends BasicStream<T> implements Interpolator<T>

src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java

@@ -1,7 +1,7 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
-import com.volmit.iris.gen.v2.scaffold.stream.BasicStream;
+import com.volmit.iris.v2.scaffold.stream.BasicStream;
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
 
 public class BilinearStream<T> extends BasicStream<T> implements Interpolator<T>

src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java

@@ -1,8 +1,8 @@
-package com.volmit.iris.gen.v2.scaffold.stream.interpolation;
+package com.volmit.iris.v2.scaffold.stream.interpolation;
 
 import java.util.function.Function;
 
-import com.volmit.iris.gen.v2.scaffold.stream.ProceduralStream;
+import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.util.RNG;