Remove 2d base eq options. Closes #70.

This commit is contained in:
dfsek
2021-01-29 00:46:55 -07:00
parent a8266f99b1
commit dddf644c34
8 changed files with 14 additions and 77 deletions
@@ -34,10 +34,6 @@ public class GeneratorBuilder {
private boolean interpolateElevation;
private boolean noise2d;
private double base;
private NoiseBuilder biomeNoise;
private double elevationWeight;
@@ -61,7 +57,7 @@ public class GeneratorBuilder {
} catch(ParseException e) {
throw new RuntimeException(e);
}
return new WorldGenerator(palettes, slantPalettes, noise, elevation, carving, noise2d, base, biomeNoise.build((int) seed), elevationWeight, blendDistance, blendStep, blendWeight);
return new WorldGenerator(palettes, slantPalettes, noise, elevation, carving, biomeNoise.build((int) seed), elevationWeight, blendDistance, blendStep, blendWeight);
});
}
}
@@ -82,38 +78,14 @@ public class GeneratorBuilder {
this.biomeNoise = biomeNoise;
}
public boolean isNoise2d() {
return noise2d;
}
public void setNoise2d(boolean noise2d) {
this.noise2d = noise2d;
}
public double getBase() {
return base;
}
public void setBase(double base) {
this.base = base;
}
public void setElevationWeight(double elevationWeight) {
this.elevationWeight = elevationWeight;
}
public String getNoiseEquation() {
return noiseEquation;
}
public void setNoiseEquation(String noiseEquation) {
this.noiseEquation = noiseEquation;
}
public String getElevationEquation() {
return elevationEquation;
}
public void setElevationEquation(String elevationEquation) {
this.elevationEquation = elevationEquation;
}
@@ -30,8 +30,6 @@ public class BiomeFactory implements TerraFactory<BiomeTemplate, TerraBiome> {
generatorBuilder.setVarScope(vars);
generatorBuilder.setInterpolateElevation(template.interpolateElevation());
generatorBuilder.setNoise2d(template.isNoise2d());
generatorBuilder.setBase(template.getNoise2dBase());
generatorBuilder.setElevationWeight(template.getElevationWeight());
generatorBuilder.setBiomeNoise(template.getBiomeNoise());
generatorBuilder.setBlendDistance(template.getBlendDistance());
@@ -53,16 +53,6 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
@Default
private String carvingEquation = "0";
@Value("noise-2d.enable")
@Default
@Abstractable
private boolean noise2d = false;
@Value("noise-2d.base")
@Default
@Abstractable
private double noise2dBase = 64;
@Value("palette")
@Abstractable
private PaletteHolder palette;
@@ -298,14 +288,6 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
return oreHolder;
}
public boolean isNoise2d() {
return noise2d;
}
public double getNoise2dBase() {
return noise2dBase;
}
public double getElevationWeight() {
return elevationWeight;
}