New pack api

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

@@ -27,7 +27,7 @@ import com.volmit.iris.core.link.MultiverseCoreLink;
 import com.volmit.iris.core.link.MythicMobsLink;
 import com.volmit.iris.core.link.OraxenLink;
 import com.volmit.iris.core.nms.INMS;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomeCustom;

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

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.jigsaw;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.edit.JigsawEditor;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;

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

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.jigsaw;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.edit.JigsawEditor;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.jigsaw.PlannedStructure;
 import com.volmit.iris.engine.object.basic.IrisPosition;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.service.WandSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.tile.TileData;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.plugin.MortarCommand;

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

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.studio;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.gui.NoiseExplorerGUI;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.noise.IrisGenerator;

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

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.basic.IrisPosition;

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

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.studio;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.IrisProject;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.entity.IrisEntity;

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

@@ -21,7 +21,7 @@ package com.volmit.iris.core.command.studio;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.IrisProject;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.util.collection.KList;

src/main/java/com/volmit/iris/core/decrees/DecObject.java

@@ -1,7 +1,7 @@
 package com.volmit.iris.core.decrees;
 
 import com.volmit.iris.core.command.object.CommandIrisObjectUndo;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.WandSVC;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.objects.IrisObject;

src/main/java/com/volmit/iris/core/decrees/DecStudio.java

@@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.gui.NoiseExplorerGUI;
 import com.volmit.iris.core.gui.VisionGUI;
 import com.volmit.iris.core.project.IrisProject;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.ConversionSVC;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;

src/main/java/com/volmit/iris/core/loader/IrisData.java

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

src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java

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

src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java

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

src/main/java/com/volmit/iris/core/loader/ResourceLoader.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.core.project.loader;
+package com.volmit.iris.core.loader;
 
 import com.google.common.util.concurrent.AtomicDouble;
 import com.google.gson.Gson;

src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java

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

src/main/java/com/volmit/iris/core/pack/IrisPack.java

@@ -0,0 +1,285 @@
+/*
+ * 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.core.pack;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.core.loader.IrisData;
+import com.volmit.iris.core.loader.ResourceLoader;
+import com.volmit.iris.core.service.StudioSVC;
+import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.exceptions.IrisException;
+import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.io.IO;
+import com.volmit.iris.util.json.JSONArray;
+import com.volmit.iris.util.json.JSONObject;
+import com.volmit.iris.util.plugin.VolmitSender;
+import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import lombok.Data;
+import org.bukkit.World;
+import org.zeroturnaround.zip.commons.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+/**
+ * Represents an Iris pack that exists
+ */
+@Data
+public class IrisPack {
+    private final File folder;
+    private final IrisData data;
+
+    /**
+     * Create an iris pack backed by a data folder
+     * @param folder the folder of the pack. Must be a directory
+     */
+    public IrisPack(File folder) {
+        this.folder = folder;
+
+        if(!folder.exists())
+        {
+            throw new RuntimeException("Cannot open Pack " + folder.getPath() + " (directory doesnt exist)");
+        }
+
+        if(!folder.isDirectory())
+        {
+            throw new RuntimeException("Cannot open Pack " + folder.getPath() + " (not a directory)");
+        }
+
+        this.data = IrisData.get(folder);
+    }
+
+    /**
+     * Delete this pack. This invalidates this pack and you should
+     * probably no longer use this instance after deleting this pack
+     */
+    public void delete() {
+        IO.delete(folder);
+        folder.delete();
+    }
+
+    /**
+     * Create a new pack from the input url
+     * @param sender the sender
+     * @param url the url, or name, or really anything see IrisPackRepository.from(String)
+     * @return the iris pack
+     * @throws IrisException fails
+     */
+    public static IrisPack from(VolmitSender sender, String url) throws IrisException {
+        IrisPackRepository repo = IrisPackRepository.from(url);
+        if(repo == null)
+        {
+            throw new IrisException("Null Repo");
+        }
+
+        try {
+            return from(sender, repo);
+        } catch (MalformedURLException e) {
+            throw new IrisException("Malformed URL " + e.getMessage());
+        }
+    }
+
+    /**
+     * Get the name of this pack
+     * @return the pack name
+     */
+    public String getName()
+    {
+        return folder.getName();
+    }
+
+    /**
+     * Get the file path of the workspace file
+     * @return the workspace file path
+     */
+    public File getWorkspaceFile() {
+        return new File(getFolder(), getName() + ".code-workspace");
+    }
+
+    /**
+     * Update the workspace file
+     * @return true if it was updated
+     */
+    public boolean updateWorkspace() {
+        getFolder().mkdirs();
+        File ws = getWorkspaceFile();
+
+        try {
+            PrecisionStopwatch p = PrecisionStopwatch.start();
+            Iris.debug("Building Workspace: " + ws.getPath());
+            JSONObject j = generateWorkspaceConfig();
+            IO.writeAll(ws, j.toString(4));
+            p.end();
+            Iris.debug("Building Workspace: " + ws.getPath() + " took " + Form.duration(p.getMilliseconds(), 2));
+            return true;
+        } catch (Throwable e) {
+            Iris.reportError(e);
+            Iris.warn("Pack invalid: " + ws.getAbsolutePath() + " Re-creating. You may loose some vs-code workspace settings! But not your actual project!");
+            ws.delete();
+            try {
+                IO.writeAll(ws, generateWorkspaceConfig());
+            } catch (IOException e1) {
+                Iris.reportError(e1);
+                e1.printStackTrace();
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Install this pack into a world
+     * @param world the world to install into (world/iris/pack)
+     * @return the main dimension object loaded from the fresh installed directory, NOT this pack's directory
+     */
+    public IrisDimension install(World world)
+    {
+        return install(new File(world.getWorldFolder(), "iris/pack"));
+    }
+
+    /**
+     * Install this pack into a world
+     * @param world the world to install into (world/iris/pack)
+     * @return the main dimension object loaded from the fresh installed directory, NOT this pack's directory
+     */
+    public IrisDimension install(IrisWorld world)
+    {
+        return install(new File(world.worldFolder(), "iris/pack"));
+    }
+
+    /**
+     * Install this pack into a world
+     * @param folder the folder to install this pack into
+     * @return the main dimension object loaded from the fresh installed directory, NOT this pack's directory
+     */
+    public IrisDimension install(File folder)
+    {
+        IrisDimension dim = getDimension();
+        folder.mkdirs();
+
+        try {
+            FileUtils.copyDirectory(getFolder(), folder);
+        } catch (IOException e) {
+            Iris.reportError(e);
+        }
+
+        return IrisData.get(folder).getDimensionLoader().load(dim.getLoadKey());
+    }
+
+    /**
+     * The dimension's assumed loadkey
+     * @return getName()
+     */
+    public String getDimensionKey()
+    {
+        return getName();
+    }
+
+    /**
+     * Get the main dimension object
+     * @return the dimension (folder name as dim key)
+     */
+    public IrisDimension getDimension()
+    {
+        return getData().getDimensionLoader().load(getDimensionKey());
+    }
+
+    /**
+     * Find all files in this pack with the given extension
+     * @param fileExtension the extension
+     * @return the list of files
+     */
+    public KList<File> collectFiles(String fileExtension) {
+        return collectFiles(getFolder(), fileExtension);
+    }
+
+    private JSONObject generateWorkspaceConfig() {
+        JSONObject ws = new JSONObject();
+        JSONArray folders = new JSONArray();
+        JSONObject folder = new JSONObject();
+        folder.put("path", ".");
+        folders.put(folder);
+        ws.put("folders", folders);
+        JSONObject settings = new JSONObject();
+        settings.put("workbench.colorTheme", "Monokai");
+        settings.put("workbench.preferredDarkColorTheme", "Solarized Dark");
+        settings.put("workbench.tips.enabled", false);
+        settings.put("workbench.tree.indent", 24);
+        settings.put("files.autoSave", "onFocusChange");
+        JSONObject jc = new JSONObject();
+        jc.put("editor.autoIndent", "brackets");
+        jc.put("editor.acceptSuggestionOnEnter", "smart");
+        jc.put("editor.cursorSmoothCaretAnimation", true);
+        jc.put("editor.dragAndDrop", false);
+        jc.put("files.trimTrailingWhitespace", true);
+        jc.put("diffEditor.ignoreTrimWhitespace", true);
+        jc.put("files.trimFinalNewlines", true);
+        jc.put("editor.suggest.showKeywords", false);
+        jc.put("editor.suggest.showSnippets", false);
+        jc.put("editor.suggest.showWords", false);
+        JSONObject st = new JSONObject();
+        st.put("strings", true);
+        jc.put("editor.quickSuggestions", st);
+        jc.put("editor.suggest.insertMode", "replace");
+        settings.put("[json]", jc);
+        settings.put("json.maxItemsComputed", 30000);
+        JSONArray schemas = new JSONArray();
+        IrisData dm = IrisData.get(getFolder());
+
+        for (ResourceLoader<?> r : dm.getLoaders().v()) {
+            if (r.supportsSchemas()) {
+                schemas.put(r.buildSchema());
+            }
+        }
+
+        settings.put("json.schemas", schemas);
+        ws.put("settings", settings);
+
+        return ws;
+    }
+
+    /**
+     * Create a pack from a repo
+     * @param sender the sender
+     * @param repo the repo
+     * @return the pack
+     * @throws MalformedURLException shit happens
+     */
+    public static IrisPack from(VolmitSender sender, IrisPackRepository repo) throws MalformedURLException {
+        repo.install(sender);
+        return new IrisPack(Iris.instance.getDataFolder(StudioSVC.WORKSPACE_NAME, repo.getRepo()));
+    }
+    
+    private static KList<File> collectFiles(File f, String fileExtension) {
+        KList<File> l = new KList<>();
+
+        if (f.isDirectory()) {
+            for (File i : f.listFiles()) {
+                l.addAll(collectFiles(i, fileExtension));
+            }
+        } else if (f.getName().endsWith("." + fileExtension)) {
+            l.add(f);
+        }
+
+        return l;
+    }
+}

src/main/java/com/volmit/iris/core/pack/IrisPackRepository.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.data;
+package com.volmit.iris.core.pack;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.service.StudioSVC;
@@ -50,6 +50,11 @@ public class IrisPackRepository {
     @Builder.Default
     private String tag = "";
 
+    /**
+     *
+     * @param g
+     * @return
+     */
     public static IrisPackRepository from(String g) {
         // https://github.com/IrisDimensions/overworld
         if (g.startsWith("https://github.com/")) {
@@ -123,5 +128,10 @@ public class IrisPackRepository {
                         }
                     })).execute(sender);
         }
+
+        else
+        {
+            sender.sendMessage("Pack already exists!");
+        }
     }
 }

src/main/java/com/volmit/iris/core/project/IrisPack.java

@@ -1,55 +0,0 @@
-/*
- * 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.core.project;
-
-import com.volmit.iris.Iris;
-import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.util.data.IrisPackRepository;
-import com.volmit.iris.util.io.IO;
-import com.volmit.iris.util.plugin.VolmitSender;
-import lombok.Data;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-@Data
-public class IrisPack {
-    private final File folder;
-
-    public IrisPack(File folder) {
-        this.folder = folder;
-    }
-
-    public void delete() {
-        IO.delete(folder);
-        folder.delete();
-    }
-
-    public static IrisPack from(VolmitSender sender, String url) throws MalformedURLException {
-        return from(sender, IrisPackRepository.from(url));
-    }
-
-    public static IrisPack from(VolmitSender sender, IrisPackRepository repo) throws MalformedURLException {
-        String name = repo.getRepo();
-        String url = repo.toURL();
-        repo.install(sender);
-
-        return new IrisPack(Iris.instance.getDataFolder(StudioSVC.WORKSPACE_NAME, repo.getRepo()));
-    }
-}

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

@@ -21,9 +21,9 @@ package com.volmit.iris.core.project;
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.core.project.loader.ResourceLoader;
+import com.volmit.iris.core.loader.ResourceLoader;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.block.IrisBlockData;

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

@@ -19,9 +19,9 @@
 package com.volmit.iris.core.project;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.core.project.loader.ResourceLoader;
+import com.volmit.iris.core.loader.ResourceLoader;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/core/service/BoardSVC.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.feature.IrisFeaturePositional;

src/main/java/com/volmit/iris/core/service/PreservationSVC.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.context.IrisContext;
 import com.volmit.iris.util.parallel.MultiBurst;

src/main/java/com/volmit/iris/core/service/StudioSVC.java

@@ -21,9 +21,8 @@ package com.volmit.iris.core.service;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.project.IrisProject;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
@@ -35,7 +34,6 @@ import com.volmit.iris.util.json.JSONException;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.plugin.IrisService;
 import com.volmit.iris.util.plugin.VolmitSender;
-import com.volmit.iris.util.scheduling.J;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.zeroturnaround.zip.ZipUtil;
@@ -54,16 +52,7 @@ public class StudioSVC implements IrisService {
 
     @Override
     public void onEnable() {
-        J.a(() ->
-        {
-            File project = Iris.instance.getDataFolder(WORKSPACE_NAME, IrisSettings.get().getGenerator().getDefaultWorldType());
 
-            if(!project.exists())
-            {
-                Iris.info("Attempting to download default pack " + IrisSettings.get().getGenerator().getDefaultWorldType());
-                downloadSearch(Iris.getSender(), IrisSettings.get().getGenerator().getDefaultWorldType(), false, false);
-            }
-        });
     }
 
     @Override

src/main/java/com/volmit/iris/core/service/TreeSVC.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.common.IObjectPlacer;

src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java

@@ -25,7 +25,7 @@ import com.volmit.iris.core.pregenerator.PregenTask;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
 import com.volmit.iris.core.pregenerator.methods.HeadlessPregenMethod;
 import com.volmit.iris.core.pregenerator.methods.HybridPregenMethod;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.platform.HeadlessGenerator;

src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.core.tools;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.common.IrisWorld;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;

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

@@ -20,7 +20,7 @@ package com.volmit.iris.engine;
 
 import com.google.common.util.concurrent.AtomicDouble;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.modifier.IrisCaveModifier;

src/main/java/com/volmit/iris/engine/framework/Engine.java

@@ -21,7 +21,7 @@ package com.volmit.iris.engine.framework;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.gui.components.RenderType;
 import com.volmit.iris.core.gui.components.Renderer;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;

src/main/java/com/volmit/iris/engine/framework/EngineComponent.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.math.RollingSequence;

src/main/java/com/volmit/iris/engine/framework/EngineTarget.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.common.IrisWorld;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.parallel.MultiBurst;

src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.framework.placer;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
 import com.volmit.iris.engine.object.tile.TileData;

src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.jigsaw;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.basic.IrisPosition;

src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.jigsaw;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.basic.IrisPosition;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.feature.IrisFeature;

src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.mantle;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineTarget;

src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.mantle;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.documentation.ChunkCoordinates;

src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.mantle;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.object.common.IObjectPlacer;
 import com.volmit.iris.engine.object.feature.IrisFeaturePositional;

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListResource.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.annotations;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

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

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object.biome;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.gui.components.RenderType;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;

src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.biome;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.block.IrisBlockData;

src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.object.block;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;

src/main/java/com/volmit/iris/engine/object/block/IrisBlockDrops.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.block;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;

src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.block;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;

src/main/java/com/volmit/iris/engine/object/carve/IrisCarveLayer.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.carve;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

src/main/java/com/volmit/iris/engine/object/carve/IrisCaveFluid.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.carve;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

src/main/java/com/volmit/iris/engine/object/carve/IrisCavernZone.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.carve;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

src/main/java/com/volmit/iris/engine/object/carve/IrisCaverns.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.carve;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;

src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.cave;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.noise.IrisWorm;
 import com.volmit.iris.util.json.JSONObject;

src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.cave;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;

src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.common;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;

src/main/java/com/volmit/iris/engine/object/common/IObjectPlacer.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.common;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.tile.TileData;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;

src/main/java/com/volmit/iris/engine/object/common/IrisScript.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.common;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.plugin.VolmitSender;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.decoration;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.biome.IrisBiome;

src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.deposits;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.block.IrisBlockData;

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

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.object.dimensional;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.biome.InferredType;

src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.entity;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.common.IrisScript;

src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object.feature;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;

src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;

src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPool.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.jigsaw;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;

src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.feature.IrisFeature;

src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.loot;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;

src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.mods;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.objects.IrisObject;

src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java

@@ -22,7 +22,7 @@ import com.dfsek.paralithic.Expression;
 import com.dfsek.paralithic.eval.parser.Parser;
 import com.dfsek.paralithic.eval.parser.Scope;
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;

src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.noise;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.Required;

src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.noise;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.common.IRare;

src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.noise;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.noise;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;

src/main/java/com/volmit/iris/engine/object/noise/IrisShapedGeneratorStyle.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.noise;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;
 import com.volmit.iris.engine.object.annotations.MinNumber;

src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.noise;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;

src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.noise;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.util.function.NoiseProvider;

src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.object.objects;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer;
 import com.volmit.iris.engine.object.basic.IrisPosition;

src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.objects;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;

src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object.objects;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.feature.IrisFeaturePotential;

src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.objects;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.block.IrisBlockData;

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

@@ -20,8 +20,8 @@ package com.volmit.iris.engine.object.regional;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.gui.components.RenderType;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.engine.object.biome.InferredType;

src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object.spawners;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.basic.IrisRange;

src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.platform;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.engine.IrisEngine;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;

src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.platform;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineTarget;
 import com.volmit.iris.engine.framework.Hotloadable;

src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.scripting;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.biome.IrisBiome;

src/main/java/com/volmit/iris/util/context/IrisContext.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.context;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/data/DataProvider.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.util.data;
 
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 
 public interface DataProvider {
     IrisData getData();

src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.handlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.handlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.handlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.entity.IrisEntity;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.handlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.noise.IrisGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.handlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.handlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.common.IrisScript;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/util/decree/specialhandlers/ObjectHandler.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.decree.specialhandlers;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.decree.DecreeParameterHandler;
 import com.volmit.iris.util.decree.exceptions.DecreeParsingException;

src/main/java/com/volmit/iris/util/matter/slices/RegionMatter.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.util.matter.slices;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.util.matter.Sliced;
 
 @Sliced

src/main/java/com/volmit/iris/util/matter/slices/RegistryMatter.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.util.matter.slices;
 
-import com.volmit.iris.core.project.loader.IrisRegistrant;
+import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.util.context.IrisContext;
 
 import java.io.DataInputStream;

src/main/java/com/volmit/iris/util/stream/ProceduralStream.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.util.stream;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.project.loader.IrisData;
+import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.common.IRare;
 import com.volmit.iris.engine.object.noise.IrisStyledRange;
 import com.volmit.iris.util.collection.KList;