automatically distinguish between UUID and name

Author: Aliorpse

README.md

@@ -18,7 +18,7 @@ dependencies {
 
 ### Server Status
 
-#### [Demo API Endpoint](https://api.aliorpse.tech/minecraft/server/status/java/hypixel.net)
+#### [Demo API Endpoint](https://api.aliorpse.tech/minecraft/server/status/hypixel.net:25565?type=java)
 
 ```kotlin
 runBlocking {
@@ -41,13 +41,14 @@ runBlocking {
 
 ### Player Profile (Java Edition Only)
 
-#### [Demo API Endpoint](https://api.aliorpse.tech/minecraft/player/profile/name/Aliorpse)
+#### [Demo API Endpoint](https://api.aliorpse.tech/minecraft/player/profile/Aliorpse)
 
 ```kotlin
 runBlocking {
     var pl
-    pl = Player.getProfile("Aliorpse", Player.IDType.NAME)
-    pl = Player.getProfile("ec042e1200ac4a249cc83eb1fab0bd88", Player.IDType.UUID)
+    pl = Player.getProfile("Aliorpse")
+    pl = Player.getProfile("ec042e1200ac4a249cc83eb1fab0bd88")
+    pl = Player.getProfile("ec042e12-00ac-4a24-9cc8-3eb1fab0bd88")
 
     println(pl)
 }

src/main/kotlin/tech/aliorpse/mcutils/model/server/MOTDTextComponentAdapter.kt

@@ -7,7 +7,7 @@ import com.squareup.moshi.ToJson
 import tech.aliorpse.mcutils.modules.server.JavaServer.moshi
 
 /**
- * 有些傻逼服务器喜欢往 [MOTDTextComponent.text] 里面加§. mcutils不支持这种写法. §不会做处理.
+ * 有些傻逼服务器喜欢往 [MOTDTextComponent.text] 里面加§. mcutils不支持这种写法. 这里的§不会做处理.
  */
 internal class MOTDTextComponentAdapter(
     private val colorAdapter: ColorAdapter

src/main/kotlin/tech/aliorpse/mcutils/modules/player/Player.kt

@@ -4,35 +4,42 @@ import kotlinx.coroutines.runBlocking
 import tech.aliorpse.mcutils.model.player.PlayerProfile
 
 object Player {
-    /**
-     * UUID or NAME.
-     */
-    enum class IDType {
-        UUID, NAME
-    }
+    const val UUID_LENGTH = 32
+    val nameRegex = Regex("^[A-Za-z0-9_]{3,16}$")
 
     /**
-     * Retrieves the player's profile from the Mojang session server.
+     * Fetches a player's profile from Mojang's session server.
+     *
+     * The input can be either:
+     * - A UUID (with or without dashes, 32–36 characters), or
+     * - A valid Minecraft username (3–16 characters, letters, digits, and underscores).
      *
-     * @param id Either UUID or name.
-     * @return `PlayerProfile` containing detailed player information including id, name, skin, cape, and model type.
+     * @param player The player's UUID or username.
+     * @return A [PlayerProfile] containing the player's UUID, username, skin, cape, and model type.
+     * @throws IllegalArgumentException if the input is neither a valid UUID nor a valid username.
      */
-    suspend fun getProfile(id: String, type: IDType): PlayerProfile {
-        return when (type) {
-            IDType.UUID -> PlayerClient.sessionService.getProfile(id)
+    suspend fun getProfile(player: String): PlayerProfile {
+        val pl = player.replace("-", "")
 
-            IDType.NAME -> {
-                val id = PlayerClient.profileService.getUUID(id).id
-                PlayerClient.sessionService.getProfile(id)
+        return when {
+            pl.length == UUID_LENGTH -> {
+                PlayerClient.profileService.getProfile(pl)
             }
+
+            nameRegex.matches(pl) -> {
+                val uuid = PlayerClient.sessionService.getUUID(pl).id
+                PlayerClient.sessionService.getProfile(uuid)
+            }
+
+            else -> throw IllegalArgumentException("Invalid identifier: $pl")
         }
     }
 
     /**
      * Blocking method of [getProfile].
      */
     @JvmStatic
-    fun getProfileBlocking(id: String, type: IDType): PlayerProfile = runBlocking {
-        getProfile(id, type)
+    fun getProfileBlocking(player: String): PlayerProfile = runBlocking {
+        getProfile(player)
     }
 }