Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
mcrcortex
2025-12-02 08:53:48 +10:00
3 changed files with 13 additions and 9 deletions

View File

@@ -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 {

View File

@@ -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!

View File

@@ -53,6 +53,11 @@ 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) {
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(() -> {
@@ -61,7 +66,6 @@ public class Logger {
});
}
}
}
public static void warn(Object... args) {
if (SHUTUP) {