From 6c8db56474085acbbafb5dd1df9857e36db2bf17 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 31 Oct 2020 08:30:20 -0400 Subject: [PATCH] Region slice fixes --- .../iris/v2/scaffold/hunk/io/HunkRegionSlice.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java index 953b41ecf..6cedddfb7 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java @@ -1,6 +1,7 @@ package com.volmit.iris.v2.scaffold.hunk.io; import java.io.IOException; +import java.util.concurrent.atomic.AtomicIntegerArray; import com.volmit.iris.util.*; import org.bukkit.block.data.BlockData; @@ -10,9 +11,9 @@ import com.volmit.iris.v2.scaffold.hunk.Hunk; public class HunkRegionSlice { - public static final Function2> BLOCKDATA = (h, c) -> new HunkRegionSlice<>(h, Hunk::newMappedHunk, new BlockDataHunkIOAdapter(), c, "blockdata"); - public static final Function3> STRING = (h, c, t) -> new HunkRegionSlice<>(h, Hunk::newMappedHunk, new StringHunkIOAdapter(), c, t); - public static final Function3> BOOLEAN = (h, c, t) -> new HunkRegionSlice<>(h, Hunk::newMappedHunk, new BooleanHunkIOAdapter(), c, t); + public static final Function2> BLOCKDATA = (h, c) -> new HunkRegionSlice<>(h, Hunk::newAtomicHunk, new BlockDataHunkIOAdapter(), c, "blockdata"); + public static final Function3> STRING = (h, c, t) -> new HunkRegionSlice<>(h, Hunk::newAtomicHunk, new StringHunkIOAdapter(), c, t); + public static final Function3> BOOLEAN = (h, c, t) -> new HunkRegionSlice<>(h, Hunk::newAtomicHunk, new BooleanHunkIOAdapter(), c, t); private final Function3> factory; private final HunkIOAdapter adapter; private final CompoundTag compound; @@ -229,4 +230,8 @@ public class HunkRegionSlice return key + "." + Integer.toString(((short) (((x & 0xFF) << 8) | (z & 0xFF))), 36); } + + public int getLoadCount() { + return loadedChunks.size(); + } }