Restructure Packages (read commit description)

There are now three root packages
- Engine: Generator & JSON Scaffolding
- Core: Managers, Commands, NMS
- Util: Random utility packages

src/main/java/com/volmit/iris/Iris.java

@@ -18,19 +18,19 @@
 
 package com.volmit.iris;
 
-import com.volmit.iris.manager.*;
-import com.volmit.iris.manager.command.CommandIris;
-import com.volmit.iris.manager.command.PermissionIris;
-import com.volmit.iris.manager.command.world.CommandLocate;
-import com.volmit.iris.manager.link.BKLink;
-import com.volmit.iris.manager.link.CitizensLink;
-import com.volmit.iris.manager.link.MultiverseCoreLink;
-import com.volmit.iris.manager.link.MythicMobsLink;
-import com.volmit.iris.nms.INMS;
-import com.volmit.iris.object.IrisCompat;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.EngineCompositeGenerator;
+import com.volmit.iris.core.*;
+import com.volmit.iris.core.command.CommandIris;
+import com.volmit.iris.core.command.PermissionIris;
+import com.volmit.iris.core.command.world.CommandLocate;
+import com.volmit.iris.core.link.BKLink;
+import com.volmit.iris.core.link.CitizensLink;
+import com.volmit.iris.core.link.MultiverseCoreLink;
+import com.volmit.iris.core.link.MythicMobsLink;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.IrisCompat;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.EngineCompositeGenerator;
 import com.volmit.iris.util.*;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;

src/main/java/com/volmit/iris/core/ConversionManager.java

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.*;
-import com.volmit.iris.pregen.DirectWorldWriter;
-import com.volmit.iris.scaffold.data.nbt.io.NBTUtil;
-import com.volmit.iris.scaffold.data.nbt.io.NamedTag;
-import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag;
-import com.volmit.iris.scaffold.data.nbt.tag.IntTag;
-import com.volmit.iris.scaffold.data.nbt.tag.ListTag;
+import com.volmit.iris.engine.object.*;
+import com.volmit.iris.engine.data.DirectWorldWriter;
+import com.volmit.iris.engine.data.nbt.io.NBTUtil;
+import com.volmit.iris.engine.data.nbt.io.NamedTag;
+import com.volmit.iris.engine.data.nbt.tag.CompoundTag;
+import com.volmit.iris.engine.data.nbt.tag.IntTag;
+import com.volmit.iris.engine.data.nbt.tag.ListTag;
 import com.volmit.iris.util.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

src/main/java/com/volmit/iris/core/EditManager.java

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.edit.BlockEditor;
-import com.volmit.iris.manager.edit.BukkitBlockEditor;
-import com.volmit.iris.manager.edit.WEBlockEditor;
+import com.volmit.iris.core.edit.BlockEditor;
+import com.volmit.iris.core.edit.BukkitBlockEditor;
+import com.volmit.iris.core.edit.WEBlockEditor;
 import com.volmit.iris.util.KMap;
 import com.volmit.iris.util.M;
 import io.papermc.lib.PaperLib;

src/main/java/com/volmit/iris/core/IrisBoardManager.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

src/main/java/com/volmit/iris/core/IrisDataManager.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.*;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.ObjectResourceLoader;
 import com.volmit.iris.util.RNG;
 import com.volmit.iris.util.ResourceLoader;

src/main/java/com/volmit/iris/core/IrisProject.java

@@ -16,18 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.report.Report;
-import com.volmit.iris.manager.report.ReportType;
-import com.volmit.iris.nms.INMS;
-import com.volmit.iris.object.*;
-import com.volmit.iris.scaffold.IrisWorldCreator;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.core.report.Report;
+import com.volmit.iris.core.report.ReportType;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.*;
+import com.volmit.iris.engine.IrisWorldCreator;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import lombok.Data;
 import net.md_5.bungee.api.ChatMessageType;

src/main/java/com/volmit/iris/core/IrisSettings.java

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris;
+package com.volmit.iris.core;
 
 import com.google.gson.Gson;
+import com.volmit.iris.Iris;
 import com.volmit.iris.util.*;
 import lombok.Data;
 

src/main/java/com/volmit/iris/core/ProjectManager.java

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.scaffold.cache.AtomicCache;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.util.*;
 import lombok.Data;
 import org.zeroturnaround.zip.ZipUtil;

src/main/java/com/volmit/iris/core/SchemaBuilder.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.*;

src/main/java/com/volmit/iris/core/WandManager.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager;
+package com.volmit.iris.core;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.manager.edit.DustRevealer;
-import com.volmit.iris.object.IrisObject;
+import com.volmit.iris.core.edit.DustRevealer;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.*;
 import org.bukkit.*;
 import org.bukkit.block.Block;

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

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.manager.command.jigsaw.CommandIrisJigsaw;
-import com.volmit.iris.manager.command.object.CommandIrisObject;
-import com.volmit.iris.manager.command.studio.CommandIrisStudio;
-import com.volmit.iris.manager.command.what.CommandIrisWhat;
-import com.volmit.iris.manager.command.world.*;
+import com.volmit.iris.core.command.jigsaw.CommandIrisJigsaw;
+import com.volmit.iris.core.command.object.CommandIrisObject;
+import com.volmit.iris.core.command.studio.CommandIrisStudio;
+import com.volmit.iris.core.command.what.CommandIrisWhat;
+import com.volmit.iris.core.command.world.*;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.*;

src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/CommandIrisReload.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.*;

src/main/java/com/volmit/iris/core/command/PermissionIris.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.util.MortarPermission;
 import com.volmit.iris.util.Permission;

src/main/java/com/volmit/iris/core/command/PermissionIrisStudio.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command;
+package com.volmit.iris.core.command;
 
 import com.volmit.iris.util.MortarPermission;
 

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.jigsaw;
+package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.jigsaw;
+package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.edit.JigsawEditor;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.object.IrisJigsawPiece;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.jigsaw;
+package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.edit.JigsawEditor;
+import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.jigsaw;
+package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.edit.JigsawEditor;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.object.IrisObject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.jigsaw;
+package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.object.IrisJigsawStructure;
 import com.volmit.iris.object.IrisPosition;
-import com.volmit.iris.scaffold.jigsaw.PlannedStructure;
+import com.volmit.iris.engine.jigsaw.PlannedStructure;
 import com.volmit.iris.util.*;
 
 public class CommandIrisJigsawPlace extends MortarCommand {

src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.jigsaw;
+package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.edit.JigsawEditor;
+import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
 import org.bukkit.Sound;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
 import org.bukkit.Sound;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.ProjectManager;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.ProjectManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.object.IrisObject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.object.IrisObject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
 import org.bukkit.Sound;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.Cuboid;
 import com.volmit.iris.util.Cuboid.CuboidDirection;
 import com.volmit.iris.util.KList;

src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.object;
+package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.WandManager;
+import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.Cuboid;
 import com.volmit.iris.util.Cuboid.CuboidDirection;
 import com.volmit.iris.util.KList;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.gui.NoiseExplorer;
+import com.volmit.iris.gui.NoiseExplorer;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.gui.NoiseExplorer;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.gui.NoiseExplorer;
 import com.volmit.iris.object.IrisGenerator;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java

@@ -16,15 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisObject;
 import com.volmit.iris.object.IrisRegion;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
 import org.bukkit.World;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.scaffold.IrisWorlds;
+import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
 import com.volmit.iris.object.InventorySlotType;
 import com.volmit.iris.object.IrisLootTable;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java

@@ -16,27 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.generator.IrisComplex;
-import com.volmit.iris.generator.IrisEngine;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.gui.IrisVision;
-import com.volmit.iris.map.MapVision;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.IrisAccess;
-import com.volmit.iris.util.FakeEngine;
-import com.volmit.iris.util.FakeWorld;
+import com.volmit.iris.gui.IrisVision;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
-import org.bukkit.World;
-
-import java.io.File;
 
 public class CommandIrisStudioMap extends MortarCommand
 {

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.generator.noise.CNG;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.IrisProject;
+import com.volmit.iris.engine.noise.CNG;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.IrisProject;
 import com.volmit.iris.object.*;
 import com.volmit.iris.util.*;
 

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
 import com.volmit.iris.object.IrisEntity;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;

src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.studio;
+package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisProject;
+import com.volmit.iris.core.IrisProject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.what;
+package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.Command;

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.what;
+package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.nms.INMS;
 import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.what;
+package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.*;

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.what;
+package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.C;

src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.what;
+package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisObject;
 import com.volmit.iris.object.IrisObjectPlacement;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import io.papermc.lib.PaperLib;
 import org.bukkit.*;

src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.world;
+package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.manager.link.MultiverseCoreLink;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.link.MultiverseCoreLink;
 import com.volmit.iris.nms.INMS;
 import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.pregen.Pregenerator;
-import com.volmit.iris.scaffold.IrisWorldCreator;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.gui.Pregenerator;
+import com.volmit.iris.engine.IrisWorldCreator;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.world;
+package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 
 import java.util.concurrent.atomic.AtomicInteger;

src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.world;
+package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.pregen.Pregenerator;
+import com.volmit.iris.gui.Pregenerator;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.world;
+package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.KList;

src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.world;
+package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.util.*;

src/main/java/com/volmit/iris/core/command/world/CommandLocate.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.command.world;
+package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.scaffold.IrisWorlds;
+import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;

src/main/java/com/volmit/iris/core/edit/BlockEditor.java

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

src/main/java/com/volmit/iris/core/edit/BlockSignal.java

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.edit;
+package com.volmit.iris.core.edit;
 
-import com.volmit.iris.scaffold.parallel.MultiBurst;
+import com.volmit.iris.engine.parallel.MultiBurst;
 import com.volmit.iris.util.J;
 import com.volmit.iris.util.SR;
 import org.bukkit.Location;

src/main/java/com/volmit/iris/core/edit/BukkitBlockEditor.java

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

src/main/java/com/volmit/iris/core/edit/DustRevealer.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.edit;
+package com.volmit.iris.core.edit;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
-import com.volmit.iris.scaffold.parallax.ParallaxAccess;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.parallax.ParallaxAccess;
 import com.volmit.iris.util.*;
 import lombok.Data;
 import org.bukkit.World;

src/main/java/com/volmit/iris/core/edit/JigsawEditor.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.edit;
+package com.volmit.iris.core.edit;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/core/edit/WEBlockEditor.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.edit;
+package com.volmit.iris.core.edit;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;

src/main/java/com/volmit/iris/core/gui/IrisRenderer.java

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.gui;
+package com.volmit.iris.gui;
 
-import com.volmit.iris.map.RenderType;
-import com.volmit.iris.scaffold.engine.Engine;
+import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.IrisInterpolation;
 import org.bukkit.Material;
 

src/main/java/com/volmit/iris/core/gui/IrisVision.java

@@ -16,25 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.gui;
+package com.volmit.iris.gui;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.IrisComplex;
-import com.volmit.iris.generator.IrisEngine;
-import com.volmit.iris.map.RenderType;
+import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisRegion;
-import com.volmit.iris.object.IrisRegistrant;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.IrisAccess;
-import com.volmit.iris.scaffold.parallel.MultiBurst;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Zombie;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;

src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.gui;
+package com.volmit.iris.gui;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.noise.CNG;
+import com.volmit.iris.engine.noise.CNG;
 import com.volmit.iris.object.NoiseStyle;
 import com.volmit.iris.util.*;
 

src/main/java/com/volmit/iris/core/gui/Pregenerator.java

@@ -16,20 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.pregen;
+package com.volmit.iris.gui;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.scaffold.engine.IrisAccess;
-import com.volmit.iris.scaffold.parallel.BurstExecutor;
-import com.volmit.iris.scaffold.parallel.MultiBurst;
+import com.volmit.iris.engine.IrisWorlds;
+import com.volmit.iris.engine.data.DirectWorldWriter;
+import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.parallel.BurstExecutor;
+import com.volmit.iris.engine.parallel.MultiBurst;
 import com.volmit.iris.util.*;
 import io.papermc.lib.PaperLib;
 import lombok.Data;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
-import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.event.Listener;
 
@@ -45,8 +45,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Comparator;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;

src/main/java/com/volmit/iris/core/gui/RenderType.java

@@ -0,0 +1,23 @@
+/*
+ * Iris is a World Generator for Minecraft Bukkit Servers
+ * Copyright (c) 2021 Arcane Arts (Volmit Software)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.volmit.iris.gui;
+
+public enum RenderType {
+    BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, LAYER_LOAD
+}

src/main/java/com/volmit/iris/core/gui/Renderer.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.gui;
+package com.volmit.iris.gui;
 
 import java.awt.*;
 

src/main/java/com/volmit/iris/core/gui/TileRender.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.gui;
+package com.volmit.iris.gui;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/volmit/iris/core/link/BKLink.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.link;
+package com.volmit.iris.core.link;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

src/main/java/com/volmit/iris/core/link/CitizensLink.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.link;
+package com.volmit.iris.core.link;
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;

src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.link;
+package com.volmit.iris.core.link;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.object.IrisDimension;

src/main/java/com/volmit/iris/core/link/MythicMobsLink.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.link;
+package com.volmit.iris.core.link;
 
 import com.volmit.iris.util.KList;
 import io.lumine.xikage.mythicmobs.MythicMobs;

src/main/java/com/volmit/iris/core/report/Report.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.report;
+package com.volmit.iris.core.report;
 
 import lombok.Builder;
 

src/main/java/com/volmit/iris/core/report/ReportType.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.manager.report;
+package com.volmit.iris.core.report;
 
 public enum ReportType {
     ERROR,

src/main/java/com/volmit/iris/engine/IrisComplex.java

@@ -16,20 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
 import com.google.common.util.concurrent.AtomicDouble;
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.generator.actuator.IrisTerrainActuator;
-import com.volmit.iris.generator.modifier.IrisCaveModifier;
-import com.volmit.iris.generator.noise.CNG;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.*;
-import com.volmit.iris.scaffold.data.DataProvider;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.stream.ProceduralStream;
-import com.volmit.iris.scaffold.stream.interpolation.Interpolated;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.actuator.IrisTerrainActuator;
+import com.volmit.iris.engine.modifier.IrisCaveModifier;
+import com.volmit.iris.engine.noise.CNG;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.*;
+import com.volmit.iris.engine.data.DataProvider;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.stream.ProceduralStream;
+import com.volmit.iris.engine.stream.interpolation.Interpolated;
 import com.volmit.iris.util.CaveResult;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.M;

src/main/java/com/volmit/iris/engine/IrisEngine.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.*;
-import com.volmit.iris.scaffold.engine.*;
-import com.volmit.iris.scaffold.hunk.Hunk;
+import com.volmit.iris.engine.object.*;
+import com.volmit.iris.engine.framework.*;
+import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.util.J;
 import com.volmit.iris.util.PrecisionStopwatch;
 import com.volmit.iris.util.RNG;

src/main/java/com/volmit/iris/engine/IrisEngineCompound.java

@@ -16,19 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.object.IrisDimensionIndex;
-import com.volmit.iris.object.IrisPosition;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineCompound;
-import com.volmit.iris.scaffold.engine.EngineData;
-import com.volmit.iris.scaffold.engine.EngineTarget;
-import com.volmit.iris.scaffold.hunk.Hunk;
-import com.volmit.iris.scaffold.parallel.MultiBurst;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimensionIndex;
+import com.volmit.iris.engine.object.IrisPosition;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineCompound;
+import com.volmit.iris.engine.framework.EngineData;
+import com.volmit.iris.engine.framework.EngineTarget;
+import com.volmit.iris.engine.hunk.Hunk;
+import com.volmit.iris.engine.parallel.MultiBurst;
 import com.volmit.iris.util.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/volmit/iris/engine/IrisEngineEffects.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineAssignedComponent;
-import com.volmit.iris.scaffold.engine.EngineEffects;
-import com.volmit.iris.scaffold.engine.EnginePlayer;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineAssignedComponent;
+import com.volmit.iris.engine.framework.EngineEffects;
+import com.volmit.iris.engine.framework.EnginePlayer;
 import com.volmit.iris.util.KMap;
 import com.volmit.iris.util.M;
 import com.volmit.iris.util.PrecisionStopwatch;

src/main/java/com/volmit/iris/engine/IrisEngineFramework.java

@@ -16,18 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.generator.actuator.IrisBiomeActuator;
-import com.volmit.iris.generator.actuator.IrisDecorantActuator;
-import com.volmit.iris.generator.actuator.IrisTerrainActuator;
-import com.volmit.iris.generator.modifier.IrisCaveModifier;
-import com.volmit.iris.generator.modifier.IrisDepositModifier;
-import com.volmit.iris.generator.modifier.IrisPostModifier;
-import com.volmit.iris.generator.modifier.IrisRavineModifier;
-import com.volmit.iris.scaffold.engine.*;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.actuator.IrisBiomeActuator;
+import com.volmit.iris.engine.actuator.IrisDecorantActuator;
+import com.volmit.iris.engine.actuator.IrisTerrainActuator;
+import com.volmit.iris.engine.modifier.IrisCaveModifier;
+import com.volmit.iris.engine.modifier.IrisDepositModifier;
+import com.volmit.iris.engine.modifier.IrisPostModifier;
+import com.volmit.iris.engine.modifier.IrisRavineModifier;
+import com.volmit.iris.engine.framework.*;
 import com.volmit.iris.util.ChronoLatch;
 import lombok.Getter;
 import org.bukkit.block.Biome;

src/main/java/com/volmit/iris/engine/IrisEngineParallax.java

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineParallaxManager;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineParallaxManager;
 import lombok.Getter;
 
 public class IrisEngineParallax implements EngineParallaxManager {

src/main/java/com/volmit/iris/engine/IrisWorldCreator.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.scaffold;
+package com.volmit.iris.engine;
 
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.scaffold.engine.EngineCompositeGenerator;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.framework.EngineCompositeGenerator;
 import com.volmit.iris.util.FakeWorld;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;

src/main/java/com/volmit/iris/engine/IrisWorldManager.java

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator;
+package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.object.*;
-import com.volmit.iris.scaffold.cache.Cache;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineAssignedWorldManager;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.object.*;
+import com.volmit.iris.engine.cache.Cache;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineAssignedWorldManager;
 import com.volmit.iris.util.J;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.RNG;

src/main/java/com/volmit/iris/engine/IrisWorlds.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.scaffold;
+package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.scaffold.engine.IrisAccess;
-import com.volmit.iris.scaffold.engine.IrisAccessProvider;
+import com.volmit.iris.engine.framework.IrisAccess;
+import com.volmit.iris.engine.framework.IrisAccessProvider;
 import com.volmit.iris.util.KMap;
 import com.volmit.iris.util.MortarSender;
 import org.bukkit.Bukkit;

src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java

@@ -22,12 +22,10 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.nms.INMS;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisBiomeCustom;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.scaffold.hunk.Hunk;
-import com.volmit.iris.scaffold.hunk.view.BiomeGridHunkView;
-import com.volmit.iris.scaffold.parallel.BurstExecutor;
-import com.volmit.iris.scaffold.parallel.MultiBurst;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineAssignedActuator;
+import com.volmit.iris.engine.hunk.Hunk;
+import com.volmit.iris.engine.hunk.view.BiomeGridHunkView;
 import com.volmit.iris.util.PrecisionStopwatch;
 import com.volmit.iris.util.RNG;
 import com.volmit.iris.util.TerrainChunk;

src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java

@@ -20,10 +20,10 @@ package com.volmit.iris.generator.actuator;
 
 import com.volmit.iris.generator.decorator.*;
 import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.scaffold.engine.EngineDecorator;
-import com.volmit.iris.scaffold.hunk.Hunk;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineAssignedActuator;
+import com.volmit.iris.engine.framework.EngineDecorator;
+import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.util.PrecisionStopwatch;
 import com.volmit.iris.util.RNG;
 import lombok.Getter;

src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java

@@ -19,9 +19,9 @@
 package com.volmit.iris.generator.actuator;
 
 import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.scaffold.engine.Engine;
-import com.volmit.iris.scaffold.engine.EngineAssignedActuator;
-import com.volmit.iris.scaffold.hunk.Hunk;
+import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.engine.framework.EngineAssignedActuator;
+import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.PrecisionStopwatch;
 import com.volmit.iris.util.RNG;