From 2b4bc621acfb8cfa64b6d6da012b7a77e0257f13 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <repixelatedmc@gmail.com>
Date: Sat, 11 Nov 2023 21:56:28 +0100
Subject: [PATCH] misc

---
 core/src/main/java/com/volmit/iris/Iris.java               | 7 -------
 core/src/main/java/com/volmit/iris/core/IrisSettings.java  | 1 -
 .../java/com/volmit/iris/core/safeguard/IrisSafeguard.java | 3 ++-
 .../java/com/volmit/iris/core/safeguard/ServerBootSFG.java | 2 --
 .../java/com/volmit/iris/core/service/ChunkHandlerSVC.java | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index 75af63cf8..bffe76848 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -31,7 +31,6 @@ import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import com.volmit.iris.core.pregenerator.LazyPregenerator;
 import com.volmit.iris.core.safeguard.ServerBootSFG;
-import com.volmit.iris.core.service.ChunkHandlerSVC;
 import com.volmit.iris.core.service.HotDropWorldSVC;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
@@ -444,7 +443,6 @@ public class Iris extends VolmitPlugin implements Listener {
     private static void fixShading() {
         ShadeFix.fix(ComponentSerializer.class);
     }
-    private ChunkHandlerSVC chunkHandlerSVC;
     private void enable() {
         instance = this;
         services = new KMap<>();
@@ -476,11 +474,6 @@ public class Iris extends VolmitPlugin implements Listener {
             UtilsSFG.SupportedServerSoftware();
             UtilsSFG.printIncompatibleWarnings();
             UtilsSFG.unstablePrompt();
-            if(IrisSettings.get().getGeneral().useIntegratedChunkHandler) {
-                chunkHandlerSVC = new ChunkHandlerSVC(this);
-                Iris.info(C.LIGHT_PURPLE + "Started Intergrated ChunkHandlerSVC");
-            }
-
             HotDropWorldSVC hotDropWorldSVC = new HotDropWorldSVC(this);
             hotDropWorldSVC.start();
 
diff --git a/core/src/main/java/com/volmit/iris/core/IrisSettings.java b/core/src/main/java/com/volmit/iris/core/IrisSettings.java
index cefe5c9ec..2c570a788 100644
--- a/core/src/main/java/com/volmit/iris/core/IrisSettings.java
+++ b/core/src/main/java/com/volmit/iris/core/IrisSettings.java
@@ -126,7 +126,6 @@ public class IrisSettings {
         public boolean markerEntitySpawningSystem = true;
         public boolean effectSystem = true;
         public boolean worldEditWandCUI = true;
-        public boolean AutoFindIrisWorlds = false;
     }
 
     @Data
diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java b/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java
index 8943a629e..a7d945dfc 100644
--- a/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java
+++ b/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java
@@ -1,9 +1,10 @@
 package com.volmit.iris.core.safeguard;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.util.format.C;
 
 public class IrisSafeguard {
- // more planned and WIP
     public static boolean unstablemode = false;
     public static void IrisSafeguardSystem() {
         Iris.info("Enabled Iris SafeGuard");
diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
index a677cf334..4aa78c7c8 100644
--- a/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
+++ b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
@@ -77,7 +77,6 @@ public class ServerBootSFG {
         }
     }
     public static void CheckIrisWorlds() {
-        if (IrisSettings.get().getWorld().AutoFindIrisWorlds) {
             StringJoiner joiner = new StringJoiner(", ");
 
             // Get the main server folder
@@ -108,6 +107,5 @@ public class ServerBootSFG {
             }
             // No Idea what I should do with this
             String worldsList = joiner.toString();
-        }
     }
 }
diff --git a/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java b/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java
index c245653be..91531b049 100644
--- a/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java
@@ -22,7 +22,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 public class ChunkHandlerSVC implements Listener {
-    // Idk how it works but it works lol
+    // Does nothing for now
     private final JavaPlugin plugin;
     private static BukkitTask task;
     private final Map<World, ChunkUnloader> worlds = new ConcurrentHashMap<>();