Added some packets

libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/buffer.kt

@@ -9,7 +9,6 @@ package cn.rtast.libmc.common
 
 import kotlin.uuid.Uuid
 
-@Suppress("CLASSNAME")
 public expect class BytesBuffer {
     public constructor()
     public constructor(bytes: ByteArray)
@@ -18,6 +17,8 @@ public expect class BytesBuffer {
     public fun writeShort(value: Short, endian: ByteOrder = ByteOrder.BIG_ENDIAN)
     public fun writeInt(value: Int, endian: ByteOrder = ByteOrder.BIG_ENDIAN)
     public fun writeLong(value: Long, endian: ByteOrder = ByteOrder.BIG_ENDIAN)
+    public fun writeDouble(value: Double, endian: ByteOrder = ByteOrder.BIG_ENDIAN)
+    public fun writeFloat(value: Float, endian: ByteOrder = ByteOrder.BIG_ENDIAN)
     public fun writeBytes(bytes: ByteArray)
     public fun writeBoolean(value: Boolean)
 
@@ -25,6 +26,8 @@ public expect class BytesBuffer {
     public fun readShort(endian: ByteOrder = ByteOrder.BIG_ENDIAN): Short
     public fun readInt(endian: ByteOrder = ByteOrder.BIG_ENDIAN): Int
     public fun readLong(endian: ByteOrder = ByteOrder.BIG_ENDIAN): Long
+    public fun readDouble(endian: ByteOrder = ByteOrder.BIG_ENDIAN): Double
+    public fun readFloat(endian: ByteOrder = ByteOrder.BIG_ENDIAN): Float
     public fun readBytes(length: Int): ByteArray
     public fun readBoolean(): Boolean
     public fun readRemainingBytes(): ByteArray

libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/channels.kt

@@ -7,7 +7,6 @@
 
 package cn.rtast.libmc.common
 
-@Suppress("CLASSNAME")
 public expect class ReadChannel {
     public fun readByte(): Byte
     public fun readShort(endian: ByteOrder = ByteOrder.BIG_ENDIAN): Short
@@ -17,7 +16,6 @@ public expect class ReadChannel {
     public fun readFully(out: ByteArray, start: Int = 0, end: Int = out.size)
 }
 
-@Suppress("CLASSNAME")
 public expect class WriteChannel {
     public fun writeFully(value: ByteArray, startIndex: Int = 0, endIndex: Int = value.size)
     public fun flush()

libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/socket.kt

@@ -7,15 +7,13 @@
 
 package cn.rtast.libmc.common
 
-@Suppress("CLASSNAME")
 public expect class Socket public constructor(host: String, port: Int, context: LibMCContext) {
     public fun openReadChannel(): ReadChannel
     public fun openWriteChannel(): WriteChannel
     public fun close()
 }
 
-@Suppress("CLASSNAME")
-public expect class _UdpSocket public constructor(host: String, port: Int, context: LibMCContext) {
+public expect class UdpSocket public constructor(host: String, port: Int, context: LibMCContext) {
     public fun sendAndReceive(data: ByteArray): ByteArray
     public fun close()
 }

libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/buffer.jvm.kt

@@ -8,7 +8,6 @@ package cn.rtast.libmc.common
 
 import java.io.ByteArrayOutputStream
 
-@Suppress("CLASSNAME")
 public actual class BytesBuffer {
     private val outStream = ByteArrayOutputStream()
     private var readBuffer: ByteArray? = null
@@ -26,6 +25,7 @@ public actual class BytesBuffer {
     }
 
     public actual fun writeShort(value: Short, endian: ByteOrder) {
+        readBuffer = null
         val v = value.toInt()
         if (endian == ByteOrder.BIG_ENDIAN) {
             outStream.write(v shr 8)
@@ -37,6 +37,7 @@ public actual class BytesBuffer {
     }
 
     public actual fun writeInt(value: Int, endian: ByteOrder) {
+        readBuffer = null
         if (endian == ByteOrder.BIG_ENDIAN) {
             outStream.write(value shr 24)
             outStream.write(value shr 16)
@@ -51,6 +52,7 @@ public actual class BytesBuffer {
     }
 
     public actual fun writeLong(value: Long, endian: ByteOrder) {
+        readBuffer = null
         if (endian == ByteOrder.BIG_ENDIAN) {
             for (i in 56 downTo 0 step 8) outStream.write((value shr i).toInt())
         } else {
@@ -58,6 +60,14 @@ public actual class BytesBuffer {
         }
     }
 
+    public actual fun writeDouble(value: Double, endian: ByteOrder) {
+        writeLong(value.toRawBits(), endian)
+    }
+
+    public actual fun writeFloat(value: Float, endian: ByteOrder) {
+        writeInt(value.toRawBits(), endian)
+    }
+
     public actual fun writeBytes(bytes: ByteArray) {
         readBuffer = null
         outStream.write(bytes)
@@ -83,6 +93,15 @@ public actual class BytesBuffer {
     public actual fun readShort(endian: ByteOrder): Short = readBytes(2).toShort(endian)
     public actual fun readInt(endian: ByteOrder): Int = readBytes(4).toInt(endian)
     public actual fun readLong(endian: ByteOrder): Long = readBytes(8).toLong(endian)
+
+    public actual fun readDouble(endian: ByteOrder): Double {
+        return Double.fromBits(readLong(endian))
+    }
+
+    public actual fun readFloat(endian: ByteOrder): Float {
+        return Float.fromBits(readInt(endian))
+    }
+
     public actual fun readBytes(length: Int): ByteArray {
         val array = ensureReadArray()
         if (readOffset + length > array.size) throw IndexOutOfBoundsException("Buffer underflow")
@@ -96,7 +115,9 @@ public actual class BytesBuffer {
     public actual fun readRemainingBytes(): ByteArray {
         val array = ensureReadArray()
         if (readOffset >= array.size) return byteArrayOf()
-        return array.copyOfRange(readOffset, array.size)
+        val result = array.copyOfRange(readOffset, array.size)
+        readOffset = array.size
+        return result
     }
 
     public actual fun toByteArray(): ByteArray = outStream.toByteArray()

libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/channels.jvm.kt

@@ -11,7 +11,6 @@ import java.io.EOFException
 import java.io.InputStream
 import java.io.OutputStream
 
-@Suppress("CLASSNAME")
 public actual class ReadChannel(private val _inputStream: InputStream) {
 
     public actual fun readByte(): Byte = _inputStream.read().toByte()
@@ -32,7 +31,6 @@ public actual class ReadChannel(private val _inputStream: InputStream) {
     public actual fun readLong(endian: ByteOrder): Long = readBytes(8).toLong(endian)
 }
 
-@Suppress("CLASSNAME")
 public actual class WriteChannel {
     private val _outputStream: OutputStream
 

libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/socket.jvm.kt

@@ -11,7 +11,6 @@ import java.net.DatagramSocket
 import java.net.InetSocketAddress
 import java.net.Socket as JvmSocket
 
-@Suppress("CLASSNAME")
 public actual class Socket public actual constructor(host: String, port: Int, context: LibMCContext) {
     private val socket = JvmSocket(host, port)
 
@@ -20,8 +19,7 @@ public actual class Socket public actual constructor(host: String, port: Int, co
     public actual fun close(): Unit = socket.close()
 }
 
-@Suppress("CLASSNAME")
-public actual class _UdpSocket public actual constructor(host: String, port: Int, context: LibMCContext) {
+public actual class UdpSocket public actual constructor(host: String, port: Int, context: LibMCContext) {
     private val socket = DatagramSocket().apply {
         soTimeout = 3000
         connect(InetSocketAddress(host, port))

libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/buffer.native.kt

@@ -6,12 +6,10 @@
 
 package cn.rtast.libmc.common
 
-import io.ktor.utils.io.bits.*
 import io.ktor.utils.io.core.*
+import kotlinx.io.*
 import kotlinx.io.Buffer
-import kotlinx.io.readByteArray
 
-@Suppress("CLASSNAME")
 public actual class BytesBuffer {
     private val _delegateBuf: Buffer
 
@@ -26,37 +24,43 @@ public actual class BytesBuffer {
     public actual fun writeByte(value: Byte): Unit = _delegateBuf.writeByte(value)
     public actual fun writeShort(value: Short, endian: ByteOrder) {
         if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.writeShort(value)
-        else _delegateBuf.writeShort(value.reverseByteOrder())
+        else _delegateBuf.writeShortLe(value)
     }
 
     public actual fun writeInt(value: Int, endian: ByteOrder) {
         if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.writeInt(value)
-        else _delegateBuf.writeInt(value.reverseByteOrder())
+        else _delegateBuf.writeIntLe(value)
     }
 
     public actual fun writeLong(value: Long, endian: ByteOrder) {
         if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.writeLong(value)
-        else _delegateBuf.writeLong(value.reverseByteOrder())
+        else _delegateBuf.writeLongLe(value)
     }
 
+    public actual fun writeDouble(value: Double, endian: ByteOrder): Unit =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.writeDouble(value) else _delegateBuf.writeDoubleLe(value)
+
+    public actual fun writeFloat(value: Float, endian: ByteOrder): Unit =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.writeFloat(value) else _delegateBuf.writeFloatLe(value)
+
     public actual fun writeBytes(bytes: ByteArray): Unit = _delegateBuf.write(bytes)
     public actual fun writeBoolean(value: Boolean): Unit = _delegateBuf.writeByte(if (value) 0x01 else 0x00)
 
     public actual fun readByte(): Byte = _delegateBuf.readByte()
-    public actual fun readShort(endian: ByteOrder): Short {
-        val v = _delegateBuf.readShort()
-        return if (endian == ByteOrder.BIG_ENDIAN) v else v.reverseByteOrder()
-    }
+    public actual fun readShort(endian: ByteOrder): Short =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.readShort() else _delegateBuf.readShortLe()
 
-    public actual fun readInt(endian: ByteOrder): Int {
-        val v = _delegateBuf.readInt()
-        return if (endian == ByteOrder.BIG_ENDIAN) v else v.reverseByteOrder()
-    }
+    public actual fun readInt(endian: ByteOrder): Int =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.readInt() else _delegateBuf.readIntLe()
 
-    public actual fun readLong(endian: ByteOrder): Long {
-        val v = _delegateBuf.readLong()
-        return if (endian == ByteOrder.BIG_ENDIAN) v else v.reverseByteOrder()
-    }
+    public actual fun readLong(endian: ByteOrder): Long =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.readLong() else _delegateBuf.readLongLe()
+
+    public actual fun readDouble(endian: ByteOrder): Double =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.readDouble() else _delegateBuf.readDoubleLe()
+
+    public actual fun readFloat(endian: ByteOrder): Float =
+        if (endian == ByteOrder.BIG_ENDIAN) _delegateBuf.readFloat() else _delegateBuf.readFloatLe()
 
     public actual fun readBytes(length: Int): ByteArray = _delegateBuf.readByteArray(length)
     public actual fun readBoolean(): Boolean = _delegateBuf.readByte() != 0x00.toByte()

libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/channels.native.kt

@@ -10,7 +10,6 @@ import io.ktor.utils.io.*
 import io.ktor.utils.io.bits.reverseByteOrder
 import kotlinx.coroutines.runBlocking
 
-@Suppress("CLASSNAME")
 public actual class ReadChannel(private val _readChannel: ByteReadChannel) {
 
     public actual fun readByte(): Byte = runBlocking { _readChannel.readByte() }
@@ -34,7 +33,6 @@ public actual class ReadChannel(private val _readChannel: ByteReadChannel) {
     }
 }
 
-@Suppress("CLASSNAME")
 public actual class WriteChannel {
     private val _writeChannel: ByteWriteChannel
 

libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/socket.native.kt

@@ -11,7 +11,6 @@ import io.ktor.utils.io.core.*
 import kotlinx.coroutines.runBlocking
 import kotlinx.io.readByteArray
 
-@Suppress("CLASSNAME")
 public actual class Socket public actual constructor(host: String, port: Int, context: LibMCContext) {
     private val ctx = context
     private val socket = runBlocking { aSocket(ctx._selectorManager).tcp().connect(host, port) }
@@ -26,8 +25,7 @@ public actual class Socket public actual constructor(host: String, port: Int, co
     }
 }
 
-@Suppress("CLASSNAME")
-public actual class _UdpSocket public actual constructor(host: String, port: Int, context: LibMCContext) {
+public actual class UdpSocket public actual constructor(host: String, port: Int, context: LibMCContext) {
     private val ctx = context
 
     // use bind to create an unconnected socket