github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-09 19:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix package

Browse Source
This commit is contained in:
Him188 2020-12-26 22:16:27 +08:00
parent 83818ed45b
commit 822c3049c2
7 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-api/src/jvmMain/kotlin/utils/PlatformLogger.jvm.kt
View File

@ -7,8 +7,6 @@
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
@file:JvmName("Utils")
@file:JvmMultifileClass
@file:Suppress("MemberVisibilityCanBePrivate")
package net.mamoe.mirai.utils

3
mirai-core-utils/src/commonMain/kotlin/Conversions.kt
View File

@ -9,6 +9,9 @@
@file:Suppress("EXPERIMENTAL_UNSIGNED_LITERALS", "EXPERIMENTAL_API_USAGE", "unused")
@file:JvmMultifileClass
@file:JvmName("MiraiUtils")
package net.mamoe.mirai.utils
/*

4
mirai-core/src/commonMain/kotlin/network/protocol/packet/EncryptMethod.kt
View File

@ -16,8 +16,8 @@ import kotlinx.io.core.writeFully
import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.utils.crypto.ECDH
import net.mamoe.mirai.internal.utils.crypto.ECDHKeyPair
import net.mamoe.mirai.utils.encryptAndWrite
import net.mamoe.mirai.utils.writeShortLVByteArray
import net.mamoe.mirai.internal.utils.io.encryptAndWrite
import net.mamoe.mirai.internal.utils.io.writeShortLVByteArray
internal interface EncryptMethod {
val id: Int

6
mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacketAndroid.kt
View File

@ -15,9 +15,9 @@ import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.buildPacket
import kotlinx.io.core.writeFully
import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.utils.encryptAndWrite
import net.mamoe.mirai.utils.writeHex
import net.mamoe.mirai.utils.writeIntLVPacket
import net.mamoe.mirai.internal.utils.io.encryptAndWrite
import net.mamoe.mirai.internal.utils.io.writeHex
import net.mamoe.mirai.internal.utils.io.writeIntLVPacket
internal class OutgoingPacket constructor(
name: String?,

15
mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt
View File

@ -17,7 +17,10 @@ import kotlinx.io.core.toByteArray
import kotlinx.io.core.writeFully
import net.mamoe.mirai.internal.network.protocol.LoginType
import net.mamoe.mirai.internal.utils.NetworkType
import net.mamoe.mirai.utils.*
import net.mamoe.mirai.internal.utils.io.*
import net.mamoe.mirai.utils.currentTimeMillis
import net.mamoe.mirai.utils.md5
import net.mamoe.mirai.utils.toByteArray
import kotlin.random.Random
/**
@ -671,6 +674,16 @@ internal fun BytePacketBuilder.t521( // 1313
} shouldEqualsTo 6
}
internal fun BytePacketBuilder.t52c(
// ?
) {
writeShort(0x52c)
writeShortLVPacket {
writeByte(1)
writeLong(-1)
}
}
internal fun BytePacketBuilder.t536( // 1334
loginExtraData: ByteArray
) {

1
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt
View File

@ -20,6 +20,7 @@ import net.mamoe.mirai.internal.utils.MacOrAndroidIdChangeFlag
import net.mamoe.mirai.internal.utils._miraiContentToString
import net.mamoe.mirai.internal.utils.crypto.TEA
import net.mamoe.mirai.internal.utils.guidFlag
import net.mamoe.mirai.internal.utils.io.writeShortLVByteArray
import net.mamoe.mirai.utils.*
internal class WtLogin {

2
mirai-core/src/commonMain/kotlin/utils/io/output.kt
View File

@ -11,7 +11,7 @@
@file:JvmMultifileClass
@file:JvmName("Utils")
package net.mamoe.mirai.utils
package net.mamoe.mirai.internal.utils.io
import kotlinx.io.core.*
import net.mamoe.mirai.internal.utils.coerceAtMostOrFail