diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f689e9701..27b35c5b4 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -81,5 +81,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e708b1c02..000000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java b/src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
index f6bba40a0..4812a0c03 100644
--- a/src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
+++ b/src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
@@ -59,7 +59,7 @@ public class TerraBiomeGrid extends BiomeGrid {
failNum++;
return null;
}
- if(erode.isEroded(xp, zp)) return b.getErode();
+ if(erode != null && erode.isEroded(xp, zp)) return b.getErode();
return b;
}
diff --git a/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java b/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
index a4e0da0ab..d63460942 100644
--- a/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
+++ b/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
@@ -25,8 +25,10 @@ public class GeneratorBuilder {
private boolean preventInterpolation;
+ private boolean interpolateElevation;
+
public WorldGenerator build(long seed) {
- return gens.computeIfAbsent(seed, k -> new WorldGenerator(seed, noiseEquation, elevationEquation, varScope, noiseBuilderMap, palettes, slantPalettes, preventInterpolation));
+ return gens.computeIfAbsent(seed, k -> new WorldGenerator(seed, noiseEquation, elevationEquation, varScope, noiseBuilderMap, palettes, slantPalettes, preventInterpolation, interpolateElevation));
}
public String getNoiseEquation() {
@@ -84,4 +86,12 @@ public class GeneratorBuilder {
public void setPreventInterpolation(boolean preventInterpolation) {
this.preventInterpolation = preventInterpolation;
}
+
+ public void setInterpolateElevation(boolean interpolateElevation) {
+ this.interpolateElevation = interpolateElevation;
+ }
+
+ public boolean interpolateElevation() {
+ return interpolateElevation;
+ }
}
diff --git a/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java b/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java
index 0e42f5381..5924bb9d8 100644
--- a/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java
+++ b/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java
@@ -24,6 +24,7 @@ public class BiomeFactory implements TerraFactory {
public NoiseBuilder load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
NoiseBuilder builder = new NoiseBuilder();
try {
- Debug.info(o + "");
LOADER.load(builder, new Configuration((Map) o));
} catch(ConfigException e) {
throw new LoadException("Could not load noise", e);
}
- Debug.info("FREQ: " + builder.getFrequency());
- Debug.info("FRAC: " + builder.getFractalType());
- Debug.info("OCT:" + builder.getOctaves());
return builder;
}
}
diff --git a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
index bdce4bb93..7cdf6ed8c 100644
--- a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
+++ b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
@@ -111,6 +111,15 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
@Default
private double slantThreshold = 0.1;
+ @Value("interpolate-elevation")
+ @Abstractable
+ @Default
+ private boolean interpolateElevation = true;
+
+ public boolean interpolateElevation() {
+ return interpolateElevation;
+ }
+
public double getSlantThreshold() {
return slantThreshold;
}
diff --git a/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java b/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java
index 287157921..576ab7f28 100644
--- a/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java
+++ b/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java
@@ -32,10 +32,10 @@ public class WorldGenerator extends Generator {
private final Variable zVar;
private final Variable elevationXVar;
private final Variable elevationZVar;
- private boolean elevationInterpolation = true;
+ private final boolean elevationInterpolation;
@SuppressWarnings({"rawtypes", "unchecked"})
- public WorldGenerator(long seed, String equation, String elevateEquation, Scope vScope, Map noiseBuilders, PaletteHolder palettes, PaletteHolder slantPalettes, boolean preventSmooth) {
+ public WorldGenerator(long seed, String equation, String elevateEquation, Scope vScope, Map noiseBuilders, PaletteHolder palettes, PaletteHolder slantPalettes, boolean preventSmooth, boolean elevationInterpolation) {
Parser p = new Parser();
p.registerFunction("rand", new RandomFunction());
Parser ep = new Parser();
@@ -52,6 +52,8 @@ public class WorldGenerator extends Generator {
this.palettes = palettes;
this.slantPalettes = slantPalettes;
+ this.elevationInterpolation = elevationInterpolation;
+
for(Map.Entry e : noiseBuilders.entrySet()) {
switch(e.getValue().getDimensions()) {
case 2:
@@ -133,8 +135,4 @@ public class WorldGenerator extends Generator {
return elevationInterpolation;
}
- public WorldGenerator setElevationInterpolation(boolean elevationInterpolation) {
- this.elevationInterpolation = elevationInterpolation;
- return this;
- }
}