Login into server complete

libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/mc_primitives.kt

@@ -1,54 +0,0 @@
-/*
- * Copyright © 2026 RTAkland
- * Author: RTAkland
- * Date: 2026/9/3
- */
-
-package cn.rtast.libmc.mcping.java
-
-import cn.rtast.libmc.common.PacketCodec
-import cn.rtast.libmc.common._Buffer
-
-internal object VarIntCodec : PacketCodec<Int> {
-    override fun encode(buffer: _Buffer, value: Int) {
-        var v = value
-        while (true) {
-            if ((v and 0x7F.inv()) == 0) {
-                buffer.writeByte(v.toByte())
-                return
-            }
-            buffer.writeByte(((v and 0x7F) or 0x80).toByte())
-            v = v ushr 7
-        }
-    }
-
-    override fun decode(buffer: _Buffer): Int {
-        var value = 0
-        var position = 0
-        while (true) {
-            val currentByte = buffer.readByte().toInt() and 0xFF
-            value = value or ((currentByte and 0x7F) shl position)
-            if ((currentByte and 0x80) == 0) break
-            position += 7
-            if (position >= 35) throw IllegalArgumentException("VarInt too long")
-        }
-        return value
-    }
-}
-
-internal object McStringCodec : PacketCodec<String> {
-    override fun encode(buffer: _Buffer, value: String) {
-        val bytes = value.encodeToByteArray()
-        VarIntCodec.encode(buffer, bytes.size)
-        buffer.writeBytes(bytes)
-    }
-
-    override fun decode(buffer: _Buffer): String {
-        val length = VarIntCodec.decode(buffer)
-        val bytes = buffer.readBytes(length)
-        return bytes.decodeToString()
-    }
-}
-
-internal fun _Buffer.writeVarInt(value: Int) = VarIntCodec.encode(this, value)
-internal fun _Buffer.readVarInt(): Int = VarIntCodec.decode(this)

libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet.kt

@@ -7,15 +7,10 @@
 
 package cn.rtast.libmc.mcping.java
 
-import cn.rtast.libmc.common.PacketCodec
-import cn.rtast.libmc.common._Buffer
-
-internal interface MinecraftPacket {
-    val packetId: Int
-}
+import cn.rtast.libmc.common.*
 
 // ref https://minecraft.wiki/w/Java_Edition_protocol/Packets#Handshake
-internal data class HandshakePacket(
+public data class HandshakePacket(
     val protocolVersion: Int,
     val serverAddress: String,
     val serverPort: UShort,
@@ -24,7 +19,7 @@ internal data class HandshakePacket(
 ) : MinecraftPacket {
     override val packetId: Int = 0x00
 
-    companion object Codec : PacketCodec<HandshakePacket> {
+    public companion object Codec : PacketCodec<HandshakePacket> {
         override fun encode(buffer: _Buffer, value: HandshakePacket) {
             VarIntCodec.encode(buffer, value.protocolVersion)
             McStringCodec.encode(buffer, value.serverAddress)
@@ -37,17 +32,17 @@ internal data class HandshakePacket(
 }
 
 // ref https://minecraft.wiki/w/Java_Edition_protocol/Packets#Status
-internal data object StatusRequestPacket : MinecraftPacket, PacketCodec<StatusRequestPacket> {
+public data object StatusRequestPacket : MinecraftPacket, PacketCodec<StatusRequestPacket> {
     override val packetId: Int = 0x00
 
     override fun encode(buffer: _Buffer, value: StatusRequestPacket) {}
     override fun decode(buffer: _Buffer): StatusRequestPacket = throw UnsupportedOperationException()
 }
 
-internal data class PingPacket(val currentTime: Long) : MinecraftPacket {
+public data class PingPacket(val currentTime: Long) : MinecraftPacket {
     override val packetId: Int = 0x01
 
-    companion object : PacketCodec<PingPacket> {
+    public companion object : PacketCodec<PingPacket> {
         override fun encode(buffer: _Buffer, value: PingPacket) {
             buffer.writeLong(value.currentTime)
         }

libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet_writer.kt

@@ -1,27 +0,0 @@
-/*
- * Copyright © 2026 RTAkland
- * Author: RTAkland
- * Date: 2026/9/3
- */
-
-
-package cn.rtast.libmc.mcping.java
-
-import cn.rtast.libmc.common.PacketCodec
-import cn.rtast.libmc.common._Buffer
-import cn.rtast.libmc.common._WriteChannel
-import cn.rtast.libmc.common.write
-import cn.rtast.libmc.common.writeBuffer
-
-
-internal fun <T : MinecraftPacket> _WriteChannel.sendPacket(packet: T, codec: PacketCodec<T>) {
-    val bodyBuffer = _Buffer()
-    bodyBuffer.write(packet.packetId, VarIntCodec)
-    codec.encode(bodyBuffer, packet)
-    val frameBuffer = _Buffer()
-    frameBuffer.write(bodyBuffer.size, VarIntCodec)
-    frameBuffer.writeBuffer(bodyBuffer)
-    val bytes = frameBuffer.toByteArray()
-    this.writeFully(bytes, 0, bytes.size)
-    this.flush()
-}

libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/ping_java.kt

@@ -7,10 +7,7 @@
 
 package cn.rtast.libmc.mcping.java
 
-import cn.rtast.libmc.common.LibMCContext
-import cn.rtast.libmc.common._Buffer
-import cn.rtast.libmc.common._ReadChannel
-import cn.rtast.libmc.common._Socket
+import cn.rtast.libmc.common.*
 import cn.rtast.libmc.mcping.PingResponse
 import kotlin.time.Clock
 
@@ -50,22 +47,4 @@ internal fun pingJavaServer(host: String, port: Int, context: LibMCContext): Pin
     } finally {
         socket.close()
     }
-}
-
-private fun _ReadChannel.readVarIntWithCodec(): Int {
-    val tempBuffer = _Buffer()
-    while (true) {
-        val byte = this.readByte()
-        tempBuffer.writeByte(byte)
-        if ((byte.toInt() and 0x80) == 0) break
-    }
-    return VarIntCodec.decode(tempBuffer)
-}
-
-private fun _ReadChannel.readPacketFrame(): _Buffer {
-    val length = this.readVarIntWithCodec()
-    val frameBytes = this.readBytes(length)
-    return _Buffer().apply {
-        writeBytes(frameBytes)
-    }
 }