From 021f9b1d0e2e94a3243baf125ed812cc7af0eff2 Mon Sep 17 00:00:00 2001 From: RePixelatedMC Date: Thu, 2 Nov 2023 16:55:47 +0100 Subject: [PATCH] Cleanup / Fixes --- .../volmit/iris/core/commands/CommandIris.java | 14 ++------------ .../volmit/iris/core/service/ChunkHandlerSVC.java | 2 +- .../com/volmit/iris/core/tools/IrisCreator.java | 1 - .../com/volmit/iris/engine/IrisEngineMantle.java | 15 ++++++++++----- .../iris/engine/jigsaw/PlannedStructure.java | 2 +- .../iris/engine/safeguard/IrisSafeguard.java | 1 + .../iris/engine/safeguard/PerformanceSFG.java | 2 +- 7 files changed, 16 insertions(+), 21 deletions(-) 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 a2d831425..eaa359acb 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 @@ -185,14 +185,8 @@ public class CommandIris implements DecreeExecutor { @Decree(description = "Benchmark a pack", origin = DecreeOrigin.CONSOLE) public void fixunstable() throws InterruptedException { if (unstablemode){ - if (sender() instanceof Player) { // todo: fix this being always false - sender().sendMessage(C.RED + "Your server is experiencing an incompatibility with the Iris plugin."); - sender().sendMessage(C.RED + "Please rectify this problem to avoid further complications."); - sender().sendMessage(C.RED + "----------------------------------------------------------------"); - sender().sendMessage(C.RED + "Command ran: /iris fixunstable"); - sender().sendMessage(C.RED + "Server Issues: " + C.DARK_RED + UtilsSFG.MSGIncompatibleWarnings()); - sender().sendMessage(C.RED + "----------------------------------------------------------------"); - } + sender().sendMessage(C.RED + "Incompatibilities are posted in console.."); + Iris.info(C.RED + "Your server is experiencing an incompatibility with the Iris plugin."); Iris.info(C.RED + "Please rectify this problem to avoid further complications."); Iris.info(C.RED + "----------------------------------------------------------------"); @@ -210,10 +204,6 @@ public class CommandIris implements DecreeExecutor { sender().sendMessage(C.GREEN + "" + sender().player().getWorld().getMinHeight() + " to " + sender().player().getWorld().getMaxHeight()); sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight())); } - @Decree(description = "TEST") - public void cpspaper() { - ChunkHandlerSVC.exit(); - } @Decree(description = "QOL command to open a overworld studio world.", sync = true) public void so() { diff --git a/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java b/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java index 4f7f0dddd..c245653be 100644 --- a/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java +++ b/core/src/main/java/com/volmit/iris/core/service/ChunkHandlerSVC.java @@ -111,7 +111,7 @@ public class ChunkHandlerSVC implements Listener { } public void onChunkLoad(Chunk chunk) { - //System.out.printf("%s > Loaded Chunk [x=%s, z=%s]%n", world.getName(), chunk.getX(), chunk.getZ()); + // System.out.printf("%s > Loaded Chunk [x=%s, z=%s]%n", world.getName(), chunk.getX(), chunk.getZ()); chunks.put(chunk, System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(3)); } 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 6da3c28d7..0088d8411 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 @@ -176,7 +176,6 @@ public class IrisCreator { } } //if (benchmark){loaded = true;} - Iris.info("Debug1"); }); diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index 591f76c31..d7a88eb77 100644 --- a/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -46,6 +46,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import static com.volmit.iris.core.tools.IrisPackBenchmarking.benchmark; +import static com.volmit.iris.engine.safeguard.PerformanceSFG.lowPerformance; @Data public class IrisEngineMantle implements EngineMantle { @@ -285,15 +286,19 @@ public class IrisEngineMantle implements EngineMantle { x = Math.max(x, c); x = (Math.max(x, 16) + 16) >> 4; x = x % 2 == 0 ? x + 1 : x; - IrisPackBenchmarking PackBench = new IrisPackBenchmarking(); if (benchmark){ x = 4; Iris.info("Mantle Size: " + x + " Chunks " + C.BLUE + "BENCHMARK MODE"); } else { - Iris.info("Mantle Size: " + x + " Chunks"); - Iris.info(" Object Mantle Size: " + u + " (" + ((Math.max(u, 16) + 16) >> 4) + ")"); - Iris.info(" Jigsaw Mantle Size: " + jig + " (" + ((Math.max(jig, 16) + 16) >> 4) + ")"); - Iris.info(" Carving Mantle Size: " + c + " (" + ((Math.max(c, 16) + 16) >> 4) + ")"); + if(lowPerformance){ + x = 4; + Iris.info("Mantle Size: " + x + " Chunks" + C.GOLD + "LOW PERFORMANCE MODE"); + } else { + Iris.info("Mantle Size: " + x + " Chunks"); + Iris.info(" Object Mantle Size: " + u + " (" + ((Math.max(u, 16) + 16) >> 4) + ")"); + Iris.info(" Jigsaw Mantle Size: " + jig + " (" + ((Math.max(jig, 16) + 16) >> 4) + ")"); + Iris.info(" Carving Mantle Size: " + c + " (" + ((Math.max(c, 16) + 16) >> 4) + ")"); + } } diff --git a/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index b3dae5bf0..9d7283d49 100644 --- a/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/core/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -101,7 +101,7 @@ public class PlannedStructure { int sz = (v.getD() / 2); int xx = i.getPosition().getX() + sx; int zz = i.getPosition().getZ() + sz; - RNG rngf = new RNG(Cache.key(xx, zz)); + RNG rng = new RNG(Cache.key(xx, zz)); int offset = i.getPosition().getY() - startHeight; int height; diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java b/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java index 218fc4845..351c46e78 100644 --- a/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java +++ b/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java @@ -8,6 +8,7 @@ public class IrisSafeguard { public static void IrisSafeguardSystem() { Iris.info("Enabled Iris SafeGuard"); ServerBootSFG.BootCheck(); + PerformanceSFG.calculatePerformance(); } } 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 31e3b0e1c..950ba57f1 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 @@ -7,7 +7,7 @@ import static com.volmit.iris.util.misc.getHardware.*; public class PerformanceSFG { public static boolean lowPerformance = false; - public void getPerformance(){ + public static void calculatePerformance(){ if (getCPUModel().contains("Xeon")){ lowPerformance = true;