From 3ad0ef8501aad0cf825745c6ea10c59ee0369bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Wed, 9 Jul 2025 14:06:01 -0600 Subject: [PATCH] Update Seismic + paralihtic --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- .../main/java/com/dfsek/terra/addons/noise/NoiseAddon.java | 7 ++++--- .../config/templates/noise/CellularNoiseTemplate.java | 5 +++-- .../noise/config/templates/noise/SimpleNoiseTemplate.java | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index e0ec343e3..c8de850eb 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -5,9 +5,9 @@ object Versions { object Libraries { const val tectonic = "4.2.1" - const val paralithic = "2.0.0" + const val paralithic = "2.0.1" const val strata = "1.3.2" - const val seismic = "2.0.1" + const val seismic = "2.0.3" const val cloud = "2.0.0" diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index f714dfc47..2fcab4281 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -14,7 +14,8 @@ import com.dfsek.seismic.algorithms.sampler.arithmetic.MaxSampler; import com.dfsek.seismic.algorithms.sampler.arithmetic.MinSampler; import com.dfsek.seismic.algorithms.sampler.arithmetic.MultiplicationSampler; import com.dfsek.seismic.algorithms.sampler.arithmetic.SubtractionSampler; -import com.dfsek.seismic.algorithms.sampler.noise.CellularSampler; +import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularSampler; +import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler; import com.dfsek.seismic.algorithms.sampler.noise.random.GaussianNoiseSampler; import com.dfsek.seismic.algorithms.sampler.noise.random.PositiveWhiteNoiseSampler; import com.dfsek.seismic.algorithms.sampler.noise.random.WhiteNoiseSampler; @@ -95,8 +96,8 @@ public class NoiseAddon implements AddonInitializer { event.getPack() .applyLoader(DistanceFunction.class, (type, o, loader, depthTracker) -> DistanceFunction.valueOf((String) o)) - .applyLoader(CellularSampler.ReturnType.class, - (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o)) + .applyLoader(CellularStyleSampler.CellularReturnType.class, + (type, o, loader, depthTracker) -> CellularStyleSampler.CellularReturnType.valueOf((String) o)) .applyLoader(DistanceFunction.class, (type, o, loader, depthTracker) -> DistanceFunction.valueOf((String) o)) .applyLoader(DimensionApplicableSampler.class, DimensionApplicableSampler::new) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java index 3307a600e..9b018d1ab 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java @@ -7,7 +7,8 @@ package com.dfsek.terra.addons.noise.config.templates.noise; -import com.dfsek.seismic.algorithms.sampler.noise.CellularSampler; +import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler; +import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularSampler; import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler; import com.dfsek.seismic.type.DistanceFunction; import com.dfsek.seismic.type.sampler.Sampler; @@ -25,7 +26,7 @@ public class CellularNoiseTemplate extends NoiseTemplate { @Value("return") @Default - private CellularSampler.@Meta ReturnType cellularReturnType = CellularSampler.ReturnType.Distance; + private CellularStyleSampler.@Meta CellularReturnType cellularReturnType = CellularStyleSampler.CellularReturnType.Distance; @Value("jitter") @Default diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java index 90206c427..304574020 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java @@ -22,7 +22,7 @@ public class SimpleNoiseTemplate extends NoiseTemplate< @Override public Sampler get() { - NoiseFunction sampler = null; + NoiseFunction sampler; try { sampler = samplerClass.getConstructor(double.class, long.class) .newInstance(frequency, salt);