sync

child-side/src/main/kotlin/cc/maxmc/msm/child/MultiServerMan.kt

@@ -1,6 +1,6 @@
 package cc.maxmc.msm.child
 
-import cc.maxmc.msm.child.listener.PacketListener
+import cc.maxmc.msm.child.command.Send
 import cc.maxmc.msm.child.netty.NetClient
 import net.md_5.bungee.api.ProxyServer
 import net.md_5.bungee.api.plugin.Plugin
@@ -11,8 +11,8 @@ class MultiServerMan : Plugin() {
     }
 
     override fun onEnable() {
-        ProxyServer.getInstance().pluginManager.registerListener(this, PacketListener)
-        NetClient
+        ProxyServer.getInstance().pluginManager.registerCommand(this, Send)
+        NetClient.start()
     }
 
     override fun onDisable() {

child-side/src/main/kotlin/cc/maxmc/msm/child/command/Send.kt

@@ -0,0 +1,16 @@
+package cc.maxmc.msm.child.command
+
+import cc.maxmc.msm.child.netty.NetClient
+import cc.maxmc.msm.common.network.packet.PPacketDebug
+import net.md_5.bungee.api.CommandSender
+import net.md_5.bungee.api.chat.TextComponent
+import net.md_5.bungee.api.plugin.Command
+
+object Send : Command("debugP") {
+    override fun execute(sender: CommandSender, args: Array<out String>) {
+        val content = args.joinToString(" ")
+        val packet = PPacketDebug(content)
+        NetClient.sendPacket(packet)
+        sender.sendMessage(TextComponent("Success."))
+    }
+}

child-side/src/main/kotlin/cc/maxmc/msm/child/listener/PacketListener.kt

@@ -1,20 +0,0 @@
-package cc.maxmc.msm.child.listener
-
-import cc.maxmc.msm.child.utils.log
-import cc.maxmc.msm.common.event.PacketReceiveEvent
-import cc.maxmc.msm.common.network.packet.CPacketDebug
-import cc.maxmc.msm.common.network.packet.PPacketDebug
-import net.md_5.bungee.api.plugin.Listener
-import net.md_5.bungee.event.EventHandler
-
-object PacketListener : Listener {
-    @EventHandler
-    fun onPacket(evt: PacketReceiveEvent) {
-        val packet = evt.packet
-        if (packet !is CPacketDebug) {
-            return
-        }
-        log("§fDEBUG | §7收到: \"${packet.content}\"")
-        evt.channel.writeAndFlush(PPacketDebug("(${evt.channel.localAddress()}) - ${packet.content}"))
-    }
-}

child-side/src/main/kotlin/cc/maxmc/msm/child/netty/ClientPacketHandler.kt

@@ -1,13 +0,0 @@
-package cc.maxmc.msm.child.netty
-
-import cc.maxmc.msm.common.event.PacketReceiveEvent
-import cc.maxmc.msm.common.network.BungeePacket
-import io.netty.channel.ChannelHandlerContext
-import io.netty.channel.SimpleChannelInboundHandler
-
-object ClientPacketHandler : SimpleChannelInboundHandler<BungeePacket>() {
-    override fun channelRead0(ctx: ChannelHandlerContext, msg: BungeePacket) {
-        PacketReceiveEvent(ctx.channel(), msg).callEvent()
-    }
-
-}

child-side/src/main/kotlin/cc/maxmc/msm/child/netty/NetClient.kt

@@ -1,32 +1,39 @@
 package cc.maxmc.msm.child.netty
 
 import cc.maxmc.msm.child.settings.Settings
-import cc.maxmc.msm.child.utils.log
+import cc.maxmc.msm.common.network.BungeePacket
+import cc.maxmc.msm.common.utils.log
 import cc.maxmc.msm.common.utils.pipelineInit
 import io.netty.bootstrap.Bootstrap
+import io.netty.channel.Channel
 import io.netty.channel.ChannelFutureListener
 import io.netty.channel.ChannelOption
 import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.socket.nio.NioSocketChannel
 
 object NetClient {
     private val loop = NioEventLoopGroup()
+    lateinit var channel: Channel
+        private set
 
-    init {
-        start()
-    }
-
-    private fun start() {
+    fun start() {
         val parent = Settings.Parent
         Bootstrap()
+            .channel(NioSocketChannel::class.java)
             .group(loop)
-            .handler(pipelineInit(ClientPacketHandler))
+            .handler(pipelineInit())
             .option(ChannelOption.TCP_NODELAY, true)
             .remoteAddress(parent.address, parent.port)
             .connect().addListener(ChannelFutureListener {
+                channel = it.channel()
                 log("§a| §7成功连接到集群的主节点. (${it.channel().remoteAddress()})")
             })
     }
 
+    fun sendPacket(packet: BungeePacket) {
+        channel.writeAndFlush(packet)
+    }
+
     fun shutdown() {
         loop.shutdownGracefully().sync()
     }

child-side/src/main/kotlin/cc/maxmc/msm/child/utils/Logging.kt

@@ -1,8 +0,0 @@
-package cc.maxmc.msm.child.utils
-
-import net.md_5.bungee.api.ProxyServer
-import net.md_5.bungee.api.chat.TextComponent
-
-fun log(msg: String) {
-    ProxyServer.getInstance().console.sendMessage(TextComponent(msg))
-}