diff --git a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java index 66396b4d..f0d5a511 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java +++ b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java @@ -113,7 +113,7 @@ public class VoxyClientInstance extends VoxyInstance { @Override public boolean isIngestEnabled(WorldIdentifier worldId) { - return !this.noIngestOverride; + return (!this.noIngestOverride) && VoxyConfig.CONFIG.ingestEnabled; } private static class Config { diff --git a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java index 7f7fee2d..4db735f7 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java @@ -112,7 +112,7 @@ public class MixinRenderSectionManager { } int x = instance.getChunkX(), y = instance.getChunkY(), z = instance.getChunkZ(); - if (wasBuilt) { + if (wasBuilt && VoxyConfig.CONFIG.ingestEnabled) { var tracker = ((AccessorChunkTracker)ChunkTrackerHolder.get(this.level)).getChunkStatus(); //in theory the cache value could be wrong but is so soso unlikely and at worst means we either duplicate ingest a chunk // which... could be bad ;-; or we dont ingest atall which is ok! diff --git a/src/main/java/me/cortex/voxy/common/Logger.java b/src/main/java/me/cortex/voxy/common/Logger.java index 3b190f46..5eac5bd3 100644 --- a/src/main/java/me/cortex/voxy/common/Logger.java +++ b/src/main/java/me/cortex/voxy/common/Logger.java @@ -53,13 +53,17 @@ public class Logger { String error = (INSERT_CLASS?("["+callClsName()+"]: "):"") + Stream.of(args).map(Logger::objToString).collect(Collectors.joining(" ")); LOGGER.error(error, throwable); if (VoxyCommon.IS_IN_MINECRAFT && !VoxyCommon.IS_DEDICATED_SERVER) { - var instance = Minecraft.getInstance(); - if (instance != null) { - instance.executeIfPossible(() -> { - var player = Minecraft.getInstance().player; - if (player != null) player.displayClientMessage(Component.literal(error), true); - }); - } + error0(error);//This is done so that on dedicated server, the Minecraft client class isnt loaded + } + } + + private static void error0(String error) { + var instance = Minecraft.getInstance(); + if (instance != null) { + instance.executeIfPossible(() -> { + var player = Minecraft.getInstance().player; + if (player != null) player.displayClientMessage(Component.literal(error), true); + }); } }