From d9f8909bdc23238c34c7b92707c42ff613181166 Mon Sep 17 00:00:00 2001
From: CrazyDev22 <juliankrings6@gmail.com>
Date: Sat, 18 May 2024 23:36:03 +0200
Subject: [PATCH] fix crash when using iris as main world

---
 core/src/main/java/com/volmit/iris/Iris.java  | 44 +++++++++++++++++++
 .../volmit/iris/core/ServerConfigurator.java  |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index f916d9501..7ae5816e2 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -92,6 +92,7 @@ import java.lang.management.OperatingSystemMXBean;
 import java.net.URL;
 import java.util.Date;
 import java.util.Map;
+import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -474,6 +475,7 @@ public class Iris extends VolmitPlugin implements Listener {
         services.values().forEach(IrisService::onEnable);
         services.values().forEach(this::registerListener);
         configured = ServerConfigurator.postConfigure();
+        installMainDimension();
         if (!IrisSafeguard.instance.acceptUnstable && IrisSafeguard.instance.unstablemode) {
             Iris.info(C.RED + "World loading has been disabled until the incompatibility is resolved.");
             Iris.info(C.DARK_RED + "Alternatively, go to plugins/iris/settings.json and set ignoreBootMode to true.");
@@ -686,6 +688,48 @@ public class Iris extends VolmitPlugin implements Listener {
         s.sendMessage(C.IRIS + "[" + C.DARK_GRAY + "Iris" + C.IRIS + "]" + C.GRAY + ": " + msg);
     }
 
+    private void installMainDimension() {
+        try {
+            Properties props = new Properties();
+            props.load(new FileInputStream("server.properties"));
+            String world = props.getProperty("level-name");
+            if (world == null) return;
+
+            FileConfiguration fc = new YamlConfiguration();
+            fc.load(new File("bukkit.yml"));
+            String id = fc.getString("worlds." + world + ".generator");
+            if (id.startsWith("Iris:")) {
+                id = id.split("\\Q:\\E")[1];
+            } else if (id.equalsIgnoreCase("Iris")) {
+                id = IrisSettings.get().getGenerator().getDefaultWorldType();
+            } else {
+                return;
+            }
+
+            IrisDimension dim;
+            if (id == null || id.isEmpty()) {
+                dim = IrisData.loadAnyDimension(IrisSettings.get().getGenerator().getDefaultWorldType());
+            } else {
+                dim = IrisData.loadAnyDimension(id);
+            }
+
+            File w = new File(Bukkit.getWorldContainer(), world);
+            File packFolder = new File(w, "/iris/pack");
+            if (!packFolder.exists() || packFolder.listFiles().length == 0) {
+                packFolder.mkdirs();
+                service(StudioSVC.class).installIntoWorld(getSender(), dim.getLoadKey(), w);
+            }
+            if (packFolder.exists()) {
+                IrisDimension worldDim = IrisData.get(packFolder).getDimensionLoader().load(id);
+                if (worldDim != null) dim = worldDim;
+            }
+
+            INMS.get().registerDimension("overworld", dim);
+        } catch (Throwable e) {
+
+        }
+    }
+
     @Nullable
     @Override
     public BiomeProvider getDefaultBiomeProvider(@NotNull String worldName, @Nullable String id) {
diff --git a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
index f3dafea22..284d2ffa4 100644
--- a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
+++ b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
@@ -111,7 +111,7 @@ public class ServerConfigurator {
         try {
             Properties prop = new Properties();
             prop.load(new FileInputStream("server.properties"));
-            String world = prop.getProperty("level-name");
+            String world = prop.getProperty("level-name", "world");
             return new File(Bukkit.getWorldContainer(), world);
         } catch (Exception e) {
             e.printStackTrace();