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

fix:

Browse Source 
- Replaced IrisGeneratorStyle.create with createNoCache in ContinentGenerator
- Removed @ExpectedToFailUntilFixed from the continent tests

Ref.: https://github.com/VolmitSoftware/Iris/issues/1251
This commit is contained in:
CeeVeeR
2026-10-02 05:14:52 +02:00
parent 8bccb48c09
commit bda770650b
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/art/arcane/iris/generation/terrain/ContinentGenerator.java
+1 -1
View File
@@ -15,7 +15,7 @@ public final class ContinentGenerator {
} }
private static CNG takeSharedGenerator(IrisDimension dimension, RNG parentSeedSource, IrisData packData) { private static CNG takeSharedGenerator(IrisDimension dimension, RNG parentSeedSource, IrisData packData) {
return dimension.getContinentalStyle().create(deriveContinentSeed(parentSeedSource), packData); return dimension.getContinentalStyle().createNoCache(deriveContinentSeed(parentSeedSource), packData);
} }
static RNG deriveContinentSeed(RNG parentSeedSource) { static RNG deriveContinentSeed(RNG parentSeedSource) {
core/src/test/java/art/arcane/iris/generation/terrain/ContinentGeneratorTest.java
-13
View File
@@ -4,11 +4,8 @@ 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.generation.runtime.Engine; import art.arcane.iris.generation.runtime.Engine;
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.volmlib.util.math.RNG; import art.arcane.volmlib.util.math.RNG;
import art.arcane.volmlib.util.noise.CNG; import art.arcane.volmlib.util.noise.CNG;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import java.util.Arrays; import java.util.Arrays;
@@ -18,9 +15,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
public class ContinentGeneratorTest { public class ContinentGeneratorTest {
private static final String SHARED_STYLE_GENERATOR_BUG =
"ContinentGenerator scales the shared style generator instead of a private one. "
+ "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 double POWER_OF_TWO_CONTINENT_ZOOM = 4D; 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 SQUARED_CONTINENT_ZOOM = POWER_OF_TWO_CONTINENT_ZOOM * POWER_OF_TWO_CONTINENT_ZOOM;
@@ -35,9 +29,6 @@ public class ContinentGeneratorTest {
private final IrisDimension squaredZoomDimension = createDimensionWithContinentZoom(SQUARED_CONTINENT_ZOOM); private final IrisDimension squaredZoomDimension = createDimensionWithContinentZoom(SQUARED_CONTINENT_ZOOM);
private final IrisDimension overworldStyleDimension = createDimensionWithOverworldContinentalStyle(); private final IrisDimension overworldStyleDimension = createDimensionWithOverworldContinentalStyle();
@Rule
public final ExpectedToFailUntilFixedRule expectedFailures = new ExpectedToFailUntilFixedRule();
@Test @Test
public void doesTheContinentMapAtWorldStartMatchExistingWorlds() { public void doesTheContinentMapAtWorldStartMatchExistingWorlds() {
assertArrayEquals(CONTINENT_MAP_OF_EXISTING_WORLDS, sampleContinentMapAtWorldStart(baseZoomDimension), 0D); assertArrayEquals(CONTINENT_MAP_OF_EXISTING_WORLDS, sampleContinentMapAtWorldStart(baseZoomDimension), 0D);
@@ -49,25 +40,21 @@ public class ContinentGeneratorTest {
sampleContinentMapAtWorldStart(squaredZoomDimension), 0D); sampleContinentMapAtWorldStart(squaredZoomDimension), 0D);
} }
@ExpectedToFailUntilFixed(SHARED_STYLE_GENERATOR_BUG)
@Test @Test
public void doesRebuildingTheSameWorldZoomItsContinentMapOnlyOnce() { public void doesRebuildingTheSameWorldZoomItsContinentMapOnlyOnce() {
assertArrayEquals(CONTINENT_MAP_OF_EXISTING_WORLDS, sampleContinentMapAfterRebuild(baseZoomDimension), 0D); assertArrayEquals(CONTINENT_MAP_OF_EXISTING_WORLDS, sampleContinentMapAfterRebuild(baseZoomDimension), 0D);
} }
@ExpectedToFailUntilFixed(SHARED_STYLE_GENERATOR_BUG)
@Test @Test
public void doesRebuildingTheSameWorldTwiceZoomItsContinentMapOnlyOnce() { public void doesRebuildingTheSameWorldTwiceZoomItsContinentMapOnlyOnce() {
assertArrayEquals(CONTINENT_MAP_OF_EXISTING_WORLDS, sampleContinentMapAfterSecondRebuild(baseZoomDimension), 0D); assertArrayEquals(CONTINENT_MAP_OF_EXISTING_WORLDS, sampleContinentMapAfterSecondRebuild(baseZoomDimension), 0D);
} }
@ExpectedToFailUntilFixed(SHARED_STYLE_GENERATOR_BUG)
@Test @Test
public void doesRebuildingAWorldWithTheOverworldContinentalStyleZoomItsContinentMapOnlyOnce() { public void doesRebuildingAWorldWithTheOverworldContinentalStyleZoomItsContinentMapOnlyOnce() {
assertArrayEquals(sampleOverworldContinentMapAtWorldStart(), sampleContinentMapAfterRebuild(overworldStyleDimension), 0D); assertArrayEquals(sampleOverworldContinentMapAtWorldStart(), sampleContinentMapAfterRebuild(overworldStyleDimension), 0D);
} }
@ExpectedToFailUntilFixed(SHARED_STYLE_GENERATOR_BUG)
@Test @Test
public void doesBuildingTheContinentMapLeaveTheSharedStyleGeneratorUnscaled() { public void doesBuildingTheContinentMapLeaveTheSharedStyleGeneratorUnscaled() {
assertArrayEquals(sampleUntouchedSharedStyleGenerator(), sampleSharedStyleGeneratorAfterContinentMapBuilt(baseZoomDimension), 0D); assertArrayEquals(sampleUntouchedSharedStyleGenerator(), sampleSharedStyleGeneratorAfterContinentMapBuilt(baseZoomDimension), 0D);