diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e36870f22..504971796 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -16,8 +16,8 @@ @@ -123,10 +123,10 @@ - + - + @@ -143,22 +143,22 @@ - + - - + + - - + + - - + + - + @@ -171,9 +171,9 @@ - + - + \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/manager/IrisDataManager.java b/src/main/java/com/volmit/iris/manager/IrisDataManager.java index 2c377f24d..92264b4f9 100644 --- a/src/main/java/com/volmit/iris/manager/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisDataManager.java @@ -41,13 +41,24 @@ public class IrisDataManager private ObjectResourceLoader objectLoader; public IrisDataManager(File dataFolder) + { + this(dataFolder, false); + } + + public IrisDataManager(File dataFolder, boolean v2) { this.dataFolder = dataFolder; this.packs = new File(dataFolder, ProjectManager.WORKSPACE_NAME); boolean pr = false; if(!packs.exists()) { - if(new File(dataFolder, "iris").exists()) + if(v2) + { + pr = true; + packs = new File(dataFolder, "iris/pack"); + } + + else if(new File(dataFolder, "iris").exists()) { pr = true; packs = new File(dataFolder, "iris"); @@ -58,6 +69,10 @@ public class IrisDataManager prod = pr; } + public IrisDataManager copy() { + return new IrisDataManager(dataFolder); + } + public void hotloaded() { if(prod)