Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
c5b01fbf
Commit
c5b01fbf
authored
Aug 31, 2019
by
Him188moe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Message receiver is working!
parent
6350638e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
...ava/net/mamoe/mirai/network/packet/server/ServerPacket.kt
+3
-1
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/UnknownPacket.kt
...va/net/mamoe/mirai/network/packet/server/UnknownPacket.kt
+12
-0
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/event/MessageEvent.kt
...t/mamoe/mirai/network/packet/server/event/MessageEvent.kt
+2
-2
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/event/ServerEventPacket.kt
...oe/mirai/network/packet/server/event/ServerEventPacket.kt
+3
-2
No files found.
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
View file @
c5b01fbf
...
@@ -73,6 +73,9 @@ abstract class ServerPacket(val input: DataInputStream) : Packet {
...
@@ -73,6 +73,9 @@ abstract class ServerPacket(val input: DataInputStream) : Packet {
"08 28 04 34"
->
ServerSessionKeyResponsePacketEncrypted
(
stream
)
"08 28 04 34"
->
ServerSessionKeyResponsePacketEncrypted
(
stream
)
"00 81 EC 78"
->
UnknownPacket
(
stream
)
"00 81 AD 7A"
->
UnknownPacket
(
stream
)
else
->
when
(
idHex
.
substring
(
0
,
5
))
{
else
->
when
(
idHex
.
substring
(
0
,
5
))
{
"00 EC"
->
ServerLoginSuccessPacket
(
stream
)
"00 EC"
->
ServerLoginSuccessPacket
(
stream
)
"00 1D"
->
ServerSKeyResponsePacketEncrypted
(
stream
)
"00 1D"
->
ServerSKeyResponsePacketEncrypted
(
stream
)
...
@@ -85,7 +88,6 @@ abstract class ServerPacket(val input: DataInputStream) : Packet {
...
@@ -85,7 +88,6 @@ abstract class ServerPacket(val input: DataInputStream) : Packet {
"00 CE"
,
"00 17"
->
ServerMessageEventPacketRawEncoded
(
stream
,
idHex
.
hexToBytes
())
"00 CE"
,
"00 17"
->
ServerMessageEventPacketRawEncoded
(
stream
,
idHex
.
hexToBytes
())
else
->
throw
IllegalArgumentException
(
idHex
)
else
->
throw
IllegalArgumentException
(
idHex
)
}
}
}
}
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/UnknownPacket.kt
0 → 100644
View file @
c5b01fbf
package
net.mamoe.mirai.network.packet.server
import
java.io.DataInputStream
/**
* @author Him188moe
*/
class
UnknownPacket
(
input
:
DataInputStream
)
:
ServerPacket
(
input
)
{
override
fun
decode
()
{
}
}
\ No newline at end of file
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/event/MessageEvent.kt
View file @
c5b01fbf
...
@@ -67,9 +67,9 @@ class ServerMessageEventPacketRaw(
...
@@ -67,9 +67,9 @@ class ServerMessageEventPacketRaw(
"00 A6"
->
ServerFriendMessageEventPacket
(
this
.
input
,
packetId
,
eventIdentity
)
"00 A6"
->
ServerFriendMessageEventPacket
(
this
.
input
,
packetId
,
eventIdentity
)
"02 10
"
->
ServerUnknownEventPacket
(
this
.
input
,
packetId
,
eventIdentity
)
//"02 10", "00 12
" -> ServerUnknownEventPacket(this.input, packetId, eventIdentity)
else
->
throw
IllegalArgumentException
(
typeHex
)
else
->
ServerUnknownEventPacket
(
this
.
input
,
packetId
,
eventIdentity
)
}
}
}
}
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/event/ServerEventPacket.kt
View file @
c5b01fbf
...
@@ -57,7 +57,6 @@ class ServerGroupMessageEventPacket(input: DataInputStream, packetId: ByteArray,
...
@@ -57,7 +57,6 @@ class ServerGroupMessageEventPacket(input: DataInputStream, packetId: ByteArray,
group
=
this
.
input
.
goto
(
51
).
readInt
()
group
=
this
.
input
.
goto
(
51
).
readInt
()
qq
=
this
.
input
.
goto
(
56
).
readInt
()
qq
=
this
.
input
.
goto
(
56
).
readInt
()
val
fontLength
=
this
.
input
.
goto
(
108
).
readShort
()
val
fontLength
=
this
.
input
.
goto
(
108
).
readShort
()
println
(
this
.
toString
())
messageType
=
when
(
val
id
=
this
.
input
.
goto
(
110
+
fontLength
+
2
).
readByte
().
toInt
())
{
messageType
=
when
(
val
id
=
this
.
input
.
goto
(
110
+
fontLength
+
2
).
readByte
().
toInt
())
{
19
->
MessageType
.
NORMAL
19
->
MessageType
.
NORMAL
14
->
MessageType
.
XML
14
->
MessageType
.
XML
...
@@ -130,8 +129,10 @@ class ServerGroupMessageEventPacket(input: DataInputStream, packetId: ByteArray,
...
@@ -130,8 +129,10 @@ class ServerGroupMessageEventPacket(input: DataInputStream, packetId: ByteArray,
}
}
class
ServerFriendMessageEventPacket
(
input
:
DataInputStream
,
packetId
:
ByteArray
,
eventIdentity
:
ByteArray
)
:
ServerEventPacket
(
input
,
packetId
,
eventIdentity
)
{
class
ServerFriendMessageEventPacket
(
input
:
DataInputStream
,
packetId
:
ByteArray
,
eventIdentity
:
ByteArray
)
:
ServerEventPacket
(
input
,
packetId
,
eventIdentity
)
{
var
qq
:
Int
=
0
lateinit
var
message
:
String
override
fun
decode
()
{
override
fun
decode
()
{
TODO
(
"FRIEND 解析"
)
}
}
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment