diff --git a/lib/Gaea-1.12.1-javadoc.jar b/lib/Gaea-1.12.1-javadoc.jar
deleted file mode 100644
index ceaaba0af..000000000
Binary files a/lib/Gaea-1.12.1-javadoc.jar and /dev/null differ
diff --git a/lib/Gaea-1.12.2-javadoc.jar b/lib/Gaea-1.12.2-javadoc.jar
new file mode 100644
index 000000000..3b6faa82d
Binary files /dev/null and b/lib/Gaea-1.12.2-javadoc.jar differ
diff --git a/lib/Gaea-1.12.1-sources.jar b/lib/Gaea-1.12.2-sources.jar
similarity index 97%
rename from lib/Gaea-1.12.1-sources.jar
rename to lib/Gaea-1.12.2-sources.jar
index 5183b00d8..eeb72f357 100644
Binary files a/lib/Gaea-1.12.1-sources.jar and b/lib/Gaea-1.12.2-sources.jar differ
diff --git a/lib/Gaea-1.12.1.jar b/lib/Gaea-1.12.2.jar
similarity index 90%
rename from lib/Gaea-1.12.1.jar
rename to lib/Gaea-1.12.2.jar
index 3ba00e430..7be88ed49 100644
Binary files a/lib/Gaea-1.12.1.jar and b/lib/Gaea-1.12.2.jar differ
diff --git a/pom.xml b/pom.xml
index 1d828c9c2..3bf17e955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,9 +111,9 @@
org.polydev
gaea
- 1.12.1
+ 1.12.2
system
- ${basedir}/lib/Gaea-1.12.1.jar
+ ${basedir}/lib/Gaea-1.12.2.jar
org.apache.commons
diff --git a/src/main/java/com/dfsek/terra/biome/ErosionNoise.java b/src/main/java/com/dfsek/terra/biome/ErosionNoise.java
index 3a931de8f..7763f66bc 100644
--- a/src/main/java/com/dfsek/terra/biome/ErosionNoise.java
+++ b/src/main/java/com/dfsek/terra/biome/ErosionNoise.java
@@ -8,11 +8,11 @@ import org.polydev.gaea.math.FastNoiseLite;
public class ErosionNoise {
private final double thresh;
private final FastNoiseLite noise;
- public ErosionNoise(float freq1, double thresh, long seed) {
+ public ErosionNoise(float freq1, double thresh, int octaves, long seed) {
FastNoiseLite main = new FastNoiseLite((int) (seed+1));
main.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
- main.setFractalType(FastNoiseLite.FractalType.PingPong);
- main.setFractalOctaves(1);
+ main.setFractalType(FastNoiseLite.FractalType.FBm);
+ main.setFractalOctaves(octaves);
main.setFrequency(freq1);
this.thresh = thresh;
this.noise = main;
@@ -25,6 +25,7 @@ public class ErosionNoise {
* @return Whether location is eroded
*/
boolean isEroded(int x, int z) {
- return (noise.getNoise(x, z)+1)/2 <= thresh;
+ double abs = Math.pow(noise.getNoise(x, z), 2);
+ return abs < thresh;
}
}
diff --git a/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java b/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java
index c083d5bed..c8ba9cddf 100644
--- a/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java
+++ b/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java
@@ -21,13 +21,13 @@ public class TerraBiomeGrid extends BiomeGrid {
private final BiomeZone zone;
public TerraBiomeGrid(World w, float freq1, float freq2, BiomeZone zone, ConfigPack c, UserDefinedGrid erosion) {
- super(w, freq1, freq2);
+ super(w, freq1, freq2, 0, 0);
if(c.biomeBlend) {
perturb = new CoordinatePerturb(c.blendFreq, c.blendAmp, w.getSeed());
}
this.zone = zone;
if(c.erosionEnable) {
- erode = new ErosionNoise(c.erosionFreq, c.erosionThresh, w.getSeed());
+ erode = new ErosionNoise(c.erosionFreq, c.erosionThresh, c.erosionOctaves, w.getSeed());
this.erosionGrid = erosion;
}
}
diff --git a/src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java b/src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java
index 1639e5a4a..d237a7562 100644
--- a/src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java
+++ b/src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java
@@ -16,7 +16,6 @@ public class UserDefinedGrid extends BiomeGrid {
private final ImageLoader.Channel channelZ;
public UserDefinedGrid(World w, float freq1, float freq2, UserDefinedBiome[][] b, WorldConfig c) {
super(w, freq1, freq2, b.length, b[0].length);
- super.setNormalType(NormalType.LOOKUP4096);
super.setGrid(b);
imageLoader = c.imageLoader;
fromImage = c.fromImage;
diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
index 4d96d6699..f12a574c1 100644
--- a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
+++ b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
@@ -61,6 +61,7 @@ public class ConfigPack extends YamlConfiguration {
public final float erosionFreq;
public final double erosionThresh;
public final boolean erosionEnable;
+ public final int erosionOctaves;
public final String erosionName;
public final int blendAmp;
@@ -107,6 +108,7 @@ public class ConfigPack extends YamlConfiguration {
erosionEnable = getBoolean("erode.enable", false);
erosionFreq = (float) getDouble("erode.frequency", 0.01);
erosionThresh = getDouble("erode.threshold", 0.04);
+ erosionOctaves = getInt("erode.octaves", 3);
octaves = getInt("noise.octaves", 4);
frequency = (float) getDouble("noise.frequency", 1f/96);