From b1e75431aef9ca2c5eb2733073e31cb1e51590a5 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 18 Aug 2023 08:25:23 -0500 Subject: [PATCH] Fix WorldGen ThreadFactory not being used --- .../wrappers/worldGeneration/BatchGenerationEnvironment.java | 2 -- .../common/wrappers/worldGeneration/GenerationEvent.java | 3 ++- coreSubProjects | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 56d9d46d8..18b886f71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -215,8 +215,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv onDistantGenerationMixinData.remove(); } - public static final DhThreadFactory threadFactory = new DhThreadFactory("DH-Gen-Worker-Thread", Thread.MIN_PRIORITY); - //==============// diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java index 75be5ceeb..3fa8d05b8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.generation.WorldGenerationQueue; import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.DhChunkPos; @@ -120,7 +121,7 @@ public final class GenerationEvent public boolean terminate() { LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN======================="); - BatchGenerationEnvironment.threadFactory.dumpAllThreadStacks(); + WorldGenerationQueue.THREAD_FACTORY.dumpAllThreadStacks(); this.future.cancel(true); return this.future.isCancelled(); } diff --git a/coreSubProjects b/coreSubProjects index c7ac9facc..91f67cac9 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit c7ac9faccd4a68de38919fff2aab5ac9bda580e9 +Subproject commit 91f67cac9b69f8d83f5012db55867dd5ef19e38a