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 4e786f94c..d3deec96c 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 @@ -1021,25 +1021,6 @@ public class Config + "") .build(); - public static ConfigEntry genTaskPriorityDistanceRatio = new ConfigEntry.Builder() - .setServersideShortName("genTaskPriorityDistanceRatio") - .setMinDefaultMax(1d, 3d, 10d) - // todo: this comment should probably be rewritten, but it's outside my knowledge scope - // - yeshi - .comment("" - + "Controls the max ratio between distances of nearest unloaded sections of each priority.\n" - + "For example, value of 2 means that the nearest lower priority section will be allowed to stay\n" - + "unloaded only if it's at most 2x closer than one of a higher priority." - + "") - .build(); - public static ConfigEntry genTaskPriorityRequestRateLimit = new ConfigEntry.Builder() - .setServersideShortName("genTaskPriorityRequestRateLimit") - .setMinDefaultMax(1, 50, 200) - .comment("" - + "Limits the amount of LOD sections the client can request states for per second." - + "") - .build(); - public static ConfigUIComment realTimeUpdatesSectionNote = new ConfigUIComment(); public static ConfigEntry enableRealTimeUpdates = new ConfigEntry.Builder() diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java index 0f2b9aa35..239a5eee1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java @@ -45,11 +45,6 @@ public class WorldRemoteGenerationQueue extends AbstractFullDataRequestQueue imp return LodUtil.BLOCK_DETAIL_LEVEL; } - @Override - protected double getPriorityDistanceRatio() - { - return Config.Client.Advanced.Multiplayer.ServerNetworking.genTaskPriorityDistanceRatio.get(); - } @Override public CompletableFuture submitGenTask(long sectionPos, byte requiredDataDetail, IWorldGenTaskTracker tracker) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java index 07e4d0835..693f97353 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/MultiplayerConfigChangeListener.java @@ -14,7 +14,6 @@ public class MultiplayerConfigChangeListener implements Closeable Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius, Config.Client.Advanced.WorldGenerator.enableDistantGeneration, Config.Client.Advanced.Multiplayer.ServerNetworking.generationRequestRCLimit, - Config.Client.Advanced.Multiplayer.ServerNetworking.genTaskPriorityRequestRateLimit, Config.Client.Advanced.Multiplayer.ServerNetworking.enableRealTimeUpdates, Config.Client.Advanced.Multiplayer.ServerNetworking.enableLoginDataSync, Config.Client.Advanced.Multiplayer.ServerNetworking.loginDataSyncRCLimit, diff --git a/core/src/main/resources/assets/distanthorizons/lang/en_us.json b/core/src/main/resources/assets/distanthorizons/lang/en_us.json index 26e2565b1..a05a5d2ec 100644 --- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -402,10 +402,6 @@ "distanthorizons.config.client.advanced.multiplayer.serverNetworking.generationRequestRCLimit.@tooltip": "Limits the amount of generation requests sent by client and processed by server.", "distanthorizons.config.client.advanced.multiplayer.serverNetworking.generationRequestBeginDelay": "Generation Request Begin Delay", "distanthorizons.config.client.advanced.multiplayer.serverNetworking.generationRequestBeginDelay.@tooltip": "Adds a delay in seconds before sending LOD requests, when generation is enabled. \nIncrease this value if initial generation starts too far away.", - "distanthorizons.config.client.advanced.multiplayer.serverNetworking.genTaskPriorityDistanceRatio": "Gen Task Priority Distance Max Ratio", - "distanthorizons.config.client.advanced.multiplayer.serverNetworking.genTaskPriorityDistanceRatio.@tooltip": "Controls the max ratio between distances of nearest unloaded sections of each priority. \nFor example, a value of 2 means that the nearest lower priority section will be allowed to stay \nunloaded only if it's at most 2x closer than one of a higher priority.", - "distanthorizons.config.client.advanced.multiplayer.serverNetworking.genTaskPriorityRequestRateLimit": "Gen Task Priority Check Rate Limit", - "distanthorizons.config.client.advanced.multiplayer.serverNetworking.genTaskPriorityRequestRateLimit.@tooltip": "Limits the amount of LOD sections that the client can request states for, per second.", "distanthorizons.config.client.advanced.multiplayer.serverNetworking.realTimeUpdatesSectionNote": " \u25cf Real Time Updates", "distanthorizons.config.client.advanced.multiplayer.serverNetworking.enableRealTimeUpdates": "Enable Real Time Updates", "distanthorizons.config.client.advanced.multiplayer.serverNetworking.enableRealTimeUpdates.@tooltip": "Enables real time updates from server.",