readme

Author: Aliorpse

README.md

@@ -22,11 +22,15 @@ dependencies {
 runBlocking {
     var status
     status = JavaServer.getStatus("mc.hypixel.net")
+    
+    // More options
     status = JavaServer.getStatus(
         host = "wdsj.net",
         port = 25565,
         enableSrv = true
     )
+    
+    // Bedrock servers
     status = BedrockServer.getStatus("play.easecation.net")
 
     println(status)
@@ -38,16 +42,16 @@ runBlocking {
 ```kotlin
 runBlocking {
     var pl
-    pl = Player.getProfileByName("Aliorpse")
-    pl = Player.getProfile("ec042e1200ac4a249cc83eb1fab0bd88")
+    pl = Player.getProfile("Aliorpse", Player.IDType.NAME)
+    pl = Player.getProfile("ec042e1200ac4a249cc83eb1fab0bd88", Player.IDType.UUID)
 
     println(pl)
 }
 ```
 
 ## Java Usage
 
-All asynchronous methods also provide a blocking variant (running on `Dispatchers.IO`),  
+All asynchronous methods also provide a blocking variant,  
 allowing you to call them directly from Java without dealing with coroutines.
 
 ```java

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

@@ -1,43 +1,38 @@
 package tech.aliorpse.mcutils.modules.player
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import tech.aliorpse.mcutils.model.player.PlayerProfile
 
 object Player {
     /**
-     * Retrieves the player's profile from the Mojang session server based on the provided UUID.
-     *
-     * @param uuid The player's uuid.
-     * @return `PlayerProfile` containing detailed player information including id, name, skin, cape, and model type.
+     * UUID or NAME.
      */
-    suspend fun getProfile(uuid: String): PlayerProfile =
-        PlayerClient.sessionService.getProfile(uuid)
-
-    /**
-     * Blocking method of [getProfile].
-     */
-    @JvmStatic
-    fun getProfileBlocking(uuid: String): PlayerProfile = runBlocking(Dispatchers.IO) {
-        PlayerClient.sessionService.getProfile(uuid)
+    enum class IDType {
+        UUID, NAME
     }
 
     /**
-     * Another version of [getProfile].
+     * Retrieves the player's profile from the Mojang session server.
      *
-     * @param username The player's username.
+     * @param id Either UUID or name.
      * @return `PlayerProfile` containing detailed player information including id, name, skin, cape, and model type.
      */
-    suspend fun getProfileByName(username: String): PlayerProfile {
-        val uuid = PlayerClient.profileService.getUUID(username).id
-        return PlayerClient.sessionService.getProfile(uuid)
+    suspend fun getProfile(id: String, type: IDType): PlayerProfile {
+        return when (type) {
+            IDType.UUID -> PlayerClient.sessionService.getProfile(id)
+
+            IDType.NAME -> {
+                val id = PlayerClient.profileService.getUUID(id).id
+                PlayerClient.sessionService.getProfile(id)
+            }
+        }
     }
 
     /**
-     * Blocking method of [getProfileByName]
+     * Blocking method of [getProfile].
      */
     @JvmStatic
-    fun getProfileByNameBlocking(username: String): PlayerProfile = runBlocking(Dispatchers.IO) {
-        getProfileByName(username)
+    fun getProfileBlocking(id: String, type: IDType): PlayerProfile = runBlocking {
+        getProfile(id, type)
     }
 }

src/main/kotlin/tech/aliorpse/mcutils/modules/server/BedrockServer.kt

@@ -117,7 +117,7 @@ object BedrockServer {
         host: String,
         port: Int = 19132,
         timeout: Int = 2000
-    ) = runBlocking(Dispatchers.IO) {
+    ) = runBlocking {
         getStatus(host, port, timeout)
     }
 }

src/main/kotlin/tech/aliorpse/mcutils/modules/server/JavaServer.kt

@@ -31,13 +31,6 @@ import java.nio.charset.StandardCharsets
 
 /**
  * Provides functionality to fetch and parse the status of a Java Minecraft server.
- *
- * The object supports asynchronous and blocking methods to retrieve server details such as
- * server description, version, players, and ping latency. It also includes support for SRV record
- * resolution and Unicode domains.
- *
- * Internal constants and helper methods handle Minecraft's communication protocol, including
- * packet construction and parsing.
  */
 @Suppress("MagicNumber", "TooManyFunctions")
 object JavaServer {
@@ -52,7 +45,7 @@ object JavaServer {
     private val motdAdapter = MOTDTextComponentAdapter(colorAdapter)
     private val descAdapter = DescriptionAdapter(motdAdapter)
 
-    val moshi: Moshi = Moshi.Builder()
+    internal val moshi: Moshi = Moshi.Builder()
         .add(colorAdapter)
         .add(motdAdapter)
         .add(descAdapter)
@@ -74,23 +67,17 @@ object JavaServer {
      * @param host Host
      * @param port Port (25565)
      * @param timeout Timeout (2000ms)
-     * @param enableSrv Srv (true)
      *
      * @throws IOException
      */
     suspend fun getStatus(
         host: String,
         port: Int = 25565,
         timeout: Int = 2000,
-        enableSrv: Boolean = true
     ): JavaServerStatus = withContext(Dispatchers.IO) {
         val asciiHost = IDN.toASCII(host)
 
-        val (srvTarget, srvPort) = if (enableSrv) {
-            resolveSrvRecord(asciiHost) ?: (asciiHost to port)
-        } else {
-            asciiHost to port
-        }
+        val (srvTarget, srvPort) = resolveSrvRecord(asciiHost) ?: (asciiHost to port)
 
         val resolvedHost = resolveToIpOrHost(srvTarget) ?: srvTarget
 
@@ -136,9 +123,8 @@ object JavaServer {
         host: String,
         port: Int = 25565,
         timeout: Int = 2000,
-        enableSrv: Boolean = true
-    ) = runBlocking(Dispatchers.IO) {
-        getStatus(host, port, timeout, enableSrv)
+    ) = runBlocking {
+        getStatus(host, port, timeout)
     }
 
     @Suppress("ReturnCount")

src/test/kotlin/tech/aliorpse/mcutils/player/PlayerProfileTest.kt

@@ -9,7 +9,7 @@ class PlayerProfileTest {
      */
     @Test
     fun getProfileTest() {
-        val result = Player.getProfileByNameBlocking("Aliorpse")
+        val result = Player.getProfileBlocking("Aliorpse", Player.IDType.NAME)
         println(result)
         assert(result.name.isNotEmpty())
     }