diff --git a/src/main/java/ninja/bytecode/iris/Settings.java b/src/main/java/ninja/bytecode/iris/Settings.java index b1e4a6e04..4f2acd260 100644 --- a/src/main/java/ninja/bytecode/iris/Settings.java +++ b/src/main/java/ninja/bytecode/iris/Settings.java @@ -29,8 +29,8 @@ public class Settings public double heightFracture = 155; public double landScale = 0.25; public double landChance = 0.45; - public double biomeEdgeScramble = 0; // 1550D public double roughness = 1.55; + public double biomeEdgeScrambleScale = 1; public double heightMultiplier = 0.806; public double heightExponentBase = 1; public double heightExponentMultiplier = 1.41; @@ -41,7 +41,7 @@ public class Settings public double caveScale = 1.45; public double biomeScale = 0.65; public boolean flatBedrock = true; - public boolean genObjects = true; + public boolean genObjects = false; public boolean genCarving = true; public boolean genCaverns = true; public boolean genCaves = true; diff --git a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java index f02bd97cf..71b45275f 100644 --- a/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java +++ b/src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java @@ -112,6 +112,7 @@ public class IrisGenerator extends ParallelChunkGenerator return; } + //@builder this.world = world; rTerrain = new RNG(world.getSeed()); glLNoise = new GenLayerLayeredNoise(this, world, random, rTerrain.nextParallelRNG(2)); @@ -123,7 +124,7 @@ public class IrisGenerator extends ParallelChunkGenerator glCliffs = new GenLayerCliffs(this, world, random, rTerrain.nextParallelRNG(9)); scatterCache = new double[16][][]; scatter = new CNG(rTerrain.nextParallelRNG(52), 1, 1).scale(10); - + //@done for(int i = 0; i < 16; i++) { scatterCache[i] = new double[16][]; diff --git a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java index 254b1c53b..17f12614e 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java @@ -135,8 +135,8 @@ public class GenLayerBiome extends GenLayer { double wx = Math.round((double) wxx * (Iris.settings.gen.horizontalZoom / 1.90476190476)) * Iris.settings.gen.biomeScale; double wz = Math.round((double) wzx * (Iris.settings.gen.horizontalZoom / 1.90476190476)) * Iris.settings.gen.biomeScale; - double x = wx + (Iris.settings.gen.biomeEdgeScramble == 0 ? 0 : (fracture.noise(wz, wx) * Iris.settings.gen.biomeEdgeScramble)); - double z = wz - (Iris.settings.gen.biomeEdgeScramble == 0 ? 0 : (fracture.noise(wx, wz) * Iris.settings.gen.biomeEdgeScramble)); + double x = wx + ((fracture.noise(wx, wz) / 2D) * 200D * Iris.settings.gen.biomeEdgeScrambleScale); + double z = wz - ((fracture.noise(wz, wx) / 2D) * 200D * Iris.settings.gen.biomeEdgeScrambleScale); if(real) {