From 9cb627eaac72af63f11e93921aaf8132c68a8914 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 10 Jun 2025 00:29:02 +0500 Subject: [PATCH] Move max generation distance check functionality to render distance config --- .../seibel/distanthorizons/core/config/Config.java | 11 ++--------- .../core/level/AbstractDhServerLevel.java | 4 ++-- .../core/multiplayer/config/SessionConfig.java | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index 855fbdf04..720235387 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -171,9 +171,11 @@ public class Config public static class Quality { public static ConfigEntry lodChunkRenderDistanceRadius = new ConfigEntry.Builder() + .setChatCommandName("generation.maxRequestDistance") .setMinDefaultMax(32, 256, 4096) .comment("" + "The radius of the mod's render distance. (measured in chunks)\n" + + "On server defines the distance allowed to generate around the player; note that real-time updates and synd on load limits are defined separately. \n" + "") .setPerformance(EConfigEntryPerformance.HIGH) .build(); @@ -1620,15 +1622,6 @@ public class Config + "") .build(); - public static ConfigEntry maxGenerationRequestDistance = new ConfigEntry.Builder() - .setChatCommandName("generation.maxRequestDistance") - .setMinDefaultMax(256, 4096, 4096) - .comment("" + - "Defines the distance allowed to generate around the player." + - "") - .setPerformance(EConfigEntryPerformance.HIGH) - .build(); - public static ConfigEntry generationBoundsX = new ConfigEntry.Builder() .setChatCommandName("generation.bounds.x") .setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java index 80fad925e..96f60d63e 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java @@ -143,9 +143,9 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I if (message.clientTimestamp == null) { - if (distanceFromPlayer > Config.Server.maxGenerationRequestDistance.get()) + if (distanceFromPlayer > Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get()) { - message.sendResponse(new RequestOutOfRangeException("Distance too large: " + distanceFromPlayer + " > " + Config.Server.maxGenerationRequestDistance.get())); + message.sendResponse(new RequestOutOfRangeException("Distance too large: " + distanceFromPlayer + " > " + Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get())); return; } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/SessionConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/SessionConfig.java index 5fd59ccc4..71b4fa99f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/SessionConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/SessionConfig.java @@ -32,7 +32,7 @@ public class SessionConfig implements INetworkObject // Note: config values are transmitted in the insertion order registerConfigEntry(Config.Common.WorldGenerator.enableDistantGeneration, Boolean::logicalAnd); - registerConfigEntry(Config.Server.maxGenerationRequestDistance, Math::min); + registerConfigEntry(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius, Math::min); registerConfigEntry(Config.Server.generationBoundsX, (x, y) -> y); registerConfigEntry(Config.Server.generationBoundsZ, (x, y) -> y); registerConfigEntry(Config.Server.generationBoundsRadius, (x, y) -> y); @@ -67,7 +67,7 @@ public class SessionConfig implements INetworkObject //===============// public boolean isDistantGenerationEnabled() { return this.getValue(Config.Common.WorldGenerator.enableDistantGeneration); } - public int getMaxGenerationRequestDistance() { return this.getValue(Config.Server.maxGenerationRequestDistance); } + public int getMaxGenerationRequestDistance() { return this.getValue(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius); } public Integer getGenerationBoundsX() { return this.getValue(Config.Server.generationBoundsX); } public Integer getGenerationBoundsZ() { return this.getValue(Config.Server.generationBoundsZ); } public Integer getGenerationBoundsRadius() { return this.getValue(Config.Server.generationBoundsRadius); }