mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-05 07:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Tectonic validation API to validate Biome noise equations

Browse Source
This commit is contained in:
dfsek
2020-11-29 23:57:03 -07:00
parent 7fe2fa493e
commit ce97732da7
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/Tectonic-0.1.0.jar
View File

Binary file not shown.

34
src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
View File

@@ -3,6 +3,8 @@ package com.dfsek.terra.config.templates;
import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ValidatedConfigTemplate;
import com.dfsek.tectonic.exception.ValidationException;
import com.dfsek.terra.biome.palette.PaletteHolder;
import com.dfsek.terra.biome.palette.SinglePalette;
import com.dfsek.terra.carving.UserDefinedCarver;
@@ -10,19 +12,23 @@ import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.generation.items.flora.FloraLayer;
import com.dfsek.terra.generation.items.ores.Ore;
import com.dfsek.terra.generation.items.ores.OreConfig;
import com.dfsek.terra.math.BlankFunction;
import com.dfsek.terra.structure.TerraStructure;
import org.bukkit.Material;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import org.polydev.gaea.util.GlueList;
import org.polydev.gaea.world.palette.Palette;
import parsii.eval.Parser;
import parsii.eval.Scope;
import parsii.tokenizer.ParseException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@SuppressWarnings({"FieldMayBeFinal", "unused"})
public class BiomeTemplate extends AbstractableTemplate {
public class BiomeTemplate extends AbstractableTemplate implements ValidatedConfigTemplate {
private final ConfigPack pack;
@Value("id")
@@ -179,4 +185,30 @@ public class BiomeTemplate extends AbstractableTemplate {
public Map<Ore, OreConfig> getOres() {
return ores;
}
@Override
public boolean validate() throws ValidationException {
Parser tester = new Parser();
Scope testScope = new Scope().withParent(pack.getVarScope());
testScope.create("x");
testScope.create("y");
testScope.create("z");
testScope.create("seed");
pack.getTemplate().getNoiseBuilderMap().forEach((id, builder) -> tester.registerFunction(id, new BlankFunction(builder.getDimensions()))); // Register dummy functions
try {
tester.parse(noiseEquation, testScope);
} catch(ParseException e) {
throw new ValidationException("Invalid noise equation: ", e);
}
try {
if(elevationEquation != null) tester.parse(elevationEquation, testScope);
} catch(ParseException e) {
throw new ValidationException("Invalid elevation equation: ", e);
}
return true;
}
}