diff --git a/core/src/main/java/art/arcane/iris/generation/decoration/IrisDecorator.java b/core/src/main/java/art/arcane/iris/generation/decoration/IrisDecorator.java index 32fa759ca..a0e8fc629 100644 --- a/core/src/main/java/art/arcane/iris/generation/decoration/IrisDecorator.java +++ b/core/src/main/java/art/arcane/iris/generation/decoration/IrisDecorator.java @@ -159,7 +159,7 @@ public class IrisDecorator { } private CNG createVarianceGenerator(RNG rng, IrisData data) { - return variance.create(deriveVarianceSeed(rng, data), data).scale(1D / variance.getZoom()); + return variance.createNoCache(deriveVarianceSeed(rng, data), data).scale(1D / variance.getZoom()); } RNG deriveVarianceSeed(RNG rng, IrisData data) { 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 64654aa0f..dd09c3544 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 @@ -4,21 +4,15 @@ import art.arcane.iris.generation.block.IrisBlockData; import art.arcane.iris.generation.noise.IrisGeneratorStyle; import art.arcane.iris.generation.noise.NoiseStyle; import art.arcane.iris.pack.loading.IrisData; -import art.arcane.iris.testsupport.ExpectedToFailUntilFixed; -import art.arcane.iris.testsupport.ExpectedToFailUntilFixedRule; import art.arcane.iris.testsupport.RunningEnginePackData; import art.arcane.volmlib.util.collection.KList; import art.arcane.volmlib.util.math.RNG; -import org.junit.Rule; import org.junit.Test; import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; import static org.junit.Assert.assertArrayEquals; public class IrisDecoratorVarianceGeneratorTest { - private static final String SHARED_VARIANCE_STYLE_GENERATOR_BUG = - "IrisDecorator scales the shared variance style generator instead of its own. " - + "Ref.: https://github.com/VolmitSoftware/Iris/issues/1251"; 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}}; @@ -26,10 +20,6 @@ public class IrisDecoratorVarianceGeneratorTest { private final IrisData packData = RunningEnginePackData.create(); private final IrisDecorator decorator = createDecoratorWithZoomedSimplexVariance(); - @Rule - public final ExpectedToFailUntilFixedRule expectedFailures = new ExpectedToFailUntilFixedRule(); - - @ExpectedToFailUntilFixed(SHARED_VARIANCE_STYLE_GENERATOR_BUG) @Test public void doesBuildingTheVarianceGeneratorLeaveTheSharedVarianceStyleGeneratorUnscaled() { assertArrayEquals(sampleUntouchedSharedVarianceStyleGenerator(), sampleSharedVarianceStyleGeneratorAfterVarianceBuilt(), 0D);