diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java index b9e0e593d..0f38b0f59 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiMultiThreadingConfig.java @@ -46,7 +46,7 @@ public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig @Override public IDhApiConfigValue dataConverterThreads() - { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfDataConverterThreads); } + { return new DhApiConfigValue(Config.Client.Advanced.MultiThreading.numberOfDataTransformerThreads); } @Override public IDhApiConfigValue chunkLodConverterThreads() 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 c9c98cb98..33f325060 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 @@ -802,7 +802,7 @@ public class Config .comment(THREAD_RUN_TIME_RATIO_NOTE) .build(); - public static final ConfigEntry numberOfDataConverterThreads = new ConfigEntry.Builder() + public static final ConfigEntry numberOfDataTransformerThreads = new ConfigEntry.Builder() .setMinDefaultMax(1, ThreadPresetConfigEventHandler.getDataConverterDefaultThreadCount(), Runtime.getRuntime().availableProcessors()) @@ -818,7 +818,7 @@ public class Config + "\n" + THREAD_NOTE) .build(); - public static final ConfigEntry runTimeRatioForDataConverterThreads = new ConfigEntry.Builder() + public static final ConfigEntry runTimeRatioForDataTransformerThreads = new ConfigEntry.Builder() .setMinDefaultMax(0.01, ThreadPresetConfigEventHandler.getDataConverterDefaultRunTimeRatio(), 1.0) .comment(THREAD_RUN_TIME_RATIO_NOTE) .build(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java index 5bdbc3722..7d4916c2c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/ThreadPresetConfigEventHandler.java @@ -88,7 +88,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan public static int getDataConverterDefaultThreadCount() { return getThreadCountByPercent(0.1); } - private final ConfigEntryWithPresetOptions dataConverterThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfDataConverterThreads, + private final ConfigEntryWithPresetOptions dataTransformerThreadCount = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.numberOfDataTransformerThreads, new HashMap() {{ this.put(EThreadPreset.MINIMAL_IMPACT, 1); @@ -98,7 +98,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan this.put(EThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0)); }}); public static double getDataConverterDefaultRunTimeRatio() { return 0.25; } - private final ConfigEntryWithPresetOptions dataConverterRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForDataConverterThreads, + private final ConfigEntryWithPresetOptions dataTransformerRunTime = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.MultiThreading.runTimeRatioForDataTransformerThreads, new HashMap() {{ this.put(EThreadPreset.MINIMAL_IMPACT, 0.1); @@ -149,8 +149,8 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan this.configList.add(this.fileHandlerThreadCount); this.configList.add(this.fileHandlerRunTime); - this.configList.add(this.dataConverterThreadCount); - this.configList.add(this.dataConverterRunTime); + this.configList.add(this.dataTransformerThreadCount); + this.configList.add(this.dataTransformerRunTime); this.configList.add(this.chunkLodConverterThreadCount); this.configList.add(this.chunkLodConverterRunTime); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java index 6f3802754..42e76529a 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/DataRenderTransformer.java @@ -77,14 +77,15 @@ public class DataRenderTransformer // static setup if (configListener == null) { - configListener = new ConfigChangeListener<>(Config.Client.Advanced.MultiThreading.numberOfDataConverterThreads, (threadCount) -> { setThreadPoolSize(threadCount); }); + configListener = new ConfigChangeListener<>(Config.Client.Advanced.MultiThreading.numberOfDataTransformerThreads, (threadCount) -> { setThreadPoolSize(threadCount); }); } + // TODO this didn't seem to be re-sizing when changed via the config if (transformerThreadPool == null || transformerThreadPool.isTerminated()) { LOGGER.info("Starting "+DataRenderTransformer.class.getSimpleName()); - setThreadPoolSize(Config.Client.Advanced.MultiThreading.numberOfDataConverterThreads.get()); + setThreadPoolSize(Config.Client.Advanced.MultiThreading.numberOfDataTransformerThreads.get()); } } public static void setThreadPoolSize(int threadPoolSize) @@ -95,7 +96,7 @@ public class DataRenderTransformer transformerThreadPool.shutdown(); } - transformerThreadPool = ThreadUtil.makeRateLimitedThreadPool(threadPoolSize, "Full/Render Data Transformer", Config.Client.Advanced.MultiThreading.runTimeRatioForDataConverterThreads); + transformerThreadPool = ThreadUtil.makeRateLimitedThreadPool(threadPoolSize, "Full/Render Data Transformer", Config.Client.Advanced.MultiThreading.runTimeRatioForDataTransformerThreads); } /** 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 3ee414af4..923222373 100644 --- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -323,12 +323,12 @@ "distanthorizons.config.client.advanced.multiThreading.runTimeRatioForFileHandlerThreads": "Runtime % for file handler threads", - "distanthorizons.config.client.advanced.multiThreading.numberOfDataConverterThreads": - "NO. of data converter threads", - "distanthorizons.config.client.advanced.multiThreading.numberOfDataConverterThreads.@tooltip": + "distanthorizons.config.client.advanced.multiThreading.numberOfDataTransformerThreads": + "NO. of data transformer threads", + "distanthorizons.config.client.advanced.multiThreading.numberOfDataTransformerThreads.@tooltip": "The number of threads used when converting ID data to render-able data. \n(This generally happens when generating new terrain or changing graphics settings). \nCan only be between 1 and your CPU's processor count.", - "distanthorizons.config.client.advanced.multiThreading.runTimeRatioForDataConverterThreads": - "Runtime % for data converter threads", + "distanthorizons.config.client.advanced.multiThreading.runTimeRatioForDataTransformerThreads": + "Runtime % for data transformer threads", "distanthorizons.config.client.advanced.multiThreading.numberOfChunkLodConverterThreads": "NO. of chunk LOD converter threads",