diff --git a/core/src/main/java/art/arcane/iris/generation/hydrology/cave/HydrologyCaveStorage.java b/core/src/main/java/art/arcane/iris/generation/hydrology/cave/HydrologyCaveStorage.java index 736df5051..5d9e6fc3a 100644 --- a/core/src/main/java/art/arcane/iris/generation/hydrology/cave/HydrologyCaveStorage.java +++ b/core/src/main/java/art/arcane/iris/generation/hydrology/cave/HydrologyCaveStorage.java @@ -15,7 +15,7 @@ public final class HydrologyCaveStorage { } int chunkX = x >> 4; int chunkZ = z >> 4; - TectonicPlate plate = mantle.getLoadedRegions().get(Mantle.key(chunkX >> 5, chunkZ >> 5)); + TectonicPlate plate = mantle.getLoadedRegion(chunkX >> 5, chunkZ >> 5); if (plate == null || plate.isClosed()) { return null; } diff --git a/core/src/main/java/art/arcane/iris/generation/stage/IrisCarveModifier.java b/core/src/main/java/art/arcane/iris/generation/stage/IrisCarveModifier.java index 64bf27b3e..7036f22f0 100644 --- a/core/src/main/java/art/arcane/iris/generation/stage/IrisCarveModifier.java +++ b/core/src/main/java/art/arcane/iris/generation/stage/IrisCarveModifier.java @@ -579,7 +579,7 @@ public class IrisCarveModifier extends EngineAssignedModifier } private MantleChunk existingMantleChunk(Mantle mantle, int chunkX, int chunkZ) { - TectonicPlate plate = mantle.getLoadedRegions().get(Mantle.key(chunkX >> 5, chunkZ >> 5)); + TectonicPlate plate = mantle.getLoadedRegion(chunkX >> 5, chunkZ >> 5); if (plate == null || plate.isClosed()) { return null; } diff --git a/core/src/main/java/art/arcane/iris/world/history/GenerationHistoryRuntimeRouter.java b/core/src/main/java/art/arcane/iris/world/history/GenerationHistoryRuntimeRouter.java index 919d219c7..9ef3809b1 100644 --- a/core/src/main/java/art/arcane/iris/world/history/GenerationHistoryRuntimeRouter.java +++ b/core/src/main/java/art/arcane/iris/world/history/GenerationHistoryRuntimeRouter.java @@ -557,7 +557,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable { Mantle mantle = access.mantle(); MantleChunk anchor = mantle.getChunk(regionX << 5, regionZ << 5).use(); try { - TectonicPlate plate = mantle.getLoadedRegions().get(Mantle.key(regionX, regionZ)); + TectonicPlate plate = mantle.getLoadedRegion(regionX, regionZ); HashMap bundles = new HashMap<>(); for (int x = 0; x < 32; x++) { for (int z = 0; z < 32; z++) { diff --git a/core/src/test/java/art/arcane/iris/generation/stage/IrisCarveBoundaryFacesTest.java b/core/src/test/java/art/arcane/iris/generation/stage/IrisCarveBoundaryFacesTest.java index 85c9eca15..80f4c5aa4 100644 --- a/core/src/test/java/art/arcane/iris/generation/stage/IrisCarveBoundaryFacesTest.java +++ b/core/src/test/java/art/arcane/iris/generation/stage/IrisCarveBoundaryFacesTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; @@ -72,7 +71,7 @@ public class IrisCarveBoundaryFacesTest { matter[0][0].slice(PreObjectMatterCell.class).set(0, 5, 0, PreObjectMatterCell.cavern(null)); Mantle mantle = mock(Mantle.class, RETURNS_DEEP_STUBS); TectonicPlate plate = mock(TectonicPlate.class); - when(mantle.getLoadedRegions().get(anyLong())).thenReturn(plate); + when(mantle.getLoadedRegion(anyInt(), anyInt())).thenReturn(plate); when(plate.get(31, 0)).thenReturn(chunks[1]); when(plate.get(1, 0)).thenReturn(chunks[2]); when(plate.get(0, 31)).thenReturn(chunks[3]);