Little updates

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/handler/ActionPacketHandler.kt

@@ -2,7 +2,10 @@ package net.mamoe.mirai.network.protocol.tim.handler
 
 import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.network.LoginSession
-import net.mamoe.mirai.network.protocol.tim.packet.*
+import net.mamoe.mirai.network.protocol.tim.packet.ClientAccountInfoRequestPacket
+import net.mamoe.mirai.network.protocol.tim.packet.ServerAccountInfoResponsePacket
+import net.mamoe.mirai.network.protocol.tim.packet.ServerEventPacket
+import net.mamoe.mirai.network.protocol.tim.packet.ServerPacket
 import net.mamoe.mirai.network.protocol.tim.packet.action.AddFriendResult
 import net.mamoe.mirai.network.protocol.tim.packet.action.ClientAddFriendPacket
 import net.mamoe.mirai.network.protocol.tim.packet.action.ClientCanAddFriendPacket
@@ -10,6 +13,9 @@ import net.mamoe.mirai.network.protocol.tim.packet.action.ServerCanAddFriendResp
 import net.mamoe.mirai.network.protocol.tim.packet.image.ServerTryGetImageIDFailedPacket
 import net.mamoe.mirai.network.protocol.tim.packet.image.ServerTryGetImageIDResponsePacket
 import net.mamoe.mirai.network.protocol.tim.packet.image.ServerTryGetImageIDSuccessPacket
+import net.mamoe.mirai.network.protocol.tim.packet.login.ClientSKeyRefreshmentRequestPacket
+import net.mamoe.mirai.network.protocol.tim.packet.login.ClientSKeyRequestPacket
+import net.mamoe.mirai.network.protocol.tim.packet.login.ServerSKeyResponsePacket
 import net.mamoe.mirai.task.MiraiThreadPool
 import net.mamoe.mirai.utils.getGTK
 import java.awt.image.BufferedImage

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/ClientPacket.kt

@@ -192,9 +192,9 @@ fun UInt.toByteArray(): ByteArray = byteArrayOf(
 
 fun Int.toUHexString(separator: String = " "): String = this.toByteArray().toUHexString(separator)
 
-internal fun md5(str: String): ByteArray = MessageDigest.getInstance("MD5").digest(str.toByteArray())
+fun md5(str: String): ByteArray = MessageDigest.getInstance("MD5").digest(str.toByteArray())
 
-internal fun md5(byteArray: ByteArray): ByteArray = MessageDigest.getInstance("MD5").digest(byteArray)
+fun md5(byteArray: ByteArray): ByteArray = MessageDigest.getInstance("MD5").digest(byteArray)
 
 
 @Throws(IOException::class)

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Packet.kt

@@ -3,9 +3,7 @@ package net.mamoe.mirai.network.protocol.tim.packet
 /**
  * @author Him188moe
  */
-interface Packet {
-
-}
+interface Packet
 
 
 object PacketNameFormatter {

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/SKey.kt → mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/SKey.kt

-package net.mamoe.mirai.network.protocol.tim.packet
+package net.mamoe.mirai.network.protocol.tim.packet.login
 
 import net.mamoe.mirai.network.protocol.tim.TIMProtocol
+import net.mamoe.mirai.network.protocol.tim.packet.*
 import net.mamoe.mirai.utils.TEA
 import java.io.DataInputStream
 

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Session.kt → mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/Session.kt

-package net.mamoe.mirai.network.protocol.tim.packet
+package net.mamoe.mirai.network.protocol.tim.packet.login
 
 import net.mamoe.mirai.network.protocol.tim.TIMProtocol
+import net.mamoe.mirai.network.protocol.tim.packet.*
 import net.mamoe.mirai.utils.TEA
 import net.mamoe.mirai.utils.lazyEncode
 import java.io.DataInputStream

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/Touch.kt → mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/Touch.kt

-package net.mamoe.mirai.network.protocol.tim.packet
+package net.mamoe.mirai.network.protocol.tim.packet.login
 
 import net.mamoe.mirai.network.protocol.tim.TIMProtocol
-import net.mamoe.mirai.network.protocol.tim.packet.login.ClientPasswordSubmissionPacket
+import net.mamoe.mirai.network.protocol.tim.packet.*
 import net.mamoe.mirai.utils.ByteArrayDataOutputStream
 import net.mamoe.mirai.utils.TEA
 import net.mamoe.mirai.utils.hexToBytes

mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/VerificationCode.kt → mirai-core/src/main/java/net/mamoe/mirai/network/protocol/tim/packet/login/VerificationCode.kt

-package net.mamoe.mirai.network.protocol.tim.packet
+package net.mamoe.mirai.network.protocol.tim.packet.login
 
 import net.mamoe.mirai.network.protocol.tim.TIMProtocol
+import net.mamoe.mirai.network.protocol.tim.packet.*
 import net.mamoe.mirai.utils.TEA
 import net.mamoe.mirai.utils.Tested
 import net.mamoe.mirai.utils.hexToBytes
@@ -51,11 +52,11 @@ class ClientVerificationCodeSubmitPacket(
         private val packetIdLast: Int,
         private val qq: Long,
         private val token0825: ByteArray,
-        private val verificationCode: String,
+        private val captcha: String,
         private val verificationToken: ByteArray
 ) : ClientPacket() {
     init {
-        require(verificationCode.length == 4) { "verificationCode.length must == 4" }
+        require(captcha.length == 4) { "captcha.length must == 4" }
     }
 
     override fun encode() {
@@ -75,7 +76,7 @@ class ClientVerificationCodeSubmitPacket(
             it.writeHex(TIMProtocol.publicKey)//25
 
             it.writeHex("14 00 05 00 00 00 00 00 04")
-            it.write(verificationCode.toUpperCase().toByteArray())
+            it.write(captcha.toUpperCase().toByteArray())
             it.writeHex("00 38")
             it.write(verificationToken)