From 860374fd1bb35eb3f8770d6f7d0d30ad80f2c01a Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 22 Jul 2023 12:34:15 -0500 Subject: [PATCH] Add a config for world gen timeout --- .../com/seibel/distanthorizons/core/config/Config.java | 9 +++++++++ .../resources/assets/distanthorizons/lang/en_us.json | 4 ++++ 2 files changed, 13 insertions(+) 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 c6c788438..5f247c80c 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 @@ -657,6 +657,15 @@ public class Config + "This will effect generation speed, but not rendering performance.") .build(); + public static ConfigEntry worldGenerationTimeoutLengthInSeconds = new ConfigEntry.Builder() + .setMinDefaultMax(5, 60, 60*10/*10 minutes*/) + .comment("" + + "How long should a world generator thread run for before timing out? \n" + + "Note: If you are experiencing timeout errors it is better to lower your CPU usage first \n" + + "via the thread config before changing this value. \n" + + "") + .build(); + // deprecated and not implemented, can be made public if we ever re-implement it @Deprecated private static ConfigEntry generationPriority = new ConfigEntry.Builder() 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 6479a91aa..1f814acfc 100644 --- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -279,6 +279,10 @@ "Lighting Engine", "distanthorizons.config.client.advanced.worldGenerator.worldGenLightingEngine.@tooltip": "§6Minecraft:§r use Minecraft's lighting engine, gives accurate lighting.\n§6Distant Horizons:§r estimates lighting, shadows won't be as smooth, but is more stable.\n\nIf the LODs appear black, set this to §6Distant Horizons§r.", + "distanthorizons.config.client.advanced.worldGenerator.worldGenerationTimeoutLengthInSeconds": + "Timeout Length In Seconds", + "distanthorizons.config.client.advanced.worldGenerator.worldGenerationTimeoutLengthInSeconds.@tooltip": + "How long should a world generator thread run for before timing out? \nNote: If you are experiencing timeout errors it is better to lower your CPU usage first \nvia the thread config before changing this value.", "distanthorizons.config.client.advanced.worldGenerator.generationPriority": "Generation Priority", "distanthorizons.config.client.advanced.worldGenerator.generationPriority.@tooltip":