From c6aa690eee679c8efaf4adea352b990495248300 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Mon, 14 Apr 2025 01:28:57 +1000 Subject: [PATCH] Random things --- src/main/java/me/cortex/voxy/common/util/UnsafeUtil.java | 2 -- .../java/me/cortex/voxy/common/world/WorldEngine.java | 8 ++++---- src/main/java/me/cortex/voxy/commonImpl/VoxyInstance.java | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/cortex/voxy/common/util/UnsafeUtil.java b/src/main/java/me/cortex/voxy/common/util/UnsafeUtil.java index 0490aab3..90f04dba 100644 --- a/src/main/java/me/cortex/voxy/common/util/UnsafeUtil.java +++ b/src/main/java/me/cortex/voxy/common/util/UnsafeUtil.java @@ -47,6 +47,4 @@ public class UnsafeUtil { public static void memcpy(short[] src, long dst) { UNSAFE.copyMemory(src, SHORT_ARRAY_BASE_OFFSET, null, dst, (long) src.length <<1); } - - } diff --git a/src/main/java/me/cortex/voxy/common/world/WorldEngine.java b/src/main/java/me/cortex/voxy/common/world/WorldEngine.java index ad6a2b26..ad8f11ea 100644 --- a/src/main/java/me/cortex/voxy/common/world/WorldEngine.java +++ b/src/main/java/me/cortex/voxy/common/world/WorldEngine.java @@ -41,17 +41,17 @@ public class WorldEngine { public final @Nullable VoxyInstance instanceIn; - public WorldEngine(SectionStorage storage, int cacheCount) { - this(storage, cacheCount, null); + public WorldEngine(SectionStorage storage) { + this(storage, null); } - public WorldEngine(SectionStorage storage, int cacheCount, @Nullable VoxyInstance instance) { + public WorldEngine(SectionStorage storage, @Nullable VoxyInstance instance) { this.instanceIn = instance; this.storage = storage; this.mapper = new Mapper(this.storage); //5 cache size bits means that the section tracker has 32 separate maps that it uses - this.sectionTracker = new ActiveSectionTracker(10, storage::loadSection, cacheCount, this); + this.sectionTracker = new ActiveSectionTracker(10, storage::loadSection, 2048, this); } public WorldSection acquireIfExists(int lvl, int x, int y, int z) { diff --git a/src/main/java/me/cortex/voxy/commonImpl/VoxyInstance.java b/src/main/java/me/cortex/voxy/commonImpl/VoxyInstance.java index 6049f561..73b8811c 100644 --- a/src/main/java/me/cortex/voxy/commonImpl/VoxyInstance.java +++ b/src/main/java/me/cortex/voxy/commonImpl/VoxyInstance.java @@ -67,6 +67,7 @@ public class VoxyInstance { if (!this.activeWorlds.isEmpty()) { throw new IllegalStateException("Not all worlds shutdown"); } + Logger.info("Instance shutdown"); } public ServiceThreadPool getThreadPool() { @@ -99,7 +100,7 @@ public class VoxyInstance { } protected WorldEngine createWorld(SectionStorage storage) { - var world = new WorldEngine(storage, 2048, this); + var world = new WorldEngine(storage, this); world.setSaveCallback(this.savingService::enqueueSave); this.activeWorlds.add(world); return world;