From 23136be280c8e601df11e0e62fc8eca873ea0024 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 23 Oct 2020 13:59:38 +0200 Subject: [PATCH] Add thread count getter --- .../com/volmit/iris/command/CommandIrisCTC.java | 14 +++++++------- .../volmit/iris/gen/ParallelTerrainProvider.java | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/volmit/iris/command/CommandIrisCTC.java b/src/main/java/com/volmit/iris/command/CommandIrisCTC.java index baab7ae7e..a7d2c6b21 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisCTC.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisCTC.java @@ -22,12 +22,6 @@ public class CommandIrisCTC extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { - if(args.length == 0) - { - sender.sendMessage("/iris ctc " + getArgsUsage()); - return true; - } - if(sender.isPlayer()) { Player p = sender.player(); @@ -38,8 +32,14 @@ public class CommandIrisCTC extends MortarCommand sender.sendMessage("You must be in an iris world."); return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); + + if(args.length == 0){ + sender.sendMessage("Current threads: " + g.getThreadCount()); + return true; + } + + int m = Math.min(Math.max(Integer.valueOf(args[0]), 2), 256); g.changeThreadCount(m); sender.sendMessage("Thread count changed to " + m); diff --git a/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java index af743ea32..620dc88cb 100644 --- a/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java @@ -45,6 +45,10 @@ public abstract class ParallelTerrainProvider extends DimensionalTerrainProvider Iris.info("Thread Count changed to " + getThreads()); } + public int getThreadCount(){ + return getThreads(); + } + protected abstract int onGenerateColumn(int cx, int cz, int wx, int wz, int x, int z, AtomicSliver sliver, BiomeMap biomeMap, boolean sampled); protected void onGenerateColumn(int cx, int cz, int wx, int wz, int x, int z, AtomicSliver sliver, BiomeMap biomeMap)