Backport J21 virtual thread usage to J17 compatible version

TerraformersMC · Jun 18, 2024 · dab771c · dab771c
1 parent 893764a
commit dab771c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/com/terraformersmc/modmenu/util/UpdateCheckerThreadFactory.java b/src/main/java/com/terraformersmc/modmenu/util/UpdateCheckerThreadFactory.java
@@ -11,6 +11,8 @@ public class UpdateCheckerThreadFactory implements ThreadFactory {
 	@Override
 	public Thread newThread(@NotNull Runnable r) {
 		var index = COUNT.incrementAndGet();
-		return Thread.ofVirtual().name("ModMenu/Update Checker/%s".formatted(index)).unstarted(r);
+		Thread thread = new Thread(r);
+		thread.setName("ModMenu/Update Checker/" + index);
+		return thread;
 	}
 }
diff --git a/src/main/java/com/terraformersmc/modmenu/util/UpdateCheckerUtil.java b/src/main/java/com/terraformersmc/modmenu/util/UpdateCheckerUtil.java
@@ -48,7 +48,8 @@ public static void checkForUpdates() {
 	}
 
 	private static void checkForUpdates0() {
-		try (var executor = Executors.newThreadPerTaskExecutor(new UpdateCheckerThreadFactory())) {
+		var executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new UpdateCheckerThreadFactory());
+		try {
 			List<Mod> withoutUpdateChecker = new ArrayList<>();
 
 			List<Mod> updatableMods = ModMenu.MODS.values()
@@ -130,6 +131,8 @@ private static void checkForUpdates0() {
 						data.versionNumber);
 				}
 			}
+		} finally {
+			executor.shutdown();
 		}
 	}