From 204989b90961d8b76a76b98f35b01b9132158bd1 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Mon, 2 Jun 2025 21:28:15 +1000 Subject: [PATCH] tweeks + version number in config --- build.gradle | 2 +- src/main/java/me/cortex/voxy/client/VoxyClientInstance.java | 1 + src/main/java/me/cortex/voxy/client/config/VoxyConfig.java | 2 +- .../core/rendering/building/RenderGenerationService.java | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8e6d16fa..40b1dde2 100644 --- a/build.gradle +++ b/build.gradle @@ -218,7 +218,7 @@ dependencies { include(runtimeOnly "org.lwjgl:lwjgl-zstd:$lwjglVersion:natives-linux") include(implementation 'redis.clients:jedis:5.1.0') - include(implementation('org.rocksdb:rocksdbjni:8.10.0')) + include(implementation('org.rocksdb:rocksdbjni:10.2.1')) include(implementation 'org.apache.commons:commons-pool2:2.12.0') include(implementation 'org.lz4:lz4-java:1.8.0') include(implementation('org.tukaani:xz:1.10')) diff --git a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java index 4e58f419..48168fba 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java +++ b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java @@ -107,6 +107,7 @@ public class VoxyClientInstance extends VoxyInstance { } private static class Config { + public int version = 1; public SectionStorageConfig sectionStorageConfig; } private static final Config DEFAULT_STORAGE_CONFIG; diff --git a/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java b/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java index 7e9efad2..012e049a 100644 --- a/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java +++ b/src/main/java/me/cortex/voxy/client/config/VoxyConfig.java @@ -28,7 +28,7 @@ public class VoxyConfig implements OptionStorage { public boolean enableRendering = true; public boolean ingestEnabled = true; public int sectionRenderDistance = 16; - public int serviceThreads = Math.max(CpuLayout.CORES.length/2, 1); + public int serviceThreads = (int) Math.max(CpuLayout.CORES.length/1.5, 1); public float subDivisionSize = 64; public boolean renderVanillaFog = false; public boolean renderStatistics = false; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java index 237c72e0..7c9f2ec1 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java @@ -43,7 +43,7 @@ public class RenderGenerationService { int unique = COUNTER.incrementAndGet(); int lvl = WorldEngine.MAX_LOD_LAYER-WorldEngine.getLevel(this.position); lvl = Math.min(lvl, 3);//Make the 2 highest quality have equal priority - this.priority = (((lvl*3L + Math.min(this.attempts, 5))*2 + this.addin) <<32) + Integer.toUnsignedLong(unique); + this.priority = (((lvl*3L + Math.min(this.attempts, 3))*2 + this.addin) <<32) + Integer.toUnsignedLong(unique); this.addin = 0; } } @@ -238,7 +238,7 @@ public class RenderGenerationService { task.hasDoneModelRequestOuter = true; } - task.addin = WorldEngine.getLevel(task.position)>2?3:0;//Single time addin which gives the models time to bake before the task executes + task.addin = WorldEngine.getLevel(task.position)>2?1:0;//Single time addin which gives the models time to bake before the task executes } //Keep the lock on the section, and attach it to the task, this prevents needing to re-aquire it later