Merge remote-tracking branch 'origin/master' into ver/6.0.0

# Conflicts: # build.gradle.kts # common/src/main/java/com/dfsek/terra/api/TerraPlugin.java # common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java # common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java # common/src/main/java/com/dfsek/terra/profiler/Profiler.java # common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java # common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java # common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java # common/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java # common/src/main/java/com/dfsek/terra/world/population/OrePopulator.java # common/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java # common/src/main/java/com/dfsek/terra/world/population/TreePopulator.java # common/src/test/java/biome/DistributionTest.java # common/src/test/java/biome/ImageTest.java # platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java # platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java # platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
2026-04-13 11:16:05 +00:00 · 2021-05-09 22:20:47 -07:00
parent 9ea8dc7eee fd48f5f110
commit 526049523f
162 changed files with 4123 additions and 1179 deletions
--- a/common/src/main/java/com/dfsek/terra/api/TerraPlugin.java
+++ b/common/src/main/java/com/dfsek/terra/api/TerraPlugin.java
@@ -7,6 +7,7 @@ import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.LockedRegistry;
+import com.dfsek.terra.api.util.JarUtil;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.Logger;
 import com.dfsek.terra.config.PluginConfig;
@@ -16,6 +17,9 @@ import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.world.TerraWorld;

 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.jar.JarFile;

 /**
 * Represents a Terra mod/plugin instance.
@@ -67,4 +71,8 @@ public interface TerraPlugin extends LoaderRegistrar {
    }

    Profiler getProfiler();
+
+    default JarFile getModJar() throws URISyntaxException, IOException {
+        return JarUtil.getJarFile();
+    }
 }
--- a/common/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java
+++ b/common/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java
@@ -65,7 +65,7 @@ public class TerraCommandManager implements CommandManager {
            return;
        }

-        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !TerraWorld.isTerraWorld(((Player) sender).getWorld()))) {
+        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !(((Player) sender).getWorld()).isTerraWorld())) {
            sender.sendMessage("Command must be executed in a Terra world.");
            return;
        }
--- a/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java
@@ -1,6 +1,7 @@
 package com.dfsek.terra.api.platform.inventory;

 import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.platform.inventory.item.Damageable;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;

 public interface ItemStack extends Handle {
@@ -13,4 +14,8 @@ public interface ItemStack extends Handle {
    ItemMeta getItemMeta();

    void setItemMeta(ItemMeta meta);
+
+    default boolean isDamageable() {
+        return getItemMeta() instanceof Damageable;
+    }
 }
--- a/common/src/main/java/com/dfsek/terra/api/platform/world/World.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/world/World.java
@@ -6,6 +6,8 @@ import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.entity.Entity;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.world.generation.TerraChunkGenerator;

 import java.io.File;
 import java.util.UUID;
@@ -17,20 +19,12 @@ public interface World extends Handle {

    ChunkGenerator getGenerator();

-    String getName();
-
-    UUID getUID();
-
-    boolean isChunkGenerated(int x, int z);
-
    Chunk getChunkAt(int x, int z);

    default Chunk getChunkAt(Location location) {
        return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
    }

-    File getWorldFolder();
-
    Block getBlockAt(int x, int y, int z);

    default Block getBlockAt(Location l) {
@@ -40,4 +34,12 @@ public interface World extends Handle {
    Entity spawnEntity(Location location, EntityType entityType);

    int getMinHeight();
+
+    default boolean isTerraWorld() {
+        return getGenerator().getHandle() instanceof GeneratorWrapper;
+    }
+
+    default TerraChunkGenerator getTerraGenerator() {
+        return ((GeneratorWrapper) getGenerator().getHandle()).getHandle();
+    }
 }
--- a/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/DamageFunction.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/DamageFunction.java
@@ -34,8 +34,8 @@ public class DamageFunction implements LootFunction {
    @Override
    public ItemStack apply(ItemStack original, Random r) {
        if(original == null) return null;
+        if(!original.isDamageable()) return original;
        ItemMeta meta = original.getItemMeta();
-        if(!(meta instanceof Damageable)) return original;
        double itemDurability = (r.nextDouble() * (max - min)) + min;
        Damageable damage = (Damageable) meta;
        damage.setDamage((int) (original.getType().getMaxDurability() - (itemDurability / 100) * original.getType().getMaxDurability()));
--- a/common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java
@@ -33,6 +33,9 @@ import com.dfsek.terra.api.structures.structure.buffer.Buffer;
 import com.dfsek.terra.api.structures.structure.buffer.DirectBuffer;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
 import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.registry.config.FunctionRegistry;
+import com.dfsek.terra.registry.config.LootRegistry;
+import com.dfsek.terra.registry.config.ScriptRegistry;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import net.jafama.FastMath;
@@ -89,6 +92,12 @@ public class StructureScript {
                .registerFunction("ceil", new UnaryNumberFunctionBuilder(number -> FastMath.ceil(number.doubleValue())))
                .registerFunction("log", new UnaryNumberFunctionBuilder(number -> FastMath.log(number.doubleValue())))
                .registerFunction("round", new UnaryNumberFunctionBuilder(number -> FastMath.round(number.doubleValue())))
+                .registerFunction("sin", new UnaryNumberFunctionBuilder(number -> FastMath.sin(number.doubleValue())))
+                .registerFunction("cos", new UnaryNumberFunctionBuilder(number -> FastMath.cos(number.doubleValue())))
+                .registerFunction("tan", new UnaryNumberFunctionBuilder(number -> FastMath.tan(number.doubleValue())))
+                .registerFunction("asin", new UnaryNumberFunctionBuilder(number -> FastMath.asin(number.doubleValue())))
+                .registerFunction("acos", new UnaryNumberFunctionBuilder(number -> FastMath.acos(number.doubleValue())))
+                .registerFunction("atan", new UnaryNumberFunctionBuilder(number -> FastMath.atan(number.doubleValue())))
                .registerFunction("max", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.max(number.doubleValue(), number2.doubleValue())))
                .registerFunction("min", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.min(number.doubleValue(), number2.doubleValue())));

--- a/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java
@@ -19,6 +19,6 @@ public class BufferedEntity implements BufferedItem {
    @Override
    public void paste(Location origin) {
        Entity entity = origin.clone().add(0.5, 0, 0.5).getWorld().spawnEntity(origin, type);
-        main.getEventManager().callEvent(new EntitySpawnEvent(main.getWorld(entity.getWorld()).getGenerator().getConfigPack(), entity, entity.getLocation()));
+        main.getEventManager().callEvent(new EntitySpawnEvent(entity.getWorld().getTerraGenerator().getConfigPack(), entity, entity.getLocation()));
    }
 }
--- a/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
@@ -32,7 +32,7 @@ public class BufferedLootApplication implements BufferedItem {
            }
            Container container = (Container) data;

-            LootPopulateEvent event = new LootPopulateEvent(block, container, table, main.getWorld(block.getLocation().getWorld()).getGenerator().getConfigPack(), structure);
+            LootPopulateEvent event = new LootPopulateEvent(block, container, table, block.getLocation().getWorld().getTerraGenerator().getConfigPack(), structure);
            main.getEventManager().callEvent(event);
            if(event.isCancelled()) return;

@@ -40,7 +40,7 @@ public class BufferedLootApplication implements BufferedItem {
            data.update(false);
        } catch(Exception e) {
            main.logger().warning("Could not apply loot at " + origin + ": " + e.getMessage());
-            main.getDebugLogger().stack(e);
+            e.printStackTrace();
        }
    }
 }
--- a/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java
@@ -21,7 +21,7 @@ public class BufferedStateManipulator implements BufferedItem {
            state.update(false);
        } catch(Exception e) {
            main.logger().warning("Could not apply BlockState at " + origin + ": " + e.getMessage());
-            main.getDebugLogger().stack(e);
+            e.printStackTrace();
        }
    }
 }
--- a/common/src/main/java/com/dfsek/terra/api/util/JarUtil.java
+++ b/common/src/main/java/com/dfsek/terra/api/util/JarUtil.java
@@ -1,9 +1,13 @@
 package com.dfsek.terra.api.util;

+import com.dfsek.terra.api.TerraPlugin;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -32,4 +36,12 @@ public class JarUtil {
            }
        }
    }
+
+    public static JarFile getJarFile() throws URISyntaxException, IOException {
+        return new JarFile(new File(getJarURL().toURI()));
+    }
+
+    public static URL getJarURL() {
+        return TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation();
+    }
 }
--- a/common/src/main/java/com/dfsek/terra/config/PluginConfig.java
+++ b/common/src/main/java/com/dfsek/terra/config/PluginConfig.java
@@ -69,12 +69,12 @@ public class PluginConfig implements ConfigTemplate {
            ConfigLoader loader = new ConfigLoader();
            loader.load(this, file);
            if(dumpDefaultConfig) { // Don't dump default config if already loaded.
-                try(JarFile jar = new JarFile(new File(TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) {
+                try(JarFile jar = main.getModJar()) {
                    JarUtil.copyResourcesToDirectory(jar, "packs", new File(main.getDataFolder(), "packs").toString());
                } catch(IOException | URISyntaxException e) {
                    main.getDebugLogger().error("Failed to dump default config files!");
                    e.printStackTrace();
-                    main.getDebugLogger().error("Report this to Terra!");
+                    main.getDebugLogger().error("Either you're on Forge, or this is a bug. If it's the latter, report this to Terra!");
                }
            }
        } catch(ConfigException | IOException e) {
--- a/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
+++ b/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
@@ -9,9 +9,6 @@ import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;

-import java.io.File;
-import java.util.UUID;
-
 public class DummyWorld implements World {
    @Override
    public Object getHandle() {
@@ -33,31 +30,11 @@ public class DummyWorld implements World {
        return () -> (GeneratorWrapper) () -> null;
    }

-    @Override
-    public String getName() {
-        return "DUMMY";
-    }
-
-    @Override
-    public UUID getUID() {
-        return UUID.randomUUID();
-    }
-
-    @Override
-    public boolean isChunkGenerated(int x, int z) {
-        return false;
-    }
-
    @Override
    public Chunk getChunkAt(int x, int z) {
        throw new UnsupportedOperationException("Cannot get chunk in DummyWorld");
    }

-    @Override
-    public File getWorldFolder() {
-        throw new UnsupportedOperationException("Cannot get folder of DummyWorld");
-    }
-
    @Override
    public Block getBlockAt(int x, int y, int z) {
        throw new UnsupportedOperationException("Cannot get block in DummyWorld");
--- a/common/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java
+++ b/common/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java
@@ -1,5 +1,6 @@
 package com.dfsek.terra.config.fileloaders;

+import com.dfsek.tectonic.config.Configuration;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.terra.api.util.GlueList;

@@ -18,8 +19,12 @@ public abstract class Loader {
     *
     * @param consumer Something to do with the streams.
     */
-    public Loader then(ExceptionalConsumer<List<InputStream>> consumer) throws ConfigException {
-        consumer.accept(new GlueList<>(streams.values()));
+    public Loader then(ExceptionalConsumer<List<Configuration>> consumer) throws ConfigException {
+        List<Configuration> list = new GlueList<>();
+        streams.forEach((id, stream) -> {
+                    list.add(new Configuration(stream, id));
+        });
+        consumer.accept(list);
        return this;
    }

--- a/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
+++ b/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
@@ -17,7 +17,7 @@ public final class LangUtil {
    public static void load(String langID, TerraPlugin main) {
        Logger logger = main.logger();
        File file = new File(main.getDataFolder(), "lang");
-        try(JarFile jar = new JarFile(new File(TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) {
+        try(JarFile jar = main.getModJar()) {
            copyResourcesToDirectory(jar, "lang", file.toString());
        } catch(IOException | URISyntaxException e) {
            main.getDebugLogger().error("Failed to dump language files!");
--- a/common/src/main/java/com/dfsek/terra/profiler/Profiler.java
+++ b/common/src/main/java/com/dfsek/terra/profiler/Profiler.java
@@ -3,22 +3,54 @@ package com.dfsek.terra.profiler;
 import java.util.Map;

 public interface Profiler {
+    /**
+     * Push a frame to this profiler.
+     *
+     * @param frame ID of frame.
+     */
    void push(String frame);

+    /**
+     * Pop a frame from this profiler.
+     *
+     * @param frame ID of frame. Must match ID
+     *              at the top of the profiler stack.
+     */
    void pop(String frame);

+    /**
+     * Start profiling.
+     */
    void start();

+    /**
+     * Stop profiling.
+     */
    void stop();

+    /**
+     * Get the profiler data.
+     *
+     * @return Profiler data.
+     */
    Map<String, Timings> getTimings();

+    /**
+     * Return a {@link AutoCloseable} implementation that
+     * may be used in a try-with-resources statement for
+     * more intuitive profiling, with auto-push/pop.
+     *
+     * @param frame ID of frame.
+     * @return {@link AutoCloseable} implementation for use
+     * in try-with-resources.
+     */
    default ProfileFrame profile(String frame) {
        push(frame);
        return new ProfileFrame(() -> pop(frame));
    }

-    default void reset() {
-        // todo: impl
-    }
+    /**
+     * Clear the profiler data.
+     */
+    void reset();
 }
--- a/common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java
+++ b/common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java
@@ -83,4 +83,9 @@ public class ProfilerImpl implements Profiler {
        }));
        return map;
    }
+
+    @Override
+    public void reset() {
+        accessibleThreadMaps.forEach(Map::clear);
+    }
 }
--- a/common/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java
+++ b/common/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java
@@ -68,10 +68,4 @@ public class FloraRegistry extends OpenRegistry<Flora> {
    private BlockData data(String s) {
        return main.getWorldHandle().createBlockData(s);
    }
-
-
-    @Override
-    public Flora get(String identifier) {
-        return super.get(identifier);
-    }
 }
--- a/common/src/main/java/com/dfsek/terra/world/TerraWorld.java
+++ b/common/src/main/java/com/dfsek/terra/world/TerraWorld.java
@@ -25,7 +25,7 @@ public class TerraWorld {


    public TerraWorld(World w, ConfigPack c, TerraPlugin main) {
-        if(!isTerraWorld(w)) throw new IllegalArgumentException("World " + w + " is not a Terra World!");
+        if(!w.isTerraWorld()) throw new IllegalArgumentException("World " + w + " is not a Terra World!");
        this.world = w;
        config = c.toWorldConfig(this);
        this.provider = config.getProvider();
@@ -34,17 +34,11 @@ public class TerraWorld {
        safe = true;
    }

-    public static boolean isTerraWorld(World w) {
-        return w.getGenerator().getHandle() instanceof GeneratorWrapper;
-    }

    public World getWorld() {
        return world;
    }

-    public TerraChunkGenerator getGenerator() {
-        return ((GeneratorWrapper) world.getGenerator().getHandle()).getHandle();
-    }

    public BiomeProvider getBiomeProvider() {
        return provider;
--- a/common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
+++ b/common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
@@ -50,7 +50,6 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {

    private final Carver carver;

-
    public DefaultChunkGenerator3D(ConfigPack c, TerraPlugin main) {
        this.configPack = c;
        this.main = main;
@@ -104,9 +103,10 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
    @Override
    @SuppressWarnings({"try"})
    public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
-        TerraWorld tw = main.getWorld(world);
-        BiomeProvider grid = tw.getBiomeProvider();
        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) {
+            TerraWorld tw = main.getWorld(world);
+            BiomeProvider grid = tw.getBiomeProvider();
+
            if(!tw.isSafe()) return chunk;
            int xOrig = (chunkX << 4);
            int zOrig = (chunkZ << 4);
@@ -120,7 +120,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
                    int cx = xOrig + x;
                    int cz = zOrig + z;

-                    TerraBiome b = grid.getBiome(xOrig + x, zOrig + z);
+                    TerraBiome b = grid.getBiome(cx, cz);
                    BiomeTemplate c = ((UserDefinedBiome) b).getConfig();

                    int sea = c.getSeaLevel();
@@ -227,17 +227,20 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
        return false;
    }

+    @SuppressWarnings({"try"})
    static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
-        int xOrig = (chunkX << 4);
-        int zOrig = (chunkZ << 4);
-        BiomeProvider grid = main.getWorld(world).getBiomeProvider();
-        for(int x = 0; x < 4; x++) {
-            for(int z = 0; z < 4; z++) {
-                int cx = xOrig + (x << 2);
-                int cz = zOrig + (z << 2);
-                TerraBiome b = grid.getBiome(cx, cz);
+        try(ProfileFrame ignore = main.getProfiler().profile("biomes")) {
+            int xOrig = (chunkX << 4);
+            int zOrig = (chunkZ << 4);
+            BiomeProvider grid = main.getWorld(world).getBiomeProvider();
+            for(int x = 0; x < 4; x++) {
+                for(int z = 0; z < 4; z++) {
+                    int cx = xOrig + (x << 2);
+                    int cz = zOrig + (z << 2);
+                    TerraBiome b = grid.getBiome(cx, cz);

-                biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator(world).getBiomeNoise(), cx, 0, cz));
+                    biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator(world).getBiomeNoise(), cx, 0, cz));
+                }
            }
        }
    }
--- a/common/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java
+++ b/common/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java
@@ -25,7 +25,7 @@ public class SamplerCache {
                    public Sampler load(@NotNull Long key) {
                        int cx = (int) (key >> 32);
                        int cz = (int) key.longValue();
-                        return world.getGenerator().createSampler(cx, cz, world.getBiomeProvider(), world.getWorld(), world.getConfig().getTemplate().getElevationBlend());
+                        return world.getWorld().getTerraGenerator().createSampler(cx, cz, world.getBiomeProvider(), world.getWorld(), world.getConfig().getTemplate().getElevationBlend());
                    }
                });
    }
--- a/common/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java
+++ b/common/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java
@@ -33,7 +33,7 @@ public class FloraPopulator implements TerraBlockPopulator {
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
        try(ProfileFrame ignore = main.getProfiler().profile("flora")) {
-            if(tw.getConfig().getTemplate().disableCarvers()) return;
+            if(tw.getConfig().getTemplate().disableFlora()) return;

            if(!tw.isSafe()) return;
            BiomeProvider provider = tw.getBiomeProvider();
--- a/common/src/main/java/com/dfsek/terra/world/population/OrePopulator.java
+++ b/common/src/main/java/com/dfsek/terra/world/population/OrePopulator.java
@@ -28,7 +28,7 @@ public class OrePopulator implements TerraBlockPopulator {
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
        try(ProfileFrame ignore = main.getProfiler().profile("ore")) {
-            if(tw.getConfig().getTemplate().disableCarvers()) return;
+            if(tw.getConfig().getTemplate().disableOres()) return;

            if(!tw.isSafe()) return;
            for(int cx = -1; cx <= 1; cx++) {
--- a/common/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java
+++ b/common/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java
@@ -32,7 +32,7 @@ public class StructurePopulator implements TerraBlockPopulator, Chunkified {
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
        try(ProfileFrame ignore = main.getProfiler().profile("structure")) {
-            if(tw.getConfig().getTemplate().disableCarvers()) return;
+            if(tw.getConfig().getTemplate().disableStructures()) return;

            int cx = (chunk.getX() << 4);
            int cz = (chunk.getZ() << 4);
--- a/common/src/main/java/com/dfsek/terra/world/population/TreePopulator.java
+++ b/common/src/main/java/com/dfsek/terra/world/population/TreePopulator.java
@@ -33,7 +33,7 @@ public class TreePopulator implements TerraBlockPopulator {
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
        try(ProfileFrame ignore = main.getProfiler().profile("tree")) {
-            if(tw.getConfig().getTemplate().disableCarvers()) return;
+            if(tw.getConfig().getTemplate().disableTrees()) return;

            if(!tw.isSafe()) return;
            BiomeProvider provider = tw.getBiomeProvider();
--- a/common/src/test/java/biome/DistributionTest.java
+++ b/common/src/test/java/biome/DistributionTest.java
--- a/common/src/test/java/biome/ImageTest.java
+++ b/common/src/test/java/biome/ImageTest.java