From 318c1e100bd7beb7180e53aa6125b3e4f8f6c928 Mon Sep 17 00:00:00 2001 From: CeeVeeR Date: Fri, 2 Oct 2026 12:37:51 +0200 Subject: [PATCH] chore: - Extracted shared style generator sampling to GeneratorSampling.sampleSharedGenerator Ref.: https://github.com/VolmitSoftware/Iris/issues/1251 --- .../generation/biome/IrisBiomeChildrenGeneratorTest.java | 4 ++-- .../decoration/IrisDecoratorVarianceGeneratorTest.java | 4 ++-- .../iris/generation/terrain/ContinentGeneratorTest.java | 3 ++- .../generation/terrain/IrisDimensionCarvingEntryTest.java | 4 ++-- .../art/arcane/iris/testsupport/GeneratorSampling.java | 7 +++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeChildrenGeneratorTest.java b/core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeChildrenGeneratorTest.java index b4acbb55f..f556b2278 100644 --- a/core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeChildrenGeneratorTest.java +++ b/core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeChildrenGeneratorTest.java @@ -8,7 +8,7 @@ import art.arcane.volmlib.util.math.RNG; import org.junit.Test; import static art.arcane.iris.testsupport.GeneratorSampling.SAMPLE_BLOCKS; -import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; +import static art.arcane.iris.testsupport.GeneratorSampling.sampleSharedGenerator; import static org.junit.Assert.assertArrayEquals; public class IrisBiomeChildrenGeneratorTest { @@ -38,7 +38,7 @@ public class IrisBiomeChildrenGeneratorTest { } private double[] sampleSharedChildStyleGenerator(IrisGeneratorStyle childStyle) { - return sampleAtBlocks(childStyle.create(deriveSharedChildStyleSeed(), packData), SAMPLE_BLOCKS); + return sampleSharedGenerator(childStyle, deriveSharedChildStyleSeed(), packData); } private static RNG deriveSharedChildStyleSeed() { diff --git a/core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorVarianceGeneratorTest.java b/core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorVarianceGeneratorTest.java index 892a764d6..a5cb2be26 100644 --- a/core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorVarianceGeneratorTest.java +++ b/core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorVarianceGeneratorTest.java @@ -10,7 +10,7 @@ import art.arcane.volmlib.util.math.RNG; import org.junit.Test; import static art.arcane.iris.testsupport.GeneratorSampling.SAMPLE_BLOCKS; -import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; +import static art.arcane.iris.testsupport.GeneratorSampling.sampleSharedGenerator; import static org.junit.Assert.assertArrayEquals; public class IrisDecoratorVarianceGeneratorTest { @@ -35,7 +35,7 @@ public class IrisDecoratorVarianceGeneratorTest { } private double[] sampleSharedVarianceStyleGenerator(IrisGeneratorStyle varianceStyle) { - return sampleAtBlocks(varianceStyle.create(decorator.deriveVarianceSeed(new RNG(WORLD_SEED), packData), packData), SAMPLE_BLOCKS); + return sampleSharedGenerator(varianceStyle, decorator.deriveVarianceSeed(new RNG(WORLD_SEED), packData), packData); } private static IrisDecorator createDecoratorWithZoomedSimplexVariance() { diff --git a/core/src/test/java/art/arcane/iris/generation/terrain/ContinentGeneratorTest.java b/core/src/test/java/art/arcane/iris/generation/terrain/ContinentGeneratorTest.java index 127311eeb..de74d930d 100644 --- a/core/src/test/java/art/arcane/iris/generation/terrain/ContinentGeneratorTest.java +++ b/core/src/test/java/art/arcane/iris/generation/terrain/ContinentGeneratorTest.java @@ -11,6 +11,7 @@ import java.util.Arrays; import static art.arcane.iris.testsupport.GeneratorSampling.SAMPLE_BLOCKS; import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; +import static art.arcane.iris.testsupport.GeneratorSampling.sampleSharedGenerator; import static org.junit.Assert.assertArrayEquals; public class ContinentGeneratorTest { @@ -90,7 +91,7 @@ public class ContinentGeneratorTest { } private double[] sampleSharedStyleGenerator(IrisGeneratorStyle style) { - return sampleAtBlocks(style.create(ContinentGenerator.deriveContinentSeed(new RNG(WORLD_SEED)), packData), SAMPLE_BLOCKS); + return sampleSharedGenerator(style, ContinentGenerator.deriveContinentSeed(new RNG(WORLD_SEED)), packData); } private double[] sampleContinentMap(IrisDimension dimension, double[][] blocks) { diff --git a/core/src/test/java/art/arcane/iris/generation/terrain/IrisDimensionCarvingEntryTest.java b/core/src/test/java/art/arcane/iris/generation/terrain/IrisDimensionCarvingEntryTest.java index 71f152b42..0cd2b7977 100644 --- a/core/src/test/java/art/arcane/iris/generation/terrain/IrisDimensionCarvingEntryTest.java +++ b/core/src/test/java/art/arcane/iris/generation/terrain/IrisDimensionCarvingEntryTest.java @@ -8,7 +8,7 @@ import art.arcane.volmlib.util.math.RNG; import org.junit.Test; import static art.arcane.iris.testsupport.GeneratorSampling.SAMPLE_BLOCKS; -import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; +import static art.arcane.iris.testsupport.GeneratorSampling.sampleSharedGenerator; import static org.junit.Assert.assertArrayEquals; public class IrisDimensionCarvingEntryTest { @@ -34,7 +34,7 @@ public class IrisDimensionCarvingEntryTest { } private double[] sampleSharedChildStyleGenerator(IrisGeneratorStyle childStyle) { - return sampleAtBlocks(childStyle.create(deriveSharedChildStyleSeed(), packData), SAMPLE_BLOCKS); + return sampleSharedGenerator(childStyle, deriveSharedChildStyleSeed(), packData); } private RNG deriveSharedChildStyleSeed() { diff --git a/core/src/test/java/art/arcane/iris/testsupport/GeneratorSampling.java b/core/src/test/java/art/arcane/iris/testsupport/GeneratorSampling.java index 218994e0b..79370d729 100644 --- a/core/src/test/java/art/arcane/iris/testsupport/GeneratorSampling.java +++ b/core/src/test/java/art/arcane/iris/testsupport/GeneratorSampling.java @@ -1,5 +1,8 @@ package art.arcane.iris.testsupport; +import art.arcane.iris.generation.noise.IrisGeneratorStyle; +import art.arcane.iris.pack.loading.IrisData; +import art.arcane.volmlib.util.math.RNG; import art.arcane.volmlib.util.noise.CNG; import java.util.Arrays; @@ -10,6 +13,10 @@ public final class GeneratorSampling { private GeneratorSampling() { } + public static double[] sampleSharedGenerator(IrisGeneratorStyle style, RNG seed, IrisData packData) { + return sampleAtBlocks(style.create(seed, packData), SAMPLE_BLOCKS); + } + public static double[] sampleAtBlocks(CNG generator, double[][] blocks) { return Arrays.stream(blocks).mapToDouble(block -> sampleAt(generator, block)).toArray(); }