mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-17 06:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug when on intel cpu and unstable mode and moved more to SFG

Browse Source
This commit is contained in:
RePixelatedMC
2023-11-29 16:26:34 +01:00
parent d473126d4c
commit d830aa1d1a
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/Iris.java
+6 -7
View File
@@ -30,7 +30,6 @@ import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.core.nms.v1X.NMSBinding1X; import com.volmit.iris.core.nms.v1X.NMSBinding1X;
import com.volmit.iris.core.pregenerator.LazyPregenerator; 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.service.StudioSVC;
import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.core.tools.IrisToolbelt;
import com.volmit.iris.engine.EnginePanic; import com.volmit.iris.engine.EnginePanic;
@@ -469,10 +468,7 @@ public class Iris extends VolmitPlugin implements Listener {
J.s(this::setupPapi); J.s(this::setupPapi);
J.a(ServerConfigurator::configure, 20); J.a(ServerConfigurator::configure, 20);
splash(); splash();
UtilsSFG.UnstableMode(); UtilsSFG.splash();
UtilsSFG.SupportedServerSoftware();
UtilsSFG.printIncompatibleWarnings();
UtilsSFG.unstablePrompt();
autoStartStudio(); autoStartStudio();
checkForBukkitWorlds(); checkForBukkitWorlds();
@@ -787,8 +783,11 @@ public class Iris extends VolmitPlugin implements Listener {
if(unstablemode) Iris.info("Server Cpu: " + C.DARK_RED + getCPUModel()); if(unstablemode) Iris.info("Server Cpu: " + C.DARK_RED + getCPUModel());
if(getCPUModel().contains("Intel")) Iris.info("Server Cpu: " + C.BLUE + getCPUModel()); if(getCPUModel().contains("Intel")) Iris.info("Server Cpu: " + C.BLUE + getCPUModel());else {
if(getCPUModel().contains("Ryzen")) Iris.info("Server Cpu: " + C.RED + getCPUModel()); 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()); if(!getCPUModel().contains("Intel") && !getCPUModel().contains("Ryzen")) Iris.info("Server Cpu: " + C.DARK_GRAY + getCPUModel());
Iris.info("Process Threads: " + getCPUThreads()); Iris.info("Process Threads: " + getCPUThreads());
core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java
+8 -2
View File
@@ -5,14 +5,20 @@ import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
public class UtilsSFG { 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) { if (IrisSafeguard.unstablemode) {
Iris.safeguard(C.DARK_RED + "Iris is running in Unstable Mode"); Iris.safeguard(C.DARK_RED + "Iris is running in Unstable Mode");
} else { } else {
Iris.safeguard(C.BLUE + "Iris is running Stable"); Iris.safeguard(C.BLUE + "Iris is running Stable");
} }
} }
public static void SupportedServerSoftware(){ public static void supportedServerSoftware(){
if (!ServerBootSFG.passedserversoftware) { if (!ServerBootSFG.passedserversoftware) {
Iris.safeguard(C.DARK_RED + "Server is running unsupported server software"); Iris.safeguard(C.DARK_RED + "Server is running unsupported server software");
Iris.safeguard(C.RED + "Supported: Purpur, Pufferfish, Paper, Spigot, Bukkit"); Iris.safeguard(C.RED + "Supported: Purpur, Pufferfish, Paper, Spigot, Bukkit");