Merge branch 'biome' into asmparser

# Conflicts:
#	platforms/bukkit/build.gradle.kts

common/src/main/java/com/dfsek/terra/config/GenericLoaders.java

@@ -14,6 +14,8 @@ import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
 import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
 import com.dfsek.terra.biome.pipeline.stages.ExpanderStage;
 import com.dfsek.terra.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.carving.CarverPalette;
+import com.dfsek.terra.config.loaders.LinkedHashMapLoader;
 import com.dfsek.terra.config.loaders.MaterialSetLoader;
 import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader;
 import com.dfsek.terra.config.loaders.RangeLoader;
@@ -35,6 +37,7 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate
 import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalNormalizerTemplate;
+import com.dfsek.terra.config.loaders.palette.CarverPaletteLoader;
 import com.dfsek.terra.config.loaders.palette.PaletteHolderLoader;
 import com.dfsek.terra.config.loaders.palette.PaletteLayerLoader;
 import com.dfsek.terra.util.MaterialSet;
@@ -45,6 +48,8 @@ import com.dfsek.terra.world.population.items.ores.OreConfig;
 import com.dfsek.terra.world.population.items.ores.OreHolder;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 
+import java.util.LinkedHashMap;
+
 public class GenericLoaders implements LoaderRegistrar {
     private final TerraPlugin main;
 
@@ -79,6 +84,8 @@ public class GenericLoaders implements LoaderRegistrar {
                 .registerLoader(BorderMutatorTemplate.class, BorderMutatorTemplate::new)
                 .registerLoader(BorderListMutatorTemplate.class, BorderListMutatorTemplate::new)
                 .registerLoader(FunctionTemplate.class, FunctionTemplate::new)
+                .registerLoader(LinkedHashMap.class, new LinkedHashMapLoader())
+                .registerLoader(CarverPalette.class, new CarverPaletteLoader())
                 .registerLoader(ImageSampler.Channel.class, (t, object, cf) -> ImageSampler.Channel.valueOf((String) object))
                 .registerLoader(ExpanderStage.Type.class, (t, object, cf) -> ExpanderStage.Type.valueOf((String) object))
                 .registerLoader(MutatorStage.Type.class, (t, object, cf) -> MutatorStage.Type.valueOf((String) object))

common/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java

@@ -9,7 +9,7 @@ import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class BiomeFactory implements TerraFactory<BiomeTemplate, TerraBiome> {
@@ -27,7 +27,7 @@ public class BiomeFactory implements TerraFactory<BiomeTemplate, TerraBiome> {
         generatorBuilder.setCarvingEquation(template.getCarvingEquation());
         generatorBuilder.setNoiseBuilderMap(pack.getTemplate().getNoiseBuilderMap());
 
-        Map<String, FunctionTemplate> functions = new HashMap<>(pack.getTemplate().getFunctions());
+        Map<String, FunctionTemplate> functions = new LinkedHashMap<>(pack.getTemplate().getFunctions()); // linked map to preserve order.
         functions.putAll(template.getFunctions());
         generatorBuilder.setFunctionTemplateMap(functions);
 

common/src/main/java/com/dfsek/terra/config/factories/CarverFactory.java

@@ -0,0 +1,37 @@
+package com.dfsek.terra.config.factories;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.math.MathUtil;
+import com.dfsek.terra.carving.UserDefinedCarver;
+import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.templates.CarverTemplate;
+import parsii.tokenizer.ParseException;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CarverFactory implements TerraFactory<CarverTemplate, UserDefinedCarver> {
+    private final ConfigPack pack;
+
+    public CarverFactory(ConfigPack pack) {
+        this.pack = pack;
+    }
+
+    @Override
+    public UserDefinedCarver build(CarverTemplate config, TerraPlugin main) throws LoadException {
+        double[] start = new double[] {config.getStartX(), config.getStartY(), config.getStartZ()};
+        double[] mutate = new double[] {config.getMutateX(), config.getMutateY(), config.getMutateZ()};
+        List<String> radius = Arrays.asList(config.getRadMX(), config.getRadMY(), config.getRadMZ());
+        long hash = MathUtil.hashToLong(config.getID());
+        UserDefinedCarver carver;
+        try {
+            carver = new UserDefinedCarver(config.getHeight(), config.getLength(), start, mutate, radius, pack.getVarScope(), hash, config.getCutTop(), config.getCutBottom(), config, main, pack.getTemplate().getNoiseBuilderMap(), pack.getTemplate().getFunctions());
+        } catch(ParseException e) {
+            throw new LoadException("Unable to parse radius equations", e);
+        }
+        carver.setRecalc(config.getRecalc());
+        carver.setRecalcMagnitude(config.getRecaclulateMagnitude());
+        return carver;
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java

@@ -0,0 +1,28 @@
+package com.dfsek.terra.config.loaders;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.tectonic.loading.TypeLoader;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class LinkedHashMapLoader implements TypeLoader<LinkedHashMap<Object, Object>> {
+    @Override
+    public LinkedHashMap<Object, Object> load(Type t, Object c, ConfigLoader loader) throws LoadException {
+        Map<String, Object> config = (Map<String, Object>) c;
+        LinkedHashMap<Object, Object> map = new LinkedHashMap<>();
+        if(t instanceof ParameterizedType) {
+            ParameterizedType pType = (ParameterizedType) t;
+            Type key = pType.getActualTypeArguments()[0];
+            Type value = pType.getActualTypeArguments()[1];
+            for(Map.Entry<String, Object> entry : config.entrySet()) {
+                map.put(loader.loadType(key, entry.getKey()), loader.loadType(value, entry.getValue()));
+            }
+        } else throw new LoadException("Unable to load config");
+
+        return map;
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/BiomeProviderBuilderLoader.java

@@ -69,7 +69,7 @@ public class BiomeProviderBuilderLoader implements TypeLoader<BiomeProvider.Biom
             builder.setResolution(resolution);
             if(map.containsKey("blend")) {
                 Map<String, Object> blend = (Map<String, Object>) map.get("blend");
-                if(blend.containsKey("amplitude")) builder.setNoiseAmp(Integer.parseInt(blend.get("amplitude").toString()));
+                if(blend.containsKey("amplitude")) builder.setNoiseAmp(Double.parseDouble(blend.get("amplitude").toString()));
                 if(blend.containsKey("noise"))
                     builder.setBlender(loader.loadClass(NoiseSeeded.class, blend.get("noise")));
             }

common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java

@@ -0,0 +1,33 @@
+package com.dfsek.terra.config.loaders.palette;
+
+import com.dfsek.tectonic.config.Configuration;
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.tectonic.loading.TypeLoader;
+import com.dfsek.terra.api.math.ProbabilityCollection;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.carving.CarverPalette;
+import com.dfsek.terra.config.loaders.Types;
+import com.dfsek.terra.util.MaterialSet;
+
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("unchecked")
+public class CarverPaletteLoader implements TypeLoader<CarverPalette> {
+
+
+    @Override
+    public CarverPalette load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
+        Configuration configuration = new Configuration((Map<String, Object>) o);
+        CarverPalette palette = new CarverPalette((MaterialSet) configLoader.loadType(MaterialSet.class, configuration.get("replace")), (Boolean) configuration.get("replace-blacklist"));
+
+        for(Map<String, Object> map : (List<Map<String, Object>>) configuration.get("layers")) {
+            ProbabilityCollection<BlockData> layer = (ProbabilityCollection<BlockData>) configLoader.loadType(Types.BLOCK_DATA_PROBABILITY_COLLECTION_TYPE, map.get("materials"));
+            palette.add(layer, (Integer) map.get("y"));
+        }
+        palette.build();
+        return palette;
+    }
+}

common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java

@@ -15,8 +15,10 @@ import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.biome.TerraBiome;
 import com.dfsek.terra.biome.provider.BiomeProvider;
+import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.exception.FileMissingException;
 import com.dfsek.terra.config.factories.BiomeFactory;
+import com.dfsek.terra.config.factories.CarverFactory;
 import com.dfsek.terra.config.factories.FloraFactory;
 import com.dfsek.terra.config.factories.OreFactory;
 import com.dfsek.terra.config.factories.PaletteFactory;
@@ -31,12 +33,14 @@ import com.dfsek.terra.config.loaders.config.BufferedImageLoader;
 import com.dfsek.terra.config.loaders.config.biome.BiomeProviderBuilderLoader;
 import com.dfsek.terra.config.templates.AbstractableTemplate;
 import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.config.templates.CarverTemplate;
 import com.dfsek.terra.config.templates.FloraTemplate;
 import com.dfsek.terra.config.templates.OreTemplate;
 import com.dfsek.terra.config.templates.PaletteTemplate;
 import com.dfsek.terra.config.templates.StructureTemplate;
 import com.dfsek.terra.config.templates.TreeTemplate;
 import com.dfsek.terra.registry.BiomeRegistry;
+import com.dfsek.terra.registry.CarverRegistry;
 import com.dfsek.terra.registry.FloraRegistry;
 import com.dfsek.terra.registry.LootRegistry;
 import com.dfsek.terra.registry.OreRegistry;
@@ -82,6 +86,8 @@ public class ConfigPack implements LoaderRegistrar {
     private final ScriptRegistry scriptRegistry = new ScriptRegistry();
     private final LootRegistry lootRegistry = new LootRegistry();
 
+    private final CarverRegistry carverRegistry = new CarverRegistry();
+
     private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader();
     private final ConfigLoader selfLoader = new ConfigLoader();
     private final Scope varScope = new Scope();
@@ -180,14 +186,13 @@ public class ConfigPack implements LoaderRegistrar {
         }).close();
 
         loader
+                .open("carving", ".yml").then(streams -> buildAll(new CarverFactory(this), carverRegistry, abstractConfigLoader.load(streams, CarverTemplate::new), main)).close()
                 .open("palettes", ".yml").then(streams -> buildAll(new PaletteFactory(), paletteRegistry, abstractConfigLoader.load(streams, PaletteTemplate::new), main)).close()
                 .open("ores", ".yml").then(streams -> buildAll(new OreFactory(), oreRegistry, abstractConfigLoader.load(streams, OreTemplate::new), main)).close()
                 .open("structures/trees", ".yml").then(streams -> buildAll(new TreeFactory(), treeRegistry, abstractConfigLoader.load(streams, TreeTemplate::new), main)).close()
                 .open("structures/structures", ".yml").then(streams -> buildAll(new StructureFactory(), structureRegistry, abstractConfigLoader.load(streams, StructureTemplate::new), main)).close()
                 .open("flora", ".yml").then(streams -> buildAll(new FloraFactory(), floraRegistry, abstractConfigLoader.load(streams, FloraTemplate::new), main)).close()
                 .open("biomes", ".yml").then(streams -> buildAll(new BiomeFactory(this), biomeRegistry, abstractConfigLoader.load(streams, () -> new BiomeTemplate(this, main)), main)).close();
-
-
         main.packPostLoadCallback(this);
         LangUtil.log("config-pack.loaded", Level.INFO, template.getID(), String.valueOf((System.nanoTime() - start) / 1000000D), template.getAuthor(), template.getVersion());
     }
@@ -240,6 +245,7 @@ public class ConfigPack implements LoaderRegistrar {
                 .registerLoader(StructureScript.class, scriptRegistry)
                 .registerLoader(TerraStructure.class, structureRegistry)
                 .registerLoader(LootTable.class, lootRegistry)
+                .registerLoader(UserDefinedCarver.class, carverRegistry)
                 .registerLoader(BufferedImage.class, new BufferedImageLoader(loader))
                 .registerLoader(BiomeProvider.BiomeProviderBuilder.class, new BiomeProviderBuilderLoader(main, biomeRegistry, loader));
     }
@@ -255,4 +261,8 @@ public class ConfigPack implements LoaderRegistrar {
     public SamplerCache getSamplerCache() {
         return samplerCache;
     }
+
+    public Set<UserDefinedCarver> getCarvers() {
+        return carverRegistry.entries();
+    }
 }

common/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java

@@ -8,6 +8,7 @@ import com.dfsek.terra.biome.provider.BiomeProvider;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
@@ -22,9 +23,13 @@ public class ConfigPackTemplate implements ConfigTemplate {
     @Default
     private Map<String, Double> variables = new HashMap<>();
 
+    @Value("beta.carving")
+    @Default
+    private boolean betaCarvers = false;
+
     @Value("functions")
     @Default
-    private Map<String, FunctionTemplate> functions = new HashMap<>();
+    private LinkedHashMap<String, FunctionTemplate> functions = new LinkedHashMap<>();
 
     @Value("structures.locatable")
     @Default
@@ -34,22 +39,6 @@ public class ConfigPackTemplate implements ConfigTemplate {
     @Default
     private int elevationBlend = 4;
 
-    @Value("erode.enable")
-    @Default
-    private boolean erode = false;
-
-    @Value("erode.frequency")
-    @Default
-    private double erodeFreq = 0.001D;
-
-    @Value("erode.threshold")
-    @Default
-    private double erodeThresh = 0.0015D;
-
-    @Value("erode.octaves")
-    @Default
-    private int erodeOctaves = 5;
-
     @Value("vanilla.mobs")
     @Default
     private boolean vanillaMobs = true;
@@ -129,22 +118,6 @@ public class ConfigPackTemplate implements ConfigTemplate {
         return variables;
     }
 
-    public boolean isErode() {
-        return erode;
-    }
-
-    public double getErodeFreq() {
-        return erodeFreq;
-    }
-
-    public double getErodeThresh() {
-        return erodeThresh;
-    }
-
-    public int getErodeOctaves() {
-        return erodeOctaves;
-    }
-
     public int getElevationBlend() {
         return elevationBlend;
     }
@@ -152,4 +125,8 @@ public class ConfigPackTemplate implements ConfigTemplate {
     public Map<String, String> getLocatable() {
         return locatable;
     }
+
+    public boolean doBetaCarvers() {
+        return betaCarvers;
+    }
 }

common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java

@@ -22,6 +22,7 @@ import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.SinglePalette;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
+import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate;
 import com.dfsek.terra.config.pack.ConfigPack;
@@ -31,6 +32,7 @@ import com.dfsek.terra.world.population.items.ores.OreHolder;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -55,9 +57,9 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
     @Value("functions")
     @Default
     @Abstractable
-    private Map<String, FunctionTemplate> functions = new HashMap<>();
+    private LinkedHashMap<String, FunctionTemplate> functions = new LinkedHashMap<>();
 
-    @Value("carving.equation")
+    @Value("beta.carving.equation")
     @Abstractable
     @Default
     private String carvingEquation = "0";
@@ -183,10 +185,19 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
     @Abstractable
     private Set<String> tags;
 
+    @Value("carving")
+    @Abstractable
+    @Default
+    private Map<UserDefinedCarver, Integer> carvers = new HashMap<>();
+
     public Set<String> getTags() {
         return tags;
     }
 
+    public Map<UserDefinedCarver, Integer> getCarvers() {
+        return carvers;
+    }
+
     public Map<String, FunctionTemplate> getFunctions() {
         return functions;
     }
@@ -340,7 +351,7 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
 
         pack.getTemplate().getNoiseBuilderMap().forEach((id, builder) -> tester.registerFunction(id, new BlankFunction(builder.getDimensions()))); // Register dummy functions
 
-        Map<String, FunctionTemplate> testFunctions = new HashMap<>(pack.getTemplate().getFunctions());
+        Map<String, FunctionTemplate> testFunctions = new LinkedHashMap<>(pack.getTemplate().getFunctions());
         testFunctions.putAll(functions);
         for(Map.Entry<String, FunctionTemplate> entry : testFunctions.entrySet()) {
             String id = entry.getKey();