mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-06-17 06:11:06 +00:00
Cleanup / Fixes
This commit is contained in:
@@ -185,14 +185,8 @@ public class CommandIris implements DecreeExecutor {
|
|||||||
@Decree(description = "Benchmark a pack", origin = DecreeOrigin.CONSOLE)
|
@Decree(description = "Benchmark a pack", origin = DecreeOrigin.CONSOLE)
|
||||||
public void fixunstable() throws InterruptedException {
|
public void fixunstable() throws InterruptedException {
|
||||||
if (unstablemode){
|
if (unstablemode){
|
||||||
if (sender() instanceof Player) { // todo: fix this being always false
|
sender().sendMessage(C.RED + "Incompatibilities are posted in console..");
|
||||||
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 + "----------------------------------------------------------------");
|
|
||||||
}
|
|
||||||
Iris.info(C.RED + "Your server is experiencing an incompatibility with the Iris plugin.");
|
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 + "Please rectify this problem to avoid further complications.");
|
||||||
Iris.info(C.RED + "----------------------------------------------------------------");
|
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 + "" + sender().player().getWorld().getMinHeight() + " to " + sender().player().getWorld().getMaxHeight());
|
||||||
sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));
|
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)
|
@Decree(description = "QOL command to open a overworld studio world.", sync = true)
|
||||||
public void so() {
|
public void so() {
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public class ChunkHandlerSVC implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onChunkLoad(Chunk chunk) {
|
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));
|
chunks.put(chunk, System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(3));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -176,7 +176,6 @@ public class IrisCreator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//if (benchmark){loaded = true;}
|
//if (benchmark){loaded = true;}
|
||||||
Iris.info("Debug1");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ import java.util.Map;
|
|||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
import static com.volmit.iris.core.tools.IrisPackBenchmarking.benchmark;
|
import static com.volmit.iris.core.tools.IrisPackBenchmarking.benchmark;
|
||||||
|
import static com.volmit.iris.engine.safeguard.PerformanceSFG.lowPerformance;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class IrisEngineMantle implements EngineMantle {
|
public class IrisEngineMantle implements EngineMantle {
|
||||||
@@ -285,15 +286,19 @@ public class IrisEngineMantle implements EngineMantle {
|
|||||||
x = Math.max(x, c);
|
x = Math.max(x, c);
|
||||||
x = (Math.max(x, 16) + 16) >> 4;
|
x = (Math.max(x, 16) + 16) >> 4;
|
||||||
x = x % 2 == 0 ? x + 1 : x;
|
x = x % 2 == 0 ? x + 1 : x;
|
||||||
IrisPackBenchmarking PackBench = new IrisPackBenchmarking();
|
|
||||||
if (benchmark){
|
if (benchmark){
|
||||||
x = 4;
|
x = 4;
|
||||||
Iris.info("Mantle Size: " + x + " Chunks " + C.BLUE + "BENCHMARK MODE");
|
Iris.info("Mantle Size: " + x + " Chunks " + C.BLUE + "BENCHMARK MODE");
|
||||||
} else {
|
} else {
|
||||||
Iris.info("Mantle Size: " + x + " Chunks");
|
if(lowPerformance){
|
||||||
Iris.info(" Object Mantle Size: " + u + " (" + ((Math.max(u, 16) + 16) >> 4) + ")");
|
x = 4;
|
||||||
Iris.info(" Jigsaw Mantle Size: " + jig + " (" + ((Math.max(jig, 16) + 16) >> 4) + ")");
|
Iris.info("Mantle Size: " + x + " Chunks" + C.GOLD + "LOW PERFORMANCE MODE");
|
||||||
Iris.info(" Carving Mantle Size: " + c + " (" + ((Math.max(c, 16) + 16) >> 4) + ")");
|
} 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) + ")");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public class PlannedStructure {
|
|||||||
int sz = (v.getD() / 2);
|
int sz = (v.getD() / 2);
|
||||||
int xx = i.getPosition().getX() + sx;
|
int xx = i.getPosition().getX() + sx;
|
||||||
int zz = i.getPosition().getZ() + sz;
|
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 offset = i.getPosition().getY() - startHeight;
|
||||||
int height;
|
int height;
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ public class IrisSafeguard {
|
|||||||
public static void IrisSafeguardSystem() {
|
public static void IrisSafeguardSystem() {
|
||||||
Iris.info("Enabled Iris SafeGuard");
|
Iris.info("Enabled Iris SafeGuard");
|
||||||
ServerBootSFG.BootCheck();
|
ServerBootSFG.BootCheck();
|
||||||
|
PerformanceSFG.calculatePerformance();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import static com.volmit.iris.util.misc.getHardware.*;
|
|||||||
|
|
||||||
public class PerformanceSFG {
|
public class PerformanceSFG {
|
||||||
public static boolean lowPerformance = false;
|
public static boolean lowPerformance = false;
|
||||||
public void getPerformance(){
|
public static void calculatePerformance(){
|
||||||
|
|
||||||
if (getCPUModel().contains("Xeon")){
|
if (getCPUModel().contains("Xeon")){
|
||||||
lowPerformance = true;
|
lowPerformance = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user