From d830aa1d1a1943b154de3347971ce6feff43fe56 Mon Sep 17 00:00:00 2001 From: RePixelatedMC Date: Wed, 29 Nov 2023 16:26:34 +0100 Subject: [PATCH] Bug when on intel cpu and unstable mode and moved more to SFG --- core/src/main/java/com/volmit/iris/Iris.java | 13 ++++++------- .../com/volmit/iris/core/safeguard/UtilsSFG.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java index 331e466d1..981085014 100644 --- a/core/src/main/java/com/volmit/iris/Iris.java +++ b/core/src/main/java/com/volmit/iris/Iris.java @@ -30,7 +30,6 @@ import com.volmit.iris.core.loader.IrisData; 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.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.EnginePanic; @@ -469,10 +468,7 @@ public class Iris extends VolmitPlugin implements Listener { J.s(this::setupPapi); J.a(ServerConfigurator::configure, 20); splash(); - UtilsSFG.UnstableMode(); - UtilsSFG.SupportedServerSoftware(); - UtilsSFG.printIncompatibleWarnings(); - UtilsSFG.unstablePrompt(); + UtilsSFG.splash(); autoStartStudio(); checkForBukkitWorlds(); @@ -787,8 +783,11 @@ public class Iris extends VolmitPlugin implements Listener { if(unstablemode) Iris.info("Server Cpu: " + C.DARK_RED + getCPUModel()); - if(getCPUModel().contains("Intel")) Iris.info("Server Cpu: " + C.BLUE + getCPUModel()); - if(getCPUModel().contains("Ryzen")) Iris.info("Server Cpu: " + C.RED + getCPUModel()); + if(getCPUModel().contains("Intel")) Iris.info("Server Cpu: " + C.BLUE + getCPUModel());else { + if (getCPUModel().contains("Ryzen")) Iris.info("Server Cpu: " + C.RED + getCPUModel()); else { + Iris.info("Server Cpu: " + C.DARK_GRAY + getCPUModel()); + } + } if(!getCPUModel().contains("Intel") && !getCPUModel().contains("Ryzen")) Iris.info("Server Cpu: " + C.DARK_GRAY + getCPUModel()); Iris.info("Process Threads: " + getCPUThreads()); diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java index 746512698..caf34bf86 100644 --- a/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java @@ -5,14 +5,20 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.format.C; public class UtilsSFG { - public static void UnstableMode(){ + public static void splash(){ + UtilsSFG.unstableMode(); + UtilsSFG.supportedServerSoftware(); + UtilsSFG.printIncompatibleWarnings(); + UtilsSFG.unstablePrompt(); + } + public static void 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(){ + public static void supportedServerSoftware(){ if (!ServerBootSFG.passedserversoftware) { Iris.safeguard(C.DARK_RED + "Server is running unsupported server software"); Iris.safeguard(C.RED + "Supported: Purpur, Pufferfish, Paper, Spigot, Bukkit");