From 428d4859daba9bc9c8eb6992aeabfbe0d6ea2451 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Mon, 9 Aug 2021 04:38:24 -0400
Subject: [PATCH] Fix world data location

---
 src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java  | 2 +-
 .../com/volmit/iris/engine/object/common/HeadlessWorld.java     | 2 +-
 .../com/volmit/iris/engine/platform/PlatformChunkGenerator.java | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
index 95631919d..66ba19e17 100644
--- a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
+++ b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
@@ -90,7 +90,7 @@ public class IrisWorldCreator {
                 .build();
         ChunkGenerator g = new BukkitChunkGenerator(w, studio, studio
                 ? IrisData.loadAnyDimension(dimensionName).getLoader().getDataFolder():
-                new File(w.worldFolder(), "iris"), dimensionName);
+                new File(w.worldFolder(), "iris/pack"), dimensionName);
 
         return new WorldCreator(name)
                 .environment(findEnvironment())
diff --git a/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java b/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java
index e1dc3f1d3..b066c900f 100644
--- a/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java
+++ b/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java
@@ -59,7 +59,7 @@ public class HeadlessWorld {
         world.worldFolder().mkdirs();
         new File(world.worldFolder(), "region").mkdirs();
 
-        if (!studio && !new File(world.worldFolder(), "iris").exists()) {
+        if (!studio && !new File(world.worldFolder(), "iris/pack").exists()) {
             Iris.proj.installIntoWorld(new VolmitSender(Bukkit.getConsoleSender(), Iris.instance.getTag("Headless")), dimension.getLoadKey(), world.worldFolder());
         }
     }
diff --git a/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java
index 92182243e..4d2321557 100644
--- a/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java
+++ b/src/main/java/com/volmit/iris/engine/platform/PlatformChunkGenerator.java
@@ -24,6 +24,8 @@ import com.volmit.iris.engine.framework.EngineTarget;
 import com.volmit.iris.engine.framework.Hotloadable;
 import com.volmit.iris.util.data.DataProvider;
 
+import java.io.File;
+
 public interface PlatformChunkGenerator extends Hotloadable, DataProvider {
     Engine getEngine();