mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-18 23:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove SeededNoiseSampler from configs

Browse Source
This commit is contained in:
dfsek
2021-07-19 21:10:49 -07:00
parent 3bf8fe7901
commit 6f40e7b1f5
35 changed files with 92 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
+9 -38
View File
@@ -11,6 +11,7 @@ import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.config.AbstractableTemplate;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
import com.dfsek.terra.api.world.biome.Biome;
@@ -42,14 +43,14 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
@Value("beta.carving.equation")
@Default
private SeededNoiseSampler carvingEquation = SeededNoiseSampler.zero(3);
private NoiseSampler carvingEquation = NoiseSampler.zero();
@Value("vanilla")
private ProbabilityCollection<Biome> vanilla;
@Value("biome-noise")
@Default
private SeededNoiseSampler biomeNoise = SeededNoiseSampler.zero(2);
private NoiseSampler biomeNoise = NoiseSampler.zero();
@Value("blend.distance")
@Default
@@ -64,7 +65,7 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
private int blendStep = 4;
@Value("noise")
private SeededNoiseSampler noiseEquation;
private NoiseSampler noiseEquation;
@Value("ocean.level")
@Default
@@ -72,7 +73,7 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
@Value("elevation.equation")
@Default
private SeededNoiseSampler elevationEquation = SeededNoiseSampler.zero(2);
private NoiseSampler elevationEquation = NoiseSampler.zero();
@Value("elevation.weight")
@Default
@@ -159,15 +160,15 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
return stairPalettes;
}
public SeededNoiseSampler getBiomeNoise() {
public NoiseSampler getBiomeNoise() {
return biomeNoise;
}
public SeededNoiseSampler getElevationEquation() {
public NoiseSampler getElevationEquation() {
return elevationEquation;
}
public SeededNoiseSampler getCarvingEquation() {
public NoiseSampler getCarvingEquation() {
return carvingEquation;
}
@@ -187,7 +188,7 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
return vanilla;
}
public SeededNoiseSampler getNoiseEquation() {
public NoiseSampler getNoiseEquation() {
return noiseEquation;
}
@@ -206,36 +207,6 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
@Override
public boolean validate() throws ValidationException {
color |= 0xff000000; // Alpha adjustment
Parser tester = new Parser();
Scope testScope = new Scope();
variables.forEach(testScope::create);
testScope.addInvocationVariable("x");
testScope.addInvocationVariable("y");
testScope.addInvocationVariable("z");
//pack.getTemplate().getNoiseBuilderMap().forEach((id, builder) -> tester.registerFunction(id, new BlankFunction(builder.getDimensions()))); // Register dummy functions
try {
noiseEquation.build(0L);
} catch(Exception e) {
throw new ValidationException("Invalid noise sampler: ", e);
}
try {
carvingEquation.build(0L);
} catch(Exception e) {
throw new ValidationException("Invalid carving sampler: ", e);
}
try {
elevationEquation.build(0L);
} catch(Exception e) {
throw new ValidationException("Invalid elevation sampler: ", e);
}
return true;
}
}
common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedSeededTerraBiome.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class UserDefinedSeededTerraBiome implements SeededTerraBiome {
synchronized(biomeMap) {
return biomeMap.computeIfAbsent(seed,
s -> {
UserDefinedGenerator generator = new UserDefinedGenerator(template.getNoiseEquation().build(seed), template.getElevationEquation().build(seed), template.getCarvingEquation().build(seed), template.getBiomeNoise().build(seed), template.getElevationWeight(),
UserDefinedGenerator generator = new UserDefinedGenerator(template.getNoiseEquation(), template.getElevationEquation(), template.getCarvingEquation(), template.getBiomeNoise(), template.getElevationWeight(),
template.getBlendDistance(), template.getBlendStep(), template.getBlendWeight());
return new UserDefinedBiome(template.getVanilla(), generator, template, context);
}