From 357f14e9007e20e5d4b997dd167c99cee87edbc9 Mon Sep 17 00:00:00 2001 From: CeeVeeR Date: Fri, 2 Oct 2026 12:36:55 +0200 Subject: [PATCH] chore: - Extracted shared SAMPLE_BLOCKS to GeneratorSampling Ref.: https://github.com/VolmitSoftware/Iris/issues/1251 --- .../iris/generation/biome/IrisBiomeChildrenGeneratorTest.java | 2 +- .../decoration/IrisDecoratorVarianceGeneratorTest.java | 2 +- .../arcane/iris/generation/terrain/ContinentGeneratorTest.java | 2 +- .../iris/generation/terrain/IrisDimensionCarvingEntryTest.java | 2 +- .../java/art/arcane/iris/testsupport/GeneratorSampling.java | 2 ++ 5 files changed, 6 insertions(+), 4 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 f7f1202fd..b4acbb55f 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 @@ -7,6 +7,7 @@ import art.arcane.iris.testsupport.RunningEnginePackData; 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 org.junit.Assert.assertArrayEquals; @@ -14,7 +15,6 @@ public class IrisBiomeChildrenGeneratorTest { private static final long WORLD_SEED = 7L; private static final int CHILDREN_SIGNATURE = 123; private static final double CHILD_SHRINK_FACTOR = 4D; - private static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}}; private final IrisData packData = RunningEnginePackData.create(); private final IrisBiome biome = createBiomeWithSimplexChildStyle(packData); 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 dd09c3544..892a764d6 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 @@ -9,13 +9,13 @@ import art.arcane.volmlib.util.collection.KList; 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 org.junit.Assert.assertArrayEquals; public class IrisDecoratorVarianceGeneratorTest { private static final long WORLD_SEED = 7L; private static final double VARIANCE_ZOOM = 4D; - private static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}}; private final IrisData packData = RunningEnginePackData.create(); private final IrisDecorator decorator = 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 9ae188ef5..127311eeb 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 @@ -9,6 +9,7 @@ import org.junit.Test; import java.util.Arrays; +import static art.arcane.iris.testsupport.GeneratorSampling.SAMPLE_BLOCKS; import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; import static org.junit.Assert.assertArrayEquals; @@ -17,7 +18,6 @@ public class ContinentGeneratorTest { private static final double POWER_OF_TWO_CONTINENT_ZOOM = 4D; private static final double SQUARED_CONTINENT_ZOOM = POWER_OF_TWO_CONTINENT_ZOOM * POWER_OF_TWO_CONTINENT_ZOOM; private static final double OVERWORLD_STYLE_ZOOM = 6D; - private static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}}; private static final double[][] BLOCKS_SHRUNK_BY_CONTINENT_ZOOM = shrinkByContinentZoom(SAMPLE_BLOCKS); private static final double[] CONTINENT_MAP_OF_EXISTING_WORLDS = {0.21889892332042843D, 0.6984934456740721D, 0.2708759584352327D}; 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 079ef46c4..71f152b42 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 @@ -7,6 +7,7 @@ import art.arcane.iris.testsupport.RunningEnginePackData; 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 org.junit.Assert.assertArrayEquals; @@ -14,7 +15,6 @@ public class IrisDimensionCarvingEntryTest { private static final long WORLD_SEED = 7L; private static final String CARVING_ENTRY_ID = "deep-caves"; private static final double CHILD_SHRINK_FACTOR = 4D; - private static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}}; private final IrisData packData = RunningEnginePackData.create(); private final IrisDimensionCarvingEntry carvingEntry = createCarvingEntry(); 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 d83bf5585..218994e0b 100644 --- a/core/src/test/java/art/arcane/iris/testsupport/GeneratorSampling.java +++ b/core/src/test/java/art/arcane/iris/testsupport/GeneratorSampling.java @@ -5,6 +5,8 @@ import art.arcane.volmlib.util.noise.CNG; import java.util.Arrays; public final class GeneratorSampling { + public static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}}; + private GeneratorSampling() { }