From 1477dc037c7944e292330f55b8c1bf4652682974 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <107539181+RePixelatedMC@users.noreply.github.com>
Date: Fri, 2 Aug 2024 17:29:39 +0200
Subject: [PATCH] changes i guess

---
 build.gradle                                  |  1 +
 core/src/main/java/com/volmit/iris/Iris.java  | 44 ++++++++++---------
 .../volmit/iris/core/tools/IrisCreator.java   |  2 +-
 .../com/volmit/iris/engine/IrisEngine.java    |  2 +
 core/src/main/resources/plugin.yml            |  1 +
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6ae59d5d5..b13668736 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,6 +156,7 @@ allprojects {
         compileOnly 'net.bytebuddy:byte-buddy-agent:1.12.8'
         compileOnly 'org.bytedeco:javacpp:1.5.10'
         compileOnly 'org.bytedeco:cuda-platform:12.3-8.9-1.5.10'
+        compileOnly 'org.mapdb:mapdb:3.1.0'
     }
 
     /**
diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index c985fc619..52caccd77 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -517,32 +517,34 @@ public class Iris extends VolmitPlugin implements Listener {
                         continue;
                     }
 
-                    String generator = entry.getString("generator");
+                    String generator = entry.getString("backup-generator");
                     if (!generator.startsWith("Iris")) {
                         continue;
                     }
 
-//                    if (generator.startsWith("Iris:")) {
-//                        generator = generator.split("\\Q:\\E")[1];
-//                    } else if (generator.equalsIgnoreCase("Iris")) {
-//                        generator = IrisSettings.get().getGenerator().getDefaultWorldType();
-//                    } else {
-//                        continue;
-//                    }
+                    if (new File(Bukkit.getWorldContainer().getPath() + "/" + s).exists()) {
+                        File world = new File(Bukkit.getWorldContainer().getPath() + "/" + s + "/iris/engine-data/");
+                        IOFileFilter jsonFilter = org.apache.commons.io.filefilter.FileFilterUtils.suffixFileFilter(".json");
+                        Collection<File> files = FileUtils.listFiles(world, jsonFilter, TrueFileFilter.INSTANCE);
+                        if(files.size() != 1) {
+                            Iris.info(C.DARK_GRAY + "------------------------------------------");
+                            Iris.info(C.RED + "Failed to load " + C.GRAY + s + C.RED + ". No valid engine-data file was found.");
+                            Iris.info(C.DARK_GRAY + "------------------------------------------");
+                            continue;
+                        }
 
-                    File world = new File(Bukkit.getWorldContainer().getPath() + "/" + s + "/iris/engine-data/");
-                    IOFileFilter jsonFilter = org.apache.commons.io.filefilter.FileFilterUtils.suffixFileFilter(".json");
-                    Collection<File> files = FileUtils.listFiles(world, jsonFilter, TrueFileFilter.INSTANCE);
-                    if(files.size() != 1) {
-                        Iris.info(C.DARK_GRAY + "------------------------------------------");
-                        Iris.info(C.RED + "Failed to load " + C.GRAY + s + C.RED + ". No valid engine-data file was found.");
-                        Iris.info(C.DARK_GRAY + "------------------------------------------");
-                        continue;
-                    }
-
-                    for (File file : files) {
-                        int lastDotIndex = file.getName().lastIndexOf(".");
-                        generator = file.getName().substring(0, lastDotIndex);
+                        for (File file : files) {
+                            int lastDotIndex = file.getName().lastIndexOf(".");
+                            generator = file.getName().substring(0, lastDotIndex);
+                        }
+                    }  else {
+                        if (generator.startsWith("Iris:")) {
+                            generator = generator.split("\\Q:\\E")[1];
+                        } else if (generator.equalsIgnoreCase("Iris")) {
+                            generator = IrisSettings.get().getGenerator().getDefaultWorldType();
+                        } else {
+                            continue;
+                        }
                     }
 
                     Iris.info("2 World: %s | Generator: %s", s, generator);
diff --git a/core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java b/core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
index 9f5b58e67..23a086c76 100644
--- a/core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
+++ b/core/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
@@ -238,7 +238,7 @@ public class IrisCreator {
         String gen = "Iris:" + dimension;
         ConfigurationSection section = yml.contains("worlds") ? yml.getConfigurationSection("worlds") : yml.createSection("worlds");
         if (!section.contains(name)) {
-            section.createSection(name).set("generator", gen);
+            section.createSection(name).set("backup-generator", gen);
             try {
                 yml.save(BUKKIT_YML);
                 Iris.info("Registered \"" + name + "\" in bukkit.yml");
diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
index 4b8241692..9a9239371 100644
--- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -56,6 +56,8 @@ import org.bukkit.Material;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;
+import org.mapdb.DB;
+import org.mapdb.DBMaker;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
index 05cd9bf4b..bca7e4638 100644
--- a/core/src/main/resources/plugin.yml
+++ b/core/src/main/resources/plugin.yml
@@ -6,6 +6,7 @@ authors: [ cyberpwn, NextdoorPsycho, Vatuu ]
 website: volmit.com
 description: More than a Dimension!
 libraries:
+  - org.mapdb:mapdb:3.1.0
   - org.bytedeco:cuda-platform:12.3-8.9-1.5.10
   - org.bytedeco:javacpp:1.5.10
   - net.bytebuddy:byte-buddy:1.14.14