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

fix:

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

Ref.: https://github.com/VolmitSoftware/Iris/issues/1251
This commit is contained in:
CeeVeeR
2026-10-02 12:16:41 +02:00
parent 92310ef839
commit 0faae93049
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/art/arcane/iris/generation/terrain/IrisDimensionCarvingEntry.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class IrisDimensionCarvingEntry {
} }
private CNG createChildrenGenerator(long childrenGeneratorSeed, IrisData data) { private CNG createChildrenGenerator(long childrenGeneratorSeed, IrisData data) {
return scaleByShrinkFactor(getChildStyle().create(deriveChildStyleSeed(childrenGeneratorSeed), data)); return scaleByShrinkFactor(getChildStyle().createNoCache(deriveChildStyleSeed(childrenGeneratorSeed), data));
} }
long deriveChildrenGeneratorSeed(long worldSeed) { long deriveChildrenGeneratorSeed(long worldSeed) {
core/src/test/java/art/arcane/iris/generation/terrain/IrisDimensionCarvingEntryTest.java
-10
View File
@@ -3,20 +3,14 @@ package art.arcane.iris.generation.terrain;
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 IrisDimensionCarvingEntryTest { public class IrisDimensionCarvingEntryTest {
private static final String SHARED_CHILD_STYLE_GENERATOR_BUG =
"IrisDimensionCarvingEntry 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 String CARVING_ENTRY_ID = "deep-caves"; private static final String CARVING_ENTRY_ID = "deep-caves";
private static final double CHILD_SHRINK_FACTOR = 4D; private static final double CHILD_SHRINK_FACTOR = 4D;
@@ -25,10 +19,6 @@ public class IrisDimensionCarvingEntryTest {
private final IrisData packData = RunningEnginePackData.create(); private final IrisData packData = RunningEnginePackData.create();
private final IrisDimensionCarvingEntry carvingEntry = createCarvingEntry(); private final IrisDimensionCarvingEntry carvingEntry = createCarvingEntry();
@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);