feat: 依存関係のimplementation、コマンド実行時の非同期化

- gradleをアップデート
- 依存関係をリモート化し、ファイルシステム上の依存を削除

.gitignore

@@ -1,25 +1,4 @@
-# ---> Gradle
-.gradle
-**/build/
-!src/**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Avoid ignore Gradle wrappper properties
-!gradle-wrapper.properties
-
-# Cache of project
-.gradletasknamecache
-
-# Eclipse Gradle plugin generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
 .direnv
-bin
+.kotlin
+.gradle
+build

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "kommand-lib"]
+	path = kommand-lib
+	url = git@gitea.hareworks.net:Hare/kommand-lib.git
+	branch=master

build.gradle.kts

@@ -1,14 +1,13 @@
-import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
+import net.minecrell.pluginyml.paper.PaperPluginDescription
 
 group = "net.hareworks"
-version = "1.1"
+version = "1.2"
 
-val exposedVersion = "0.54.0"
 
 plugins {
-    kotlin("jvm") version "2.0.20"
+    kotlin("jvm") version "2.2.21"
-    kotlin("plugin.serialization") version "2.0.20"
+    kotlin("plugin.serialization") version "2.2.21"
-    id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
+    id("de.eldoria.plugin-yml.paper") version "0.8.0"
     id("com.gradleup.shadow") version "9.2.2"
 }
 repositories {
@@ -16,8 +15,12 @@ repositories {
     maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://repo.codemc.io/repository/maven-public/")
 }
+
+val exposedVersion = "0.54.0"
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    implementation("net.hareworks:kommand-lib:1.1")
     implementation("net.kyori:adventure-api:4.17.0")
     implementation("net.kyori:adventure-text-minimessage:4.17.0")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
@@ -28,78 +31,31 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
     implementation("org.jetbrains.exposed:exposed-kotlin-datetime:$exposedVersion")
     implementation("de.tr7zw:item-nbt-api:2.15.3")
-    implementation("com.michael-bull.kotlin-result:kotlin-result:2.0.0")
 }
 tasks {
-    shadowJar {
+    withType<Jar> {
         archiveBaseName.set("SimplyMCDB")
-        archiveClassifier.set("")
-        relocate("de.tr7zw.changeme.nbtapi", "net.hareworks.simplymcdb.libs.nbtapi")
     }
-
+    shadowJar {
-    build {
+        minimize {
-        dependsOn(shadowJar)
+            exclude(dependency("org.jetbrains.exposed:exposed-core"))
+            exclude(dependency("org.jetbrains.exposed:exposed-dao"))
+            exclude(dependency("org.jetbrains.exposed:exposed-jdbc"))
+            exclude(dependency("org.jetbrains.exposed:exposed-kotlin-datetime"))
+            exclude(dependency("org.postgresql:postgresql"))
+        }
+        archiveClassifier.set("min")
+        relocate("de.tr7zw.changeme.nbtapi", "net.hareworks.simplymcdb.libs.nbtapi")
     }
 }
 
-bukkit {
+paper {
     main = "net.hareworks.simplymcdb.App"
     name = "Simply-Minecraft-DB"
     description = "It provides a simple way to manage player data through a database."
     version = getVersion().toString()
-		apiVersion = "1.21.10"
+	apiVersion = "1.21.10"
-    authors =
+    authors = listOf(
-            listOf("Hare-K02")
+        "Hare-K02"
-    permissions {
+    )
-        register("simplydb.*") {
-            children = listOf("simplydb.command", "simplydb.admin")
-        }
-        register("simplydb.command") {
-            description = "Allows access to the /simplydb command"
-            default = BukkitPluginDescription.Permission.Default.TRUE
-        }
-        register("simplydb.command.*") {
-            children = listOf(
-                "simplydb.command.config",
-                "simplydb.command.config.*",
-                "simplydb.command.on",
-                "simplydb.command.off",
-            )
-        }
-        register("simplydb.command.config") {
-            description = "Allows access to the /simplydb config command"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-        register("simplydb.command.config.*") {
-            children = listOf(
-                "simplydb.command.config.reload",
-                "simplydb.command.config.fetch",
-                "simplydb.command.config.upload",
-            )
-        }
-        register("simplydb.command.config.reload") {
-            description = "Allows access to the /simplydb config reload command"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-        register("simplydb.command.config.fetch") {
-            description = "Allows access to the /simplydb config fetch command"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-        register("simplydb.command.config.upload") {
-            description = "Allows access to the /simplydb config upload command"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-        register("simplydb.command.on") {
-            description = "Allows access to the /simplydb on command"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-        register("simplydb.command.off") {
-            description = "Allows access to the /simplydb off command"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-        register("simplydb.admin") {
-            description = "Allows configration/manage simplydb"
-            default = BukkitPluginDescription.Permission.Default.OP
-        }
-		}
 }

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764020296,
+        "lastModified": 1764173365,
-        "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
+        "narHash": "sha256-JaNFPy3nywPNxSDpEgFFqvngQww5Igb6twG4NhMo8oc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
+        "rev": "2fecba9952096ba043c16b9ef40b92851ff3e5d9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -36,10 +36,6 @@
             export PATH="$JAVA_HOME/bin:$PATH"
 
             export GRADLE_USER_HOME="$PWD/.gradle"
-
-            echo "Loaded Minecraft dev env (JDK 21 + Gradle)"
-            java -version || true
-            gradle --version || true
           '';
         };
       }

gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.configuration-cache=true
+org.gradle.parallel=true
+org.gradle.caching=true
+
+kotlin.stdlib.default.dependency=false

gradle/gradle-daemon-jvm.properties

@@ -1,2 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainVersion=21

gradle/libs.versions.toml

@@ -0,0 +1,2 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -0,0 +1,3 @@
+rootProject.name = "simply-mcdb"
+
+includeBuild("kommand-lib")

src/main/kotlin/net/hareworks/kommandlib/main.kt

@@ -1,147 +0,0 @@
-package net.hareworks.kommandlib
-
-import com.github.michaelbull.result.*
-import kotlin.collections.listOf
-import org.bukkit.Bukkit
-import org.bukkit.command.CommandMap
-import org.bukkit.command.CommandSender
-import org.bukkit.command.PluginCommand
-import org.bukkit.command.TabCompleter
-import org.bukkit.plugin.java.JavaPlugin
-import net.hareworks.simplymcdb.App
-
-class KommandLib(plugin: JavaPlugin, vararg routes: Argument) {
-  val entries = routes.toList()
-  init {
-    val f = Bukkit.getServer().javaClass.getDeclaredField("commandMap")
-    f.isAccessible = true
-    val commandMap = f.get(Bukkit.getServer()) as CommandMap
-    for (route in routes) {
-      commandMap.register(
-              plugin.getName(),
-              (PluginCommand::class
-                              .java
-                              .declaredConstructors
-                              .first()
-                              .apply { isAccessible = true }
-                              .newInstance(route.name, plugin) as
-                              PluginCommand)
-                      .apply {
-                        this.name = name
-                        this.setExecutor { sender, _, alias, args ->
-                          val routeargs = routeTreeSearch(arrayOf(alias, *args))
-                          if (routeargs.size == args.size + 1)
-                                  routeargs.last().onCommand(sender, args)
-                          true
-                        }
-                        this.tabCompleter = TabCompleter { sender, _, alias, args ->
-                          val routeargs = routeTreeSearch(arrayOf(alias, *args))
-                          if (routeargs.size == args.size)
-                                  routeargs.last().getCompletList(sender, args)
-                          else listOf()
-                        }
-                      }
-      )
-    }
-  }
-
-  fun routeTreeSearch(args: Array<String>): List<Argument> {
-    val list =
-            mutableListOf<Argument>(
-                    entries.find { it.name == args[0] } ?: throw Exception("Invalid command")
-            )
-    var i = 1
-    while (i + 1 <= args.size) {
-      if (list.last().routes.isEmpty()) break
-      val route = list.last().routes.sortedBy { it.priority }.find { it.name == args[i] } ?: break
-      list.add(route)
-      i += route.unit
-    }
-    return list
-  }
-
-  fun unregister() {
-    val f = Bukkit.getServer().javaClass.getDeclaredField("commandMap")
-    f.isAccessible = true
-    val commandMap = f.get(Bukkit.getServer()) as CommandMap
-    for (route in entries) {
-      commandMap.getCommand(route.name)?.unregister(commandMap)
-    }
-  }
-}
-
-abstract class Argument(
-        val argname: String,
-        vararg routes: Argument,
-        val execute: (CommandSender, Array<String>) -> Unit
-) {
-  val name = argname
-  var routes = routes.toList()
-  var permission: String = ""
-    set(value) {
-      field = value
-      if (value.isEmpty()) return
-      for (route in routes) {
-        route.permission = value + "." + route.name
-      }
-    }
-  var condition: (CommandSender) -> Boolean = { true }
-
-  public fun addArgs(vararg routes: Argument): Argument {
-    this.routes += routes
-    return this
-  }
-
-  abstract var priority: Int
-  open var unit: Int = 1
-  open fun onCommand(sender: CommandSender, args: Array<String>) {
-    execute(sender, args)
-  }
-
-  abstract fun suggest(sender: CommandSender, args: Array<String>): List<String>
-
-  fun getCompletList(sender: CommandSender, args: Array<String>): List<String> {
-    return routes
-            .filter { sender.hasPermission(it.permission) && it.condition(sender) }
-            .map { it.suggest(sender, args) }
-            .flatten()
-  }
-}
-
-class Route(
-        name: String,
-        vararg routes: Argument,
-        execute: (CommandSender, Array<String>) -> Unit
-) : Argument(name, *routes, execute = execute) {
-  override var priority: Int = 2
-
-  override fun suggest(sender: CommandSender, args: Array<String>): List<String> {
-    return if (sender.hasPermission(this.permission) &&
-                    this.condition(sender) &&
-                    this.name.startsWith(args.last())
-    )
-            listOf(this.name)
-    else listOf()
-  }
-}
-
-class Text(name: String, vararg routes: Argument, execute: (CommandSender, Array<String>) -> Unit) :
-        Argument(name, *routes, execute = execute) {
-  override var priority: Int = 0
-
-  override fun suggest(sender: CommandSender, args: Array<String>): List<String> {
-    return listOf(args.last())
-  }
-}
-
-class Integer(
-        name: String,
-        vararg routes: Argument,
-        execute: (CommandSender, Array<String>) -> Unit
-) : Argument(name, *routes, execute = execute) {
-  override var priority: Int = 1
-
-  override fun suggest(sender: CommandSender, args: Array<String>): List<String> {
-    return listOf()
-  }
-}

src/main/kotlin/net/hareworks/simplymcdb/App.kt

@@ -1,7 +1,7 @@
 package net.hareworks.simplymcdb
 
-import net.hareworks.kommandlib.KommandLib
+import net.hareworks.kommand_lib.KommandLib
-import net.hareworks.simplymcdb.command.smcdb
+import net.hareworks.simplymcdb.command.registerCommands
 import net.hareworks.simplymcdb.database.Database
 import org.bukkit.plugin.java.JavaPlugin
 
@@ -30,7 +30,7 @@ public class App : JavaPlugin() {
   override fun onEnable() {
     instance = this
     Config.init()
-    command = KommandLib(this, smcdb)
+    command = registerCommands(this)
 
     server.pluginManager.registerEvents(EventListener, this)
 

src/main/kotlin/net/hareworks/simplymcdb/Command.kt

@@ -1,287 +1,281 @@
 package net.hareworks.simplymcdb.command
 
-import com.github.michaelbull.result.*
+import java.util.UUID
-import net.hareworks.kommandlib.*
+import net.hareworks.kommand_lib.KommandLib
-import net.hareworks.simplymcdb.*
+import net.hareworks.kommand_lib.kommand
+import net.hareworks.simplymcdb.App
+import net.hareworks.simplymcdb.Config
+import net.hareworks.simplymcdb.State
 import net.hareworks.simplymcdb.database.Database
+import net.hareworks.simplymcdb.fetch
+import net.hareworks.simplymcdb.findPlayersNeedingMigration
+import net.hareworks.simplymcdb.isRegistered
+import net.hareworks.simplymcdb.overwritePlayerData
+import net.hareworks.simplymcdb.register
+import net.hareworks.simplymcdb.update
+import net.hareworks.simplymcdb.PlayerSerializer
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.text.minimessage.MiniMessage
 import org.bukkit.entity.Player
+import org.bukkit.plugin.java.JavaPlugin
+
+private val miniMessage = MiniMessage.miniMessage()
+private val commandBuffer = mutableMapOf<UUID, String>()
 
 public fun Audience.sendMM(message: String) {
-  this.sendMessage(MiniMessage.miniMessage().deserialize(message))
+  this.sendMessage(miniMessage.deserialize(message))
 }
 
-val command_buffer = mutableMapOf<java.util.UUID, String>()
+private fun Audience.sendConfigHelp() {
-public val smcdb =
+  sendMM(
-        Route("smcdb") { sender, _ -> sender.sendMessage("simptlymcdb command") }
+      "<red>simplymcdb config help<newline><gray>reload: <green>reload the config from config.yml<newline><gray>fetch: <green>fetch the config from the database<newline><gray>upload: <green>upload the current config to the database")
-                .addArgs(
+}
-                        Route("config") { sender, _ ->
+
-                                  (sender as Player).performCommand("smcdb config help")
+public fun registerCommands(plugin: JavaPlugin): KommandLib =
-                                }
+    kommand(plugin) {
-                                .addArgs(
+      command("smcdb") {
-                                        Route("reload") { sender, _ ->
+        description = "Control Simply-Minecraft-DB"
-                                          sender.sendMessage("reloading config...")
+        permission = "simplydb.command"
-                                          Config.reload()
+
-                                          sender.sendMessage("reloaded.")
+        executes {
-                                        },
+          sender.sendMessage("simplymcdb command")
-                                        Route("fetch") { sender, _ ->
+        }
-                                          sender.sendMessage("fetching config...")
+
-                                        },
+        literal("config") {
-                                        Route("upload") { sender, _ ->
+          requires("simplydb.command.config")
-                                          sender.sendMessage("uploading config...")
+          executes { sender.sendConfigHelp() }
-                                        },
+
-                                        Route("help") { sender, _ ->
+          literal("reload") {
-                                          var help =
+            requires("simplydb.command.config.reload")
-                                                  MiniMessage.miniMessage()
+            executes {
-                                                          .deserialize(
+              sender.sendMessage("reloading config...")
-                                                                  "<red>simplymcdb config help<newline><gray>reload: <green>reload the config from config.yml<newline><gray>fetch: <green>fetch the config from the database<newline><gray>upload: <green>upload the current config to the database"
+              Config.reload()
-                                                          )
+              sender.sendMessage("reloaded.")
-                                          sender.sendMessage(help)
+            }
-                                        }
+          }
-                                ),
+
-                        Route("help") { sender, _ ->
+          literal("fetch") {
-                          sender.sendMM(
+            requires("simplydb.command.config.fetch")
-                                  "<red>simplymcdb help<newline><gray>config: <green>configre the plugin<newline><gray>activate: <green>when the plugin is disabled, activate it<newline><gray>deactivate: <green>when the plugin is enabled, deactivate it"
+            executes { sender.sendMessage("fetching config...") }
-                          )
+          }
-                        },
+
-                        Route("activate") { sender, _ ->
+          literal("upload") {
-                          if (App.instance.enabled == State.ACTIVE) {
+            requires("simplydb.command.config.upload")
-                            sender.sendMessage("simplymcdb is already enabled.")
+            executes { sender.sendMessage("uploading config...") }
-                            return@Route
+          }
-                          }
+
-                          App.instance.enable()
+          literal("help") { executes { sender.sendConfigHelp() } }
-                          sender.sendMessage("simplymcdb enabled.")
+        }
-                        },
+
-                        Route("deactivate") { sender, _ ->
+        literal("help") {
-                          if (App.instance.enabled == State.DISABLED) {
+          executes {
-                            sender.sendMessage("simplymcdb is already disabled.")
+            sender.sendMM(
-                            return@Route
+                "<red>simplymcdb help<newline><gray>config: <green>configre the plugin<newline><gray>activate: <green>when the plugin is disabled, activate it<newline><gray>deactivate: <green>when the plugin is enabled, deactivate it")
-                          }
+          }
-                          App.instance.disable()
+        }
-                          sender.sendMessage("simplymcdb disabled.")
+
-                        },
+        literal("activate") {
-                        Route("database") { _, _ -> }
+          requires("simplydb.command.on")
-                                .addArgs(
+          executes {
-                                        Route("init") { sender, _ ->
+            if (App.instance.enabled == State.ACTIVE) {
-                                          Database.initialize()
+              sender.sendMessage("simplymcdb is already enabled.")
-                                          sender.sendMessage("database initialized.")
+              return@executes
-                                        },
+            }
-                                        Route("reset") { sender, _ ->
+            App.instance.enable()
-                                          Database.reset()
+            sender.sendMessage("simplymcdb enabled.")
-                                          sender.sendMessage("database reset.")
+          }
-                                        },
+        }
-                                ),
+
-                        Route("migrate") { sender, _ ->
+        literal("deactivate") {
-                          if (sender !is Player) {
+          requires("simplydb.command.off")
-                            sender.sendMM("<red>[SMCDB] This command can only be run by players.")
+          executes {
-                            return@Route
+            if (App.instance.enabled == State.DISABLED) {
-                          }
+              sender.sendMessage("simplymcdb is already disabled.")
-                          when (App.instance.enabled) {
+              return@executes
-                            State.DISABLED -> {
+            }
-                              sender.sendMM("<red>[SMCDB] simplymcdb is disabled.")
+            App.instance.disable()
-                              return@Route
+            sender.sendMessage("simplymcdb disabled.")
-                            }
+          }
-                            State.DISCONNECTED -> {
+        }
-                              sender.sendMM("<yellow>[SMCDB] Database disconnected. Try again later.")
+
-                              return@Route
+        literal("database") {
-                            }
+          literal("init") {
-                            else -> {}
+            executes {
-                          }
+              Database.initialize()
-                          if (!isRegistered(sender.uniqueId)) {
+              sender.sendMessage("database initialized.")
-                            sender.sendMM("<red>[SMCDB] You are not registered in the database.")
+            }
-                            return@Route
+          }
-                          }
+          literal("reset") {
-                          try {
+            executes {
-                            sender.sendMM("<gray>[SMCDB] Applying legacy data...")
+              Database.reset()
-                            fetch(sender)
+              sender.sendMessage("database reset.")
-                            update(sender)
+            }
-                            sender.sendMM("<green>[SMCDB] Migration complete. Data updated to the latest format.")
+          }
-                          } catch (e: Exception) {
+        }
-                            App.instance.logger.warning("Failed to migrate data for ${sender.uniqueId}: ${e.message}")
+
-                            sender.sendMM("<red>[SMCDB] Migration failed. Check server logs.")
+        literal("migrate") {
-                          }
+          executes {
-                        }.addArgs(
+            val player = sender as? Player
-                                Route("all") { sender, _ ->
+            if (player == null) {
-                                  if (sender !is Player) {
+              sender.sendMM("<red>[SMCDB] This command can only be run by players.")
-                                    sender.sendMM("<red>[SMCDB] This command can only be run by players.")
+              return@executes
-                                    return@Route
+            }
-                                  }
+            when (App.instance.enabled) {
-                                  when (App.instance.enabled) {
+              State.DISABLED -> {
-                                    State.DISABLED -> {
+                sender.sendMM("<red>[SMCDB] simplymcdb is disabled.")
-                                      sender.sendMM("<red>[SMCDB] simplymcdb is disabled.")
+                return@executes
-                                      return@Route
+              }
-                                    }
+              State.DISCONNECTED -> {
-                                    State.DISCONNECTED -> {
+                sender.sendMM("<yellow>[SMCDB] Database disconnected. Try again later.")
-                                      sender.sendMM(
+                return@executes
-                                              "<yellow>[SMCDB] Database disconnected. Try again later."
+              }
-                                      )
+              else -> {}
-                                      return@Route
+            }
-                                    }
+            if (!isRegistered(player.uniqueId)) {
-                                    else -> {}
+              sender.sendMM("<red>[SMCDB] You are not registered in the database.")
-                                  }
+              return@executes
-                                  val targets = findPlayersNeedingMigration()
+            }
-                                  if (targets.isEmpty()) {
+            try {
-                                    sender.sendMM("<gray>[SMCDB] No legacy data found.")
+              sender.sendMM("<gray>[SMCDB] Applying legacy data...")
-                                    return@Route
+              fetch(player)
-                                  }
+              update(player)
-                                  sender.sendMM(
+              sender.sendMM("<green>[SMCDB] Migration complete. Data updated to the latest format.")
-                                          "<gray>[SMCDB] Migrating ${targets.size} legacy profiles... Please wait."
+            } catch (e: Exception) {
-                                  )
+              App.instance.logger.warning("Failed to migrate data for ${player.uniqueId}: ${e.message}")
-                                  val backup = PlayerSerializer.serialize(sender)
+              sender.sendMM("<red>[SMCDB] Migration failed. Check server logs.")
-                                  var migrated = 0
+            }
-                                  try {
+          }
-                                    targets.forEach { entry ->
+
-                                      try {
+          literal("all") {
-                                        PlayerSerializer.deserialize(sender, entry.serialized)
+            executes {
-                                        val updatedSnapshot = PlayerSerializer.serialize(sender)
+              val executor = sender as? Player
-                                        overwritePlayerData(entry.uuid, updatedSnapshot)
+              if (executor == null) {
-                                        migrated++
+                sender.sendMM("<red>[SMCDB] This command can only be run by players.")
-                                      } catch (ex: Exception) {
+                return@executes
-                                        App.instance.logger.warning(
+              }
-                                                "Failed to migrate data for ${entry.uuid}: ${ex.message}"
+              when (App.instance.enabled) {
-                                        )
+                State.DISABLED -> {
-                                      }
+                  sender.sendMM("<red>[SMCDB] simplymcdb is disabled.")
-                                    }
+                  return@executes
-                                  } finally {
+                }
-                                    try {
+                State.DISCONNECTED -> {
-                                      PlayerSerializer.deserialize(sender, backup)
+                  sender.sendMM("<yellow>[SMCDB] Database disconnected. Try again later.")
-                                    } catch (restoreEx: Exception) {
+                  return@executes
-                                      App.instance.logger.warning(
+                }
-                                              "Failed to restore migration executor state: ${restoreEx.message}"
+                else -> {}
-                                      )
+              }
-                                    }
+              val targets = findPlayersNeedingMigration()
-                                  }
+              if (targets.isEmpty()) {
-                                  sender.sendMM(
+                sender.sendMM("<gray>[SMCDB] No legacy data found.")
-                                          "<green>[SMCDB] Migration finished ($migrated/${targets.size}). Check logs for failures."
+                return@executes
-                                  )
+              }
-                                }
+              sender.sendMM("<gray>[SMCDB] Migrating ${targets.size} legacy profiles... Please wait.")
-                        ),
+              val backup = PlayerSerializer.serialize(executor)
-                        Route("check") { sender, _ ->
+              var migrated = 0
-                          sender.sendMM(
+              try {
-                                  "${when (App.instance.enabled) {
+                targets.forEach { entry ->
-                                              State.ACTIVE -> "<green>●"
+                  try {
-                                              State.DISCONNECTED -> "<yellow>■"
+                    PlayerSerializer.deserialize(executor, entry.serialized)
-                                              State.DISABLED -> "<red>○"
+                    val updatedSnapshot = PlayerSerializer.serialize(executor)
-                                            }}<white> simply-minecraft-database"
+                    overwritePlayerData(entry.uuid, updatedSnapshot)
-                          )
+                    migrated++
-                          sender.sendMM(
+                  } catch (ex: Exception) {
-                                  "status: ${when (App.instance.enabled) {
+                    App.instance.logger.warning("Failed to migrate data for ${entry.uuid}: ${ex.message}")
-                                                          State.ACTIVE -> "<green>active" 
+                  }
-                                                          State.DISCONNECTED -> "<yellow>disconnected"
+                }
-                                                          State.DISABLED -> "<red>disabled"}}"
+              } finally {
-                          )
+                try {
-                          sender.sendMM(
+                  PlayerSerializer.deserialize(executor, backup)
-                                  "<gray>- <white>database test: ${if (Database.ping()) "success" else "failed"}"
+                } catch (restoreEx: Exception) {
-                          )
+                  App.instance.logger.warning("Failed to restore migration executor state: ${restoreEx.message}")
-                          sender.sendMM(
+                }
-                                  "<gray>- <white>config test: ${if (Config.config.getBoolean("enabled")) "enabled" else "disabled"}"
+              }
-                          )
+              sender.sendMM("<green>[SMCDB] Migration finished ($migrated/${targets.size}). Check logs for failures.")
-                        },
+            }
-                        Route("register") { sender, _ ->
+          }
-                          if (sender !is Player) {
+        }
-                            sender.sendMM("This command is only available for players.")
+
-                            return@Route
+        literal("check") {
-                          } else
+          executes {
-                                  when (App.instance.enabled) {
+            val commandSender = sender
-                                    State.DISABLED ->
+            commandSender.sendMM(
-                                            sender.sendMM(
+                "${when (App.instance.enabled) {
-                                                    "<red>[SMCDB] simplymcdb is disabled.<br>Run /smcdb check to check the status."
+                  State.ACTIVE -> "<green>●"
-                                            )
+                  State.DISCONNECTED -> "<yellow>■"
-                                    State.DISCONNECTED ->
+                  State.DISABLED -> "<red>○"
-                                            sender.sendMM(
+                }}<white> simply-minecraft-database")
-                                                    "<red>[SMCDB] simplymcdb is enabled but disconnected.<br>Run /smcdb check to check the status."
+            commandSender.sendMM(
-                                            )
+                "status: ${when (App.instance.enabled) {
-                                    else -> {
+                  State.ACTIVE -> "<green>active"
-                                      if (!isRegistered(sender.uniqueId)) {
+                  State.DISCONNECTED -> "<yellow>disconnected"
-                                        sender.sendMM(
+                  State.DISABLED -> "<red>disabled"
-                                                "<gray>[SMCDB] <red>The inventory of the other servers will be overwritten.<newline>" +
+                }}")
-                                                        "Are you sure you want to register?<newline>" +
+            commandSender.sendMM(
-                                                        "<green>/smcdb confirm<gray> to confirm."
+                "<gray>- <white>config test: ${if (Config.config.getBoolean("enabled")) "enabled" else "disabled"}")
-                                        )
+            commandSender.sendMM("<gray>- <white>database test: <yellow>checking...")
-                                      } else {
+
-                                        sender.sendMM("<gray>[SMCDB] You are already registered.")
+            // Run the potentially slow ping off the main thread to avoid freezing the server thread.
-                                      }
+            App.instance.server.scheduler.runTaskAsynchronously(App.instance, Runnable {
-                                    }
+              val pingSuccess = try {
-                                  }
+                Database.ping()
-                        },
+              } catch (ex: Exception) {
-                        Route("confirm") { sender, _ ->
+                App.instance.logger.warning("Database ping failed: ${ex.message}")
-                          if (sender !is Player) return@Route
+                false
-                          when (command_buffer[sender.uniqueId]) {
+              }
-                            "register" -> {
+              App.instance.server.scheduler.runTask(App.instance, Runnable {
-                              if (App.instance.enabled == State.ACTIVE) {
+                commandSender.sendMM(
-                                register(sender)
+                    "<gray>- <white>database test result: ${if (pingSuccess) "success" else "failed"}")
-                                sender.sendMM("<gray>[SMCDB] Successfully registered.")
+              })
-                              } else {
+            })
-                                sender.sendMM("<red>[SMCDB] simplymcdb is disabled.")
+          }
-                              }
+        }
-                            }
+
-                            else -> {
+        literal("register") {
-                              sender.sendMM("<red>[SMCDB] Invalid command.")
+          executes {
-                            }
+            val player = sender as? Player
-                          }
+            if (player == null) {
-                          command_buffer.remove(sender.uniqueId)
+              sender.sendMM("This command is only available for players.")
-                        }
+              return@executes
-                        // Route("update") { sender, _ ->
+            }
-                        //   if (sender !is Player) {
+            when (App.instance.enabled) {
-                        //     sender.sendMM("This command is only available for players.")
+              State.DISABLED -> {
-                        //     return@Route
+                sender.sendMM("<red>[SMCDB] simplymcdb is disabled.<br>Run /smcdb check to check the status.")
-                        //   } else
+                return@executes
-                        //           when (App.instance.enabled) {
+              }
-                        //             State.DISABLED ->
+              State.DISCONNECTED -> {
-                        //                     sender.sendMM(
+                sender.sendMM("<red>[SMCDB] simplymcdb is enabled but disconnected.<br>Run /smcdb check to check the status.")
-                        //                             "<red>[SMCDB] simplymcdb is disabled.<br>Run
+                return@executes
-                        // /smcdb check to check the status."
+              }
-                        //                     )
+              else -> {}
-                        //             State.DISCONNECTED ->
+            }
-                        //                     sender.sendMM(
+            if (!isRegistered(player.uniqueId)) {
-                        //                             "<red>[SMCDB] simplymcdb is enabled but
+              sender.sendMM(
-                        // disconnected.<br>Run /smcdb check to check the status."
+                  "<gray>[SMCDB] <red>The inventory of the other servers will be overwritten.<newline>" +
-                        //                     )
+                      "Are you sure you want to register?<newline>" +
-                        //             else -> {
+                      "<green>/smcdb confirm<gray> to confirm.")
-                        //               if (isRegistered(sender.uniqueId)) {
+              commandBuffer[player.uniqueId] = "register"
-                        //                 update(sender)
+            } else {
-                        //                 sender.sendMM("<gray>[SMCDB] Successfully updated.")
+              sender.sendMM("<gray>[SMCDB] You are already registered.")
-                        //               } else {
+            }
-                        //                 sender.sendMM("<red>[SMCDB] You are not registered.")
+          }
-                        //               }
+        }
-                        //             }
+
-                        //           }
+        literal("confirm") {
-                        // },
+          executes {
-                        // Route("fetch") { sender, _ ->
+            val player = sender as? Player ?: return@executes
-                        //   if (sender !is Player) {
+            when (commandBuffer[player.uniqueId]) {
-                        //     sender.sendMM("This command is only available for players.")
+              "register" -> {
-                        //     return@Route
+                if (App.instance.enabled == State.ACTIVE) {
-                        //   } else
+                  register(player)
-                        //           when (App.instance.enabled) {
+                  sender.sendMM("<gray>[SMCDB] Successfully registered.")
-                        //             State.DISABLED ->
+                } else {
-                        //                     sender.sendMM(
+                  sender.sendMM("<red>[SMCDB] simplymcdb is disabled.")
-                        //                             "<red>[SMCDB] simplymcdb is disabled.<br>Run
+                }
-                        // /smcdb check to check the status."
+              }
-                        //                     )
+              else -> sender.sendMM("<red>[SMCDB] Invalid command.")
-                        //             State.DISCONNECTED ->
+            }
-                        //                     sender.sendMM(
+            commandBuffer.remove(player.uniqueId)
-                        //                             "<red>[SMCDB] simplymcdb is enabled but
+          }
-                        // disconnected.<br>Run /smcdb check to check the status."
+        }
-                        //                     )
+      }
-                        //             else -> {
+    }
-                        //               if (isRegistered(sender.uniqueId)) {
-                        //                 sender.sendMM(
-                        //                         "<gray>[SMCDB] Welcome back,
-                        // ${sender.name}.<newline>Fetching your data..."
-                        //                 )
-                        //                 fetch(sender)
-                        //               } else {
-                        //                 sender.sendMM(
-                        //                         "<gray>[SMCDB] Welcome, ${sender.name}.<newline>"
-                        // +
-                        //                                 "SMCDB is active but you have already
-                        // played before.<newline>" +
-                        //                                 "Run <green>/smcdb register<gray> to
-                        // register yourself."
-                        //                 )
-                        //               }
-                        //             }
-                        //           }
-                        // },
-                        )