From 39b539aaedf44123e377deee39bbd14c0aa6553c Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Thu, 29 Oct 2020 06:35:16 -0400
Subject: [PATCH] Reorder scaffolds

---
 .../com/volmit/iris/gen/ContextualTerrainProvider.java |  2 +-
 src/main/java/com/volmit/iris/object/IrisBiome.java    |  2 +-
 .../com/volmit/iris/object/IrisBiomeGeneratorLink.java |  2 +-
 src/main/java/com/volmit/iris/object/IrisRegion.java   |  2 +-
 .../java/com/volmit/iris/v2/generator/IrisComplex.java |  2 +-
 .../v2/{ => generator}/compound/EngineCompound.java    |  2 +-
 .../java/com/volmit/iris/v2/scaffold/GenStage.java     | 10 ----------
 .../iris/v2/{ => scaffold/data}/DataProvider.java      |  2 +-
 .../v2/scaffold/{ => stream}/ArraySignificance.java    |  2 +-
 .../iris/v2/scaffold/stream/ProceduralStream.java      |  1 -
 .../iris/v2/scaffold/{ => stream}/Significance.java    |  2 +-
 .../v2/scaffold/stream/convert/SignificanceStream.java |  4 ++--
 12 files changed, 11 insertions(+), 22 deletions(-)
 rename src/main/java/com/volmit/iris/v2/{ => generator}/compound/EngineCompound.java (81%)
 delete mode 100644 src/main/java/com/volmit/iris/v2/scaffold/GenStage.java
 rename src/main/java/com/volmit/iris/v2/{ => scaffold/data}/DataProvider.java (73%)
 rename src/main/java/com/volmit/iris/v2/scaffold/{ => stream}/ArraySignificance.java (95%)
 rename src/main/java/com/volmit/iris/v2/scaffold/{ => stream}/Significance.java (80%)

diff --git a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
index 5530eb7aa..b84a38705 100644
--- a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
+++ b/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.v2.DataProvider;
+import com.volmit.iris.v2.scaffold.data.DataProvider;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.IrisBiome;
diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java
index 962180c1a..4dae26e95 100644
--- a/src/main/java/com/volmit/iris/object/IrisBiome.java
+++ b/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.v2.DataProvider;
+import com.volmit.iris.v2.scaffold.data.DataProvider;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
index ec74b7f71..3cdc07893 100644
--- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
+++ b/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.v2.DataProvider;
+import com.volmit.iris.v2.scaffold.data.DataProvider;
 import com.volmit.iris.util.DependsOn;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java
index ffcb8e8ef..51df78e9f 100644
--- a/src/main/java/com/volmit/iris/object/IrisRegion.java
+++ b/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.v2.DataProvider;
+import com.volmit.iris.v2.scaffold.data.DataProvider;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java b/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java
index 4271503ad..8b6516685 100644
--- a/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java
+++ b/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.v2.generator;
 
-import com.volmit.iris.v2.DataProvider;
+import com.volmit.iris.v2.scaffold.data.DataProvider;
 import com.volmit.iris.v2.scaffold.engine.Engine;
 import com.volmit.iris.util.B;
 import org.bukkit.Material;
diff --git a/src/main/java/com/volmit/iris/v2/compound/EngineCompound.java b/src/main/java/com/volmit/iris/v2/generator/compound/EngineCompound.java
similarity index 81%
rename from src/main/java/com/volmit/iris/v2/compound/EngineCompound.java
rename to src/main/java/com/volmit/iris/v2/generator/compound/EngineCompound.java
index 8aa70f07b..7c695aa7b 100644
--- a/src/main/java/com/volmit/iris/v2/compound/EngineCompound.java
+++ b/src/main/java/com/volmit/iris/v2/generator/compound/EngineCompound.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.v2.compound;
+package com.volmit.iris.v2.generator.compound;
 
 import com.volmit.iris.v2.scaffold.engine.Engine;
 import org.bukkit.World;
diff --git a/src/main/java/com/volmit/iris/v2/scaffold/GenStage.java b/src/main/java/com/volmit/iris/v2/scaffold/GenStage.java
deleted file mode 100644
index 306ada2f5..000000000
--- a/src/main/java/com/volmit/iris/v2/scaffold/GenStage.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.volmit.iris.v2.scaffold;
-
-public enum GenStage
-{
-	NOISE,
-	CARVING,
-	TERRAIN,
-	DECORATION,
-	PARALLAX,
-}
diff --git a/src/main/java/com/volmit/iris/v2/DataProvider.java b/src/main/java/com/volmit/iris/v2/scaffold/data/DataProvider.java
similarity index 73%
rename from src/main/java/com/volmit/iris/v2/DataProvider.java
rename to src/main/java/com/volmit/iris/v2/scaffold/data/DataProvider.java
index 224681f96..149244dd3 100644
--- a/src/main/java/com/volmit/iris/v2/DataProvider.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/data/DataProvider.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.v2;
+package com.volmit.iris.v2.scaffold.data;
 
 import com.volmit.iris.manager.IrisDataManager;
 
diff --git a/src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/ArraySignificance.java
similarity index 95%
rename from src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/ArraySignificance.java
index 53375510a..816331c4b 100644
--- a/src/main/java/com/volmit/iris/v2/scaffold/ArraySignificance.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/ArraySignificance.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.v2.scaffold;
+package com.volmit.iris.v2.scaffold.stream;
 
 import com.volmit.iris.util.KList;
 
diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java
index 919475260..9438f37a9 100644
--- a/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java
@@ -3,7 +3,6 @@ package com.volmit.iris.v2.scaffold.stream;
 import java.util.List;
 import java.util.function.Function;
 
-import com.volmit.iris.v2.scaffold.Significance;
 import com.volmit.iris.v2.scaffold.hunk.Hunk;
 import com.volmit.iris.v2.scaffold.stream.arithmetic.*;
 import com.volmit.iris.v2.scaffold.stream.convert.*;
diff --git a/src/main/java/com/volmit/iris/v2/scaffold/Significance.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/Significance.java
similarity index 80%
rename from src/main/java/com/volmit/iris/v2/scaffold/Significance.java
rename to src/main/java/com/volmit/iris/v2/scaffold/stream/Significance.java
index 3e4d256ad..a754145da 100644
--- a/src/main/java/com/volmit/iris/v2/scaffold/Significance.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/Significance.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.v2.scaffold;
+package com.volmit.iris.v2.scaffold.stream;
 
 import com.volmit.iris.util.KList;
 
diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java
index e6a9467d1..7387f301f 100644
--- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java
+++ b/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java
@@ -1,7 +1,7 @@
 package com.volmit.iris.v2.scaffold.stream.convert;
 
-import com.volmit.iris.v2.scaffold.ArraySignificance;
-import com.volmit.iris.v2.scaffold.Significance;
+import com.volmit.iris.v2.scaffold.stream.ArraySignificance;
+import com.volmit.iris.v2.scaffold.stream.Significance;
 import com.volmit.iris.v2.scaffold.stream.BasicStream;
 import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
 import com.volmit.iris.util.KList;