mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Brian Fopiano 2020-01-08 11:43:32 -08:00
commit d88a6c5db8
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ninja/bytecode/iris/Settings.java
View File

@ -15,7 +15,7 @@ public class Settings
public boolean loadonstart = true; public boolean loadonstart = true;
public int compilerThreads = 4; public int compilerThreads = 4;
public int compilerPriority = Thread.MAX_PRIORITY; public int compilerPriority = Thread.MAX_PRIORITY;
public int decorationAccuracy = 3; public int decorationAccuracy = 1;
} }
public static class GeneratorSettings public static class GeneratorSettings
@ -23,7 +23,7 @@ public class Settings
public double horizontalZoom = 1; // 0.525 public double horizontalZoom = 1; // 0.525
public double heightFracture = 155; public double heightFracture = 155;
public double landScale = 0.205; public double landScale = 0.205;
public double landChance = 0.6; public double landChance = 0.67;
public double roughness = 1.333; public double roughness = 1.333;
public double heightMultiplier = 0.806; public double heightMultiplier = 0.806;
public double heightExponentBase = 1; public double heightExponentBase = 1;
@ -33,6 +33,7 @@ public class Settings
public double baseHeight = 0.165; public double baseHeight = 0.165;
public int seaLevel = 63; public int seaLevel = 63;
public double caveDensity = 0; public double caveDensity = 0;
public double caveScale = 1.45;
public double biomeScale = 2; public double biomeScale = 2;
public boolean flatBedrock = false; public boolean flatBedrock = false;
public boolean doSchematics = true; public boolean doSchematics = true;

8
src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java
View File

@ -25,8 +25,7 @@ public class GenLayerCaves extends GenLayer
caveHeight = new CNG(rng.nextParallelRNG(-100001), 1D, 7).scale(0.00222); caveHeight = new CNG(rng.nextParallelRNG(-100001), 1D, 7).scale(0.00222);
caveGirth = new CNG(rng.nextParallelRNG(-100002), 1D, 12).scale(0.03); caveGirth = new CNG(rng.nextParallelRNG(-100002), 1D, 12).scale(0.03);
caveClamp = new CNG(rng.nextParallelRNG(-10000), 1D, 3).scale(0.1422); caveClamp = new CNG(rng.nextParallelRNG(-10000), 1D, 3).scale(0.1422);
caveVeins = new MaxingGenerator(rng.nextParallelRNG(-99999), 22, 0.002, 1, (g) -> g.fractureWith(new CNG(rng.nextParallelRNG(-5555), 1D, 4).scale(0.02), 70)); caveVeins = new MaxingGenerator(rng.nextParallelRNG(-99999), 22, 0.002 * Iris.settings.gen.caveScale, 1, (g) -> g.fractureWith(new CNG(rng.nextParallelRNG(-5555), 1D, 4).scale(0.02), 70));
} }
public void 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)
@ -49,8 +48,8 @@ public class GenLayerCaves extends GenLayer
if(caveVeins.hasBorder(3, width, wxx - (19949D * itr), wzx + (19949D * itr))) if(caveVeins.hasBorder(3, width, wxx - (19949D * itr), wzx + (19949D * itr)))
{ {
double r = (((caveGirth.noise(wxx, wzx, width)) * variance) + height) / 2D; double r = (((caveGirth.noise(wxx, wzx, width)) * variance) + height) / 2D;
int f = 3;
for(int i = (int) -r; i < r; i++) for(int i = (int) -r; i < r && f >= 0; i++)
{ {
if(i + height > s) if(i + height > s)
{ {
@ -66,7 +65,6 @@ public class GenLayerCaves extends GenLayer
g.setBlock(x, (int) (elevation + i) - 55, z, Material.AIR); g.setBlock(x, (int) (elevation + i) - 55, z, Material.AIR);
} }
} }
} }
} }
} }