refactor

Aliorpse · Aliorpse · commit 111dcd9a5608 · 2025-07-20T22:10:24.000+08:00
diff --git a/README.md b/README.md
@@ -31,16 +31,16 @@ dependencies {
 ```kotlin
 fun main() = runBlocking {
     var status
-    status = JavaPing.getStatus("mc.hypixel.net")
-    status = JavaPing.getStatus(
+    status = JavaServer.getStatus("mc.hypixel.net")
+    status = JavaServer.getStatus(
         host = "wdsj.net",
         port = 25565,
         enableSrv = true
     )
-    status = BedrockPing.getStatus("play.easecation.net")
+    status = BedrockServer.getStatus("play.easecation.net")
     
     var playerInfo
-    playerInfo = MojangAPI.getProfile("ec042e1200ac4a249cc83eb1fab0bd88")
-    playerInfo = MojangAPI.getProfileByName("Aliorpse")
+    playerInfo = Player.getProfile("ec042e1200ac4a249cc83eb1fab0bd88")
+    playerInfo = Player.getProfileByName("Aliorpse")
 }
 ```
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/player/PlayerProfile.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/player/PlayerProfile.kt
@@ -1,4 +1,4 @@
-package tech.aliorpse.mcutils.model.mojang
+package tech.aliorpse.mcutils.model.player
 
 import com.squareup.moshi.JsonClass
 
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/player/PlayerProfileAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/player/PlayerProfileAdapter.kt
@@ -1,4 +1,4 @@
-package tech.aliorpse.mcutils.model.mojang
+package tech.aliorpse.mcutils.model.player
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.Moshi
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/player/PlayerUUIDProfile.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/player/PlayerUUIDProfile.kt
@@ -1,4 +1,4 @@
-package tech.aliorpse.mcutils.model.mojang
+package tech.aliorpse.mcutils.model.player
 
 /**
  * This data class should not be used in your app. Only for internal use.
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/server/Color.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/server/Color.kt
@@ -1,4 +1,4 @@
-package tech.aliorpse.mcutils.model.status
+package tech.aliorpse.mcutils.model.server
 
 /**
  * Represents a color in Minecraft.
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/server/ColorAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/server/ColorAdapter.kt
@@ -1,14 +1,16 @@
-package tech.aliorpse.mcutils.model.status
+package tech.aliorpse.mcutils.model.server
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
-import tech.aliorpse.mcutils.model.status.Color.Custom
-import tech.aliorpse.mcutils.model.status.Color.Named
-import tech.aliorpse.mcutils.module.status.JavaPing.moshi
-
+import tech.aliorpse.mcutils.model.server.Color.Custom
+import tech.aliorpse.mcutils.model.server.Color.Named
+import tech.aliorpse.mcutils.modules.server.JavaServer.moshi
 
+/**
+ * § codes or Hex strings Adapter.
+ */
 class ColorAdapter {
     private val defaultAdapter by lazy { moshi.adapter(Color::class.java) }
 
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/server/DescriptionAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/server/DescriptionAdapter.kt
@@ -1,13 +1,16 @@
-package tech.aliorpse.mcutils.model.status
+package tech.aliorpse.mcutils.model.server
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
-import tech.aliorpse.mcutils.module.status.JavaPing.moshi
-import tech.aliorpse.mcutils.util.MOTDParser.objToSection
-import tech.aliorpse.mcutils.util.MOTDParser.sectionToObj
+import tech.aliorpse.mcutils.modules.server.JavaServer.moshi
+import tech.aliorpse.mcutils.utils.MOTDParser.objToSection
+import tech.aliorpse.mcutils.utils.MOTDParser.sectionToObj
 
+/**
+ * Adapt different kinds of Description server sent. String or TextComponent.
+ */
 class DescriptionAdapter(
     private val motdAdapter: MOTDTextComponentAdapter
 ) {
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/server/MOTDTextComponentAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/server/MOTDTextComponentAdapter.kt
@@ -1,11 +1,14 @@
-package tech.aliorpse.mcutils.model.status
+package tech.aliorpse.mcutils.model.server
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
-import tech.aliorpse.mcutils.module.status.JavaPing.moshi
+import tech.aliorpse.mcutils.modules.server.JavaServer.moshi
 
+/**
+ * 有些傻逼服务器喜欢往 [MOTDTextComponent.text] 里面加§. mcutils不支持这种写法. §不会做处理.
+ */
 class MOTDTextComponentAdapter(
     private val colorAdapter: ColorAdapter
 ) {
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/server/ServerStatus.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/server/ServerStatus.kt
@@ -1,4 +1,4 @@
-package tech.aliorpse.mcutils.model.status
+package tech.aliorpse.mcutils.model.server
 
 import com.squareup.moshi.JsonClass
 
@@ -104,7 +104,7 @@ data class Sample(
 )
 
 /**
- * Represents the various game modes. For [tech.aliorpse.mcutils.module.status.BedrockPing.getStatus].
+ * Represents the various game modes. For [tech.aliorpse.mcutils.modules.server.BedrockServer.getStatus].
  */
 enum class GameMode {
     SURVIVAL,
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/module/mojang/MojangClient.kt b/src/main/kotlin/tech/aliorpse/mcutils/module/mojang/MojangClient.kt
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/modules/player/Player.kt b/src/main/kotlin/tech/aliorpse/mcutils/modules/player/Player.kt
@@ -1,19 +1,16 @@
-package tech.aliorpse.mcutils.module.mojang
+package tech.aliorpse.mcutils.modules.player
 
-import tech.aliorpse.mcutils.model.mojang.PlayerProfile
+import tech.aliorpse.mcutils.model.player.PlayerProfile
 
-/**
- * A utility object for interacting with the Mojang API to retrieve player profile data.
- */
-object MojangAPI {
+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.
      */
     suspend fun getProfile(uuid: String): PlayerProfile =
-        MojangClient.sessionService.getProfile(uuid)
+        PlayerClient.sessionService.getProfile(uuid)
 
     /**
      * Another version of [getProfile].
@@ -22,7 +19,7 @@ object MojangAPI {
      * @return `PlayerProfile` containing detailed player information including id, name, skin, cape, and model type.
      */
     suspend fun getProfileByName(username: String): PlayerProfile {
-        val uuid = MojangClient.profileService.getUUID(username).id
-        return MojangClient.sessionService.getProfile(uuid)
+        val uuid = PlayerClient.profileService.getUUID(username).id
+        return PlayerClient.sessionService.getProfile(uuid)
     }
 }
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/modules/player/PlayerClient.kt b/src/main/kotlin/tech/aliorpse/mcutils/modules/player/PlayerClient.kt
@@ -0,0 +1,32 @@
+package tech.aliorpse.mcutils.modules.player
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import tech.aliorpse.mcutils.model.player.PlayerProfileAdapter
+
+internal object PlayerClient {
+    private val moshi = Moshi.Builder()
+        .add(PlayerProfileAdapter())
+        .add(KotlinJsonAdapterFactory())
+        .build()
+
+    private val moshiFactory = MoshiConverterFactory.create(moshi)
+
+    val profileService: PlayerService by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://api.mojang.com/")
+            .addConverterFactory(moshiFactory)
+            .build()
+            .create(PlayerService::class.java)
+    }
+
+    val sessionService: PlayerService by lazy {
+        Retrofit.Builder()
+            .baseUrl("https://sessionserver.mojang.com/")
+            .addConverterFactory(moshiFactory)
+            .build()
+            .create(PlayerService::class.java)
+    }
+}
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/modules/player/PlayerService.kt b/src/main/kotlin/tech/aliorpse/mcutils/modules/player/PlayerService.kt
@@ -1,14 +1,11 @@
-package tech.aliorpse.mcutils.module.mojang
+package tech.aliorpse.mcutils.modules.player
 
 import retrofit2.http.GET
 import retrofit2.http.Path
-import tech.aliorpse.mcutils.model.mojang.PlayerProfile
-import tech.aliorpse.mcutils.model.mojang.PlayerUUIDProfile
+import tech.aliorpse.mcutils.model.player.PlayerProfile
+import tech.aliorpse.mcutils.model.player.PlayerUUIDProfile
 
-/**
- * Defines the MojangService interface for interacting with Mojang's web APIs.
- */
-interface MojangService {
+interface PlayerService {
     /**
      * Retrieves the player's profile from the Mojang session server using their UUID.
      *
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/modules/server/BedrockServer.kt b/src/main/kotlin/tech/aliorpse/mcutils/modules/server/BedrockServer.kt
@@ -1,14 +1,14 @@
-package tech.aliorpse.mcutils.module.status
+package tech.aliorpse.mcutils.modules.server
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import tech.aliorpse.mcutils.model.status.BedrockServerStatus
-import tech.aliorpse.mcutils.model.status.Description
-import tech.aliorpse.mcutils.model.status.GameMode
-import tech.aliorpse.mcutils.model.status.Players
-import tech.aliorpse.mcutils.model.status.Version
-import tech.aliorpse.mcutils.util.MOTDParser.sectionToObj
+import tech.aliorpse.mcutils.model.server.BedrockServerStatus
+import tech.aliorpse.mcutils.model.server.Description
+import tech.aliorpse.mcutils.model.server.GameMode
+import tech.aliorpse.mcutils.model.server.Players
+import tech.aliorpse.mcutils.model.server.Version
+import tech.aliorpse.mcutils.utils.MOTDParser.sectionToObj
 import java.io.IOException
 import java.net.DatagramPacket
 import java.net.DatagramSocket
@@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets
  * Provides functionality to fetch and parse the status of a Bedrock Minecraft server.
  */
 @Suppress("MagicNumber")
-object BedrockPing {
+object BedrockServer {
     private val MAGIC_BYTES = byteArrayOf(
         0x00, 0xFF.toByte(), 0xFF.toByte(), 0x00,
         0xFE.toByte(), 0xFE.toByte(), 0xFE.toByte(), 0xFE.toByte(),
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/modules/server/JavaServer.kt b/src/main/kotlin/tech/aliorpse/mcutils/modules/server/JavaServer.kt
@@ -1,18 +1,18 @@
-package tech.aliorpse.mcutils.module.status
+package tech.aliorpse.mcutils.modules.server
 
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import tech.aliorpse.mcutils.model.status.ColorAdapter
-import tech.aliorpse.mcutils.model.status.Description
-import tech.aliorpse.mcutils.model.status.DescriptionAdapter
-import tech.aliorpse.mcutils.model.status.JavaServerStatus
-import tech.aliorpse.mcutils.model.status.MOTDTextComponentAdapter
-import tech.aliorpse.mcutils.model.status.Players
-import tech.aliorpse.mcutils.model.status.Version
+import tech.aliorpse.mcutils.model.server.ColorAdapter
+import tech.aliorpse.mcutils.model.server.Description
+import tech.aliorpse.mcutils.model.server.DescriptionAdapter
+import tech.aliorpse.mcutils.model.server.JavaServerStatus
+import tech.aliorpse.mcutils.model.server.MOTDTextComponentAdapter
+import tech.aliorpse.mcutils.model.server.Players
+import tech.aliorpse.mcutils.model.server.Version
 import java.io.ByteArrayOutputStream
 import java.io.DataInputStream
 import java.io.DataOutputStream
@@ -35,7 +35,7 @@ import javax.naming.directory.InitialDirContext
  * packet construction and parsing.
  */
 @Suppress("MagicNumber", "TooManyFunctions")
-object JavaPing {
+object JavaServer {
     private const val HANDSHAKE_PACKET_ID = 0x00
     private const val STATUS_REQUEST_PACKET_ID = 0x00
     private const val STATUS_RESPONSE_PACKET_ID = 0x00
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/utils/MOTDParser.kt b/src/main/kotlin/tech/aliorpse/mcutils/utils/MOTDParser.kt
@@ -1,8 +1,8 @@
-package tech.aliorpse.mcutils.util
+package tech.aliorpse.mcutils.utils
 
-import tech.aliorpse.mcutils.model.status.Color
-import tech.aliorpse.mcutils.model.status.MOTDTextComponent
-import tech.aliorpse.mcutils.model.status.colorToOriginalCode
+import tech.aliorpse.mcutils.model.server.Color
+import tech.aliorpse.mcutils.model.server.MOTDTextComponent
+import tech.aliorpse.mcutils.model.server.colorToOriginalCode
 
 /**
  * Utility functions for MOTD analyzing.
diff --git a/src/test/kotlin/tech/aliorpse/mcutils/player/PlayerProfileTest.kt b/src/test/kotlin/tech/aliorpse/mcutils/player/PlayerProfileTest.kt
@@ -1,16 +1,16 @@
-package tech.aliorpse.mcutils.mojang
+package tech.aliorpse.mcutils.player
 
 import kotlinx.coroutines.runBlocking
-import tech.aliorpse.mcutils.module.mojang.MojangAPI
+import tech.aliorpse.mcutils.modules.player.Player
 import kotlin.test.Test
 
-class MojangAPITest {
+class PlayerProfileTest {
     /**
      * Simple test for getting player's profile.
      */
     @Test
     fun getProfileTest() = runBlocking {
-        val result = MojangAPI.getProfileByName("Aliorpse")
+        val result = Player.getProfileByName("Aliorpse")
         println(result)
         assert(result.name.isNotEmpty())
     }
diff --git a/src/test/kotlin/tech/aliorpse/mcutils/server/ServerStatusTest.kt b/src/test/kotlin/tech/aliorpse/mcutils/server/ServerStatusTest.kt
@@ -0,0 +1,22 @@
+package tech.aliorpse.mcutils.server
+
+import tech.aliorpse.mcutils.modules.server.BedrockServer
+import tech.aliorpse.mcutils.modules.server.JavaServer
+import kotlin.test.Test
+
+class ServerStatusTest {
+    @Test
+    fun javaGetStatusTest() {
+        val result = JavaServer.getStatusBlocking("bedrock.mineseed.org")
+
+        println(result)
+        assert(result.ping > 0)
+    }
+
+    @Test
+    fun bedrockGetStatusTest() {
+        val result = BedrockServer.getStatusBlocking("asia.easecation.net")
+        println(result)
+        assert(result.ping > 0)
+    }
+}
diff --git a/src/test/kotlin/tech/aliorpse/mcutils/status/ServerPingTest.kt b/src/test/kotlin/tech/aliorpse/mcutils/status/ServerPingTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tech.aliorpse.mcutils.model.mojang`
	`1`	`+package tech.aliorpse.mcutils.model.player`
`2`	`2`
`3`	`3`	`import com.squareup.moshi.JsonClass`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package tech.aliorpse.mcutils.model.status`
	`1`	`+package tech.aliorpse.mcutils.model.server`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Represents a color in Minecraft.`