fix padding

Initial work on supporting chunk based bending and interpolation in Layered Generator
Use seismic func for perf 2
2026-05-20 08:40:26 +00:00 · 2025-06-07 01:23:44 -06:00 · 2025-06-07 01:17:24 -06:00 · 2025-06-05 22:47:16 -06:00 · 2025-06-05 22:44:19 -06:00 · 2025-06-05 22:44:07 -06:00
564 changed files with 5671 additions and 10073 deletions
@@ -1,8 +1,8 @@
 preRelease(true)

-versionProjects(":common:api", version("6.6.5"))
-versionProjects(":common:implementation", version("6.6.5"))
-versionProjects(":platforms", version("6.6.5"))
+versionProjects(":common:api", version("7.0.0"))
+versionProjects(":common:implementation", version("7.0.0"))
+versionProjects(":platforms", version("7.0.0"))


 allprojects {
@@ -6,12 +6,6 @@ plugins {
 repositories {
    mavenCentral()
    gradlePluginPortal()
-    maven("https://maven.solo-studios.ca/releases") {
-        name = "Solo Studios"
-    }
-    maven("https://maven.solo-studios.ca/snapshots") {
-        name = "Solo Studios"
-    }
    maven("https://repo.codemc.org/repository/maven-public") {
        name = "CodeMC"
    }
@@ -30,12 +30,6 @@ fun Project.configureDependencies() {
    repositories {
        mavenCentral()
        gradlePluginPortal()
-        maven("https://maven.solo-studios.ca/releases") {
-            name = "Solo Studios"
-        }
-        maven("https://maven.solo-studios.ca/snapshots") {
-            name = "Solo Studios"
-        }
        maven("https://maven.fabricmc.net/") {
            name = "FabricMC"
        }
@@ -66,8 +60,11 @@ fun Project.configureDependencies() {
        maven("https://storehouse.okaeri.eu/repository/maven-public/") {
            name = "Okaeri"
        }
-        maven("https://repo.onarandombox.com/multiverse-releases") {
-            name = "onarandombox"
+        maven("https://maven.solo-studios.ca/releases") {
+            name = "Solo Studios"
+        }
+        maven("https://maven.solo-studios.ca/snapshots") {
+            name = "Solo Studios"
        }
    }
    
@@ -1,16 +1,17 @@
 object Versions {
    object Terra {
-        const val overworldConfig = "v1.5.2"
+        const val overworldConfig = "v1.5.1"
    }
    
    object Libraries {
        const val tectonic = "4.2.1"
-        const val paralithic = "0.8.1"
+        const val paralithic = "1.0.3"
        const val strata = "1.3.2"
+        const val seismic = "0.3.4"
        
        const val cloud = "2.0.0"
        
-        const val caffeine = "3.2.1"
+        const val caffeine = "3.2.0"
        
        const val slf4j = "2.0.17"

@@ -22,14 +23,14 @@ object Versions {
            const val asm = "9.8"
            const val snakeYml = "2.4"
            const val jetBrainsAnnotations = "26.0.2"
-            const val junit = "5.13.1"
+            const val junit = "5.13.0"
            const val nbt = "6.1"
        }
    }
    
    object Fabric {
-        const val fabricAPI = "0.129.0+${Mod.minecraft}"
-        const val cloud = "2.0.0-beta.11"
+        const val fabricAPI = "0.125.3+${Mod.minecraft}"
+        const val cloud = "2.0.0-beta.10"
    }
 //
 //    object Quilt {
@@ -39,9 +40,8 @@ object Versions {
    
    object Mod {
        const val mixin = "0.15.5+mixin.0.8.7"
-        const val mixinExtras = "0.4.1"
        
-        const val minecraft = "1.21.8"
+        const val minecraft = "1.21.5"
        const val yarn = "$minecraft+build.1"
        const val fabricLoader = "0.16.14"
        
@@ -56,19 +56,18 @@ object Versions {
 //    }
    
    object Bukkit {
-        const val minecraft = "1.21.8-R0.1"
-        const val paperBuild = "$minecraft-20250717.233435-4"
+        const val minecraft = "1.21.5-R0.1"
+        const val paperBuild = "$minecraft-20250529.121722-14"
        const val paper = paperBuild
        const val paperLib = "1.0.8"
        const val reflectionRemapper = "0.1.2"
-        const val paperDevBundle = paperBuild
+        const val paperDevBundle = "$minecraft-20250529.121722-99"
        const val runPaper = "2.3.1"
        const val paperWeight = "2.0.0-beta.17"
        const val cloud = "2.0.0-beta.10"
-        const val multiverse = "5.0.2"
    }
    
-//
+    //
 //    object Sponge {
 //        const val sponge = "9.0.0-SNAPSHOT"
 //        const val mixin = "0.8.2"
@@ -88,6 +87,6 @@ object Versions {
    }
    
    object Minestom {
-        const val minestom = "1_21_6-c3ccee696b"
+        const val minestom = "1_21_5-4d91778331"
    }
 }
@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;

-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Collection;

+import com.dfsek.terra.api.world.biome.Biome;
+

 public interface Extrusion {
    Biome extrude(Biome original, int x, int y, int z, long seed);
@@ -5,13 +5,13 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.Range;
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.terra.api.util.range.Range;


 public abstract class SamplerExtrusionTemplate implements ObjectTemplate<Extrusion> {
    @Value("sampler")
-    protected @Meta NoiseSampler sampler;
+    protected @Meta Sampler sampler;

    @Value("range")
    protected @Meta Range range;
@@ -7,8 +7,8 @@ import java.util.stream.Collectors;
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.query.api.BiomeQueries;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.Range;
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.Biome;

@@ -17,7 +17,7 @@ import com.dfsek.terra.api.world.biome.Biome;
 * Sets biomes at locations based on a sampler.
 */
 public class ReplaceExtrusion implements Extrusion {
-    private final NoiseSampler sampler;
+    private final Sampler sampler;

    private final Range range;

@@ -25,7 +25,7 @@ public class ReplaceExtrusion implements Extrusion {

    private final Predicate<Biome> hasTag;

-    public ReplaceExtrusion(NoiseSampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes, String tag) {
+    public ReplaceExtrusion(Sampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes, String tag) {
        this.sampler = sampler;
        this.range = range;
        this.biomes = biomes;
@@ -6,8 +6,8 @@ import java.util.stream.Collectors;

 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.Range;
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.Biome;

@@ -16,13 +16,13 @@ import com.dfsek.terra.api.world.biome.Biome;
 * Sets biomes at locations based on a sampler.
 */
 public class SetExtrusion implements Extrusion {
-    private final NoiseSampler sampler;
+    private final Sampler sampler;

    private final Range range;

    private final ProbabilityCollection<ReplaceableBiome> biomes;

-    public SetExtrusion(NoiseSampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes) {
+    public SetExtrusion(Sampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes) {
        this.sampler = sampler;
        this.range = range;
        this.biomes = biomes;
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2025 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,5 +0,0 @@
-# biome-provider-image-v2
-
-Implements and registers the `IMAGE` biome provider, which
-utilizes various config types provided by the `library-image` addon to
-distribute biomes based on images.
@@ -1,8 +0,0 @@
-version = version("1.0.1")
-
-dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    compileOnlyApi(project(":common:addons:library-image"))
-
-
-}
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.image.v2;
-
-import java.util.Optional;
-
-import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
-import com.dfsek.terra.addons.image.converter.ColorConverter;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public class ImageBiomeProvider implements BiomeProvider {
-    private final int resolution;
-
-    private final ColorConverter<Biome> colorConverter;
-
-    private final ColorSampler colorSampler;
-
-    public ImageBiomeProvider(ColorConverter<Biome> colorConverter, ColorSampler colorSampler, int resolution) {
-        this.resolution = resolution;
-        this.colorConverter = colorConverter;
-        this.colorSampler = colorSampler;
-    }
-
-    @Override
-    public Biome getBiome(int x, int y, int z, long seed) {
-        return getBiome(x, z);
-    }
-
-    public Biome getBiome(int x, int z) {
-        x /= resolution;
-        z /= resolution;
-        return colorConverter.apply(colorSampler.apply(x, z));
-    }
-
-    @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
-        return Optional.of(getBiome(x, z));
-    }
-
-    @Override
-    public Iterable<Biome> getBiomes() {
-        return colorConverter.getEntries();
-    }
-}
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.image.v2;
-
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.util.function.Supplier;
-
-import com.dfsek.terra.addons.biome.image.v2.config.ImageProviderTemplate;
-import com.dfsek.terra.addons.biome.image.v2.config.converter.ClosestBiomeColorConverterTemplate;
-import com.dfsek.terra.addons.biome.image.v2.config.converter.ExactBiomeColorConverterTemplate;
-import com.dfsek.terra.addons.biome.image.v2.config.converter.mapping.DefinedBiomeColorMappingTemplate;
-import com.dfsek.terra.addons.image.converter.ColorConverter;
-import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
-import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public class ImageBiomeProviderAddon implements AddonInitializer {
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    public static final TypeKey<Supplier<ObjectTemplate<ColorConverter<Biome>>>> BIOME_COLOR_CONVERTER_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    public static final TypeKey<Supplier<ObjectTemplate<ColorMapping<Biome>>>> BIOME_COLOR_MAPPING_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    @Inject
-    private Platform platform;
-
-    @Inject
-    private BaseAddon addon;
-
-    @Override
-    public void initialize() {
-        platform.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(addon, ConfigPackPreLoadEvent.class)
-            .priority(501)
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                    PROVIDER_REGISTRY_KEY);
-                providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry =
-                    event.getPack().getOrCreateRegistry(
-                        BIOME_COLOR_CONVERTER_REGISTRY_KEY);
-                biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
-                biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry =
-                    event.getPack().getOrCreateRegistry(
-                        BIOME_COLOR_MAPPING_REGISTRY_KEY);
-                biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"),
-                    () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class),
-                        b -> b));
-                biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
-            })
-            .failThrough();
-    }
-}
@@ -1,14 +0,0 @@
-schema-version: 1
-contributors:
-  - Terra contributors
-id: biome-provider-image-v2
-version: @VERSION@
-entrypoints:
-  - "com.dfsek.terra.addons.biome.image.v2.ImageBiomeProviderAddon"
-website:
-  issues: https://github.com/PolyhedralDev/Terra/issues
-  source: https://github.com/PolyhedralDev/Terra
-  docs: https://terra.polydev.org
-license: MIT License
-depends:
-  library-image: "1.+"
@@ -1,6 +1,5 @@
-# biome-provider-image
+# biome-provider-image-v2

-Implements and registers the `IMAGE` biome provider, a biome provider which
-generates biomes from an image, using the `color` attribute of biomes.
-
-This addon registers the provider type, and all associated config options.
+Implements and registers the `IMAGE` biome provider, which
+utilizes various config types provided by the `library-image` addon to
+distribute biomes based on images.
@@ -1,7 +1,8 @@
-version = version("1.0.1")
+version = version("2.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:library-image"))


 }
@@ -7,32 +7,25 @@

 package com.dfsek.terra.addons.biome.image;

-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
-import java.util.Set;

+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
+import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;


 public class ImageBiomeProvider implements BiomeProvider {
-    private final Map<Color, Biome> colorBiomeMap = new HashMap<>();
-    private final BufferedImage image;
    private final int resolution;
-    private final Align align;

-    public ImageBiomeProvider(Set<Biome> registry, BufferedImage image, int resolution, Align align) {
-        this.image = image;
+    private final ColorConverter<Biome> colorConverter;
+
+    private final ColorSampler colorSampler;
+
+    public ImageBiomeProvider(ColorConverter<Biome> colorConverter, ColorSampler colorSampler, int resolution) {
        this.resolution = resolution;
-        this.align = align;
-        registry.forEach(biome -> colorBiomeMap.put(new Color(biome.getColor()), biome));
-    }
-
-    private static int distance(Color a, Color b) {
-        return Math.abs(a.getRed() - b.getRed()) + Math.abs(a.getGreen() - b.getGreen()) + Math.abs(a.getBlue() - b.getBlue());
+        this.colorConverter = colorConverter;
+        this.colorSampler = colorSampler;
    }

    @Override
@@ -43,15 +36,7 @@ public class ImageBiomeProvider implements BiomeProvider {
    public Biome getBiome(int x, int z) {
        x /= resolution;
        z /= resolution;
-        Color color = align.getColor(image, x, z);
-        return colorBiomeMap.get(colorBiomeMap.keySet()
-            .stream()
-            .reduce(colorBiomeMap.keySet().stream().findAny().orElseThrow(IllegalStateException::new),
-                (running, element) -> {
-                    int d1 = distance(color, running);
-                    int d2 = distance(color, element);
-                    return d1 < d2 ? running : element;
-                }));
+        return colorConverter.apply(colorSampler.apply(x, z));
    }

    @Override
@@ -61,24 +46,6 @@ public class ImageBiomeProvider implements BiomeProvider {

    @Override
    public Iterable<Biome> getBiomes() {
-        return colorBiomeMap.values();
-    }
-
-    public enum Align {
-        CENTER {
-            @Override
-            public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
-                    Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
-            }
-        },
-        NONE {
-            @Override
-            public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(Math.floorMod(x, image.getWidth()), Math.floorMod(z, image.getHeight())));
-            }
-        };
-
-        public abstract Color getColor(BufferedImage image, int x, int z);
+        return colorConverter.getEntries();
    }
 }
@@ -8,11 +8,14 @@
 package com.dfsek.terra.addons.biome.image;

 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.function.Supplier;

+import com.dfsek.terra.addons.biome.image.config.ImageProviderTemplate;
+import com.dfsek.terra.addons.biome.image.config.converter.ClosestBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.image.config.converter.ExactBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.image.config.converter.mapping.DefinedBiomeColorMappingTemplate;
+import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
+import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -24,12 +27,19 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

+import java.util.function.Supplier;
+

 public class ImageBiomeProviderAddon implements AddonInitializer {
-
    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
    };
-    private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
+
+    public static final TypeKey<Supplier<ObjectTemplate<ColorConverter<Biome>>>> BIOME_COLOR_CONVERTER_REGISTRY_KEY = new TypeKey<>() {
+    };
+
+    public static final TypeKey<Supplier<ObjectTemplate<ColorMapping<Biome>>>> BIOME_COLOR_MAPPING_REGISTRY_KEY = new TypeKey<>() {
+    };
+
    @Inject
    private Platform platform;

@@ -41,16 +51,28 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
        platform.getEventManager()
            .getHandler(FunctionalEventHandler.class)
            .register(addon, ConfigPackPreLoadEvent.class)
+            .priority(501)
            .then(event -> {
                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
                    PROVIDER_REGISTRY_KEY);
-                providerRegistry.register(addon.key("IMAGE"),
-                    () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
+                providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
+            })
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry =
+                    event.getPack().getOrCreateRegistry(
+                        BIOME_COLOR_CONVERTER_REGISTRY_KEY);
+                biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
+                biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
+            })
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry =
+                    event.getPack().getOrCreateRegistry(
+                        BIOME_COLOR_MAPPING_REGISTRY_KEY);
+                biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"),
+                    () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class),
+                        b -> b));
+                biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
            })
            .failThrough();
-        if(platform.getTerraConfig().isDebugLog())
-            logger.warn(
-                "The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the " +
-                "biome-provider-image-v2 addon for future pack development instead.");
    }
 }
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.image;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.awt.image.BufferedImage;
-import java.util.HashSet;
-
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-@SuppressWarnings("FieldMayBeFinal")
-public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
-    private final Registry<Biome> biomes;
-    @Value("resolution")
-    @Default
-    @Description("Sets the resolution at which to sample the image.")
-    private int resolution = 1;
-    @Value("image.name")
-    @Description("Sets the location of the image on the filesystem, relative to the pack root.")
-    private BufferedImage image;
-    @Value("image.align")
-    @Description("Sets the alignment style to use for the image.")
-    private ImageBiomeProvider.Align align;
-
-    public ImageProviderTemplate(Registry<Biome> set) {
-        this.biomes = set;
-    }
-
-    @Override
-    public BiomeProvider get() {
-        return new ImageBiomeProvider(new HashSet<>(biomes.entries()), image, resolution, align);
-    }
-}
@@ -5,14 +5,14 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.image.v2.config;
+package com.dfsek.terra.addons.biome.image.config;

 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import com.dfsek.terra.addons.biome.image.v2.ImageBiomeProvider;
+import com.dfsek.terra.addons.biome.image.ImageBiomeProvider;
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.api.world.biome.Biome;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.image.v2.config.converter;
+package com.dfsek.terra.addons.biome.image.config.converter;

 import com.dfsek.tectonic.api.config.template.annotations.Value;

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.image.v2.config.converter;
+package com.dfsek.terra.addons.biome.image.config.converter;

 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.image.v2.config.converter.mapping;
+package com.dfsek.terra.addons.biome.image.config.converter.mapping;

 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
@@ -9,4 +9,6 @@ website:
  issues: https://github.com/PolyhedralDev/Terra/issues
  source: https://github.com/PolyhedralDev/Terra
  docs: https://terra.polydev.org
-license: MIT License
+license: MIT License
+depends:
+  library-image: "1.+"
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2025 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,12 +0,0 @@
-# biome-provider-pipeline-2
-
-The second version of the Biome Pipeline, a procedural biome provider that uses a series
-of "stages" to apply "mutations" to a 2D grid of biomes.
-
-Version 2 is a re-implementation of the original addon with the primary goal of providing
-consistent scaling for noise relative to the world
-(See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been
-included as a separate addon to maintain parity with packs utilizing the first version.
-
-This addon registers the `PIPELINE` biome provider type, and all associated
-configurations.
@@ -1,5 +0,0 @@
-version = version("1.0.1")
-
-dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-}
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.v2;
-
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.util.function.Supplier;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.BiomePipelineTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.PipelineBiomeLoader;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.source.SamplerSourceTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander.ExpanderStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderListStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceListStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.SmoothStageTemplate;
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public class BiomePipelineAddon implements AddonInitializer {
-
-    public static final TypeKey<Supplier<ObjectTemplate<Source>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
-    };
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
-    };
-    @Inject
-    private Platform platform;
-
-    @Inject
-    private BaseAddon addon;
-
-    @Override
-    public void initialize() {
-        platform.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(addon, ConfigPackPreLoadEvent.class)
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                    PROVIDER_REGISTRY_KEY);
-                providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<Source>>> sourceRegistry = event.getPack().getOrCreateRegistry(
-                    SOURCE_REGISTRY_KEY);
-                sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
-                    STAGE_REGISTRY_KEY);
-                stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
-                stageRegistry.register(addon.key("SMOOTH"), SmoothStageTemplate::new);
-                stageRegistry.register(addon.key("REPLACE"), ReplaceStageTemplate::new);
-                stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListStageTemplate::new);
-                stageRegistry.register(addon.key("BORDER"), BorderStageTemplate::new);
-                stageRegistry.register(addon.key("BORDER_LIST"), BorderListStageTemplate::new);
-            })
-            .failThrough();
-        platform.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(addon, ConfigPackPostLoadEvent.class)
-            .then(event -> {
-                Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                event.getPack().applyLoader(PipelineBiome.class, new PipelineBiomeLoader(biomeRegistry));
-            });
-    }
-}
@@ -1,71 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.v2;
-
-import java.util.function.Consumer;
-
-import com.dfsek.terra.api.util.Column;
-import com.dfsek.terra.api.util.function.IntIntObjConsumer;
-import com.dfsek.terra.api.util.function.IntObjConsumer;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public class BiomePipelineColumn implements Column<Biome> {
-    private final int min;
-    private final int max;
-
-    private final int x;
-    private final int z;
-    private final Biome biome;
-
-    protected BiomePipelineColumn(BiomeProvider biomeProvider, int min, int max, int x, int z, long seed) {
-        this.min = min;
-        this.max = max;
-        this.x = x;
-        this.z = z;
-        this.biome = biomeProvider.getBiome(x, 0, z, seed);
-    }
-
-    @Override
-    public int getMinY() {
-        return min;
-    }
-
-    @Override
-    public int getMaxY() {
-        return max;
-    }
-
-    @Override
-    public int getX() {
-        return x;
-    }
-
-    @Override
-    public int getZ() {
-        return z;
-    }
-
-    @Override
-    public Biome get(int y) {
-        return biome;
-    }
-
-    @Override
-    public void forRanges(int resolution, IntIntObjConsumer<Biome> consumer) {
-        consumer.accept(min, max, biome);
-    }
-
-    @Override
-    public void forEach(Consumer<Biome> consumer) {
-        for(int y = min; y < max; y++) {
-            consumer.accept(biome);
-        }
-    }
-
-    @Override
-    public void forEach(IntObjConsumer<Biome> consumer) {
-        for(int y = min; y < max; y++) {
-            consumer.accept(y, biome);
-        }
-    }
-}
@@ -1,10 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api;
-
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-
-
-public interface BiomeChunk {
-
-    PipelineBiome get(int xInChunk, int zInChunk);
-}
@@ -1,11 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api;
-
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-
-
-public interface Source {
-    PipelineBiome get(long seed, int x, int z);
-
-    Iterable<PipelineBiome> getBiomes();
-}
@@ -1,15 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
-
-
-public interface Stage {
-    PipelineBiome apply(ViewPoint viewPoint);
-
-    int maxRelativeReadDistance();
-
-    default Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
-        return biomes;
-    }
-}
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.v2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.util.List;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.PipelineBiomeProvider;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-@SuppressWarnings({ "FieldMayBeFinal", "unused" })
-public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
-    @Value("resolution")
-    @Default
-    @Description("""
-                 The resolution at which to sample biomes.
-                 
-                 Larger values are quadratically faster, but produce lower quality results.
-                 For example, a value of 3 would sample every 3 blocks.""")
-    protected @Meta int resolution = 1;
-    @Value("blend.sampler")
-    @Default
-    @Description("A sampler to use for blending the edges of biomes via domain warping.")
-    protected @Meta NoiseSampler blendSampler = NoiseSampler.zero();
-    @Value("blend.amplitude")
-    @Default
-    @Description("The amplitude at which to perform blending.")
-    protected @Meta double blendAmplitude = 0d;
-    @Value("pipeline.source")
-    @Description("The Biome Source to use for initial population of biomes.")
-    private @Meta Source source;
-    @Value("pipeline.stages")
-    @Description("A list of pipeline stages to apply to the result of #source")
-    private @Meta List<@Meta Stage> stages;
-
-    @Override
-    public BiomeProvider get() {
-        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 128), resolution, blendSampler, blendAmplitude);
-    }
-}
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage;
-
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public abstract class StageTemplate implements ObjectTemplate<Stage> {
-    @Value("sampler")
-    @Description("Sampler to use for stage distribution.")
-    protected @Meta NoiseSampler noise;
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander;
-
-
-public class ExpanderStageTemplate extends StageTemplate {
-    @Override
-    public Expander get() {
-        return new FractalExpander(noise);
-    }
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage;
-
-
-public class SmoothStageTemplate extends StageTemplate {
-    @Override
-    public Stage get() {
-        return new SmoothStage(noise);
-    }
-}
@@ -1,27 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.source;
-
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class SamplerSource implements Source {
-    private final ProbabilityCollection<PipelineBiome> biomes;
-    private final NoiseSampler sampler;
-
-    public SamplerSource(ProbabilityCollection<PipelineBiome> biomes, NoiseSampler sampler) {
-        this.biomes = biomes;
-        this.sampler = sampler;
-    }
-
-    @Override
-    public PipelineBiome get(long seed, int x, int z) {
-        return biomes.get(sampler, x, z, seed);
-    }
-
-    @Override
-    public Iterable<PipelineBiome> getBiomes() {
-        return biomes.getContents();
-    }
-}
@@ -1,7 +1,12 @@
-# biome-provider-pipeline
+# biome-provider-pipeline-2

-Implements the Biome Pipeline, a procedural biome provider that uses a series
+The second version of the Biome Pipeline, a procedural biome provider that uses a series
 of "stages" to apply "mutations" to a 2D grid of biomes.

+Version 2 is a re-implementation of the original addon with the primary goal of providing
+consistent scaling for noise relative to the world
+(See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been
+included as a separate addon to maintain parity with packs utilizing the first version.
+
 This addon registers the `PIPELINE` biome provider type, and all associated
 configurations.
@@ -1,5 +1,5 @@
-version = version("1.0.2")
+version = version("2.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-}
+}
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.util.vector.Vector2;
-
-
-public class BiomeHolderImpl implements BiomeHolder {
-    private final Vector2.Mutable origin;
-    private final int width;
-    private final int offset;
-    private BiomeDelegate[][] biomes;
-
-    public BiomeHolderImpl(int width, Vector2.Mutable origin) {
-        width += 4;
-        this.width = width;
-        biomes = new BiomeDelegate[width][width];
-        this.origin = origin;
-        this.offset = 2;
-    }
-
-    private BiomeHolderImpl(BiomeDelegate[][] biomes, Vector2.Mutable origin, int width, int offset) {
-        this.biomes = biomes;
-        this.origin = origin;
-        this.width = width;
-        this.offset = 2 * offset;
-    }
-
-    @Override
-    public BiomeHolder expand(BiomeExpander expander, long seed) {
-        BiomeDelegate[][] old = biomes;
-        int newWidth = width * 2 - 1;
-
-        biomes = new BiomeDelegate[newWidth][newWidth];
-
-        for(int x = 0; x < width; x++) {
-            for(int z = 0; z < width; z++) {
-                biomes[x * 2][z * 2] = old[x][z];
-                if(z != width - 1)
-                    biomes[x * 2][z * 2 + 1] = expander.getBetween(x + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z],
-                        old[x][z + 1]);
-                if(x != width - 1)
-                    biomes[x * 2 + 1][z * 2] = expander.getBetween(x + 1 + origin.getX(), z + origin.getZ(), seed, old[x][z],
-                        old[x + 1][z]);
-                if(x != width - 1 && z != width - 1)
-                    biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(x + 1 + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z],
-                        old[x + 1][z + 1], old[x][z + 1], old[x + 1][z]);
-            }
-        }
-        return new BiomeHolderImpl(biomes, origin.setX(origin.getX() * 2 - 1).setZ(origin.getZ() * 2 - 1), newWidth, offset);
-    }
-
-    @Override
-    public void mutate(BiomeMutator mutator, long seed) {
-        for(int x = 0; x < width; x++) {
-            for(int z = 0; z < width; z++) {
-                BiomeMutator.ViewPoint viewPoint = new BiomeMutator.ViewPoint(this, x, z);
-                biomes[x][z] = mutator.mutate(viewPoint, x + origin.getX(), z + origin.getZ(), seed);
-            }
-        }
-    }
-
-    @Override
-    public void fill(BiomeSource source, long seed) {
-        for(int x = 0; x < width; x++) {
-            for(int z = 0; z < width; z++) {
-                biomes[x][z] = source.getBiome(origin.getX() + x, origin.getZ() + z, seed);
-            }
-        }
-    }
-
-    @Override
-    public BiomeDelegate getBiome(int x, int z) {
-        x += offset;
-        z += offset;
-        return getBiomeRaw(x, z);
-    }
-
-    @Override
-    public BiomeDelegate getBiomeRaw(int x, int z) {
-        if(x >= width || z >= width || x < 0 || z < 0) return null;
-        return biomes[x][z];
-    }
-}
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.util.vector.Vector2;
-
-
-public class BiomePipeline {
-    private final BiomeSource source;
-    private final List<Stage> stages;
-    private final int size;
-    private final int init;
-
-    private BiomePipeline(BiomeSource source, List<Stage> stages, int size, int init) {
-        this.source = source;
-        this.stages = stages;
-        this.size = size;
-        this.init = init;
-    }
-
-    /**
-     * Get biomes in a chunk
-     *
-     * @param x Chunk X coord
-     * @param z Chunk Z coord
-     *
-     * @return BiomeHolder containing biomes.
-     */
-    public BiomeHolder getBiomes(int x, int z, long seed) {
-        BiomeHolder holder = new BiomeHolderImpl(init, Vector2.of(x * (init - 1), z * (init - 1)).mutable());
-        holder.fill(source, seed);
-        for(Stage stage : stages) holder = stage.apply(holder, seed);
-        return holder;
-    }
-
-    public BiomeSource getSource() {
-        return source;
-    }
-
-    public List<Stage> getStages() {
-        return Collections.unmodifiableList(stages);
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public static final class BiomePipelineBuilder {
-        private final int init;
-        private final List<Stage> stages = new ArrayList<>();
-        private int expand;
-
-        public BiomePipelineBuilder(int init) {
-            this.init = init;
-            expand = init;
-        }
-
-        public BiomePipeline build(BiomeSource source) {
-            for(Stage stage : stages) {
-                if(stage.isExpansion()) expand = expand * 2 - 1;
-            }
-
-            return new BiomePipeline(source, stages, expand, init);
-        }
-
-        public BiomePipelineBuilder addStage(Stage stage) {
-            stages.add(stage);
-            return this;
-        }
-    }
-}
@@ -8,23 +8,21 @@
 package com.dfsek.terra.addons.biome.pipeline;

 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

 import java.util.function.Supplier;

-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.BiomeDelegateLoader;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.SamplerSourceTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.PipelineBiomeLoader;
+import com.dfsek.terra.addons.biome.pipeline.config.source.SamplerSourceTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothStageTemplate;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -41,13 +39,13 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

 public class BiomePipelineAddon implements AddonInitializer {

-    public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
+    public static final TypeKey<Supplier<ObjectTemplate<Source>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
    };
+
    public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
    };
    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
    };
-    private static final Logger logger = LoggerFactory.getLogger(BiomePipelineAddon.class);
    @Inject
    private Platform platform;

@@ -65,7 +63,7 @@ public class BiomePipelineAddon implements AddonInitializer {
                providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
            })
            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
+                CheckedRegistry<Supplier<ObjectTemplate<Source>>> sourceRegistry = event.getPack().getOrCreateRegistry(
                    SOURCE_REGISTRY_KEY);
                sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
            })
@@ -73,11 +71,11 @@ public class BiomePipelineAddon implements AddonInitializer {
                CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
                    STAGE_REGISTRY_KEY);
                stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
-                stageRegistry.register(addon.key("SMOOTH"), SmoothMutatorTemplate::new);
-                stageRegistry.register(addon.key("REPLACE"), ReplaceMutatorTemplate::new);
-                stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListMutatorTemplate::new);
-                stageRegistry.register(addon.key("BORDER"), BorderMutatorTemplate::new);
-                stageRegistry.register(addon.key("BORDER_LIST"), BorderListMutatorTemplate::new);
+                stageRegistry.register(addon.key("SMOOTH"), SmoothStageTemplate::new);
+                stageRegistry.register(addon.key("REPLACE"), ReplaceStageTemplate::new);
+                stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListStageTemplate::new);
+                stageRegistry.register(addon.key("BORDER"), BorderStageTemplate::new);
+                stageRegistry.register(addon.key("BORDER_LIST"), BorderListStageTemplate::new);
            })
            .failThrough();
        platform.getEventManager()
@@ -85,12 +83,7 @@ public class BiomePipelineAddon implements AddonInitializer {
            .register(addon, ConfigPackPostLoadEvent.class)
            .then(event -> {
                Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
+                event.getPack().applyLoader(PipelineBiome.class, new PipelineBiomeLoader(biomeRegistry));
            });
-
-        if(platform.getTerraConfig().isDebugLog())
-            logger.warn(
-                "The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the" +
-                " biome-provider-pipeline-v2 addon for future pack development instead.");
    }
 }
@@ -9,7 +9,7 @@ import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;


-class BiomePipelineColumn implements Column<Biome> {
+public class BiomePipelineColumn implements Column<Biome> {
    private final int min;
    private final int max;

@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline;
-
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
-
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.StreamSupport;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.terra.api.util.Column;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public class BiomePipelineProvider implements BiomeProvider {
-    private final LoadingCache<SeededVector, BiomeHolder> holderCache;
-    private final BiomePipeline pipeline;
-    private final int resolution;
-    private final NoiseSampler mutator;
-    private final double noiseAmp;
-
-    private final Set<Biome> biomes;
-
-    public BiomePipelineProvider(BiomePipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
-        this.resolution = resolution;
-        this.mutator = mutator;
-        this.noiseAmp = noiseAmp;
-        holderCache = Caffeine.newBuilder()
-            .maximumSize(1024)
-            .build(key -> pipeline.getBiomes(key.x, key.z, key.seed));
-        this.pipeline = pipeline;
-
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        pipeline.getSource().getBiomes().forEach(biomeSet::add);
-        Iterable<BiomeDelegate> result = biomeSet;
-        for(Stage stage : pipeline.getStages()) {
-            result = stage.getBiomes(result); // pass through all stages
-        }
-        this.biomes = new HashSet<>();
-        Iterable<BiomeDelegate> finalResult = result;
-        result.forEach(biomeDelegate -> {
-            if(biomeDelegate.isEphemeral()) {
-
-                StringBuilder biomeList = new StringBuilder("\n");
-                StreamSupport.stream(finalResult.spliterator(), false)
-                    .sorted(Comparator.comparing(StringIdentifiable::getID))
-                    .forEach(delegate -> biomeList
-                        .append("    - ")
-                        .append(delegate.getID())
-                        .append(':')
-                        .append(delegate.getClass().getCanonicalName())
-                        .append('\n'));
-                throw new IllegalArgumentException("Biome Pipeline leaks ephemeral biome \"" + biomeDelegate.getID() +
-                                                   "\". Ensure there is a stage to guarantee replacement of the ephemeral biome. Biomes: " +
-                                                   biomeList);
-            }
-            this.biomes.add(biomeDelegate.getBiome());
-        });
-    }
-
-    @Override
-    public Biome getBiome(int x, int y, int z, long seed) {
-        return getBiome(x, z, seed);
-    }
-
-    public Biome getBiome(int x, int z, long seed) {
-        x += mutator.noise(seed + 1, x, z) * noiseAmp;
-        z += mutator.noise(seed + 2, x, z) * noiseAmp;
-
-
-        x /= resolution;
-        z /= resolution;
-
-        int fdX = Math.floorDiv(x, pipeline.getSize());
-        int fdZ = Math.floorDiv(z, pipeline.getSize());
-        return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
-            z - fdZ * pipeline.getSize()).getBiome();
-    }
-
-    @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
-        return Optional.of(getBiome(x, z, seed));
-    }
-
-    @Override
-    public Iterable<Biome> getBiomes() {
-        return biomes;
-    }
-
-    @Override
-    public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
-        return new BiomePipelineColumn(this, min, max, x, z, seed);
-    }
-
-    @Override
-    public int resolution() {
-        return resolution;
-    }
-
-    private record SeededVector(int x, int z, long seed) {
-        @Override
-        public boolean equals(Object obj) {
-            if(obj instanceof SeededVector that) {
-                return this.z == that.z && this.x == that.x && this.seed == that.seed;
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            int code = x;
-            code = 31 * code + z;
-            return 31 * code + ((int) (seed ^ (seed >>> 32)));
-        }
-    }
-}
@@ -1,4 +1,11 @@
-package com.dfsek.terra.addons.biome.pipeline.v2;
+/*
+ * Copyright (c) 2020-2025 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline;

 import com.dfsek.terra.api.util.cache.SeededVector2Key;

@@ -11,11 +18,11 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.StreamSupport;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
 import com.dfsek.terra.api.world.biome.Biome;
@@ -27,11 +34,11 @@ public class PipelineBiomeProvider implements BiomeProvider {
    private final LoadingCache<SeededVector2Key, BiomeChunk> biomeChunkCache;
    private final int chunkSize;
    private final int resolution;
-    private final NoiseSampler mutator;
+    private final Sampler mutator;
    private final double noiseAmp;
    private final Set<Biome> biomes;

-    public PipelineBiomeProvider(Pipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
+    public PipelineBiomeProvider(Pipeline pipeline, int resolution, Sampler mutator, double noiseAmp) {
        this.resolution = resolution;
        this.mutator = mutator;
        this.noiseAmp = noiseAmp;
@@ -76,8 +83,8 @@ public class PipelineBiomeProvider implements BiomeProvider {

    public Biome getBiome(int x, int z, long seed) {

-        x += mutator.noise(seed + 1, x, z) * noiseAmp;
-        z += mutator.noise(seed + 2, x, z) * noiseAmp;
+        x += (int) (mutator.getSample(seed + 1, x, z) * noiseAmp);
+        z += (int) (mutator.getSample(seed + 2, x, z) * noiseAmp);

        x /= resolution;
        z /= resolution;
@@ -0,0 +1,10 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+public interface BiomeChunk {
+
+    PipelineBiome get(int xInChunk, int zInChunk);
+}
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-
-
-public interface BiomeHolder {
-    BiomeHolder expand(BiomeExpander expander, long seed);
-
-    void mutate(BiomeMutator mutator, long seed);
-
-    void fill(BiomeSource source, long seed);
-
-    BiomeDelegate getBiome(int x, int z);
-
-    BiomeDelegate getBiomeRaw(int x, int z);
-}
@@ -1,7 +1,7 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api;
+package com.dfsek.terra.addons.biome.pipeline.api;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;


 /**
@@ -10,7 +10,7 @@ import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoin
 */
 public interface Expander extends Stage {

-    PipelineBiome fillBiome(ViewPoint viewPoint);
+    PipelineBiome fillBiome(BiomeChunkImpl.ViewPoint viewPoint);

    @Override
    default int maxRelativeReadDistance() {
@@ -18,7 +18,7 @@ public interface Expander extends Stage {
    }

    @Override
-    default PipelineBiome apply(ViewPoint viewPoint) {
+    default PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) {
        PipelineBiome currentBiome = viewPoint.getBiome();
        if(currentBiome == null) {
            return fillBiome(viewPoint);
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api;
+package com.dfsek.terra.addons.biome.pipeline.api;

 import com.dfsek.terra.api.util.cache.SeededVector2Key;

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+public interface Source {
+    PipelineBiome get(long seed, int x, int z);
+
+    Iterable<PipelineBiome> getBiomes();
+}
@@ -0,0 +1,15 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+
+
+public interface Stage {
+    PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint);
+
+    int maxRelativeReadDistance();
+
+    default Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
+        return biomes;
+    }
+}
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;

 import java.util.Set;

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;

 import java.util.Set;

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;

 import java.util.HashSet;
 import java.util.Set;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;

 import java.util.Collections;
 import java.util.Set;
@@ -1,35 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Set;
-
-import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-public interface BiomeDelegate extends StringIdentifiable {
-    static BiomeDelegate ephemeral(String id) {
-        return new EphemeralBiomeDelegate(id);
-    }
-
-    static BiomeDelegate from(Biome biome) {
-        return new DelegatedBiome(biome);
-    }
-
-    static BiomeDelegate self() {
-        return SelfDelegate.INSTANCE;
-    }
-
-    Biome getBiome();
-
-    Set<String> getTags();
-
-    default boolean isEphemeral() {
-        return false;
-    }
-
-    default boolean isSelf() {
-        return false;
-    }
-
-
-}
@@ -1,40 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Set;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-final class DelegatedBiome implements BiomeDelegate {
-    private final Biome biome;
-
-    public DelegatedBiome(Biome biome) {
-        this.biome = biome;
-    }
-
-    @Override
-    public Biome getBiome() {
-        return biome;
-    }
-
-    @Override
-    public int hashCode() {
-        return biome.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(!(obj instanceof DelegatedBiome that)) return false;
-        return that.biome.equals(this.biome);
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return biome.getTags();
-    }
-
-    @Override
-    public String getID() {
-        return biome.getID();
-    }
-}
@@ -1,51 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-final class EphemeralBiomeDelegate implements BiomeDelegate {
-    private final Set<String> tags;
-    private final String id;
-
-    public EphemeralBiomeDelegate(String id) {
-        this.id = id;
-        tags = new HashSet<>();
-        tags.add(id);
-        tags.add("ALL");
-    }
-
-    @Override
-    public Biome getBiome() {
-        throw new UnsupportedOperationException("Cannot get biome from ephemeral delegate");
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return tags;
-    }
-
-    @Override
-    public String getID() {
-        return id;
-    }
-
-    @Override
-    public boolean isEphemeral() {
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return id.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(!(obj instanceof EphemeralBiomeDelegate that)) return false;
-
-        return this.id.equals(that.id);
-    }
-}
@@ -1,40 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Collections;
-import java.util.Set;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-final class SelfDelegate implements BiomeDelegate {
-    public static final SelfDelegate INSTANCE = new SelfDelegate();
-
-    private SelfDelegate() {
-
-    }
-
-    @Override
-    public Biome getBiome() {
-        throw new UnsupportedOperationException("Cannot get biome from self delegate");
-    }
-
-    @Override
-    public boolean isSelf() {
-        return true;
-    }
-
-    @Override
-    public boolean isEphemeral() {
-        return true;
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return Collections.emptySet();
-    }
-
-    @Override
-    public String getID() {
-        return "SELF";
-    }
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api.stage;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface Stage {
-    BiomeHolder apply(BiomeHolder in, long seed);
-
-    boolean isExpansion();
-
-    Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes);
-}
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api.stage.type;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeExpander {
-    BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others);
-}
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api.stage.type;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeMutator {
-    BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed);
-
-    default Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return biomes;
-    }
-
-    class ViewPoint {
-        private final BiomeHolder biomes;
-        private final int offX;
-        private final int offZ;
-
-        public ViewPoint(BiomeHolder biomes, int offX, int offZ) {
-            this.biomes = biomes;
-            this.offX = offX;
-            this.offZ = offZ;
-        }
-
-
-        public BiomeDelegate getBiome(int x, int z) {
-            return biomes.getBiomeRaw(x + offX, z + offZ);
-        }
-    }
-}
@@ -1,32 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.depth.DepthTracker;
-import com.dfsek.tectonic.api.exception.LoadException;
-import com.dfsek.tectonic.api.loader.ConfigLoader;
-import com.dfsek.tectonic.api.loader.type.TypeLoader;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.AnnotatedType;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-public class BiomeDelegateLoader implements TypeLoader<BiomeDelegate> {
-    private final Registry<Biome> biomeRegistry;
-
-    public BiomeDelegateLoader(Registry<Biome> biomeRegistry) {
-        this.biomeRegistry = biomeRegistry;
-    }
-
-    @Override
-    public BiomeDelegate load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
-    throws LoadException {
-        if(c.equals("SELF")) return BiomeDelegate.self();
-        return biomeRegistry
-            .getByID((String) c)
-            .map(BiomeDelegate::from)
-            .orElseGet(() -> BiomeDelegate.ephemeral((String) c));
-    }
-}
@@ -10,45 +10,46 @@ package com.dfsek.terra.addons.biome.pipeline.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

 import java.util.List;

-import com.dfsek.terra.addons.biome.pipeline.BiomePipeline;
-import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.addons.biome.pipeline.PipelineBiomeProvider;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl;
 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;


@SuppressWarnings({ "FieldMayBeFinal", "unused" })
-public class BiomePipelineTemplate extends BiomeProviderTemplate {
-    @Value("pipeline.initial-size")
+public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
+    @Value("resolution")
    @Default
    @Description("""
-                 The initial size of biome chunks. This value must be at least 2.
-                 <b>This is not the final size of biome chunks. Final chunks will be much larger</b>.
+                 The resolution at which to sample biomes.
                 
-                 It is recommended to keep biome chunks' final size in the range of [50, 300]
-                 to prevent performance issues. To calculate the size of biome chunks, simply
-                 take initial-size and for each expand stage, multiply the running value by 2
-                 and subtract 1. (The size is also printed to the server console if you
-                 have debug mode enabled)""")
-    private @Meta int initialSize = 2;
-
+                 Larger values are quadratically faster, but produce lower quality results.
+                 For example, a value of 3 would sample every 3 blocks.""")
+    protected @Meta int resolution = 1;
+    @Value("blend.sampler")
+    @Default
+    @Description("A sampler to use for blending the edges of biomes via domain warping.")
+    protected @Meta Sampler blendSampler = Sampler.zero();
+    @Value("blend.amplitude")
+    @Default
+    @Description("The amplitude at which to perform blending.")
+    protected @Meta double blendAmplitude = 0d;
    @Value("pipeline.source")
    @Description("The Biome Source to use for initial population of biomes.")
-    private @Meta BiomeSource source;
-
+    private @Meta Source source;
    @Value("pipeline.stages")
    @Description("A list of pipeline stages to apply to the result of #source")
    private @Meta List<@Meta Stage> stages;

    @Override
    public BiomeProvider get() {
-        BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize);
-        stages.forEach(biomePipelineBuilder::addStage);
-        BiomePipeline pipeline = biomePipelineBuilder.build(source);
-        return new BiomePipelineProvider(pipeline, resolution, blend, blendAmp);
+        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 128), resolution, blendSampler, blendAmplitude);
    }
 }
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvider> {
-    @Value("resolution")
-    @Default
-    @Description("""
-                 The resolution at which to sample biomes.
-                 
-                 Larger values are quadratically faster, but produce lower quality results.
-                 For example, a value of 3 would sample every 3 blocks.""")
-    protected @Meta int resolution = 1;
-    @Value("blend.sampler")
-    @Default
-    @Description("A sampler to use for blending the edges of biomes via domain warping.")
-    protected @Meta NoiseSampler blend = NoiseSampler.zero();
-    @Value("blend.amplitude")
-    @Default
-    @Description("The amplitude at which to perform blending.")
-    protected @Meta double blendAmp = 0d;
-}
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.config;
+package com.dfsek.terra.addons.biome.pipeline.config;

 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.world.biome.Biome;

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class SamplerSourceTemplate extends SourceTemplate {
-    @Value("sampler")
-    @Description("The sampler used to distribute biomes.")
-    private @Meta NoiseSampler noise;
-
-    @Value("biomes")
-    @Description("The biomes to be distributed.")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> biomes;
-
-    @Override
-    public BiomeSource get() {
-        return new SamplerSource(biomes, noise);
-    }
-}
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-
-
-public abstract class SourceTemplate implements ObjectTemplate<BiomeSource> {
-
-}
@@ -5,23 +5,23 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.config.source;
+package com.dfsek.terra.addons.biome.pipeline.config.source;

 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.source.SamplerSource;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;


 public class SamplerSourceTemplate extends SourceTemplate {
    @Value("sampler")
    @Description("The sampler used to distribute biomes.")
-    private @Meta NoiseSampler noise;
+    private @Meta Sampler noise;

    @Value("biomes")
    @Description("The biomes to be distributed.")
@@ -5,11 +5,11 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.config.source;
+package com.dfsek.terra.addons.biome.pipeline.config.source;

 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;


 public abstract class SourceTemplate implements ObjectTemplate<Source> {
@@ -11,13 +11,13 @@ import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.seismic.type.sampler.Sampler;


 public abstract class StageTemplate implements ObjectTemplate<Stage> {
    @Value("sampler")
    @Description("Sampler to use for stage distribution.")
-    protected @Meta NoiseSampler noise;
+    protected @Meta Sampler noise;
 }
@@ -7,15 +7,14 @@

 package com.dfsek.terra.addons.biome.pipeline.config.stage.expander;

-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.expand.FractalExpander;
-import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
+import com.dfsek.terra.addons.biome.pipeline.stage.expander.FractalExpander;


 public class ExpanderStageTemplate extends StageTemplate {
    @Override
-    public Stage get() {
-        return new ExpanderStage(new FractalExpander(noise));
+    public Expander get() {
+        return new FractalExpander(noise);
    }
 }
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import java.util.Map;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-@SuppressWarnings("unused")
-public class BorderListMutatorTemplate extends StageTemplate {
-    @Value("from")
-    private @Meta String from;
-
-    @Value("default-replace")
-    private @Meta String defaultReplace;
-
-    @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
-
-    @Value("replace")
-    private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
-
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new BorderListMutator(replace, from, defaultReplace, noise, defaultTo));
-    }
-}
@@ -5,16 +5,16 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;

 import com.dfsek.tectonic.api.config.template.annotations.Value;

 import java.util.Map;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderListStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-@SuppressWarnings("unused")
-public class BorderMutatorTemplate extends StageTemplate {
-    @Value("from")
-    private @Meta String from;
-
-    @Value("replace")
-    private @Meta String replace;
-
-    @Value("to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new BorderMutator(from, replace, noise, to));
-    }
-}
@@ -5,14 +5,14 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;

 import com.dfsek.tectonic.api.config.template.annotations.Value;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import java.util.Map;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-@SuppressWarnings("unused")
-public class ReplaceListMutatorTemplate extends StageTemplate {
-    @Value("default-from")
-    private @Meta String defaultFrom;
-
-    @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
-
-    @Value("to")
-    private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new ReplaceListMutator(replace, defaultFrom, defaultTo, noise));
-    }
-}
@@ -5,16 +5,16 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;

 import com.dfsek.tectonic.api.config.template.annotations.Value;

 import java.util.Map;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceListStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-@SuppressWarnings("unused")
-public class ReplaceMutatorTemplate extends StageTemplate {
-    @Value("from")
-    private @Meta String from;
-
-    @Value("to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new ReplaceMutator(from, to, noise));
-    }
-}
@@ -5,14 +5,14 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;

 import com.dfsek.tectonic.api.config.template.annotations.Value;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

@@ -7,15 +7,14 @@

 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;

-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.SmoothStage;


-public class SmoothMutatorTemplate extends StageTemplate {
+public class SmoothStageTemplate extends StageTemplate {
    @Override
    public Stage get() {
-        return new MutatorStage(new SmoothMutator(noise));
+        return new SmoothStage(noise);
    }
 }
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.expand;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
-
-
-public class FractalExpander implements BiomeExpander {
-    private final NoiseSampler sampler;
-
-    public FractalExpander(NoiseSampler sampler) {
-        this.sampler = sampler;
-    }
-
-    @Override
-    public BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others) {
-        return others[MathUtil.normalizeIndex(sampler.noise(seed, x, z), others.length)];
-    }
-}
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.mutator;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class BorderListMutator implements BiomeMutator {
-    private final String border;
-    private final NoiseSampler noiseSampler;
-    private final ProbabilityCollection<BiomeDelegate> replaceDefault;
-    private final String defaultReplace;
-    private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
-
-    public BorderListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String border, String defaultReplace,
-                             NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replaceDefault) {
-        this.border = border;
-        this.noiseSampler = noiseSampler;
-        this.replaceDefault = replaceDefault;
-        this.defaultReplace = defaultReplace;
-        this.replace = replace;
-    }
-
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate origin = viewPoint.getBiome(0, 0);
-        if(origin.getTags().contains(defaultReplace)) {
-            for(int xi = -1; xi <= 1; xi++) {
-                for(int zi = -1; zi <= 1; zi++) {
-                    if(xi == 0 && zi == 0) continue;
-                    BiomeDelegate current = viewPoint.getBiome(xi, zi);
-                    if(current != null && current.getTags().contains(border)) {
-                        if(replace.containsKey(origin)) {
-                            BiomeDelegate biome = replace.get(origin).get(noiseSampler, x, z, seed);
-                            return biome.isSelf() ? origin : biome;
-                        }
-                        BiomeDelegate biome = replaceDefault.get(noiseSampler, x, z, seed);
-                        return biome.isSelf() ? origin : biome;
-                    }
-                }
-            }
-        }
-        return origin;
-    }
-
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        biomes.forEach(biomeSet::add);
-        biomeSet.addAll(replaceDefault.getContents().stream().filter(Predicate.not(BiomeDelegate::isSelf)).toList());
-        replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents()));
-        return biomeSet;
-    }
-}
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.mutator;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class BorderMutator implements BiomeMutator {
-    private final String border;
-    private final NoiseSampler noiseSampler;
-    private final ProbabilityCollection<BiomeDelegate> replace;
-    private final String replaceTag;
-
-    public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replace) {
-        this.border = border;
-        this.noiseSampler = noiseSampler;
-        this.replace = replace;
-        this.replaceTag = replaceTag;
-    }
-
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate origin = viewPoint.getBiome(0, 0);
-        if(origin.getTags().contains(replaceTag)) {
-            for(int xi = -1; xi <= 1; xi++) {
-                for(int zi = -1; zi <= 1; zi++) {
-                    if(xi == 0 && zi == 0) continue;
-                    BiomeDelegate current = viewPoint.getBiome(xi, zi);
-                    if(current != null && current.getTags().contains(border)) {
-                        BiomeDelegate biome = replace.get(noiseSampler, x, z, seed);
-                        return biome.isSelf() ? origin : biome;
-                    }
-                }
-            }
-        }
-        return origin;
-    }
-
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        biomes.forEach(biomeSet::add);
-        biomeSet.addAll(
-            replace
-                .getContents()
-                .stream()
-                .filter(
-                    Predicate.not(BiomeDelegate::isSelf)
-                )
-                .toList()
-        );
-        return biomeSet;
-    }
-}
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.mutator;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class ReplaceListMutator implements BiomeMutator {
-    private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
-    private final NoiseSampler sampler;
-    private final ProbabilityCollection<BiomeDelegate> replaceDefault;
-    private final String defaultTag;
-
-    public ReplaceListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String defaultTag,
-                              ProbabilityCollection<BiomeDelegate> replaceDefault, NoiseSampler sampler) {
-        this.replace = replace;
-        this.sampler = sampler;
-        this.defaultTag = defaultTag;
-        this.replaceDefault = replaceDefault;
-    }
-
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate center = viewPoint.getBiome(0, 0);
-        if(replace.containsKey(center)) {
-            BiomeDelegate biome = replace.get(center).get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
-        }
-        if(viewPoint.getBiome(0, 0).getTags().contains(defaultTag)) {
-            BiomeDelegate biome = replaceDefault.get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
-        }
-        return center;
-    }
-
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-
-        Set<BiomeDelegate> reject = new HashSet<>();
-
-        biomes.forEach(biome -> {
-            if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) {
-                biomeSet.add(biome);
-            } else {
-                reject.add(biome);
-            }
-        });
-        biomeSet.addAll(replaceDefault.getContents().stream().flatMap(terraBiome -> {
-            if(terraBiome.isSelf()) return reject.stream();
-            return Stream.of(terraBiome);
-        }).toList());
-        replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents().stream().map(terraBiome -> {
-            if(terraBiome.isSelf()) return biome;
-            return terraBiome;
-        }).toList()));
-        return biomeSet;
-    }
-}
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.mutator;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class ReplaceMutator implements BiomeMutator {
-    private final String replaceableTag;
-    private final ProbabilityCollection<BiomeDelegate> replace;
-    private final NoiseSampler sampler;
-
-    public ReplaceMutator(String replaceable, ProbabilityCollection<BiomeDelegate> replace, NoiseSampler sampler) {
-        this.replaceableTag = replaceable;
-        this.replace = replace;
-        this.sampler = sampler;
-    }
-
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) {
-            BiomeDelegate biome = replace.get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
-        }
-        return viewPoint.getBiome(0, 0);
-    }
-
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        Set<BiomeDelegate> reject = new HashSet<>();
-        biomes.forEach(biome -> {
-            if(!biome.getTags().contains(replaceableTag)) {
-                biomeSet.add(biome);
-            } else {
-                reject.add(biome);
-            }
-        });
-        biomeSet.addAll(replace.getContents().stream().flatMap(terraBiome -> {
-            if(terraBiome.isSelf()) return reject.stream();
-            return Stream.of(terraBiome);
-        }).toList());
-        return biomeSet;
-    }
-}
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.mutator;
-
-import java.util.Objects;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
-
-
-public class SmoothMutator implements BiomeMutator {
-
-    private final NoiseSampler sampler;
-
-    public SmoothMutator(NoiseSampler sampler) {
-        this.sampler = sampler;
-    }
-
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate top = viewPoint.getBiome(1, 0);
-        BiomeDelegate bottom = viewPoint.getBiome(-1, 0);
-        BiomeDelegate left = viewPoint.getBiome(0, 1);
-        BiomeDelegate right = viewPoint.getBiome(0, -1);
-
-
-        boolean vert = Objects.equals(top, bottom) && top != null;
-        boolean horiz = Objects.equals(left, right) && left != null;
-
-        if(vert && horiz) {
-            return MathUtil.normalizeIndex(sampler.noise(seed, x, z), 2) == 0 ? left : top;
-        }
-
-        if(vert) return top;
-        if(horiz) return left;
-
-        return viewPoint.getBiome(0, 0);
-    }
-}
@@ -1,11 +1,13 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
+package com.dfsek.terra.addons.biome.pipeline.pipeline;

 import java.util.List;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
+
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.util.cache.SeededVector2Key;


@@ -98,7 +100,7 @@ public class BiomeChunkImpl implements BiomeChunk {
        // chunk samples points on the same overall grid.
        // Without this, shared chunk borders (required because of adjacent cell reads) will not be identical
        // because points would be sampled on grids at different offsets, resulting in artifacts at borders.
-        return (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
+        return FloatingPointFunctions.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
    }

    private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {
@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
+package com.dfsek.terra.addons.biome.pipeline.pipeline;

 import com.dfsek.terra.api.util.cache.SeededVector2Key;

@@ -7,11 +7,11 @@ import org.slf4j.LoggerFactory;

 import java.util.List;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;


 public class PipelineImpl implements Pipeline {
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.source;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeSource {
-    BiomeDelegate getBiome(double x, double z, long seed);
-
-    Iterable<BiomeDelegate> getBiomes();
-}
@@ -7,27 +7,28 @@

 package com.dfsek.terra.addons.biome.pipeline.source;

-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;


-public class SamplerSource implements BiomeSource {
-    private final ProbabilityCollection<BiomeDelegate> biomes;
-    private final NoiseSampler sampler;
+public class SamplerSource implements Source {
+    private final ProbabilityCollection<PipelineBiome> biomes;
+    private final Sampler sampler;

-    public SamplerSource(ProbabilityCollection<BiomeDelegate> biomes, NoiseSampler sampler) {
+    public SamplerSource(ProbabilityCollection<PipelineBiome> biomes, Sampler sampler) {
        this.biomes = biomes;
        this.sampler = sampler;
    }

    @Override
-    public BiomeDelegate getBiome(double x, double z, long seed) {
+    public PipelineBiome get(long seed, int x, int z) {
        return biomes.get(sampler, x, z, seed);
    }

    @Override
-    public Iterable<BiomeDelegate> getBiomes() {
+    public Iterable<PipelineBiome> getBiomes() {
        return biomes.getContents();
    }
 }
@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.source;
+package com.dfsek.terra.addons.biome.pipeline.source;

 import java.util.Collections;
 import java.util.Set;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;


 public class SingleSource implements Source {
@@ -1,16 +1,16 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.stage.expander;
+package com.dfsek.terra.addons.biome.pipeline.stage.expander;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.seismic.type.sampler.Sampler;


 public class FractalExpander implements Expander {

-    private final NoiseSampler sampler;
+    private final Sampler sampler;

-    public FractalExpander(NoiseSampler sampler) {
+    public FractalExpander(Sampler sampler) {
        this.sampler = sampler;
    }

@@ -20,7 +20,7 @@ public class FractalExpander implements Expander {
        int xMod2 = viewPoint.gridX() % 2;
        int zMod2 = viewPoint.gridZ() % 2;

-        double roll = sampler.noise(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());
+        double roll = sampler.getSample(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());

        if(xMod2 == 1 && zMod2 == 0) { // Pick one of 2 neighbors on X axis randomly
            return roll > 0 ? viewPoint.getRelativeBiome(-1, 0) : viewPoint.getRelativeBiome(1, 0);
@@ -5,7 +5,7 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

 import java.util.ArrayList;
 import java.util.HashSet;
@@ -14,17 +14,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.seismic.type.vector.Vector2Int;
+
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.util.vector.Vector2Int;


 public class BorderListStage implements Stage {
    private final String border;
-    private final NoiseSampler noiseSampler;
+    private final Sampler Sampler;
    private final ProbabilityCollection<PipelineBiome> replaceDefault;
    private final String defaultReplace;
    private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
@@ -32,9 +33,9 @@ public class BorderListStage implements Stage {
    private final Vector2Int[] borderPoints;

    public BorderListStage(Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace, String border, String defaultReplace,
-                           NoiseSampler noiseSampler, ProbabilityCollection<PipelineBiome> replaceDefault) {
+                           Sampler Sampler, ProbabilityCollection<PipelineBiome> replaceDefault) {
        this.border = border;
-        this.noiseSampler = noiseSampler;
+        this.Sampler = Sampler;
        this.replaceDefault = replaceDefault;
        this.defaultReplace = defaultReplace;
        this.replace = replace;
@@ -67,11 +68,11 @@ public class BorderListStage implements Stage {
                PipelineBiome current = viewPoint.getRelativeBiome(point.getX(), point.getZ());
                if(current != null && current.getTags().contains(border)) {
                    if(replace.containsKey(center)) {
-                        PipelineBiome replacement = replace.get(center).get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
+                        PipelineBiome replacement = replace.get(center).get(Sampler, viewPoint.worldX(), viewPoint.worldZ(),
                            viewPoint.worldSeed());
                        return replacement.isSelf() ? center : replacement;
                    }
-                    PipelineBiome replacement = replaceDefault.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
+                    PipelineBiome replacement = replaceDefault.get(Sampler, viewPoint.worldX(), viewPoint.worldZ(),
                        viewPoint.worldSeed());
                    return replacement.isSelf() ? center : replacement;
                }
@@ -5,7 +5,7 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

 import java.util.ArrayList;
 import java.util.HashSet;
@@ -13,24 +13,24 @@ import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.util.vector.Vector2Int;
+import com.dfsek.seismic.type.vector.Vector2Int;


 public class BorderStage implements Stage {
    private final String border;
-    private final NoiseSampler noiseSampler;
+    private final Sampler Sampler;
    private final ProbabilityCollection<PipelineBiome> replace;
    private final String replaceTag;
    private final Vector2Int[] borderPoints;

-    public BorderStage(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<PipelineBiome> replace) {
+    public BorderStage(String border, String replaceTag, Sampler Sampler, ProbabilityCollection<PipelineBiome> replace) {
        this.border = border;
-        this.noiseSampler = noiseSampler;
+        this.Sampler = Sampler;
        this.replace = replace;
        this.replaceTag = replaceTag;
        List<Vector2Int> points = new ArrayList<>();
@@ -50,7 +50,7 @@ public class BorderStage implements Stage {
            for(Vector2Int point : borderPoints) {
                PipelineBiome current = viewPoint.getRelativeBiome(point.getX(), point.getZ());
                if(current != null && current.getTags().contains(border)) {
-                    PipelineBiome replacement = replace.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+                    PipelineBiome replacement = replace.get(Sampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
                    return replacement.isSelf() ? center : replacement;
                }
            }
@@ -5,28 +5,28 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;


 public class ReplaceListStage implements Stage {
    private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
-    private final NoiseSampler sampler;
+    private final Sampler sampler;
    private final ProbabilityCollection<PipelineBiome> replaceDefault;
    private final String defaultTag;

    public ReplaceListStage(Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace, String defaultTag,
-                            ProbabilityCollection<PipelineBiome> replaceDefault, NoiseSampler sampler) {
+                            ProbabilityCollection<PipelineBiome> replaceDefault, Sampler sampler) {
        this.replace = replace;
        this.sampler = sampler;
        this.defaultTag = defaultTag;
@@ -5,25 +5,25 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;


 public class ReplaceStage implements Stage {
    private final String replaceableTag;
    private final ProbabilityCollection<PipelineBiome> replace;
-    private final NoiseSampler sampler;
+    private final Sampler sampler;

-    public ReplaceStage(String replaceable, ProbabilityCollection<PipelineBiome> replace, NoiseSampler sampler) {
+    public ReplaceStage(String replaceable, ProbabilityCollection<PipelineBiome> replace, Sampler sampler) {
        this.replaceableTag = replaceable;
        this.replace = replace;
        this.sampler = sampler;
@@ -5,21 +5,21 @@
 * reference the LICENSE file in this module's root directory.
 */

-package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

 import java.util.Objects;

-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.seismic.type.sampler.Sampler;


 public class SmoothStage implements Stage {

-    private final NoiseSampler sampler;
+    private final Sampler sampler;

-    public SmoothStage(NoiseSampler sampler) {
+    public SmoothStage(Sampler sampler) {
        this.sampler = sampler;
    }

@@ -30,7 +30,7 @@ public class SmoothStage implements Stage {
        PipelineBiome left = viewPoint.getRelativeBiome(0, 1);
        PipelineBiome right = viewPoint.getRelativeBiome(0, -1);

-        double roll = sampler.noise(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());
+        double roll = sampler.getSample(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());

        boolean vert = Objects.equals(top, bottom);
        boolean horiz = Objects.equals(left, right);
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.stages;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-
-
-public class ExpanderStage implements Stage {
-    private final BiomeExpander expander;
-
-    public ExpanderStage(BiomeExpander expander) {
-        this.expander = expander;
-    }
-
-    @Override
-    public BiomeHolder apply(BiomeHolder in, long seed) {
-        return in.expand(expander, seed);
-    }
-
-    @Override
-    public boolean isExpansion() {
-        return true;
-    }
-
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return biomes;
-    }
-}
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.stages;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-
-
-public class MutatorStage implements Stage {
-    private final BiomeMutator mutator;
-
-    public MutatorStage(BiomeMutator mutator) {
-        this.mutator = mutator;
-    }
-
-    @Override
-    public BiomeHolder apply(BiomeHolder in, long seed) {
-        in.mutate(mutator, seed);
-        return in;
-    }
-
-    @Override
-    public boolean isExpansion() {
-        return false;
-    }
-
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return mutator.getBiomes(biomes);
-    }
-
-    public enum Type {
-        REPLACE,
-        REPLACE_LIST,
-        BORDER,
-        BORDER_LIST,
-        SMOOTH
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zoë Gidiere	c9d7af5274	fix padding	2025-06-07 01:23:44 -06:00
Zoë Gidiere	3269f9ec8b	Initial work on supporting chunk based bending and interpolation in Layered Generator	2025-06-07 01:17:24 -06:00
Zoë Gidiere	619c2156cd	Use seismic func for perf 2	2025-06-05 22:47:16 -06:00
Zoë Gidiere	0e211065bc	Fix build again	2025-06-05 22:44:19 -06:00
Zoë Gidiere	bc1213b220	Use Seismic function for perf	2025-06-05 22:44:07 -06:00
Zoë Gidiere	f04c9b3e73	Fix build	2025-06-05 22:40:11 -06:00
Zoë Gidiere	e079cdfcc0	Merge branch 'dev/7.0-2' into dev/layered-generator	2025-06-05 21:04:06 -06:00
Zoë Gidiere	4eace9e7fb	Merge remote-tracking branch 'origin/master' into dev/7.0-2	2025-06-05 21:03:58 -06:00
Zoë Gidiere	39ae1fdf93	Merge branch 'master' into dev/7.0-2	2025-06-05 17:51:01 -06:00
Zoë Gidiere	e9d1add6af	Merge branch 'master' into dev/7.0-2	2025-06-05 17:21:00 -06:00
Christian Bergschneider	94d135c66c	Refactor MinestomBiomeLoader to use DynamicRegistry directly Simplified biome loading by removing dependency on MinecraftServer and using DynamicRegistry.Key directly. This improves code maintainability and aligns with updated API usage.	2025-06-05 17:04:37 -06:00
Zoë Gidiere	1881051191	Merge pull request #504 from everbuild-org/dev/7.0-2 Apply biomes to minestom instances	2025-06-05 08:16:00 +00:00
Christian Bergschneider	28132e0f13	resolve merge conflicts	2025-06-05 10:08:58 +02:00
Christian Bergschneider	1ef34469cb	Merge remote-tracking branch 'ckyuri/dev/7.0-2' into dev/7.0-2	2025-06-05 10:03:50 +02:00
kyuri	e79ea4ab82	Minestom Latest - Update (#499 ) * Bukkit Build Fix * remove comments * remove papermc repo from gradle settings * add back gradle shasum * fix formatting, update gradle hash * Minestom Updated to latest version as of now 4/12/2025 Updated method names to new documentation and changed minestom versioning. - Paper Build version was changed as I had issues building at all with the snapshot version. So it was changed to a generic version but everything still builds fine. * Bug Fix - Entity Type was parsing a value that was incorrect and causing issues to load the world. EntityType.fromId(Integer.parseInt(id)); to delegate = EntityType.fromKey(id); * Reverted changes to comply with build version requirements and avoiding pulling functionality out of a common existing function --------- Co-authored-by: Peter Pan <peter@never.lan> Co-authored-by: Zoë Gidiere <duplexsys@protonmail.com>	2025-06-04 23:38:42 -06:00
Zoë Gidiere	4450a56ef0	Merge branch 'dev/7.0-2' into dev/7.0-2	2025-06-05 05:38:32 +00:00
Christian Bergschneider	a061660e46	chore: Update Minestom version to 1_21_5-4d91778331 This commit updates the Minestom dependency to the latest tagged version. Ensures compatibility with new features and fixes in the updated Minestom release.	2025-06-04 21:52:46 +02:00
Christian Bergschneider	abdff16a0a	Merge remote-tracking branch 'origin/dev/7.0-2' into dev/7.0-2 # Conflicts: # buildSrc/src/main/kotlin/Versions.kt	2025-06-04 21:43:33 +02:00
Christian Bergschneider	c08e973e3e	feat: provide default MinestomBlockEntity implementation Introduce the `MinestomBlockEntity` class to represent block entities and hook into the block system. Update `DefaultBlockEntityFactory` to create `MinestomBlockEntity` instances and adjust `TerraMinestomWorldBuilder` initialization for factory injection. These changes improve extensibility and block entity management.	2025-06-04 21:34:04 +02:00
Christian Bergschneider	b12fe77f32	feat: add fine-grained biome control to Minestom world builder Introduced a `doFineGrainedBiomes` flag to allow fine-grained biome control per chunk. This helps mitigate client disconnection issues caused by a Minestom biome encoding bug, with a plan to deprecate once the bug is resolved. Adjusted relevant classes and the example implementation to support this feature.	2025-06-04 21:25:35 +02:00
Zoë Gidiere	28d93d158e	fix up	2025-06-03 22:52:26 -06:00
Zoë Gidiere	118dc32d64	Merge branch 'master' into dev/7.0-2	2025-06-03 22:38:32 -06:00
Christian Bergschneider	d9a4d64b17	Merge remote-tracking branch 'origin/dev/7.0-2' into dev/7.0-2	2025-06-04 00:05:56 +02:00
Christian Bergschneider	56a1feb708	refactor: move biomes to use user-defined naming conventions. Replaced "Custom" with "UserDefined" in biome classes, factories, and references for consistency and clarity. Updated relevant imports, method signatures, and internal logic to align with the new terminology. This change improves readability and better represents the purpose of these biome-related components.	2025-06-04 00:05:15 +02:00
Christian Bergschneider	858adfe866	feat: initial custom biome implementation	2025-06-03 22:41:31 +02:00
Zoë Gidiere	35bd33e256	Merge branch 'dev/7.0-2' into dev/layered-generator	2025-06-03 13:44:03 -06:00
Zoë Gidiere	bdd80d7832	Merge branch 'dev/seismic' into dev/7.0-2	2025-06-03 04:37:11 -06:00
Zoë Gidiere	adfdb8d63c	update versions	2025-06-03 04:37:03 -06:00
Zoë Gidiere	ef10081bcd	Merge branch 'dev/7.0-2' into dev/seismic	2025-06-02 17:34:30 -06:00
Zoë Gidiere	dc8492a6cb	Merge remote-tracking branch 'origin/dev/6.6.2' into dev/7.0-2	2025-06-02 17:34:18 -06:00
Christian Bergschneider	5e1c9d8ebe	fix: generation stages not being able to reference eachother	2025-06-02 00:34:48 +02:00
Christian Bergschneider	5dff25670c	refactor: minestom chunk storage to improve memory efficiency Replaced 3D array with a 1D array for chunk block storage and adjusted related logic to use calculated indices. Updated block type comparison to use state IDs instead of block IDs for consistency and correctness.	2025-05-30 09:13:04 +02:00
Christian Bergschneider	089b25dea4	feat: update Minestom version and replace deprecated ItemComponent API Updated the Minestom library to version 1_21_5-69b9a5d844 and migrated from the deprecated `ItemComponent` API to `DataComponents`. This ensures compatibility with the latest changes and improves maintainability.	2025-05-27 23:25:34 +02:00
Christian Bergschneider	1dd59c378e	refactor(minestom): replace static singleton access to platform with dependency injection for better modularity Renamed `MinestomPlatform` to `TerraMinestomPlatform` and updated `TerraMinestomWorldBuilder` to utilize the platform instance directly. Simplified world builder initialization and improved code clarity.	2025-05-27 22:58:16 +02:00
Christian Bergschneider	d97fb4ff7b	chore: update paper version	2025-05-27 22:50:03 +02:00
ckyuri	761a014ea5	Reverted changes to comply with build version requirements and avoiding pulling functionality out of a common existing function	2025-04-16 15:54:20 +01:00
ckyuri	9749eecd87	Merge remote-tracking branch 'origin/dev/7.0-2' into dev/7.0-2	2025-04-12 14:11:07 +01:00
ckyuri	32cc4976c8	Bug Fix - Entity Type was parsing a value that was incorrect and causing issues to load the world. EntityType.fromId(Integer.parseInt(id)); to delegate = EntityType.fromKey(id);	2025-04-12 14:10:54 +01:00
kyuri	e2e0e292b7	Merge branch 'dev/7.0-2' into dev/7.0-2	2025-04-12 12:22:00 +01:00
ckyuri	227bfe7b29	Minestom Updated to latest version as of now 4/12/2025 Updated method names to new documentation and changed minestom versioning. - Paper Build version was changed as I had issues building at all with the snapshot version. So it was changed to a generic version but everything still builds fine.	2025-04-12 11:54:48 +01:00
Mikal	52dc690243	Bukkit Build Fix (#494 ) * Bukkit Build Fix * remove comments * remove papermc repo from gradle settings * add back gradle shasum * fix formatting, update gradle hash	2025-03-22 07:15:43 +00:00
Peter Pan	d33d4af296	fix formatting, update gradle hash	2025-03-20 14:51:12 -04:00
Peter Pan	fb0dbda296	add back gradle shasum	2025-03-20 11:01:41 -04:00
Peter Pan	4c860ca4ae	remove papermc repo from gradle settings	2025-03-20 10:53:49 -04:00
Peter Pan	b6e4543625	remove comments	2025-03-20 10:43:29 -04:00
Peter Pan	0921dfb204	Bukkit Build Fix	2025-03-19 15:54:11 -04:00
Zoë Gidiere	5892464a1d	WIP Seismic Integration	2025-03-01 21:32:39 -07:00
Zoë Gidiere	8366a5288b	fix minestom build	2025-03-01 15:45:30 -07:00
Zoë Gidiere	d2b7384639	Merge branch 'master' into dev/7.0-2	2025-03-01 14:36:04 -07:00
Zoë Gidiere	8ffb09db36	Merge branch 'master' into dev/7.0-2	2025-02-28 11:36:23 -07:00
Zoe Gidiere	ecbca608a5	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-29 20:24:38 -06:00
Zoe Gidiere	b4ab88a02e	Fix allay reload	2024-10-29 16:13:29 -06:00
Zoe Gidiere	ef1c9c125f	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-29 16:05:01 -06:00
Zoe Gidiere	e665e187c1	Fix up merge	2024-10-29 16:00:39 -06:00
Zoe Gidiere	bd28d8170c	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-29 15:56:30 -06:00
Zoe Gidiere	d91e531fa5	fix allay	2024-10-25 16:28:00 -06:00
Zoe Gidiere	2a40f4af1e	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-25 16:14:54 -06:00
Zoe Gidiere	d088d2f5a8	InlineVar	2024-10-25 15:59:38 -06:00
Zoe Gidiere	3d66386f99	Populate packs in a metapack under extended	2024-10-25 15:58:15 -06:00
Zoe Gidiere	1912d8e34c	Fixup	2024-10-25 15:44:51 -06:00
Zoe Gidiere	d48b610b39	Merge remote-tracking branch 'origin/ver/6.6.0' into dev/7.0-2	2024-10-25 15:21:47 -06:00
Zoe Gidiere	3eb6f89776	Merge remote-tracking branch 'origin/master' into dev/layered-generator	2024-10-13 18:51:14 -06:00
Zoe Gidiere	dc6cfb4187	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-12 15:43:58 -06:00
Zoe Gidiere	cd2421bb49	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-12 15:42:47 -06:00
Zoe Gidiere	a82dcd579c	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-09 13:02:07 -06:00
Zoe Gidiere	a20d2c1f60	Merge branch 'ver/6.6.0' into dev/7.0-2	2024-10-09 12:53:46 -06:00
Zoe Gidiere	f5f3725dba	Addon dependency updates	2024-09-25 15:47:19 -06:00
Zoe Gidiere	a7a7354c40	remove 7.0 todo	2024-09-24 23:30:04 -06:00
Zoe Gidiere	42dcc9d9bd	Merge remote-tracking branch 'origin/master' into dev/7.0-2	2024-09-24 23:29:52 -06:00
Zoe Gidiere	581651e83b	reformat	2024-09-24 10:06:57 -06:00
Zoe Gidiere	a95a1284a4	reformat	2024-09-24 09:54:53 -06:00
Zoe Gidiere	c95b3c09a8	Merge branch 'ver/6.5.0' into dev/7.0-2	2024-09-24 09:44:35 -06:00
Zoe Gidiere	2df2755631	small opt	2024-09-21 17:20:28 -06:00
Zoe Gidiere	ddb131d413	Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2	2024-09-20 16:42:39 -06:00
Zoe Gidiere	2e145ccd0a	Merge branch 'ver/6.5.0' into dev/7.0-2	2024-09-17 22:10:23 -06:00
Zoe Gidiere	0731d781d5	fix-up	2024-09-17 17:54:19 -06:00
Zoe Gidiere	5bc73dec37	Merge branch 'ver/6.5.0' into dev/7.0-2	2024-09-17 17:46:33 -06:00
duplexsystem	b848ddabda	Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2	2024-03-02 22:18:54 -07:00
Zoë Gidiere	7214053b9e	update fabric loader	2024-01-07 11:57:17 -07:00
Zoë Gidiere	da5d0c52f2	Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2	2024-01-07 10:55:39 -07:00
Zoë Gidiere	cd69c7e77d	bump version	2024-01-05 19:49:20 -07:00
Zoë Gidiere	56dd15c9aa	clean up flora injection and make it configurable, off by default	2024-01-05 19:44:31 -07:00
Zoë Gidiere	2f470a3720	addon dep	2024-01-05 18:52:10 -07:00
Zoë Gidiere	5350917412	refactor v2 addons	2024-01-05 18:36:01 -07:00
Zoë Gidiere	45528acac8	update v2 addon tag	2024-01-05 18:34:55 -07:00
Zoë Gidiere	921212ccb5	Remove dump-resources and allow for ignoring specific resources	2024-01-05 17:19:27 -07:00
Zoë Gidiere	37641d43d6	Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2	2024-01-05 15:14:23 -07:00
Zoë Gidiere	87ea5ce9e7	remove translation logic	2024-01-05 15:12:35 -07:00
Zoë Gidiere	77f766b8bb	remove image and pipeline v1	2024-01-05 15:10:19 -07:00
Zoë Gidiere	ecbba57b0a	fix enum to uppcases	2024-01-05 15:01:36 -07:00
Zoë Gidiere	839835afd7	Add parameter to turn off salting cellular lookup another updated astrash commit	2024-01-05 15:00:27 -07:00
Astrash	56941c237c	Add meta annotations	2024-01-05 14:58:34 -07:00
Astrash	179a304cd2	Add default 'from' values for linear map template	2024-01-05 14:58:23 -07:00
Zoë Gidiere	4970bf5720	Implement linear map normalizer Updated astrash commit	2024-01-05 14:58:07 -07:00
Zoë Gidiere	f877f861cf	use Ranges	2024-01-05 14:47:26 -07:00
Zoë Gidiere	d5f0b69bc7	UX tweaks to biome config	2024-01-05 14:46:01 -07:00
Zoë Gidiere	b10fd84e00	Merge remote-tracking branch 'origin/ver/6.5.0' into dev/metapacks	2024-01-05 09:11:42 -07:00
Zoë	3e04bae828	Merge branch 'ver/6.5.0' into dev/metapacks	2023-12-24 22:39:15 -06:00
Zoë	82334cfe9e	Merge branch 'ver/6.5.0' into dev/metapacks	2023-12-22 15:03:04 -06:00
Zoë Gidiere	50ba1c6eab	push changes	2023-12-21 08:47:52 -07:00
Zoë Gidiere	27a967f3a6	fix build	2023-12-12 20:17:15 -07:00
Zoë Gidiere	4c71355535	Reformat	2023-12-12 19:07:57 -07:00
Zoë Gidiere	e83b70b5ae	generation settings	2023-12-12 18:52:31 -07:00
Zoë Gidiere	56b428d501	refactor	2023-12-12 17:19:32 -07:00
Zoë Gidiere	7ca24faad3	fix loading	2023-12-12 17:15:54 -07:00
Zoë Gidiere	9d200565d7	more fixes	2023-12-12 16:54:27 -07:00
Zoë Gidiere	f6c2795eaf	remove debug loging	2023-12-12 16:12:36 -07:00
Zoë Gidiere	6f03746e41	another fix	2023-12-12 16:09:08 -07:00
Zoë Gidiere	47c8cb3168	Fix up random changes	2023-12-12 16:00:56 -07:00
Zoë Gidiere	a9f973cae9	WIP Random Changes	2023-12-12 15:57:04 -07:00
Zoë Gidiere	033181d7c8	more wip changes	2023-12-12 15:48:31 -07:00
Zoë Gidiere	e11a235386	WIP Dim opts	2023-12-12 13:55:03 -07:00
Zoë Gidiere	db1e924246	more metapack work	2023-12-12 13:35:52 -07:00
Zoë Gidiere	c86faa44ec	Remove netherfossiloptimization because it's no longer applicable also it's not needed mc seems to have done this themselves	2023-12-12 13:35:24 -07:00
Zoë Gidiere	de91a6facb	metapack linking instead of shading	2023-12-11 23:36:05 -07:00
Zoë Gidiere	d4a328eb38	who let the datadrive (the dimensions)	2023-12-11 21:14:43 -07:00
Zoë Gidiere	b039629b2d	WIP meta pack system	2023-12-11 16:25:13 -07:00
Zoë Gidiere	d48fa96ec7	opt import	2023-12-11 14:56:07 -07:00
Zoë Gidiere	8dd1f49b88	Merge remote-tracking branch 'origin/dev/remove-loader' into dev/metapacks	2023-12-11 14:54:59 -07:00
Zoë Gidiere	81528915a8	Merge branch 'ver/6.5.0' into dev/metapacks	2023-12-11 14:54:44 -07:00
Zoë Gidiere	5979254808	wip	2023-12-11 14:54:27 -07:00
Astrash	c0aaf6c6e8	Add messages to exceptions	2023-11-28 10:36:30 +11:00
Astrash	1ab3233cba	Reformat code	2023-11-25 15:14:16 +11:00
Astrash	59ea5a69d8	Refactor pack loading - Combine initial load and reload logic together between each platform implementation - Should prevent pack load errors from blocking other packs from loading.	2023-11-25 15:10:43 +11:00
Astrash	4ba71e9c27	packDirectory -> rootPath	2023-11-25 15:07:45 +11:00
Astrash	5c7441241c	Replace Loader with java.nio.files	2023-11-25 13:31:42 +11:00
Astrash	e51fb9c580	Merge branch 'ver/6.4.0' into dev/layered-generator	2023-10-02 09:48:15 +11:00
Astrash	bd139a8edc	BooleanOperator -> RelationalOperator	2022-07-30 12:08:21 +10:00
Astrash	c2902cc549	Add paralithic as layered gen dependency	2022-07-30 12:01:10 +10:00
Astrash	9a171b0cdb	Implement dot product layer palette	2022-07-30 12:00:54 +10:00
Astrash	596c84ab10	Forgot signature change in chunk generator	2022-07-30 11:59:15 +10:00
Astrash	d9bd9135de	Add point sets to layered gen	2022-07-30 11:58:59 +10:00
Astrash	50397a4a6b	Add loaders for vector classes	2022-07-30 11:53:00 +10:00
Astrash	55e024dab0	Change layer signatures	2022-07-30 11:52:09 +10:00
Astrash	c733c21e3c	Implement biome defined layer samplers	2022-07-18 12:00:28 +10:00
Astrash	7baace047b	Change layer class method signatures	2022-07-18 11:59:25 +10:00
Astrash	237b897146	Rename predicates key to tests	2022-07-17 20:36:26 +10:00
Astrash	0b057c5a74	Add platform air layer palette	2022-07-17 20:36:12 +10:00
Astrash	fea7d7a4fd	Implement sampler operators + sampler list predicate	2022-07-17 20:35:05 +10:00
Astrash	4d31fda79f	Implement layer palette groups	2022-07-16 20:11:17 +10:00
Astrash	edcba9707d	Implement biome defined layer palettes	2022-07-16 18:56:30 +10:00
Astrash	b57b71baa7	Replace BLOCK layer palette with PALETTE	2022-07-16 17:17:18 +10:00
Astrash	698725c921	Implement layer samplers	2022-07-16 17:03:28 +10:00
Astrash	809a6422a1	Rename some keys	2022-07-16 16:36:45 +10:00
Astrash	11044b6589	Store palettes and predicates in registries	2022-07-16 16:28:57 +10:00
Astrash	2a9d94094c	Finish initial layered generator implementation	2022-07-12 13:15:27 +10:00
Astrash	e831f85d45	Partial layered generator implementation	2022-07-12 09:47:29 +10:00