From ce8127456c4b9fb65dbd7b101093a52ba913e190 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 8 Jan 2020 14:20:42 -0500 Subject: [PATCH] fIXES --- src/main/java/ninja/bytecode/iris/CommandIris.java | 2 -- src/main/java/ninja/bytecode/iris/Settings.java | 2 +- .../ninja/bytecode/iris/generator/IrisGenerator.java | 2 +- .../bytecode/iris/generator/layer/GenLayerCaves.java | 6 +----- src/main/java/ninja/bytecode/iris/util/ChunkPlan.java | 11 ----------- .../bytecode/iris/util/ParallelChunkGenerator.java | 2 -- 6 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/main/java/ninja/bytecode/iris/CommandIris.java b/src/main/java/ninja/bytecode/iris/CommandIris.java index 38a2c7302..878bc1e95 100644 --- a/src/main/java/ninja/bytecode/iris/CommandIris.java +++ b/src/main/java/ninja/bytecode/iris/CommandIris.java @@ -37,11 +37,9 @@ public class CommandIris implements CommandExecutor if(args[0].equalsIgnoreCase("timings")) { double t = Iris.profiler.getResult("terrain").getAverage(); - double c = Iris.profiler.getResult("caves").getAverage(); double d = Iris.profiler.getResult("decor").getAverage(); msg(sender, "Generation: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t + d, 2)); msg(sender, " \\Terrain: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t, 2)); - msg(sender, " \\Caves: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(c, 2)); msg(sender, " \\Decor: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(d, 2)); } diff --git a/src/main/java/ninja/bytecode/iris/Settings.java b/src/main/java/ninja/bytecode/iris/Settings.java index f4162d09b..7e23510e2 100644 --- a/src/main/java/ninja/bytecode/iris/Settings.java +++ b/src/main/java/ninja/bytecode/iris/Settings.java @@ -32,7 +32,7 @@ public class Settings public double superHeightScale = 0.95; public double baseHeight = 0.165; public int seaLevel = 63; - public double caveDensity = 1; + public double caveDensity = 0; public double biomeScale = 2; public boolean flatBedrock = false; public boolean doSchematics = true; diff --git a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java index 6913a8be0..c0e2b7df7 100644 --- a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java @@ -206,7 +206,7 @@ public class IrisGenerator extends ParallelChunkGenerator setBlock(x, i, z, mb.material, mb.data); } - plan.caveMs(glCaves.genCaves(wxx, wzx, x, z, height, this)); + glCaves.genCaves(wxx, wzx, x, z, height, this); return biome.getRealBiome(); } diff --git a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java index c56f2b272..b8d3d4a9a 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java @@ -9,7 +9,6 @@ import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.generator.IrisGenerator; import ninja.bytecode.iris.util.GenLayer; import ninja.bytecode.iris.util.MaxingGenerator; -import ninja.bytecode.shuriken.bench.PrecisionStopwatch; import ninja.bytecode.shuriken.math.CNG; import ninja.bytecode.shuriken.math.RNG; @@ -30,9 +29,8 @@ public class GenLayerCaves extends GenLayer } - public double genCaves(double wxx, double wzx, int x, int z, int s, IrisGenerator g) + public void genCaves(double wxx, double wzx, int x, int z, int s, IrisGenerator g) { - PrecisionStopwatch p = PrecisionStopwatch.start(); for(double itr = 0; itr < 0.1 * Iris.settings.gen.caveDensity; itr += 0.1) { double thickness = 0.25 + itr + (0.5 * caveClamp.noise(wxx, wzx)); @@ -71,8 +69,6 @@ public class GenLayerCaves extends GenLayer } } - - return p.getMilliseconds(); } @Override diff --git a/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java b/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java index cd4e3f456..92f257858 100644 --- a/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java +++ b/src/main/java/ninja/bytecode/iris/util/ChunkPlan.java @@ -13,7 +13,6 @@ public class ChunkPlan private final GMap heightCache; private final GMap biomeCache; private final GMap schematics; - private double caveMs; public ChunkPlan() { @@ -22,11 +21,6 @@ public class ChunkPlan this.biomeCache = new GMap<>(); } - public double getCaveMs() - { - return caveMs; - } - public void planSchematic(BlockVector b, Schematic s) { schematics.put(b, s); @@ -74,9 +68,4 @@ public class ChunkPlan { setHeight(new ChunkedVector(x, z), h); } - - public void caveMs(double genCaves) - { - caveMs += genCaves; - } } diff --git a/src/main/java/ninja/bytecode/iris/util/ParallelChunkGenerator.java b/src/main/java/ninja/bytecode/iris/util/ParallelChunkGenerator.java index 18fcf2fb8..164387f8a 100644 --- a/src/main/java/ninja/bytecode/iris/util/ParallelChunkGenerator.java +++ b/src/main/java/ninja/bytecode/iris/util/ParallelChunkGenerator.java @@ -8,7 +8,6 @@ import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator; import ninja.bytecode.iris.Iris; -import ninja.bytecode.shuriken.Shuriken; import ninja.bytecode.shuriken.execution.ChronoLatch; import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup; import ninja.bytecode.shuriken.execution.TaskExecutor.TaskResult; @@ -75,7 +74,6 @@ public abstract class ParallelChunkGenerator extends ChunkGenerator TaskResult r = tg.execute(); onPostChunk(world, x, z, random, data, plan.get()); rs.put(r.timeElapsed); - Iris.profiler.getResult("caves").put(plan.get().getCaveMs()); cg++; }