From fc0922d105b30bf6aae647d7b78a1c0c42cf86d7 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:39:45 +0300 Subject: [PATCH] rename chunk algorithms --- .../src/main/java/org/bxteam/divinemc/DivineConfig.java | 8 ++++++-- .../divinemc/server/chunk/ChunkSystemAlgorithms.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/divinemc-server/src/main/java/org/bxteam/divinemc/DivineConfig.java b/divinemc-server/src/main/java/org/bxteam/divinemc/DivineConfig.java index 8cbe76b..9029b7b 100644 --- a/divinemc-server/src/main/java/org/bxteam/divinemc/DivineConfig.java +++ b/divinemc-server/src/main/java/org/bxteam/divinemc/DivineConfig.java @@ -170,7 +170,7 @@ public class DivineConfig { public static long chunkDataCacheSoftLimit = 8192L; public static long chunkDataCacheLimit = 32678L; public static int maxViewDistance = 32; - public static ChunkSystemAlgorithms chunkWorkerAlgorithm = ChunkSystemAlgorithms.C2ME; + public static ChunkSystemAlgorithms chunkWorkerAlgorithm = ChunkSystemAlgorithms.MOONRISE; public static int threadPoolPriority = Thread.NORM_PRIORITY + 1; public static boolean enableSecureSeed = false; public static boolean smoothBedrockLayer = false; @@ -197,7 +197,11 @@ public class DivineConfig { "Changes the maximum view distance for the server, allowing clients to have render distances higher than 32"); chunkWorkerAlgorithm = ChunkSystemAlgorithms.valueOf(getString("settings.chunk-generation.chunk-worker-algorithm", chunkWorkerAlgorithm.name(), - "Modifies what algorithm the chunk system will use to define thread counts. values: MOONRISE, C2ME, C2ME_AGGRESSIVE")); + "Modifies what algorithm the chunk system will use to define thread counts.", + "Valid values:", + " - MOONRISE: Default algorithm, used by default in Paper", + " - C2ME: Algorithm used by C2ME (old)", + " - C2ME_NEW: Modern algorithm used by C2ME")); threadPoolPriority = getInt("settings.chunk-generation.thread-pool-priority", threadPoolPriority, "Sets the priority of the thread pool used for chunk generation"); diff --git a/divinemc-server/src/main/java/org/bxteam/divinemc/server/chunk/ChunkSystemAlgorithms.java b/divinemc-server/src/main/java/org/bxteam/divinemc/server/chunk/ChunkSystemAlgorithms.java index 4692fb3..b8c78dc 100644 --- a/divinemc-server/src/main/java/org/bxteam/divinemc/server/chunk/ChunkSystemAlgorithms.java +++ b/divinemc-server/src/main/java/org/bxteam/divinemc/server/chunk/ChunkSystemAlgorithms.java @@ -26,7 +26,7 @@ public enum ChunkSystemAlgorithms { final int ioThreads = Math.max(1, configIoThreads); return new Pair<>(workerThreads, ioThreads); }), - C2ME_AGGRESSIVE((configWorkerThreads, configIoThreads) -> { + C2ME_NEW((configWorkerThreads, configIoThreads) -> { String expression = """ max(