diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index a45cc8f54..0c720c9f6 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -190,31 +190,22 @@ public class IrisComplex implements DataProvider { slopeStream = heightStream.slope(3).cache2D(cacheSize); objectChanceStream = ProceduralStream.ofDouble((x, z) -> { AtomicDouble str = new AtomicDouble(1D); - - if(engine.getDimension().isNoiseModificationFromFeatures()) - { - for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { - str.set(Math.min(str.get(), i.getObjectChanceModifier(x, z, rng, getData()))); - } + for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { + str.set(Math.min(str.get(), i.getObjectChanceModifier(x, z, rng, getData()))); } return str.get(); }); trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D, b -> focus)).convertAware2D((b, x, z) -> { + for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { + IrisBiome bx = i.filter(x, z, b, rng); - if(engine.getDimension().isNoiseModificationFromFeatures()) - { - for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { - IrisBiome bx = i.filter(x, z, b, rng); - - if (bx != null) { - bx.setInferredType(b.getInferredType()); - return bx; + if (bx != null) { + bx.setInferredType(b.getInferredType()); + return bx; + } } - } - } - return b; }) @@ -223,39 +214,28 @@ public class IrisComplex implements DataProvider { fixBiomeType(h, baseBiomeStream.get(x, z), regionStream.get(x, z), x, z, fluidHeight)) .convertAware2D((b, x, z) -> { + for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { + IrisBiome bx = i.filter(x, z, b, rng); - if(engine.getDimension().isNoiseModificationFromFeatures()) - { - for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { - IrisBiome bx = i.filter(x, z, b, rng); - - if (bx != null) { - bx.setInferredType(b.getInferredType()); - return bx; - } + if (bx != null) { + bx.setInferredType(b.getInferredType()); + return bx; } } - - return b; }) .cache2D(cacheSize); trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D, b -> focus)).convertAware2D((b, x, z) -> { + for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { + IrisBiome bx = i.filter(x, z, b, rng); - - if(engine.getDimension().isNoiseModificationFromFeatures()) - { - for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { - IrisBiome bx = i.filter(x, z, b, rng); - - if (bx != null) { - bx.setInferredType(b.getInferredType()); - return bx; + if (bx != null) { + bx.setInferredType(b.getInferredType()); + return bx; + } } - } - } return b; }) @@ -264,18 +244,13 @@ public class IrisComplex implements DataProvider { fixBiomeType(h, baseBiomeStream.get(x, z), regionStream.get(x, z), x, z, fluidHeight)) .convertAware2D((b, x, z) -> { + for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { + IrisBiome bx = i.filter(x, z, b, rng); - if(engine.getDimension().isNoiseModificationFromFeatures()) - { - for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { - IrisBiome bx = i.filter(x, z, b, rng); - - if (bx != null) { - bx.setInferredType(b.getInferredType()); - return bx; - } + if (bx != null) { + bx.setInferredType(b.getInferredType()); + return bx; } - } return b; @@ -422,11 +397,8 @@ public class IrisComplex implements DataProvider { AtomicDouble noise = new AtomicDouble(h + fluidHeight + overlayStream.get(x, z)); if (features) { - if(engine.getDimension().isNoiseModificationFromFeatures()) - { - for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { - noise.set(i.filter(x, z, noise.get(), rng, getData())); - } + for (IrisFeaturePositional i : engine.getMantle().forEachFeature(x, z)) { + noise.set(i.filter(x, z, noise.get(), rng, getData())); } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index b49a91dcf..047006753 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -181,10 +181,6 @@ public class IrisDimension extends IrisRegistrant { @MaxNumber(360) @Desc("You can rotate the input coordinates by an angle. This can make terrain appear more natural (less sharp corners and lines). This literally rotates the entire dimension by an angle. Hint: Try 12 degrees or something not on a 90 or 45 degree angle.") private double dimensionAngleDeg = 0; - - @Desc("Use noise mods from features such as vacuum") - private boolean noiseModificationFromFeatures = true; - @MinNumber(0) @MaxNumber(8192) @Desc("Coordinate fracturing applies noise to the input coordinates. This creates the 'iris swirls' and wavy features. The distance pushes these waves further into places they shouldnt be. This is a block value multiplier.")