Dev/7.0

build.gradle.kts

@@ -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 {

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -52,7 +52,8 @@ fun Project.configureDistribution() {
                 val defaultPackUrl =
                     URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
                 downloadPack(defaultPackUrl, project)
-            } catch (_:Exception) {}
+            } catch (_: Exception) {
+            }
         }
     }
 

buildSrc/src/main/kotlin/Versions.kt

@@ -5,8 +5,9 @@ object Versions {
 
     object Libraries {
         const val tectonic = "4.2.1"
-        const val paralithic = "0.8.1"
+        const val paralithic = "2.0.1"
         const val strata = "1.3.2"
+        const val seismic = "2.0.4"
 
         const val cloud = "2.0.0"
 
@@ -88,6 +89,6 @@ object Versions {
     }
 
     object Minestom {
-        const val minestom = "1_21_6-c3ccee696b"
+        const val minestom = "1_21_6-a40d7115d4"
     }
 }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/BiomeExtrusionProvider.java

@@ -14,14 +14,14 @@
 public class BiomeExtrusionProvider implements BiomeProvider {
     private final BiomeProvider delegate;
     private final Set<Biome> biomes;
-    private final List<Extrusion> extrusions;
+    private final Extrusion[] extrusions;
     private final int resolution;
 
     public BiomeExtrusionProvider(BiomeProvider delegate, List<Extrusion> extrusions, int resolution) {
         this.delegate = delegate;
         this.biomes = delegate.stream().collect(Collectors.toSet());
         extrusions.forEach(e -> biomes.addAll(e.getBiomes()));
-        this.extrusions = extrusions;
+        this.extrusions = extrusions.toArray(new Extrusion[0]);
         this.resolution = resolution;
     }
 
@@ -33,8 +33,8 @@ public Biome getBiome(int x, int y, int z, long seed) {
     }
 
     public Biome extrude(Biome original, int x, int y, int z, long seed) {
-        for(Extrusion extrusion : extrusions) {
-            original = extrusion.extrude(original, x, y, z, seed);
+        for(int i = 0; i < extrusions.length; i++) {
+            original = extrusions[i].extrude(original, x, y, z, seed);
         }
         return original;
     }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/api/Extrusion.java

@@ -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);

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SamplerExtrusionTemplate.java

@@ -1,17 +1,17 @@
 package com.dfsek.terra.addons.biome.extrusion.config.extrusions;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 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.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;

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/ReplaceExtrusion.java

@@ -1,31 +1,32 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.Collection;
 import java.util.function.Predicate;
 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.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.range.Range;
 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;
 
     private final ProbabilityCollection<ReplaceableBiome> biomes;
 
     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;

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/SetExtrusion.java

@@ -1,28 +1,29 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.Collection;
 import java.util.function.Predicate;
 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.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.range.Range;
 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;

common/addons/biome-provider-image/README.md

@@ -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.

common/addons/biome-provider-image/build.gradle.kts

@@ -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"))
 
 
 }