From 5feaa45edf3057aebaa7015c7ee97b00d0458040 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <repixelatedmc@gmail.com>
Date: Fri, 3 Nov 2023 10:20:59 +0100
Subject: [PATCH] cleanup

---
 core/src/main/java/com/volmit/iris/Iris.java                | 6 +++---
 .../java/com/volmit/iris/core/commands/CommandStudio.java   | 1 +
 .../com/volmit/iris/engine/safeguard/PerformanceSFG.java    | 3 +++
 .../main/java/com/volmit/iris/util/misc/getHardware.java    | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java
index ff4643777..7173c109b 100644
--- a/core/src/main/java/com/volmit/iris/Iris.java
+++ b/core/src/main/java/com/volmit/iris/Iris.java
@@ -53,6 +53,7 @@ import com.volmit.iris.util.io.InstanceState;
 import com.volmit.iris.util.io.JarScanner;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.misc.getHardware;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.IrisService;
 import com.volmit.iris.util.plugin.Metrics;
@@ -778,7 +779,6 @@ public class Iris extends VolmitPlugin implements Listener {
         String[] splash = unstablemode ? splashunstable : splashstable; // Choose the appropriate splash array based on unstablemode
 
 
-        long maxMemory = Runtime.getRuntime().maxMemory() / (1024 * 1024);
         OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean();
         String osArch = osBean.getArch();
         String osName = osBean.getName();
@@ -791,8 +791,8 @@ public class Iris extends VolmitPlugin implements Listener {
         if(unstablemode) Iris.info("Server Cpu: " + C.RED + getCPUModel());
         if(!unstablemode) Iris.info("Server Cpu: " + C.BLUE + getCPUModel());
         Iris.info("Process Threads: " + getCPUThreads());
-        Iris.info("Process Memory: " + maxMemory + " MB");
-        if (maxMemory < 5999) {
+        Iris.info("Process Memory: " + getHardware.getProcessMemory() + " MB");
+        if (getHardware.getProcessMemory() < 5999) {
             Iris.warn("6GB+ Ram is recommended");
         }
         Iris.info("Bukkit version: " + Bukkit.getBukkitVersion());
diff --git a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
index b080dee01..16405436c 100644
--- a/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
+++ b/core/src/main/java/com/volmit/iris/core/commands/CommandStudio.java
@@ -281,6 +281,7 @@ public class CommandStudio implements DecreeExecutor {
             @Param(description = "The dimension to profile", contextual = true, defaultValue = "default")
             IrisDimension dimension
     ) {
+        // Todo: Make this more accurate
         File pack = dimension.getLoadFile().getParentFile().getParentFile();
         File report = Iris.instance.getDataFile("profile.txt");
         IrisProject project = new IrisProject(pack);
diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java b/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java
index 950ba57f1..b97a7ec6b 100644
--- a/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java
+++ b/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java
@@ -12,6 +12,9 @@ public class PerformanceSFG {
         if (getCPUModel().contains("Xeon")){
             lowPerformance = true;
         }
+        if (getProcessMemory() < 5999){
+            lowPerformance = true;
+        }
 
         // Todo RePixelated: Finish this
     }
diff --git a/core/src/main/java/com/volmit/iris/util/misc/getHardware.java b/core/src/main/java/com/volmit/iris/util/misc/getHardware.java
index eea952bd2..ea5aa06d5 100644
--- a/core/src/main/java/com/volmit/iris/util/misc/getHardware.java
+++ b/core/src/main/java/com/volmit/iris/util/misc/getHardware.java
@@ -18,6 +18,10 @@ public class getHardware {
         CentralProcessor processor = systemInfo.getHardware().getProcessor();
         return processor.getLogicalProcessorCount();
     }
+    public static long getProcessMemory(){
+        long maxMemory = Runtime.getRuntime().maxMemory() / (1024 * 1024);
+        return maxMemory;
+    }
 
     public static String getCPUModel() {
         try {