mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-27 14:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:

Browse Source 
- Replaced IrisGeneratorStyle.create with createNoCache in IrisBiome
- Removed @ExpectedToFailUntilFixed from the IrisBiome test

Ref.: https://github.com/VolmitSoftware/Iris/issues/1251
This commit is contained in:
CeeVeeR committed 2026-10-02 12:17:19 +02:00
1 parent 0faae93049
commit 700dc53559
2 files changed
+1 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/art/arcane/iris/generation/biome/IrisBiome.java
+1 -1
View File
@@ -516,7 +516,7 @@ public class IrisBiome extends IrisRegistrant implements Rarity {
} }
private CNG createChildrenGenerator(RNG random, int sig, double scale) { private CNG createChildrenGenerator(RNG random, int sig, double scale) {
return getChildStyle().create(deriveChildStyleSeed(random, sig), getLoader()).bake().scale(scale).bake(); return getChildStyle().createNoCache(deriveChildStyleSeed(random, sig), getLoader()).bake().scale(scale).bake();
} }
static RNG deriveChildStyleSeed(RNG random, int signature) { static RNG deriveChildStyleSeed(RNG random, int signature) {
core/src/test/java/art/arcane/iris/generation/biome/IrisBiomeChildrenGeneratorTest.java
-10
View File
@@ -3,20 +3,14 @@ package art.arcane.iris.generation.biome;
import art.arcane.iris.generation.noise.IrisGeneratorStyle; import art.arcane.iris.generation.noise.IrisGeneratorStyle;
import art.arcane.iris.generation.noise.NoiseStyle; import art.arcane.iris.generation.noise.NoiseStyle;
import art.arcane.iris.pack.loading.IrisData; 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.iris.testsupport.RunningEnginePackData;
import art.arcane.volmlib.util.math.RNG; import art.arcane.volmlib.util.math.RNG;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
public class IrisBiomeChildrenGeneratorTest { public class IrisBiomeChildrenGeneratorTest {
private static final String SHARED_CHILD_STYLE_GENERATOR_BUG =
"IrisBiome scales the shared child style generator instead of its own. "
+ "Ref.: https://github.com/VolmitSoftware/Iris/issues/1251";
private static final long WORLD_SEED = 7L; private static final long WORLD_SEED = 7L;
private static final int CHILDREN_SIGNATURE = 123; private static final int CHILDREN_SIGNATURE = 123;
private static final double CHILD_SHRINK_FACTOR = 4D; private static final double CHILD_SHRINK_FACTOR = 4D;
@@ -25,10 +19,6 @@ public class IrisBiomeChildrenGeneratorTest {
private final IrisData packData = RunningEnginePackData.create(); private final IrisData packData = RunningEnginePackData.create();
private final IrisBiome biome = createBiomeWithSimplexChildStyle(packData); private final IrisBiome biome = createBiomeWithSimplexChildStyle(packData);
@Rule
public final ExpectedToFailUntilFixedRule expectedFailures = new ExpectedToFailUntilFixedRule();
@ExpectedToFailUntilFixed(SHARED_CHILD_STYLE_GENERATOR_BUG)
@Test @Test
public void doesBuildingTheChildrenGeneratorLeaveTheSharedChildStyleGeneratorUnscaled() { public void doesBuildingTheChildrenGeneratorLeaveTheSharedChildStyleGeneratorUnscaled() {
assertArrayEquals(sampleUntouchedSharedChildStyleGenerator(), sampleSharedChildStyleGeneratorAfterChildrenGeneratorBuilt(), 0D); assertArrayEquals(sampleUntouchedSharedChildStyleGenerator(), sampleSharedChildStyleGeneratorAfterChildrenGeneratorBuilt(), 0D);