Move package `...network.data` to `...data`

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/TIMPCBot.kt

@@ -5,6 +5,9 @@ import net.mamoe.mirai.Bot
 import net.mamoe.mirai.BotAccount
 import net.mamoe.mirai.BotImpl
 import net.mamoe.mirai.contact.*
+import net.mamoe.mirai.data.AddFriendResult
+import net.mamoe.mirai.data.ImageLink
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.ImageId0x03
 import net.mamoe.mirai.message.data.ImageId0x06

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/internal/RawGroupInfo.kt

 package net.mamoe.mirai.timpc.internal
 
 import net.mamoe.mirai.contact.*
-import net.mamoe.mirai.network.data.GroupInfo
+import net.mamoe.mirai.data.GroupInfo
 import net.mamoe.mirai.timpc.TIMPCBot
 import net.mamoe.mirai.timpc.network.packet.action.GroupPacket
 import net.mamoe.mirai.utils.LockFreeLinkedList

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/ContactImpl.kt

@@ -9,10 +9,10 @@ import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.event.subscribeAlways
 import net.mamoe.mirai.message.data.ImageId
 import net.mamoe.mirai.message.data.MessageChain
-import net.mamoe.mirai.network.data.FriendNameRemark
-import net.mamoe.mirai.network.data.GroupInfo
-import net.mamoe.mirai.network.data.PreviousNameList
-import net.mamoe.mirai.network.data.Profile
+import net.mamoe.mirai.data.FriendNameRemark
+import net.mamoe.mirai.data.GroupInfo
+import net.mamoe.mirai.data.PreviousNameList
+import net.mamoe.mirai.data.Profile
 import net.mamoe.mirai.qqAccount
 import net.mamoe.mirai.timpc.TIMPCBot
 import net.mamoe.mirai.timpc.internal.RawGroupInfo

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMBotNetworkHandler.kt

@@ -12,8 +12,8 @@ import net.mamoe.mirai.event.Subscribable
 import net.mamoe.mirai.event.broadcast
 import net.mamoe.mirai.event.events.BotLoginSucceedEvent
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.LoginResult
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.LoginResult
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.qqAccount
 import net.mamoe.mirai.timpc.TIMPCBot
 import net.mamoe.mirai.timpc.network.handler.DataPacketSocketAdapter

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/handler/TemporaryPacketHandler.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.handler
 
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.withContext
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/OutgoingPacket.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.*
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.protobuf.ProtoBuf
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.utils.io.hexToBytes
 import net.mamoe.mirai.utils.io.writeQQ

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/Packet.kt

@@ -2,7 +2,7 @@ package net.mamoe.mirai.timpc.network.packet
 
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.readBytes
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.utils.io.toUHexString
 
 /**

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/PacketFactory.kt

@@ -10,7 +10,7 @@ import kotlinx.io.pool.useInstance
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.protobuf.ProtoBuf
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.utils.io.ByteArrayPool
 import net.mamoe.mirai.utils.io.debugPrint
 import net.mamoe.mirai.utils.io.read

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/AddContact.kt

@@ -5,9 +5,9 @@ package net.mamoe.mirai.timpc.network.packet.action
 import kotlinx.io.core.*
 import net.mamoe.mirai.contact.QQ
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.EventPacket
-import net.mamoe.mirai.network.data.Packet
-import net.mamoe.mirai.network.data.PreviousNameList
+import net.mamoe.mirai.data.EventPacket
+import net.mamoe.mirai.data.Packet
+import net.mamoe.mirai.data.PreviousNameList
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/FriendImage.kt

@@ -8,8 +8,8 @@ import net.mamoe.mirai.message.data.ImageId
 import net.mamoe.mirai.message.data.ImageId0x06
 import net.mamoe.mirai.message.data.requireLength
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.EventPacket
-import net.mamoe.mirai.network.data.ImageLink
+import net.mamoe.mirai.data.EventPacket
+import net.mamoe.mirai.data.ImageLink
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.ExternalImage

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/FriendList.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.packet.action
 
 import kotlinx.io.core.ByteReadPacket
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.packet.PacketId
 import net.mamoe.mirai.timpc.network.packet.SessionPacketFactory
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/GradeInfo.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.writeFully
 import kotlinx.io.core.writeUByte
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.writeQQ

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/GroupImage.kt

@@ -9,8 +9,8 @@ import net.mamoe.mirai.contact.GroupInternalId
 import net.mamoe.mirai.message.data.ImageId0x03
 import net.mamoe.mirai.message.data.requireLength
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.EventPacket
-import net.mamoe.mirai.network.data.ImageLink
+import net.mamoe.mirai.data.EventPacket
+import net.mamoe.mirai.data.ImageLink
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.timpc.utils.assertUnreachable
 import net.mamoe.mirai.utils.ExternalImage

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/GroupPacket.kt

@@ -9,7 +9,7 @@ import net.mamoe.mirai.contact.groupInternalId
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.internal.toPacket
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.internal.RawGroupInfo
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/Profile.kt

@@ -4,10 +4,10 @@ package net.mamoe.mirai.timpc.network.packet.action
 
 import io.ktor.util.date.GMTDate
 import kotlinx.io.core.*
-import net.mamoe.mirai.network.data.Gender
-import net.mamoe.mirai.network.data.Profile
+import net.mamoe.mirai.data.Gender
+import net.mamoe.mirai.data.Profile
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/Remark.kt

@@ -5,7 +5,7 @@ package net.mamoe.mirai.timpc.network.packet.action
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.FriendNameRemark
+import net.mamoe.mirai.data.FriendNameRemark
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.readUShortLVString
 import net.mamoe.mirai.utils.io.writeQQ

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/RequestFriendListPacket.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.packet.action
 
 import kotlinx.io.core.ByteReadPacket
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.writeZero

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/action/SendFriendMessagePacket.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.*
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.internal.toPacket
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/AndroidOnlineStatusChange.kt

@@ -5,7 +5,7 @@ package net.mamoe.mirai.timpc.network.packet.event
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.packet.PacketVersion
 import net.mamoe.mirai.utils.io.readBoolean
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/EventPacketFactory.kt

@@ -5,7 +5,7 @@ package net.mamoe.mirai.timpc.network.packet.event
 import kotlinx.io.core.*
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMBotNetworkHandler
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.qqAccount

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/FriendConversationIniliaze.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
 import kotlinx.io.core.readUInt
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.timpc.network.packet.PacketVersion
 import net.mamoe.mirai.utils.io.readQQ
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/GroupFileUpload.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.packet.event
 
 import kotlinx.io.core.ByteReadPacket
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.timpc.network.packet.PacketVersion
 import net.mamoe.mirai.utils.io.debugPrint
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/Ignored.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.packet.event
 
 import kotlinx.io.core.ByteReadPacket
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.utils.io.toUHexString
 
 internal inline class IgnoredEventPacket(val id: UShort) : EventPacket {

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberKickEvent.kt

@@ -7,7 +7,7 @@ import kotlinx.io.core.readUByte
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.qqAccount
 import net.mamoe.mirai.utils.io.*
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberPermission.kt

@@ -5,7 +5,7 @@ package net.mamoe.mirai.timpc.network.packet.event
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.timpc.network.packet.PacketVersion
 import net.mamoe.mirai.utils.io.readQQ
 import net.mamoe.mirai.contact.Member

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/Unknown.kt

@@ -7,7 +7,7 @@ import kotlinx.io.core.readBytes
 import kotlinx.io.pool.useInstance
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.utils.io.ByteArrayPool
 import net.mamoe.mirai.utils.io.toUHexString
 

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/Captcha.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.packet.login
 
 import kotlinx.io.core.*
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/ChangeOnlineStatusPacket.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.writeFully
 import kotlinx.io.core.writeUByte
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.OnlineStatus

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/Heartbeat.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.writeFully
 import net.mamoe.mirai.event.Subscribable
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.writeHex

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/PasswordSubmission.kt

@@ -3,10 +3,10 @@
 package net.mamoe.mirai.timpc.network.packet.login
 
 import kotlinx.io.core.*
-import net.mamoe.mirai.network.data.Gender
+import net.mamoe.mirai.data.Gender
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.LoginResult
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.LoginResult
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/SKey.kt

@@ -6,7 +6,7 @@ import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
 import kotlinx.io.core.writeFully
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/Session.kt

@@ -4,7 +4,7 @@ package net.mamoe.mirai.timpc.network.packet.login
 
 import kotlinx.io.core.*
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/login/Touch.kt

@@ -7,7 +7,7 @@ import kotlinx.io.core.discardExact
 import kotlinx.io.core.readBytes
 import kotlinx.io.core.writeFully
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.Packet
+import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.timpc.network.TIMProtocol
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.utils.io.*

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt

@@ -8,10 +8,10 @@ import kotlinx.io.OutputStream
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.use
 import net.mamoe.mirai.contact.*
+import net.mamoe.mirai.data.AddFriendResult
+import net.mamoe.mirai.data.ImageLink
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.data.AddFriendResult
-import net.mamoe.mirai.network.data.ImageLink
 import net.mamoe.mirai.utils.BotConfiguration
 import net.mamoe.mirai.utils.GroupNotFoundException
 import net.mamoe.mirai.utils.MiraiInternalAPI

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotFactory.kt

+@file:Suppress("FunctionName")
+
 package net.mamoe.mirai
 
 import kotlinx.coroutines.CoroutineScope
@@ -10,7 +12,6 @@ import net.mamoe.mirai.utils.MiraiLogger
  * - `mirai-core-timpc`: `TIMPC`
  * - `mirai-core-qqandroid`: `QQAndroid`
  */
-@Suppress("FunctionName")
 interface BotFactory {
     /**
      * 在当前 CoroutineScope 下构造 Bot 实例

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt

@@ -3,7 +3,7 @@
 package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
-import net.mamoe.mirai.network.data.GroupInfo
+import net.mamoe.mirai.data.GroupInfo
 import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail
 
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt

@@ -4,9 +4,9 @@ package net.mamoe.mirai.contact
 
 import kotlinx.coroutines.CoroutineScope
 import net.mamoe.mirai.Bot
-import net.mamoe.mirai.network.data.FriendNameRemark
-import net.mamoe.mirai.network.data.PreviousNameList
-import net.mamoe.mirai.network.data.Profile
+import net.mamoe.mirai.data.FriendNameRemark
+import net.mamoe.mirai.data.PreviousNameList
+import net.mamoe.mirai.data.Profile
 
 /**
  * QQ 对象.

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/AddFriendResult.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/AddFriendResult.kt

@@ -2,7 +2,7 @@
 @file:JvmName("BotHelperKt")
 @file:Suppress("EXPERIMENTAL_API_USAGE")
 
-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/EventPacket.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/EventPacket.kt

-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 import net.mamoe.mirai.event.Subscribable
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/FriendNameRemark.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/FriendNameRemark.kt

-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 /**
  * 给好友设置的备注

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/GroupInfo.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/GroupInfo.kt

-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 import net.mamoe.mirai.contact.ContactList
 import net.mamoe.mirai.contact.Group

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/ImageLink.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/ImageLink.kt

-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 import io.ktor.client.request.get
 import io.ktor.util.KtorExperimentalAPI

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/LoginResult.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/LoginResult.kt

 @file:Suppress("unused")
 
-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 import net.mamoe.mirai.utils.BotConfiguration
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/Packet.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/Packet.kt

-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 /**
  * 一个包的数据 (body)

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/PreviousNameList.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/PreviousNameList.kt

-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 /**
  * 曾用名列表

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/data/Profile.kt → mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/Profile.kt

 @file:Suppress("EXPERIMENTAL_API_USAGE")
 
-package net.mamoe.mirai.network.data
+package net.mamoe.mirai.data
 
 import io.ktor.util.date.GMTDate
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/ConnectionOccupiedEvent.kt

 package net.mamoe.mirai.event.events
 
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 
 /**
  * 被挤下线. 只能获取到中文的消息

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/FriendStatusChanged.kt

 package net.mamoe.mirai.event.events
 
 import net.mamoe.mirai.contact.QQ
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.utils.OnlineStatus
 
 data class FriendStatusChanged(

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/MuteEvent.kt

@@ -2,7 +2,7 @@ package net.mamoe.mirai.event.events
 
 import net.mamoe.mirai.contact.Group
 import net.mamoe.mirai.contact.Member
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 
 
 // region mute

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/ReceiveFriendAddRequestEvent.kt

 package net.mamoe.mirai.event.events
 
 import net.mamoe.mirai.contact.QQ
-import net.mamoe.mirai.network.data.EventPacket
+import net.mamoe.mirai.data.EventPacket
 import net.mamoe.mirai.utils.unsafeWeakRef
 import kotlin.jvm.JvmOverloads
 

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessagePacket.kt

@@ -5,10 +5,10 @@ package net.mamoe.mirai.message
 import kotlinx.io.core.ByteReadPacket
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.contact.*
+import net.mamoe.mirai.data.EventPacket
+import net.mamoe.mirai.data.ImageLink
 import net.mamoe.mirai.event.events.BotEvent
 import net.mamoe.mirai.message.data.*
-import net.mamoe.mirai.network.data.EventPacket
-import net.mamoe.mirai.network.data.ImageLink
 import net.mamoe.mirai.utils.*
 import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail
 import kotlin.jvm.JvmName

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/LoginFailedException.kt

 package net.mamoe.mirai.utils
 
-import net.mamoe.mirai.network.data.LoginResult
+import net.mamoe.mirai.data.LoginResult
 
 class LoginFailedException(
     val result: LoginResult,