Bug fixes.

Author: toxicity188

bootstrap/bukkit/src/main/resources/plugin.yml

@@ -5,7 +5,6 @@ api-version: 1.17
 author: toxicity
 description: Make a hud in minecraft!
 folia-supported: true
-load: STARTUP
 website: "https://www.spigotmc.org/resources/115559"
 softdepend:
   - MythicLib

build.gradle.kts

@@ -32,7 +32,7 @@ val platform = "4.3.4"
 val targetJavaVersion = 21
 val velocity = "3.4.0"
 val bStats = "3.1.0"
-val betterCommand = "52e73bee1c"
+val betterCommand = "1.0"
 
 val supportedMinecraftVersions = listOf(
     //1.17

dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt

@@ -30,7 +30,6 @@ import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.minimessage.MiniMessage
 import java.io.File
 import java.text.DecimalFormat
-import java.util.concurrent.CompletableFuture
 
 object CommandManager : BetterHudManager {
 
@@ -128,7 +127,7 @@ object CommandManager : BetterHudManager {
             @Permission("hud.reload")
             fun reload(@Source me: BetterCommandSource) {
                 reload_tryReload.send(me)
-                CompletableFuture.runAsync {
+                asyncTask {
                     when (val reload = PLUGIN.reload()) {
                         is OnReload -> reload_onReload.send(me)
                         is Success -> reload_success.send(me, mapOf("time" to reload.time.withDecimal()))
@@ -151,7 +150,7 @@ object CommandManager : BetterHudManager {
             @Permission("hud.generate")
             fun generate(@Source me: BetterCommandSource) {
                 generate_tryGenerate.send(me)
-                CompletableFuture.runAsync {
+                asyncTask {
                     val locale = me.locale()
                     val localeString = mapOf("name" to Component.text(locale.toString()))
                     if (library.generateDefaultLang(locale)) generate_success.send(me, localeString)

dist/src/main/kotlin/kr/toxicity/hud/util/Lists.kt

@@ -1,6 +1,8 @@
 package kr.toxicity.hud.util
 
-import java.util.*
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Executors
+import kotlin.collections.ArrayList
 
 fun <T> List<T>.split(splitSize: Int): List<List<T>> {
     val result = ArrayList<List<T>>()
@@ -25,16 +27,6 @@ fun <T> Collection<T>.forEachAsync(block: (T) -> Unit) {
     toList().forEachAsync(block)
 }
 
-fun <T> List<T>.forEachSync(block: (T) -> Unit) {
-    synchronized(this) {
-        val iterator = iterator()
-        synchronized(iterator) {
-            while (iterator.hasNext()) {
-                block(iterator.next())
-            }
-        }
-    }
-}
 fun <T> MutableCollection<T>.removeIfSync(block: (T) -> Boolean) {
     synchronized(this) {
         val iterator = iterator()
@@ -50,14 +42,14 @@ fun <T> MutableCollection<T>.removeIfSync(block: (T) -> Boolean) {
 fun <T> List<T>.forEachAsync(block: (T) -> Unit) {
     if (isNotEmpty()) {
         val available = Runtime.getRuntime().availableProcessors()
-        val queue = if (available >= size) {
-            LinkedList(map {
+        val tasks = if (available >= size) {
+            map {
                 {
                     block(it)
                 }
-            })
+            }
         } else {
-            val queue = LinkedList<() -> Unit>()
+            val queue = ArrayList<() -> Unit>()
             var i = 0
             val add = (size.toDouble() / available).toInt()
             while (i <= size) {
@@ -71,29 +63,13 @@ fun <T> List<T>.forEachAsync(block: (T) -> Unit) {
             }
             queue
         }
-        var i = 0
-        object : Thread() {
-            private val index = TaskIndex(queue.size)
-            override fun run() {
-                while (!isInterrupted) {
-                    queue.poll()?.let {
-                        val task = i++
-                        Thread {
-                            runWithExceptionHandling(CONSOLE, "Fail to run thread $task.") {
-                                it()
-                            }
-                            synchronized(index) {
-                                if (++index.current == index.max) {
-                                    interrupt()
-                                }
-                            }
-                        }.start()
-                    }
-                }
-            }
-        }.run {
-            start()
-            join()
-        }
+        val pool = Executors.newFixedThreadPool(tasks.size)
+        CompletableFuture.allOf(
+            *tasks.map {
+                CompletableFuture.runAsync({
+                    it()
+                }, pool)
+            }.toTypedArray()
+        ).join()
     }
 }