From 9e02c318a141dbf93c35e706a3fdd36a8f065116 Mon Sep 17 00:00:00 2001 From: RePixelatedMC Date: Sat, 11 Nov 2023 09:50:24 +0100 Subject: [PATCH] Refactoring and a new pregen message --- core/src/main/java/com/volmit/iris/Iris.java | 8 ++--- .../iris/core/commands/CommandIris.java | 9 ++---- .../iris/core/commands/CommandPregen.java | 1 - .../safeguard/IrisSafeguard.java | 2 +- .../safeguard/PerformanceSFG.java | 2 +- .../safeguard/ServerBootSFG.java | 7 ++--- .../{engine => core}/safeguard/UtilsSFG.java | 29 +++++++++---------- .../volmit/iris/core/tools/IrisCreator.java | 4 +-- 8 files changed, 26 insertions(+), 36 deletions(-) rename core/src/main/java/com/volmit/iris/{engine => core}/safeguard/IrisSafeguard.java (86%) rename core/src/main/java/com/volmit/iris/{engine => core}/safeguard/PerformanceSFG.java (87%) rename core/src/main/java/com/volmit/iris/{engine => core}/safeguard/ServerBootSFG.java (92%) rename core/src/main/java/com/volmit/iris/{engine => core}/safeguard/UtilsSFG.java (81%) diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java index 6aa236a30..849ac00e8 100644 --- a/core/src/main/java/com/volmit/iris/Iris.java +++ b/core/src/main/java/com/volmit/iris/Iris.java @@ -39,8 +39,8 @@ import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.engine.platform.DummyChunkGenerator; -import com.volmit.iris.engine.safeguard.IrisSafeguard; -import com.volmit.iris.engine.safeguard.UtilsSFG; +import com.volmit.iris.core.safeguard.IrisSafeguard; +import com.volmit.iris.core.safeguard.UtilsSFG; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.exceptions.IrisException; @@ -95,8 +95,8 @@ import java.net.URL; import java.util.Date; import java.util.Map; -import static com.volmit.iris.engine.safeguard.IrisSafeguard.unstablemode; -import static com.volmit.iris.engine.safeguard.ServerBootSFG.passedserversoftware; +import static com.volmit.iris.core.safeguard.IrisSafeguard.unstablemode; +import static com.volmit.iris.core.safeguard.ServerBootSFG.passedserversoftware; import static com.volmit.iris.util.misc.getHardware.getCPUModel; import static com.volmit.iris.util.misc.getHardware.getCPUThreads; diff --git a/core/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/core/src/main/java/com/volmit/iris/core/commands/CommandIris.java index 2a4dd688a..7d13a044b 100644 --- a/core/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/core/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -22,13 +22,11 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisBenchmarking; -import com.volmit.iris.core.tools.IrisCreator; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisWorld; import com.volmit.iris.engine.platform.PlatformChunkGenerator; -import com.volmit.iris.engine.safeguard.UtilsSFG; +import com.volmit.iris.core.safeguard.UtilsSFG; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.decree.DecreeContext; import com.volmit.iris.util.decree.DecreeExecutor; @@ -38,7 +36,6 @@ import com.volmit.iris.util.decree.annotations.Param; import com.volmit.iris.util.decree.specialhandlers.NullablePlayerHandler; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; -import com.volmit.iris.util.mantle.MantleChunk; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.VolmitSender; @@ -58,8 +55,8 @@ import java.util.concurrent.Future; import static com.volmit.iris.core.service.EditSVC.deletingWorld; import static com.volmit.iris.core.tools.IrisBenchmarking.inProgress; -import static com.volmit.iris.engine.safeguard.IrisSafeguard.unstablemode; -import static com.volmit.iris.engine.safeguard.ServerBootSFG.incompatiblePlugins; +import static com.volmit.iris.core.safeguard.IrisSafeguard.unstablemode; +import static com.volmit.iris.core.safeguard.ServerBootSFG.incompatiblePlugins; @Decree(name = "iris", aliases = {"ir", "irs"}, description = "Basic Command") public class CommandIris implements DecreeExecutor { diff --git a/core/src/main/java/com/volmit/iris/core/commands/CommandPregen.java b/core/src/main/java/com/volmit/iris/core/commands/CommandPregen.java index b59687ce6..a9bc9ff7a 100644 --- a/core/src/main/java/com/volmit/iris/core/commands/CommandPregen.java +++ b/core/src/main/java/com/volmit/iris/core/commands/CommandPregen.java @@ -111,7 +111,6 @@ public class CommandPregen implements DecreeExecutor { public void stop() { if (PregeneratorJob.shutdownInstance()) { Iris.info( C.BLUE + "Finishing up mca region..."); - sender().sendMessage(C.DARK_BLUE + "Stopped pregeneration task"); } else { sender().sendMessage(C.YELLOW + "No active pregeneration tasks to stop"); } diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java b/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java similarity index 86% rename from core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java rename to core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java index 218fc4845..8943a629e 100644 --- a/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java @@ -1,4 +1,4 @@ -package com.volmit.iris.engine.safeguard; +package com.volmit.iris.core.safeguard; import com.volmit.iris.Iris; diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/PerformanceSFG.java similarity index 87% rename from core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java rename to core/src/main/java/com/volmit/iris/core/safeguard/PerformanceSFG.java index 35ea78a57..84ee2b1f8 100644 --- a/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/PerformanceSFG.java @@ -1,4 +1,4 @@ -package com.volmit.iris.engine.safeguard; +package com.volmit.iris.core.safeguard; import com.volmit.iris.core.IrisSettings; import oshi.SystemInfo; diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java similarity index 92% rename from core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java rename to core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java index 713b3cbef..37b52939d 100644 --- a/core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java @@ -1,18 +1,15 @@ -package com.volmit.iris.engine.safeguard; +package com.volmit.iris.core.safeguard; import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.nms.v1X.NMSBinding1X; -import com.volmit.iris.util.format.C; -import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import java.util.*; -import static com.volmit.iris.Iris.dump; import static com.volmit.iris.Iris.instance; -import static com.volmit.iris.engine.safeguard.IrisSafeguard.unstablemode; +import static com.volmit.iris.core.safeguard.IrisSafeguard.unstablemode; public class ServerBootSFG { public static final Map incompatiblePlugins = new HashMap<>(); diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/UtilsSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java similarity index 81% rename from core/src/main/java/com/volmit/iris/engine/safeguard/UtilsSFG.java rename to core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java index fa94e33a3..746512698 100644 --- a/core/src/main/java/com/volmit/iris/engine/safeguard/UtilsSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java @@ -1,22 +1,19 @@ -package com.volmit.iris.engine.safeguard; +package com.volmit.iris.core.safeguard; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.format.C; -import static com.volmit.iris.engine.safeguard.IrisSafeguard.unstablemode; -import static com.volmit.iris.engine.safeguard.ServerBootSFG.*; - public class UtilsSFG { public static void UnstableMode(){ - if (unstablemode) { + if (IrisSafeguard.unstablemode) { Iris.safeguard(C.DARK_RED + "Iris is running in Unstable Mode"); } else { Iris.safeguard(C.BLUE + "Iris is running Stable"); } } public static void SupportedServerSoftware(){ - if (!passedserversoftware) { + if (!ServerBootSFG.passedserversoftware) { Iris.safeguard(C.DARK_RED + "Server is running unsupported server software"); Iris.safeguard(C.RED + "Supported: Purpur, Pufferfish, Paper, Spigot, Bukkit"); } @@ -24,31 +21,31 @@ public class UtilsSFG { public static void printIncompatibleWarnings(){ // String SupportedIrisVersion = getDescription().getVersion(); //todo Automatic version - if (safeguardPassed) { + if (ServerBootSFG.safeguardPassed) { Iris.safeguard(C.BLUE + "0 Conflicts found"); } else { - Iris.safeguard(C.DARK_RED + "" + count + " Conflicts found"); - unstablemode = true; + Iris.safeguard(C.DARK_RED + "" + ServerBootSFG.count + " Conflicts found"); + IrisSafeguard.unstablemode = true; - if (incompatiblePlugins.get("Multiverse-Core")) { + if (ServerBootSFG.incompatiblePlugins.get("Multiverse-Core")) { Iris.safeguard(C.RED + "Multiverse"); Iris.safeguard(C.RED + "- The plugin Multiverse is not compatible with the server."); Iris.safeguard(C.RED + "- If you want to have a world manager, consider using PhantomWorlds or MyWorlds instead."); } - if (incompatiblePlugins.get("Dynmap")) { + if (ServerBootSFG.incompatiblePlugins.get("Dynmap")) { Iris.safeguard(C.RED + "Dynmap"); Iris.safeguard(C.RED + "- The plugin Dynmap is not compatible with the server."); Iris.safeguard(C.RED + "- If you want to have a map plugin like Dynmap, consider Bluemap."); } - if (incompatiblePlugins.get("TerraformGenerator") || incompatiblePlugins.get("Stratos")) { + if (ServerBootSFG.incompatiblePlugins.get("TerraformGenerator") || ServerBootSFG.incompatiblePlugins.get("Stratos")) { Iris.safeguard(C.YELLOW + "Terraform Generator / Stratos"); Iris.safeguard(C.YELLOW + "- Iris is not compatible with other worldgen plugins."); } - if (unsuportedversion) { + if (ServerBootSFG.unsuportedversion) { Iris.safeguard(C.RED + "Server Version"); Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.20.2"); } - if (!passedserversoftware) { + if (!ServerBootSFG.passedserversoftware) { Iris.safeguard(C.RED + "Unsupported Server Software"); Iris.safeguard(C.RED + "- Please consider using Paper or Purpur instead."); @@ -57,12 +54,12 @@ public class UtilsSFG { } public static String MSGIncompatibleWarnings() { - return allIncompatiblePlugins; + return ServerBootSFG.allIncompatiblePlugins; } public static void unstablePrompt() { - if (unstablemode) { + if (IrisSafeguard.unstablemode) { Iris.info(""); Iris.info(C.DARK_GRAY + "--==<" + C.RED + " IMPORTANT " + C.DARK_GRAY + ">==--"); Iris.info(C.RED + "Iris is running in unstable mode what may cause the following issues."); 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 04e8b9cba..f9cb549c0 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 @@ -26,7 +26,7 @@ import com.volmit.iris.core.pregenerator.PregenTask; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.platform.PlatformChunkGenerator; -import com.volmit.iris.engine.safeguard.UtilsSFG; +import com.volmit.iris.core.safeguard.UtilsSFG; import com.volmit.iris.util.exceptions.IrisException; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import static com.volmit.iris.core.tools.IrisPackBenchmarking.benchmark; -import static com.volmit.iris.engine.safeguard.IrisSafeguard.unstablemode; +import static com.volmit.iris.core.safeguard.IrisSafeguard.unstablemode; /** * Makes it a lot easier to setup an engine, world, studio or whatever