diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 6c0248bb2..bd2b034f8 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -315,7 +315,10 @@ public class Iris extends MortarPlugin public static void verbose(String string) { - msg(C.GRAY + string); + if(IrisSettings.get().verbose) + { + msg(C.GRAY + string); + } } public static void success(String string) diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 930bc16ae..61837f392 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -25,6 +25,10 @@ public class IrisSettings @Desc("Compress parallax data in memory to reduce memory usage in exchange for more cpu usage.") public boolean parallaxCompression = true; + @DontObfuscate + @Desc("Useful information when creating iris worlds. Shows object loads & more.") + public boolean verbose = false; + @DontObfuscate @Desc("Compression level (0-9) lower is faster, but is not as good compression. Best results around 3-5") public int parallaxCompressionLevel = 2; diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index 5155b1922..9dce7f94c 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -598,7 +598,7 @@ public class IrisDimension extends IrisRegistrant { return parallaxSize.aquire(() -> { - Iris.info("Calculating the Parallax Size in Parallel"); + Iris.verbose("Calculating the Parallax Size in Parallel"); O xg = new O<>(); O zg = new O<>(); xg.set(0); @@ -697,7 +697,7 @@ public class IrisDimension extends IrisRegistrant z = z % 2 == 0 ? z + 1 : z; x = Math.max(x, z); z = x; - Iris.info("Done! Parallax Size: " + x + ", " + z); + Iris.verbose("Done! Parallax Size: " + x + ", " + z); return new ChunkPosition(x, z); }); } diff --git a/src/main/java/com/volmit/iris/util/PregenJob.java b/src/main/java/com/volmit/iris/util/PregenJob.java index e89d7ccaf..23d938683 100644 --- a/src/main/java/com/volmit/iris/util/PregenJob.java +++ b/src/main/java/com/volmit/iris/util/PregenJob.java @@ -35,7 +35,7 @@ public class PregenJob implements Listener private Spiraler chunkSpiraler; private boolean first; private Consumer2 consumer; - private int cubeSize = 7; + private int cubeSize = 5; public PregenJob(World world, int size, MortarSender sender, Runnable onDone) { @@ -138,7 +138,7 @@ public class PregenJob implements Listener if(first) { - sender.sendMessage("Pregen Started for " + Form.f((mcaWidth * mcaWidth)) + " Regions containing " + Form.f((mcaWidth * 16) * (mcaWidth * 16)) + " Chunks"); + sender.sendMessage("Pregen Started for " + Form.f((size >> 4 >> 5 * size >> 4 >> 5)) + " Regions containing " + Form.f((size >> 4) * (size >> 4)) + " Chunks"); first = false; spiraler.next(); @@ -148,7 +148,10 @@ public class PregenJob implements Listener if(isChunkWithin(chunkX, chunkZ)) { - consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.DARK_GRAY); + if(consumer != null) + { + consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.DARK_GRAY); + } } } @@ -163,7 +166,7 @@ public class PregenJob implements Listener { if(consumer != null) { - consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.YELLOW); + consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.cyan.darker().darker()); } world.loadChunk(chunkX, chunkZ); @@ -177,7 +180,6 @@ public class PregenJob implements Listener else { - total--; if(consumer != null) { consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.GREEN.darker()); @@ -236,7 +238,7 @@ public class PregenJob implements Listener @EventHandler public void on(ChunkUnloadEvent e) { - if(e.getWorld().equals(world) && isChunkWithin(e.getChunk().getX(), e.getChunk().getZ())) + if(e.getWorld().equals(world) && isChunkWithin(e.getChunk().getX(), e.getChunk().getZ()) && consumer != null) { consumer.accept(new ChunkPosition(e.getChunk().getX(), e.getChunk().getZ()), Color.GREEN); }