This commit is contained in:
RePixelatedMC
2023-12-16 14:32:06 +01:00
parent 28523a9593
commit c0fdf23133
5 changed files with 134 additions and 137 deletions
@@ -6,6 +6,7 @@ public class IrisSafeguard {
public static boolean unstablemode = false; public static boolean unstablemode = false;
public static boolean warningmode = false; public static boolean warningmode = false;
public static boolean stablemode = false; public static boolean stablemode = false;
public static void IrisSafeguardSystem() { public static void IrisSafeguardSystem() {
Iris.info("Enabled Iris SafeGuard"); Iris.info("Enabled Iris SafeGuard");
ServerBootSFG.BootCheck(); ServerBootSFG.BootCheck();
@@ -5,7 +5,7 @@ import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
public class ModesSFG { public class ModesSFG {
public static void selectMode(){ public static void selectMode() {
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");
unstable(); unstable();
@@ -18,7 +18,8 @@ public class ModesSFG {
stable(); stable();
} }
} }
public static void stable(){
public static void stable() {
Iris.safeguard(C.BLUE + "Iris is running Stable"); Iris.safeguard(C.BLUE + "Iris is running Stable");
} }
@@ -1,13 +1,7 @@
package com.volmit.iris.core.safeguard; package com.volmit.iris.core.safeguard;
import com.volmit.iris.core.IrisSettings;
import oshi.SystemInfo;
import oshi.hardware.GlobalMemory;
import static com.volmit.iris.util.misc.getHardware.*;
public class PerformanceSFG { public class PerformanceSFG {
public static void calculatePerformance(){ public static void calculatePerformance() {
} }
@@ -7,7 +7,9 @@ import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import java.io.File; import java.io.File;
import java.util.*; import java.util.HashMap;
import java.util.Map;
import java.util.StringJoiner;
import static com.volmit.iris.Iris.getJavaVersion; import static com.volmit.iris.Iris.getJavaVersion;
import static com.volmit.iris.Iris.instance; import static com.volmit.iris.Iris.instance;
@@ -58,8 +60,7 @@ public class ServerBootSFG {
!instance.getServer().getVersion().contains("Paper") && !instance.getServer().getVersion().contains("Paper") &&
!instance.getServer().getVersion().contains("Spigot") && !instance.getServer().getVersion().contains("Spigot") &&
!instance.getServer().getVersion().contains("Pufferfish") && !instance.getServer().getVersion().contains("Pufferfish") &&
!instance.getServer().getVersion().contains("Bukkit")) !instance.getServer().getVersion().contains("Bukkit")) {
{
passedserversoftware = false; passedserversoftware = false;
joiner.add("Server Software"); joiner.add("Server Software");
severityHigh++; severityHigh++;
@@ -71,12 +72,12 @@ public class ServerBootSFG {
severityHigh++; severityHigh++;
} }
if(getJavaVersion() != 17) { if (getJavaVersion() != 17) {
isJDK17 = false; isJDK17 = false;
joiner.add("Unsupported Java version"); joiner.add("Unsupported Java version");
severityMedium++; severityMedium++;
} }
if(!isJDK()) { if (!isJDK()) {
isJRE = true; isJRE = true;
joiner.add("Unsupported JDK"); joiner.add("Unsupported JDK");
severityMedium++; severityMedium++;
@@ -86,11 +87,11 @@ public class ServerBootSFG {
safeguardPassed = (severityHigh == 0 && severityMedium == 0 && severityLow == 0); safeguardPassed = (severityHigh == 0 && severityMedium == 0 && severityLow == 0);
count = severityHigh + severityMedium + severityLow; count = severityHigh + severityMedium + severityLow;
if(safeguardPassed){ if (safeguardPassed) {
stablemode = true; stablemode = true;
Iris.safeguard("Stable mode has been activated."); Iris.safeguard("Stable mode has been activated.");
} }
if(!safeguardPassed){ if (!safeguardPassed) {
if (severityMedium >= 1 && severityHigh == 0) { if (severityMedium >= 1 && severityHigh == 0) {
warningmode = true; warningmode = true;
Iris.safeguard("Warning mode has been activated."); Iris.safeguard("Warning mode has been activated.");
@@ -104,9 +105,9 @@ public class ServerBootSFG {
public static boolean isJDK() { public static boolean isJDK() {
String path = System.getProperty("sun.boot.library.path"); String path = System.getProperty("sun.boot.library.path");
if(path != null) { if (path != null) {
String javacPath = ""; String javacPath = "";
if(path.endsWith(File.separator + "bin")) { if (path.endsWith(File.separator + "bin")) {
javacPath = path; javacPath = path;
} else { } else {
int libIndex = path.lastIndexOf(File.separator + "lib"); int libIndex = path.lastIndexOf(File.separator + "lib");
@@ -4,11 +4,11 @@ import com.volmit.iris.Iris;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
public class UtilsSFG { public class UtilsSFG {
public static void splash(){ public static void splash() {
ModesSFG.selectMode(); ModesSFG.selectMode();
} }
public static void printIncompatibleWarnings(){ public static void printIncompatibleWarnings() {
// String SupportedIrisVersion = getDescription().getVersion(); //todo Automatic version // String SupportedIrisVersion = getDescription().getVersion(); //todo Automatic version
if (ServerBootSFG.safeguardPassed) { if (ServerBootSFG.safeguardPassed) {