From 495dcd94d82e96604fb6491485ee00a7fe60ce3e Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 15 Jan 2020 02:39:07 -0500 Subject: [PATCH] Disable features for noise testing --- src/main/java/ninja/bytecode/iris/Settings.java | 5 ++++- .../ninja/bytecode/iris/generator/layer/GenLayerCarving.java | 5 +++++ .../ninja/bytecode/iris/generator/layer/GenLayerCaverns.java | 5 +++++ .../ninja/bytecode/iris/generator/layer/GenLayerCaves.java | 5 +++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/ninja/bytecode/iris/Settings.java b/src/main/java/ninja/bytecode/iris/Settings.java index 24604ec0e..23e6fcb72 100644 --- a/src/main/java/ninja/bytecode/iris/Settings.java +++ b/src/main/java/ninja/bytecode/iris/Settings.java @@ -45,7 +45,10 @@ public class Settings public double caveScale = 1.45; public double biomeScale = 2; public boolean flatBedrock = false; - public boolean genObjects = true; + public boolean genObjects = false; + public boolean genCarving = false; + public boolean genCaverns = false; + public boolean genCaves = false; public double carvingChance = 0.352; public double cavernChance = 0.321; public int minCarvingHeight = 75; diff --git a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCarving.java b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCarving.java index 35f4d2ca7..0a748c52e 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCarving.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCarving.java @@ -70,6 +70,11 @@ public class GenLayerCarving extends GenLayer public void genCarves(double wxx, double wzx, int x, int z, int s, IrisGenerator g, IrisBiome biome) { + if(!Iris.settings.gen.genCarving) + { + return; + } + if(s < Iris.settings.gen.minCarvingHeight) { return; diff --git a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaverns.java b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaverns.java index 5275d3c93..2fca49f73 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaverns.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaverns.java @@ -70,6 +70,11 @@ public class GenLayerCaverns extends GenLayer public void genCaverns(double wxx, double wzx, int x, int z, int s, IrisGenerator g, IrisBiome biome) { + if(!Iris.settings.gen.genCaverns) + { + return; + } + if(s < Iris.settings.gen.minCavernHeight) { return; 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 7a899f5eb..3211b59fe 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java @@ -30,6 +30,11 @@ public class GenLayerCaves extends GenLayer public void genCaves(double wxx, double wzx, int x, int z, int s, IrisGenerator g) { + if(!Iris.settings.gen.genCaves) + { + return; + } + 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));