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
5a8899bd
Commit
5a8899bd
authored
Aug 17, 2019
by
Him188moe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
87e5f0df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
14 deletions
+23
-14
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
+1
-1
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
+22
-13
No files found.
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
View file @
5a8899bd
...
...
@@ -122,7 +122,7 @@ public class MiraiServer {
}*/
}
p
ublic
void
initSetting
(
File
setting
)
{
p
rivate
void
initSetting
(
File
setting
)
{
getLogger
().
info
(
LoggerTextFormat
.
SKY_BLUE
+
"Thanks for using Mirai"
);
getLogger
().
info
(
LoggerTextFormat
.
SKY_BLUE
+
"initializing Settings"
);
try
{
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
View file @
5a8899bd
package
net.mamoe.mirai.network
import
io.netty.bootstrap.Bootstrap
import
io.netty.channel.Channel
import
io.netty.channel.ChannelHandlerContext
import
io.netty.channel.ChannelInitializer
import
io.netty.channel.SimpleChannelInboundHandler
...
...
@@ -9,11 +10,13 @@ import io.netty.channel.socket.SocketChannel
import
io.netty.channel.socket.nio.NioSocketChannel
import
io.netty.handler.codec.bytes.ByteArrayDecoder
import
io.netty.handler.codec.bytes.ByteArrayEncoder
import
net.mamoe.mirai.network.packet.Packet
import
net.mamoe.mirai.network.packet.client.Client0825ResponsePacket
import
net.mamoe.mirai.network.packet.client.ClientPacket
import
net.mamoe.mirai.network.packet.client.writeHex
import
net.mamoe.mirai.network.packet.server.Server0825Packet
import
net.mamoe.mirai.network.packet.server.ServerPacket
import
net.mamoe.mirai.utils.MiraiLogger
import
java.net.DatagramPacket
import
java.net.InetSocketAddress
/**
...
...
@@ -22,28 +25,36 @@ import java.net.InetSocketAddress
* @author Him188moe @ Mirai Project
*/
class
Robot
(
val
number
:
Int
)
{
private
lateinit
var
c
tx
:
ChannelHandlerContext
private
lateinit
var
c
hannel
:
Channel
internal
fun
onPacketReceived
(
packet
:
Packet
)
{
if
(
packet
!
is
ServerPacket
)
{
return
}
@ExperimentalUnsignedTypes
internal
fun
onPacketReceived
(
packet
:
ServerPacket
)
{
packet
.
decode
()
if
(
packet
is
Server0825Packet
)
{
//todo 检查是否需要修改 UDP 连接???
if
(
packet
is
Server0825Packet
)
{
connect
(
packet
.
serverIP
)
sendPacket
(
Client0825ResponsePacket
(
packet
.
serverIP
,
number
))
}
}
private
fun
sendPacket
(
packet
:
Packet
)
{
@ExperimentalUnsignedTypes
private
fun
sendPacket
(
packet
:
ClientPacket
)
{
packet
.
encode
()
packet
.
writeHex
(
Protocol
.
tail
);
channel
.
writeAndFlush
(
DatagramPacket
(
packet
.
toByteArray
()))
}
companion
object
{
private
fun
DatagramPacket
(
toByteArray
:
ByteArray
):
DatagramPacket
=
DatagramPacket
(
toByteArray
,
toByteArray
.
size
)
}
@ExperimentalUnsignedTypes
@Throws
(
InterruptedException
::
class
)
fun
connect
(
host
:
String
,
port
:
Int
)
{
fun
connect
(
host
:
String
,
port
:
Int
=
8000
)
{
val
group
=
NioEventLoopGroup
()
try
{
val
b
=
Bootstrap
()
b
.
group
(
group
)
.
channel
(
NioSocketChannel
::
class
.
java
)
.
remoteAddress
(
InetSocketAddress
(
host
,
port
))
...
...
@@ -56,7 +67,6 @@ class Robot(val number: Int) {
ch
.
pipeline
().
addLast
(
object
:
SimpleChannelInboundHandler
<
ByteArray
>()
{
override
fun
channelRead0
(
ctx
:
ChannelHandlerContext
,
bytes
:
ByteArray
)
{
try
{
this
@Robot
.
ctx
=
ctx
/*val remaining = Reader.read(bytes);
if (Reader.isPacketAvailable()) {
robot.onPacketReceived(Reader.toServerPacket())
...
...
@@ -80,9 +90,8 @@ class Robot(val number: Int) {
}
})
val
cf
=
b
.
connect
().
sync
()
cf
.
channel
().
closeFuture
().
sync
()
channel
=
b
.
connect
().
sync
().
channel
();
channel
.
closeFuture
().
sync
()
}
finally
{
group
.
shutdownGracefully
().
sync
()
}
...
...
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