From 4db42f957c1479802ceb5d20eb6be973ac3e6152 Mon Sep 17 00:00:00 2001 From: TONY_All Date: Thu, 4 May 2023 21:46:09 +0800 Subject: [PATCH] repackage --- Controlled/build.gradle.kts | 4 +-- .../mistyrain}/controlled/Controlled.kt | 22 ++++++------ .../mistyrain}/controlled/api/APIImpl.kt | 10 +++--- .../mistyrain}/controlled/command/Api.kt | 4 +-- .../mistyrain}/controlled/command/Send.kt | 6 ++-- .../controlled/listener/APIPacketListener.kt | 9 +++-- .../controlled/listener/ProtocolListener.kt | 26 +++++++------- .../mistyrain}/controlled/misc/SubServer.kt | 8 ++--- .../mistyrain}/controlled/netty/NetClient.kt | 11 +++--- .../controlled/settings/Settings.kt | 4 +-- .../controlled/settings/SettingsReader.kt | 4 +-- .../controlled/utils/ScriptRunner.kt | 4 +-- Controlled/src/main/resources/bungee.yml | 2 +- MasterControl/build.gradle.kts | 4 +-- .../mistyrain}/mastercontrol/MasterControl.kt | 14 ++++---- .../mistyrain}/mastercontrol/api/APIImpl.kt | 10 +++--- .../mastercontrol/database/SQLDatabase.kt | 8 ++--- .../mastercontrol/listener/PacketListener.kt | 27 +++++++------- .../mastercontrol/manager/ChildManager.kt | 14 ++++---- .../mastercontrol/manager/MatchManager.kt | 6 ++-- .../mastercontrol/manager/ServerManager.kt | 14 ++++---- .../mastercontrol/misc/ChildBungee.kt | 15 ++++---- .../mastercontrol/netty/NetManager.kt | 10 +++--- .../mastercontrol/settings/Settings.kt | 4 +-- .../mastercontrol/settings/SettingsReader.kt | 4 +-- MasterControl/src/main/resources/bungee.yml | 2 +- README.md | 35 ++++++++++--------- api/build.gradle.kts | 2 +- .../mistyrain}/api/MultiServerManAPI.java | 4 +-- .../api/MultiServerManAPIProvider.java | 2 +- .../mohist/mistyrain}/api/misc/EnumAPI.kt | 2 +- .../mohist/mistyrain}/api/misc/MatchInfo.java | 2 +- .../mistyrain}/api/misc/ServerInfo.java | 2 +- build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- .../kotlin/cc/maxmc/msm/common/Placeholder.kt | 3 -- .../msm/common/event/ChannelActiveEvent.kt | 6 ---- .../msm/common/event/ChannelInactiveEvent.kt | 6 ---- .../common/network/packet/CPacketEndServer.kt | 19 ---------- .../common/network/packet/CPacketGetInfo.kt | 11 ------ .../cc/maxmc/msm/common/utils/Coroutines.kt | 24 ------------- .../mohist/mistyrain/common/Placeholder.kt | 3 ++ .../common/event/ChannelActiveEvent.kt | 6 ++++ .../common/event/ChannelInactiveEvent.kt | 6 ++++ .../common/event/PacketReceiveEvent.kt | 6 ++-- .../mistyrain}/common/network/BungeePacket.kt | 4 +-- .../common/network/ClusterPacketHandler.kt | 15 ++++---- .../common/network/netty/ClusterMsgCodec.kt | 13 ++++--- .../common/network/netty/NetworkRegistry.kt | 18 +++++----- .../network/packet/CPacketAPICallback.kt | 11 +++--- .../common/network/packet/CPacketDebug.kt | 5 ++- .../common/network/packet/CPacketEndServer.kt | 18 ++++++++++ .../common/network/packet/CPacketGetInfo.kt | 10 ++++++ .../network/packet/CPacketRequestServer.kt | 11 +++--- .../common/network/packet/PPacketAPICall.kt | 7 ++-- .../common/network/packet/PPacketChildInfo.kt | 5 ++- .../common/network/packet/PPacketDebug.kt | 5 ++- .../network/packet/PPacketServerStarted.kt | 11 +++--- .../mistyrain/common/utils/Coroutines.kt | 26 ++++++++++++++ .../mohist/mistyrain}/common/utils/Logging.kt | 2 +- .../mohist/mistyrain}/common/utils/Netty.kt | 13 ++++--- 61 files changed, 276 insertions(+), 287 deletions(-) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/Controlled.kt (57%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/api/APIImpl.kt (86%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/command/Api.kt (89%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/command/Send.kt (71%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/listener/APIPacketListener.kt (83%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/listener/ProtocolListener.kt (69%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/misc/SubServer.kt (87%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/netty/NetClient.kt (84%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/settings/Settings.kt (86%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/settings/SettingsReader.kt (91%) rename Controlled/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/controlled/utils/ScriptRunner.kt (94%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/MasterControl.kt (59%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/api/APIImpl.kt (64%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/database/SQLDatabase.kt (92%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/listener/PacketListener.kt (67%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/manager/ChildManager.kt (78%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/manager/MatchManager.kt (81%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/manager/ServerManager.kt (88%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/misc/ChildBungee.kt (72%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/netty/NetManager.kt (78%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/settings/Settings.kt (82%) rename MasterControl/src/main/kotlin/{cc/maxmc/msm => com/github/mistyrain}/mastercontrol/settings/SettingsReader.kt (89%) rename api/src/main/java/{cc/maxmc/msm => com/mohist/mistyrain}/api/MultiServerManAPI.java (82%) rename api/src/main/java/{cc/maxmc/msm => com/mohist/mistyrain}/api/MultiServerManAPIProvider.java (97%) rename api/src/main/java/{cc/maxmc/msm => com/mohist/mistyrain}/api/misc/EnumAPI.kt (71%) rename api/src/main/java/{cc/maxmc/msm => com/mohist/mistyrain}/api/misc/MatchInfo.java (95%) rename api/src/main/java/{cc/maxmc/msm => com/mohist/mistyrain}/api/misc/ServerInfo.java (97%) delete mode 100644 common/src/main/kotlin/cc/maxmc/msm/common/Placeholder.kt delete mode 100644 common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelActiveEvent.kt delete mode 100644 common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelInactiveEvent.kt delete mode 100644 common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketEndServer.kt delete mode 100644 common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketGetInfo.kt delete mode 100644 common/src/main/kotlin/cc/maxmc/msm/common/utils/Coroutines.kt create mode 100644 common/src/main/kotlin/com/mohist/mistyrain/common/Placeholder.kt create mode 100644 common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelActiveEvent.kt create mode 100644 common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelInactiveEvent.kt rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/event/PacketReceiveEvent.kt (56%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/BungeePacket.kt (68%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/ClusterPacketHandler.kt (70%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/netty/ClusterMsgCodec.kt (65%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/netty/NetworkRegistry.kt (81%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/CPacketAPICallback.kt (86%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/CPacketDebug.kt (79%) create mode 100644 common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketEndServer.kt create mode 100644 common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketGetInfo.kt rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/CPacketRequestServer.kt (62%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/PPacketAPICall.kt (93%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/PPacketChildInfo.kt (88%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/PPacketDebug.kt (79%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/network/packet/PPacketServerStarted.kt (51%) create mode 100644 common/src/main/kotlin/com/mohist/mistyrain/common/utils/Coroutines.kt rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/utils/Logging.kt (86%) rename common/src/main/kotlin/{cc/maxmc/msm => com/mohist/mistyrain}/common/utils/Netty.kt (79%) diff --git a/Controlled/build.gradle.kts b/Controlled/build.gradle.kts index 7b7f987..c5c0a2c 100644 --- a/Controlled/build.gradle.kts +++ b/Controlled/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.github.johnrengelman.shadow") } -group = "cc.maxmc.msm.controlled" +group = "com.mohist.mistyrain.controlled" repositories { mavenCentral() @@ -20,7 +20,7 @@ dependencies { tasks.shadowJar { archiveClassifier.set(null as? String?) - relocate("kotlin", "cc.maxmc.msm.lib.kotlin") + relocate("kotlin", "com.mohist.mistyrain.lib.kotlin") } tasks.build { diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/Controlled.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/Controlled.kt similarity index 57% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/Controlled.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/Controlled.kt index 55a462d..fb45a3a 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/Controlled.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/Controlled.kt @@ -1,15 +1,15 @@ -package cc.maxmc.msm.controlled +package com.mohist.mistyrain.controlled -import cc.maxmc.msm.api.MultiServerManAPIProvider -import cc.maxmc.msm.controlled.api.APIImpl -import cc.maxmc.msm.controlled.listener.APIPacketListener -import cc.maxmc.msm.controlled.command.Api -import cc.maxmc.msm.controlled.command.Send -import cc.maxmc.msm.controlled.listener.ProtocolListener -import cc.maxmc.msm.controlled.netty.NetClient -import cc.maxmc.msm.controlled.settings.Settings -import cc.maxmc.msm.controlled.settings.SettingsReader -import cc.maxmc.msm.common.network.netty.NetworkRegistry +import com.mohist.mistyrain.api.MultiServerManAPIProvider +import com.mohist.mistyrain.common.network.netty.NetworkRegistry +import com.mohist.mistyrain.controlled.api.APIImpl +import com.mohist.mistyrain.controlled.command.Api +import com.mohist.mistyrain.controlled.command.Send +import com.mohist.mistyrain.controlled.listener.APIPacketListener +import com.mohist.mistyrain.controlled.listener.ProtocolListener +import com.mohist.mistyrain.controlled.netty.NetClient +import com.mohist.mistyrain.controlled.settings.Settings +import com.mohist.mistyrain.controlled.settings.SettingsReader import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.plugin.Plugin diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/api/APIImpl.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/api/APIImpl.kt similarity index 86% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/api/APIImpl.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/api/APIImpl.kt index bc4e737..d38244d 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/api/APIImpl.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/api/APIImpl.kt @@ -1,9 +1,9 @@ -package cc.maxmc.msm.controlled.api +package com.mohist.mistyrain.controlled.api -import cc.maxmc.msm.api.MultiServerManAPI -import cc.maxmc.msm.api.misc.MatchInfo -import cc.maxmc.msm.controlled.netty.NetClient -import cc.maxmc.msm.common.network.packet.PPacketAPICall +import com.mohist.mistyrain.api.MultiServerManAPI +import com.mohist.mistyrain.api.misc.MatchInfo +import com.mohist.mistyrain.common.network.packet.PPacketAPICall +import com.mohist.mistyrain.controlled.netty.NetClient import java.util.* import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/command/Api.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/command/Api.kt similarity index 89% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/command/Api.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/command/Api.kt index 0752fb8..f9df0f3 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/command/Api.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/command/Api.kt @@ -1,6 +1,6 @@ -package cc.maxmc.msm.controlled.command +package com.mohist.mistyrain.controlled.command -import cc.maxmc.msm.api.MultiServerManAPIProvider +import com.mohist.mistyrain.api.MultiServerManAPIProvider import net.md_5.bungee.api.CommandSender import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.api.plugin.Command diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/command/Send.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/command/Send.kt similarity index 71% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/command/Send.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/command/Send.kt index e3b8d34..d614880 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/command/Send.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/command/Send.kt @@ -1,7 +1,7 @@ -package cc.maxmc.msm.controlled.command +package com.mohist.mistyrain.controlled.command -import cc.maxmc.msm.controlled.netty.NetClient -import cc.maxmc.msm.common.network.packet.PPacketDebug +import com.mohist.mistyrain.common.network.packet.PPacketDebug +import com.mohist.mistyrain.controlled.netty.NetClient import net.md_5.bungee.api.CommandSender import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.api.plugin.Command diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/APIPacketListener.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/listener/APIPacketListener.kt similarity index 83% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/APIPacketListener.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/listener/APIPacketListener.kt index 5189603..a69c3de 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/APIPacketListener.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/listener/APIPacketListener.kt @@ -1,14 +1,13 @@ -package cc.maxmc.msm.controlled.listener +package com.mohist.mistyrain.controlled.listener -import cc.maxmc.msm.controlled.api.APIImpl -import cc.maxmc.msm.common.event.PacketReceiveEvent -import cc.maxmc.msm.common.network.packet.CPacketAPICallback +import com.mohist.mistyrain.common.network.packet.CPacketAPICallback +import com.mohist.mistyrain.controlled.api.APIImpl import net.md_5.bungee.api.plugin.Listener import net.md_5.bungee.event.EventHandler object APIPacketListener : Listener { @EventHandler - fun onPacket(packetEvent: PacketReceiveEvent) { + fun onPacket(packetEvent: com.mohist.mistyrain.common.event.PacketReceiveEvent) { val packet = packetEvent.packet if (packet !is CPacketAPICallback) { return diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/listener/ProtocolListener.kt similarity index 69% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/listener/ProtocolListener.kt index 53e61dd..184a3a0 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/listener/ProtocolListener.kt @@ -1,14 +1,12 @@ -package cc.maxmc.msm.controlled.listener +package com.mohist.mistyrain.controlled.listener -import cc.maxmc.msm.controlled.Controlled -import cc.maxmc.msm.controlled.misc.SubServer -import cc.maxmc.msm.controlled.netty.NetClient -import cc.maxmc.msm.controlled.settings.Settings -import cc.maxmc.msm.common.event.ChannelInactiveEvent -import cc.maxmc.msm.common.event.PacketReceiveEvent -import cc.maxmc.msm.common.network.packet.* -import cc.maxmc.msm.common.utils.log -import cc.maxmc.msm.common.utils.pluginScope +import com.mohist.mistyrain.common.network.packet.* +import com.mohist.mistyrain.common.utils.log +import com.mohist.mistyrain.common.utils.pluginScope +import com.mohist.mistyrain.controlled.Controlled +import com.mohist.mistyrain.controlled.misc.SubServer +import com.mohist.mistyrain.controlled.netty.NetClient +import com.mohist.mistyrain.controlled.settings.Settings import kotlinx.coroutines.launch import net.md_5.bungee.api.plugin.Listener import net.md_5.bungee.event.EventHandler @@ -21,7 +19,7 @@ object ProtocolListener : Listener { private val serverCache = HashMap() @EventHandler - fun onGetInfo(packetE: PacketReceiveEvent) { + fun onGetInfo(packetE: com.mohist.mistyrain.common.event.PacketReceiveEvent) { if (packetE.packet !is CPacketGetInfo) return val types = Controlled.instance.dataFolder.toPath().resolve("patterns").listDirectoryEntries() .filter { it.isDirectory() }.map { it.name }.toMutableSet() @@ -30,7 +28,7 @@ object ProtocolListener : Listener { } @EventHandler - fun onRequestServer(packetE: PacketReceiveEvent) { + fun onRequestServer(packetE: com.mohist.mistyrain.common.event.PacketReceiveEvent) { val packet = packetE.packet as? CPacketRequestServer ?: return val serverInfo = packet.serverInfo log("§a| §7正在启动服务器 ${serverInfo.server}") @@ -47,12 +45,12 @@ object ProtocolListener : Listener { } @EventHandler - fun onDisconnect(evt: ChannelInactiveEvent) { + fun onDisconnect(evt: com.mohist.mistyrain.common.event.ChannelInactiveEvent) { log("§c| §7与远程服务器断开连接.") } @EventHandler - fun onServerEnd(evt: PacketReceiveEvent) { + fun onServerEnd(evt: com.mohist.mistyrain.common.event.PacketReceiveEvent) { val packet = evt.packet as? CPacketEndServer ?: return val serverInfo = packet.server val server = diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/misc/SubServer.kt similarity index 87% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/misc/SubServer.kt index 2575936..0bca067 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/misc/SubServer.kt @@ -1,8 +1,8 @@ -package cc.maxmc.msm.controlled.misc +package com.mohist.mistyrain.controlled.misc -import cc.maxmc.msm.controlled.Controlled -import cc.maxmc.msm.controlled.settings.Settings -import cc.maxmc.msm.controlled.utils.ScriptRunner +import com.mohist.mistyrain.controlled.Controlled +import com.mohist.mistyrain.controlled.settings.Settings +import com.mohist.mistyrain.controlled.utils.ScriptRunner import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.nio.file.Path diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/netty/NetClient.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/netty/NetClient.kt similarity index 84% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/netty/NetClient.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/netty/NetClient.kt index b900547..3aada67 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/netty/NetClient.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/netty/NetClient.kt @@ -1,9 +1,8 @@ -package cc.maxmc.msm.controlled.netty +package com.mohist.mistyrain.controlled.netty -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.network.netty.NetworkRegistry -import cc.maxmc.msm.common.utils.log -import cc.maxmc.msm.common.utils.pipelineInit +import com.mohist.mistyrain.common.network.netty.NetworkRegistry +import com.mohist.mistyrain.common.utils.log +import com.mohist.mistyrain.common.utils.pipelineInit import io.netty.bootstrap.Bootstrap import io.netty.channel.Channel import io.netty.channel.ChannelOption @@ -44,7 +43,7 @@ object NetClient { } } - fun sendPacket(packet: BungeePacket) { + fun sendPacket(packet: com.mohist.mistyrain.common.network.BungeePacket) { channel.writeAndFlush(packet) } diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/Settings.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/settings/Settings.kt similarity index 86% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/Settings.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/settings/Settings.kt index 78c2d29..43d5f79 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/Settings.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/settings/Settings.kt @@ -1,6 +1,6 @@ -package cc.maxmc.msm.controlled.settings +package com.mohist.mistyrain.controlled.settings -import cc.maxmc.msm.controlled.settings.SettingsReader.config +import com.mohist.mistyrain.controlled.settings.SettingsReader.config object Settings { val name diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/settings/SettingsReader.kt similarity index 91% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/settings/SettingsReader.kt index 10506cf..8be3ea3 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/settings/SettingsReader.kt @@ -1,6 +1,6 @@ -package cc.maxmc.msm.controlled.settings +package com.mohist.mistyrain.controlled.settings -import cc.maxmc.msm.controlled.Controlled +import com.mohist.mistyrain.controlled.Controlled import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.config.Configuration diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/utils/ScriptRunner.kt b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/utils/ScriptRunner.kt similarity index 94% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/utils/ScriptRunner.kt rename to Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/utils/ScriptRunner.kt index 3378efe..eb4a28a 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/utils/ScriptRunner.kt +++ b/Controlled/src/main/kotlin/com/mohist/mistyrain/controlled/utils/ScriptRunner.kt @@ -1,6 +1,6 @@ -package cc.maxmc.msm.controlled.utils +package com.mohist.mistyrain.controlled.utils -import cc.maxmc.msm.common.utils.log +import com.mohist.mistyrain.common.utils.log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.nio.file.Path diff --git a/Controlled/src/main/resources/bungee.yml b/Controlled/src/main/resources/bungee.yml index 0142bd9..d3e387c 100644 --- a/Controlled/src/main/resources/bungee.yml +++ b/Controlled/src/main/resources/bungee.yml @@ -1,3 +1,3 @@ name: Controlled -main: cc.maxmc.msm.controlled.Controlled +main: com.mohist.mistyrain.controlled.Controlled author: MistyRain \ No newline at end of file diff --git a/MasterControl/build.gradle.kts b/MasterControl/build.gradle.kts index 1a6a5cb..6b763dd 100644 --- a/MasterControl/build.gradle.kts +++ b/MasterControl/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.github.johnrengelman.shadow") } -group = "cc.maxmc.msm.mastercontrol" +group = "com.mohist.mistyrain.mastercontrol" repositories { mavenCentral() @@ -21,7 +21,7 @@ dependencies { tasks.shadowJar { archiveClassifier.set(null as? String?) - relocate("kotlin", "cc.maxmc.msm.lib.kotlin") + relocate("kotlin", "com.mohist.mistyrain.lib.kotlin") } tasks.build { diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/MasterControl.kt similarity index 59% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/MasterControl.kt index d63a709..65bd517 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/MasterControl.kt @@ -1,11 +1,11 @@ -package cc.maxmc.msm.mastercontrol +package com.mohist.mistyrain.mastercontrol -import cc.maxmc.msm.api.MultiServerManAPIProvider -import cc.maxmc.msm.mastercontrol.api.APIImpl -import cc.maxmc.msm.mastercontrol.listener.PacketListener -import cc.maxmc.msm.mastercontrol.manager.MatchManager -import cc.maxmc.msm.mastercontrol.manager.ServerManager -import cc.maxmc.msm.mastercontrol.netty.NetManager +import com.mohist.mistyrain.api.MultiServerManAPIProvider +import com.mohist.mistyrain.mastercontrol.api.APIImpl +import com.mohist.mistyrain.mastercontrol.listener.PacketListener +import com.mohist.mistyrain.mastercontrol.manager.MatchManager +import com.mohist.mistyrain.mastercontrol.manager.ServerManager +import com.mohist.mistyrain.mastercontrol.netty.NetManager import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.plugin.Plugin diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/api/APIImpl.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/api/APIImpl.kt similarity index 64% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/api/APIImpl.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/api/APIImpl.kt index b6f333b..acecc14 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/api/APIImpl.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/api/APIImpl.kt @@ -1,9 +1,9 @@ -package cc.maxmc.msm.mastercontrol.api +package com.mohist.mistyrain.mastercontrol.api -import cc.maxmc.msm.api.MultiServerManAPI -import cc.maxmc.msm.api.misc.MatchInfo -import cc.maxmc.msm.mastercontrol.database.SQLDatabase -import cc.maxmc.msm.mastercontrol.manager.MatchManager +import com.mohist.mistyrain.api.MultiServerManAPI +import com.mohist.mistyrain.api.misc.MatchInfo +import com.mohist.mistyrain.mastercontrol.database.SQLDatabase +import com.mohist.mistyrain.mastercontrol.manager.MatchManager object APIImpl : MultiServerManAPI { override fun getServer(type: String, players: List): MatchInfo { diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/database/SQLDatabase.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/database/SQLDatabase.kt similarity index 92% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/database/SQLDatabase.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/database/SQLDatabase.kt index 93f39be..738fcce 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/database/SQLDatabase.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/database/SQLDatabase.kt @@ -1,8 +1,8 @@ -package cc.maxmc.msm.mastercontrol.database +package com.mohist.mistyrain.mastercontrol.database -import cc.maxmc.msm.api.misc.MatchInfo -import cc.maxmc.msm.mastercontrol.manager.MatchManager -import cc.maxmc.msm.mastercontrol.settings.Settings +import com.mohist.mistyrain.api.misc.MatchInfo +import com.mohist.mistyrain.mastercontrol.manager.MatchManager +import com.mohist.mistyrain.mastercontrol.settings.Settings import com.zaxxer.hikari.HikariConfig import com.zaxxer.hikari.pool.HikariPool import java.sql.Timestamp diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/listener/PacketListener.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/listener/PacketListener.kt similarity index 67% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/listener/PacketListener.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/listener/PacketListener.kt index 998ae98..233394d 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/listener/PacketListener.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/listener/PacketListener.kt @@ -1,15 +1,12 @@ -package cc.maxmc.msm.mastercontrol.listener +package com.mohist.mistyrain.mastercontrol.listener -import cc.maxmc.msm.api.MultiServerManAPIProvider -import cc.maxmc.msm.common.event.ChannelActiveEvent -import cc.maxmc.msm.common.event.ChannelInactiveEvent -import cc.maxmc.msm.common.event.PacketReceiveEvent -import cc.maxmc.msm.common.network.packet.CPacketAPICallback -import cc.maxmc.msm.common.network.packet.CPacketDebug -import cc.maxmc.msm.common.network.packet.PPacketAPICall -import cc.maxmc.msm.common.network.packet.PPacketDebug -import cc.maxmc.msm.common.utils.log -import cc.maxmc.msm.mastercontrol.manager.ChildManager +import com.mohist.mistyrain.api.MultiServerManAPIProvider +import com.mohist.mistyrain.common.network.packet.CPacketAPICallback +import com.mohist.mistyrain.common.network.packet.CPacketDebug +import com.mohist.mistyrain.common.network.packet.PPacketAPICall +import com.mohist.mistyrain.common.network.packet.PPacketDebug +import com.mohist.mistyrain.common.utils.log +import com.mohist.mistyrain.mastercontrol.manager.ChildManager import net.md_5.bungee.api.plugin.Listener import net.md_5.bungee.event.EventHandler @@ -17,7 +14,7 @@ object PacketListener : Listener { val api = MultiServerManAPIProvider.getAPI() @EventHandler - fun onAPICall(evt: PacketReceiveEvent) { + fun onAPICall(evt: com.mohist.mistyrain.common.event.PacketReceiveEvent) { val packet = evt.packet if (packet !is PPacketAPICall) return val callback = when (packet) { @@ -42,7 +39,7 @@ object PacketListener : Listener { } @EventHandler - fun onPacket(evt: PacketReceiveEvent) { + fun onPacket(evt: com.mohist.mistyrain.common.event.PacketReceiveEvent) { val packet = evt.packet if (packet !is PPacketDebug) { return @@ -52,13 +49,13 @@ object PacketListener : Listener { } @EventHandler - fun onChannelActive(evt: ChannelActiveEvent) { + fun onChannelActive(evt: com.mohist.mistyrain.common.event.ChannelActiveEvent) { log("§a| §7子BC ${evt.channel.remoteAddress()} 成功连接.") ChildManager.registerChild(evt.channel) } @EventHandler - fun onChannelInactive(evt: ChannelInactiveEvent) { + fun onChannelInactive(evt: com.mohist.mistyrain.common.event.ChannelInactiveEvent) { log("§c| §7子BC ${evt.channel.remoteAddress()} 断开连接.") ChildManager.unregisterChild(evt.channel) } diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ChildManager.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ChildManager.kt similarity index 78% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ChildManager.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ChildManager.kt index 0b98165..f9aec1c 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ChildManager.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ChildManager.kt @@ -1,11 +1,11 @@ -package cc.maxmc.msm.mastercontrol.manager +package com.mohist.mistyrain.mastercontrol.manager -import cc.maxmc.msm.common.network.packet.CPacketGetInfo -import cc.maxmc.msm.common.network.packet.PPacketChildInfo -import cc.maxmc.msm.common.utils.awaitPacket -import cc.maxmc.msm.common.utils.log -import cc.maxmc.msm.common.utils.pluginScope -import cc.maxmc.msm.mastercontrol.misc.ChildBungee +import com.mohist.mistyrain.common.network.packet.CPacketGetInfo +import com.mohist.mistyrain.common.network.packet.PPacketChildInfo +import com.mohist.mistyrain.common.utils.awaitPacket +import com.mohist.mistyrain.common.utils.log +import com.mohist.mistyrain.common.utils.pluginScope +import com.mohist.mistyrain.mastercontrol.misc.ChildBungee import io.netty.channel.Channel import kotlinx.coroutines.launch import java.util.* diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/MatchManager.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/MatchManager.kt similarity index 81% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/MatchManager.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/MatchManager.kt index d2d520d..890bc0a 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/MatchManager.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/MatchManager.kt @@ -1,7 +1,7 @@ -package cc.maxmc.msm.mastercontrol.manager +package com.mohist.mistyrain.mastercontrol.manager -import cc.maxmc.msm.api.misc.MatchInfo -import cc.maxmc.msm.mastercontrol.database.SQLDatabase +import com.mohist.mistyrain.api.misc.MatchInfo +import com.mohist.mistyrain.mastercontrol.database.SQLDatabase import java.util.concurrent.ConcurrentHashMap object MatchManager { diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ServerManager.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ServerManager.kt similarity index 88% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ServerManager.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ServerManager.kt index ea4a206..231e6e5 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ServerManager.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ServerManager.kt @@ -1,10 +1,10 @@ -package cc.maxmc.msm.mastercontrol.manager +package com.mohist.mistyrain.mastercontrol.manager -import cc.maxmc.msm.api.misc.ServerInfo -import cc.maxmc.msm.common.network.packet.CPacketEndServer -import cc.maxmc.msm.common.utils.log -import cc.maxmc.msm.common.utils.pluginScope -import cc.maxmc.msm.mastercontrol.misc.ChildBungee +import com.mohist.mistyrain.api.misc.ServerInfo +import com.mohist.mistyrain.common.network.packet.CPacketEndServer +import com.mohist.mistyrain.common.utils.log +import com.mohist.mistyrain.common.utils.pluginScope +import com.mohist.mistyrain.mastercontrol.misc.ChildBungee import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.launch import java.util.* @@ -82,7 +82,7 @@ object ServerManager { val server = child.requestServer(type) if (server.uid == ServerInfo.NULL_UID) - list.add(server) + list.add(server) childMap[server] = child return server } diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/misc/ChildBungee.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/misc/ChildBungee.kt similarity index 72% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/misc/ChildBungee.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/misc/ChildBungee.kt index 8f8533a..7748f66 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/misc/ChildBungee.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/misc/ChildBungee.kt @@ -1,11 +1,10 @@ -package cc.maxmc.msm.mastercontrol.misc +package com.mohist.mistyrain.mastercontrol.misc -import cc.maxmc.msm.api.misc.ServerInfo -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.network.packet.CPacketRequestServer -import cc.maxmc.msm.common.network.packet.PPacketServerStarted -import cc.maxmc.msm.common.utils.awaitPacket -import cc.maxmc.msm.common.utils.log +import com.mohist.mistyrain.api.misc.ServerInfo +import com.mohist.mistyrain.common.network.packet.CPacketRequestServer +import com.mohist.mistyrain.common.network.packet.PPacketServerStarted +import com.mohist.mistyrain.common.utils.awaitPacket +import com.mohist.mistyrain.common.utils.log import io.netty.channel.Channel import java.net.InetSocketAddress import java.util.* @@ -13,7 +12,7 @@ import java.util.* class ChildBungee( val channel: Channel, val ports: Set, val types: Set, val usedPorts: MutableSet = HashSet() ) { - fun sendPacket(packet: BungeePacket) { + fun sendPacket(packet: com.mohist.mistyrain.common.network.BungeePacket) { channel.writeAndFlush(packet) } diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/netty/NetManager.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/netty/NetManager.kt similarity index 78% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/netty/NetManager.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/netty/NetManager.kt index 9e7dbb1..e8a36cc 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/netty/NetManager.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/netty/NetManager.kt @@ -1,9 +1,9 @@ -package cc.maxmc.msm.mastercontrol.netty +package com.mohist.mistyrain.mastercontrol.netty -import cc.maxmc.msm.common.network.netty.NetworkRegistry -import cc.maxmc.msm.common.utils.log -import cc.maxmc.msm.common.utils.pipelineInit -import cc.maxmc.msm.mastercontrol.settings.Settings +import com.mohist.mistyrain.common.network.netty.NetworkRegistry +import com.mohist.mistyrain.common.utils.log +import com.mohist.mistyrain.common.utils.pipelineInit +import com.mohist.mistyrain.mastercontrol.settings.Settings import io.netty.bootstrap.ServerBootstrap import io.netty.channel.ChannelFutureListener import io.netty.channel.nio.NioEventLoopGroup diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/Settings.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/Settings.kt similarity index 82% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/Settings.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/Settings.kt index b80954b..0c01752 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/Settings.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/Settings.kt @@ -1,6 +1,6 @@ -package cc.maxmc.msm.mastercontrol.settings +package com.mohist.mistyrain.mastercontrol.settings -import cc.maxmc.msm.mastercontrol.settings.SettingsReader.config +import com.mohist.mistyrain.mastercontrol.settings.SettingsReader.config object Settings { val serverPort diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/SettingsReader.kt similarity index 89% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt rename to MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/SettingsReader.kt index b3f42a9..37d3d40 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt +++ b/MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/SettingsReader.kt @@ -1,6 +1,6 @@ -package cc.maxmc.msm.mastercontrol.settings +package com.mohist.mistyrain.mastercontrol.settings -import cc.maxmc.msm.mastercontrol.MasterControl +import com.mohist.mistyrain.mastercontrol.MasterControl import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.config.Configuration diff --git a/MasterControl/src/main/resources/bungee.yml b/MasterControl/src/main/resources/bungee.yml index 75c4553..a11a127 100644 --- a/MasterControl/src/main/resources/bungee.yml +++ b/MasterControl/src/main/resources/bungee.yml @@ -1,3 +1,3 @@ name: MasterControl -main: cc.maxmc.msm.mastercontrol.MasterControl +main: com.mohist.mistyrain.mastercontrol.MasterControl author: MistyRain \ No newline at end of file diff --git a/README.md b/README.md index 438af6b..c93415d 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,13 @@ - 返回值： - - String类型的ip地址（带端口） + - String类型的ip地址（带端口） - - Int类型的对局id + - Int类型的对局id - 参数列表： - - `List players` - - `String type` + - `List players` + - `String type` ### `func informEnd()` @@ -48,51 +48,52 @@ - 返回值：无 - 参数列表： - - `int id` + - `int id` ### `func getPlayerServer()` - 接口描述：获取某个玩家还在进行中的对局的服务器的ip地址 - 返回值： - - String 类型的ip地址（带端口），未在对局中返回null - - Int 类型的对局id，未在对局中返回-1 + - String 类型的ip地址（带端口），未在对局中返回null + - Int 类型的对局id，未在对局中返回-1 - 参数列表： - - `Player player` + - `Player player` ### `func containPlayer()` - 接口描述：查询某个玩家是否在对局中。 - 返回值： - - bool + - bool - 参数列表： - - `Player player` + - `Player player` ## 数据库结构 - `match` | id(int) | start(datetime) | end(datetime) | players(text) | type(varchar) | -| ------- | --------------- | ------------- | ------------------------------------ | ------------- | +|---------|-----------------|---------------|--------------------------------------|---------------| | 1 | 1678554776 | 1678554784 | TONY_All,Sanseyooyea,PlayerA,PlayerB | bedwars | + ## API 使用 -依赖: +依赖: ```kotlin dependencies { - compileOnly("cc.maxmc.msm:MultiServerMan-API:${version}") + compileOnly("com.mohist.mistyrain:MultiServerMan-API:${version}") } ``` -使用: +使用: ```java List players; -MultiServerManAPI api = MultiServerManAPIProvider.getAPI(); -api.getServer("default", players); + MultiServerManAPI api=MultiServerManAPIProvider.getAPI(); + api.getServer("default",players); ``` ## Q&A @@ -110,5 +111,5 @@ api.getServer("default", players); A: 只提供服务器并记录玩家 4. Q: 服务端启动方式 - + A: 启动脚本，参数为端口+自定义参数 \ No newline at end of file diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 139e51a..62d696f 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -2,7 +2,7 @@ plugins { kotlin("jvm") } -group = "cc.maxmc.msm.api" +group = "com.mohist.mistyrain.api" repositories { mavenCentral() diff --git a/api/src/main/java/cc/maxmc/msm/api/MultiServerManAPI.java b/api/src/main/java/com/mohist/mistyrain/api/MultiServerManAPI.java similarity index 82% rename from api/src/main/java/cc/maxmc/msm/api/MultiServerManAPI.java rename to api/src/main/java/com/mohist/mistyrain/api/MultiServerManAPI.java index 6033379..884eb3b 100644 --- a/api/src/main/java/cc/maxmc/msm/api/MultiServerManAPI.java +++ b/api/src/main/java/com/mohist/mistyrain/api/MultiServerManAPI.java @@ -1,6 +1,6 @@ -package cc.maxmc.msm.api; +package com.mohist.mistyrain.api; -import cc.maxmc.msm.api.misc.MatchInfo; +import com.mohist.mistyrain.api.misc.MatchInfo; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/api/src/main/java/cc/maxmc/msm/api/MultiServerManAPIProvider.java b/api/src/main/java/com/mohist/mistyrain/api/MultiServerManAPIProvider.java similarity index 97% rename from api/src/main/java/cc/maxmc/msm/api/MultiServerManAPIProvider.java rename to api/src/main/java/com/mohist/mistyrain/api/MultiServerManAPIProvider.java index 9cad4ca..479968c 100644 --- a/api/src/main/java/cc/maxmc/msm/api/MultiServerManAPIProvider.java +++ b/api/src/main/java/com/mohist/mistyrain/api/MultiServerManAPIProvider.java @@ -1,4 +1,4 @@ -package cc.maxmc.msm.api; +package com.mohist.mistyrain.api; @SuppressWarnings("unused") // API public class MultiServerManAPIProvider { diff --git a/api/src/main/java/cc/maxmc/msm/api/misc/EnumAPI.kt b/api/src/main/java/com/mohist/mistyrain/api/misc/EnumAPI.kt similarity index 71% rename from api/src/main/java/cc/maxmc/msm/api/misc/EnumAPI.kt rename to api/src/main/java/com/mohist/mistyrain/api/misc/EnumAPI.kt index 028cac8..3251231 100644 --- a/api/src/main/java/cc/maxmc/msm/api/misc/EnumAPI.kt +++ b/api/src/main/java/com/mohist/mistyrain/api/misc/EnumAPI.kt @@ -1,4 +1,4 @@ -package cc.maxmc.msm.api.misc +package com.mohist.mistyrain.api.misc enum class EnumAPI { GET_SERVER, diff --git a/api/src/main/java/cc/maxmc/msm/api/misc/MatchInfo.java b/api/src/main/java/com/mohist/mistyrain/api/misc/MatchInfo.java similarity index 95% rename from api/src/main/java/cc/maxmc/msm/api/misc/MatchInfo.java rename to api/src/main/java/com/mohist/mistyrain/api/misc/MatchInfo.java index 5635cb3..48755b0 100644 --- a/api/src/main/java/cc/maxmc/msm/api/misc/MatchInfo.java +++ b/api/src/main/java/com/mohist/mistyrain/api/misc/MatchInfo.java @@ -1,4 +1,4 @@ -package cc.maxmc.msm.api.misc; +package com.mohist.mistyrain.api.misc; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/cc/maxmc/msm/api/misc/ServerInfo.java b/api/src/main/java/com/mohist/mistyrain/api/misc/ServerInfo.java similarity index 97% rename from api/src/main/java/cc/maxmc/msm/api/misc/ServerInfo.java rename to api/src/main/java/com/mohist/mistyrain/api/misc/ServerInfo.java index 7117bab..a49b306 100644 --- a/api/src/main/java/cc/maxmc/msm/api/misc/ServerInfo.java +++ b/api/src/main/java/com/mohist/mistyrain/api/misc/ServerInfo.java @@ -1,4 +1,4 @@ -package cc.maxmc.msm.api.misc; +package com.mohist.mistyrain.api.misc; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/build.gradle.kts b/build.gradle.kts index ea01c7d..2bb4633 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `maven-publish` } -group = "cc.maxmc.msm" +group = "com.mohist.mistyrain" version = "1.1.0" diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 21ccaca..2bed578 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -2,7 +2,7 @@ plugins { kotlin("jvm") } -group = "cc.maxmc.msm.common" +group = "com.mohist.mistyrain.common" repositories { mavenCentral() diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/Placeholder.kt b/common/src/main/kotlin/cc/maxmc/msm/common/Placeholder.kt deleted file mode 100644 index 2c19f26..0000000 --- a/common/src/main/kotlin/cc/maxmc/msm/common/Placeholder.kt +++ /dev/null @@ -1,3 +0,0 @@ -package cc.maxmc.msm.common - -object Placeholder \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelActiveEvent.kt b/common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelActiveEvent.kt deleted file mode 100644 index da22c26..0000000 --- a/common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelActiveEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package cc.maxmc.msm.common.event - -import io.netty.channel.Channel -import net.md_5.bungee.api.plugin.Event - -class ChannelActiveEvent(val channel: Channel): Event() \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelInactiveEvent.kt b/common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelInactiveEvent.kt deleted file mode 100644 index fae3489..0000000 --- a/common/src/main/kotlin/cc/maxmc/msm/common/event/ChannelInactiveEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package cc.maxmc.msm.common.event - -import io.netty.channel.Channel -import net.md_5.bungee.api.plugin.Event - -class ChannelInactiveEvent(val channel: Channel): Event() \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketEndServer.kt b/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketEndServer.kt deleted file mode 100644 index 855363f..0000000 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketEndServer.kt +++ /dev/null @@ -1,19 +0,0 @@ -package cc.maxmc.msm.common.network.packet - -import cc.maxmc.msm.api.misc.ServerInfo -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.utils.readServerInfo -import cc.maxmc.msm.common.utils.writeServerInfo -import io.netty.buffer.ByteBuf - -class CPacketEndServer( - var server: ServerInfo -) : BungeePacket() { - override fun encode(buf: ByteBuf) { - buf.writeServerInfo(server) - } - - override fun decode(buf: ByteBuf) { - server = buf.readServerInfo() - } -} \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketGetInfo.kt b/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketGetInfo.kt deleted file mode 100644 index 9133fb3..0000000 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketGetInfo.kt +++ /dev/null @@ -1,11 +0,0 @@ -package cc.maxmc.msm.common.network.packet - -import cc.maxmc.msm.common.network.BungeePacket -import io.netty.buffer.ByteBuf - -class CPacketGetInfo : BungeePacket() { - override fun encode(buf: ByteBuf) {} - - override fun decode(buf: ByteBuf) {} - -} \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/utils/Coroutines.kt b/common/src/main/kotlin/cc/maxmc/msm/common/utils/Coroutines.kt deleted file mode 100644 index 32ea66c..0000000 --- a/common/src/main/kotlin/cc/maxmc/msm/common/utils/Coroutines.kt +++ /dev/null @@ -1,24 +0,0 @@ -package cc.maxmc.msm.common.utils - -import cc.maxmc.msm.common.network.BungeePacket -import io.netty.channel.Channel -import kotlinx.coroutines.CoroutineExceptionHandler -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.SupervisorJob -import kotlin.coroutines.Continuation -import kotlin.coroutines.suspendCoroutine - -val pluginScope = CoroutineScope(SupervisorJob() + CoroutineExceptionHandler { _, except -> - log("§c执行异步操作时出现异常 ${except.message}") - except.printStackTrace() -}) - -val awaiting = - ArrayList, (Channel, BungeePacket) -> Boolean, Continuation>>() - -suspend inline fun awaitPacket(packetClass: Class, noinline filter: (Channel, T) -> Boolean) = - suspendCoroutine { - val triple = Triple(packetClass, filter, it) - @Suppress("UNCHECKED_CAST") - awaiting.add(triple as Triple, (Channel, BungeePacket) -> Boolean, Continuation>) - } \ No newline at end of file diff --git a/common/src/main/kotlin/com/mohist/mistyrain/common/Placeholder.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/Placeholder.kt new file mode 100644 index 0000000..889df4a --- /dev/null +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/Placeholder.kt @@ -0,0 +1,3 @@ +package com.mohist.mistyrain.common + +object Placeholder \ No newline at end of file diff --git a/common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelActiveEvent.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelActiveEvent.kt new file mode 100644 index 0000000..1bade11 --- /dev/null +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelActiveEvent.kt @@ -0,0 +1,6 @@ +package com.mohist.mistyrain.common.event + +import io.netty.channel.Channel +import net.md_5.bungee.api.plugin.Event + +class ChannelActiveEvent(val channel: Channel) : Event() \ No newline at end of file diff --git a/common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelInactiveEvent.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelInactiveEvent.kt new file mode 100644 index 0000000..6e96127 --- /dev/null +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/event/ChannelInactiveEvent.kt @@ -0,0 +1,6 @@ +package com.mohist.mistyrain.common.event + +import io.netty.channel.Channel +import net.md_5.bungee.api.plugin.Event + +class ChannelInactiveEvent(val channel: Channel) : Event() \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/event/PacketReceiveEvent.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/event/PacketReceiveEvent.kt similarity index 56% rename from common/src/main/kotlin/cc/maxmc/msm/common/event/PacketReceiveEvent.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/event/PacketReceiveEvent.kt index fe735b4..3e0492a 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/event/PacketReceiveEvent.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/event/PacketReceiveEvent.kt @@ -1,7 +1,7 @@ -package cc.maxmc.msm.common.event +package com.mohist.mistyrain.common.event -import cc.maxmc.msm.common.network.BungeePacket import io.netty.channel.Channel import net.md_5.bungee.api.plugin.Event -data class PacketReceiveEvent(val channel: Channel, val packet: BungeePacket) : Event() \ No newline at end of file +data class PacketReceiveEvent(val channel: Channel, val packet: com.mohist.mistyrain.common.network.BungeePacket) : + Event() \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/BungeePacket.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/BungeePacket.kt similarity index 68% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/BungeePacket.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/BungeePacket.kt index bdc4d75..3cc0876 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/BungeePacket.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/BungeePacket.kt @@ -1,8 +1,8 @@ -package cc.maxmc.msm.common.network +package com.mohist.mistyrain.common.network import io.netty.buffer.ByteBuf -abstract class BungeePacket: Cloneable { +abstract class BungeePacket : Cloneable { abstract fun encode(buf: ByteBuf) abstract fun decode(buf: ByteBuf) diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/ClusterPacketHandler.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/ClusterPacketHandler.kt similarity index 70% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/ClusterPacketHandler.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/ClusterPacketHandler.kt index 77a85cb..3ab72c6 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/ClusterPacketHandler.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/ClusterPacketHandler.kt @@ -1,10 +1,9 @@ -package cc.maxmc.msm.common.network +package com.mohist.mistyrain.common.network -import cc.maxmc.msm.common.event.ChannelActiveEvent -import cc.maxmc.msm.common.event.ChannelInactiveEvent -import cc.maxmc.msm.common.event.PacketReceiveEvent -import cc.maxmc.msm.common.utils.awaiting -import cc.maxmc.msm.common.utils.log +import com.mohist.mistyrain.common.event.ChannelActiveEvent +import com.mohist.mistyrain.common.event.ChannelInactiveEvent +import com.mohist.mistyrain.common.event.PacketReceiveEvent +import com.mohist.mistyrain.common.utils.awaiting import io.netty.channel.ChannelHandler.Sharable import io.netty.channel.ChannelHandlerContext import io.netty.channel.SimpleChannelInboundHandler @@ -14,8 +13,8 @@ import kotlin.coroutines.resume object ClusterPacketHandler : SimpleChannelInboundHandler() { override fun channelRead0(ctx: ChannelHandlerContext, msg: BungeePacket) { awaiting.filter { it.first == msg::class.java }.filter { it.second(ctx.channel(), msg) }.forEach { - it.third.resume(msg) - } + it.third.resume(msg) + } PacketReceiveEvent(ctx.channel(), msg).callEvent() } diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/netty/ClusterMsgCodec.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/netty/ClusterMsgCodec.kt similarity index 65% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/netty/ClusterMsgCodec.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/netty/ClusterMsgCodec.kt index fdccb97..03dede5 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/netty/ClusterMsgCodec.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/netty/ClusterMsgCodec.kt @@ -1,13 +1,16 @@ -package cc.maxmc.msm.common.network.netty +package com.mohist.mistyrain.common.network.netty -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.utils.debug import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.ByteToMessageCodec -class ClusterMsgCodec(private val current: NetworkRegistry.PacketDirection) : ByteToMessageCodec() { - override fun encode(ctx: ChannelHandlerContext, msg: BungeePacket, out: ByteBuf) { +class ClusterMsgCodec(private val current: NetworkRegistry.PacketDirection) : + ByteToMessageCodec() { + override fun encode( + ctx: ChannelHandlerContext, + msg: com.mohist.mistyrain.common.network.BungeePacket, + out: ByteBuf + ) { val id = NetworkRegistry.getPacketID(current, msg) out.writeInt(id) msg.encode(out) diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/netty/NetworkRegistry.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/netty/NetworkRegistry.kt similarity index 81% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/netty/NetworkRegistry.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/netty/NetworkRegistry.kt index 190f71e..1be8ea2 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/netty/NetworkRegistry.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/netty/NetworkRegistry.kt @@ -1,12 +1,11 @@ -package cc.maxmc.msm.common.network.netty +package com.mohist.mistyrain.common.network.netty -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.network.packet.* import com.google.common.collect.HashBiMap +import com.mohist.mistyrain.common.network.packet.* object NetworkRegistry { - private val parentBoundMap = HashBiMap.create>() - private val childBoundMap = HashBiMap.create>() + private val parentBoundMap = HashBiMap.create>() + private val childBoundMap = HashBiMap.create>() init { registerPacket(PacketDirection.PARENT_BOUND, PPacketDebug::class.java) @@ -27,7 +26,10 @@ object NetworkRegistry { } - private fun registerPacket(direction: PacketDirection, packet: Class) { + private fun registerPacket( + direction: PacketDirection, + packet: Class + ) { if (direction == PacketDirection.PARENT_BOUND) { parentBoundMap } else { @@ -37,12 +39,12 @@ object NetworkRegistry { } } - fun getPacketID(side: PacketDirection, packet: BungeePacket): Int { + fun getPacketID(side: PacketDirection, packet: com.mohist.mistyrain.common.network.BungeePacket): Int { val map = if (side == PacketDirection.PARENT_BOUND) childBoundMap else parentBoundMap return map.inverse()[packet::class.java] ?: throw IllegalStateException("Packet does not in registry.") } - fun getPacketByID(side: PacketDirection, id: Int): BungeePacket { + fun getPacketByID(side: PacketDirection, id: Int): com.mohist.mistyrain.common.network.BungeePacket { val map = if (side == PacketDirection.PARENT_BOUND) parentBoundMap else childBoundMap return map[id]?.newInstance() ?: throw IllegalStateException("Packet does not in registry.") } diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketAPICallback.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketAPICallback.kt similarity index 86% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketAPICallback.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketAPICallback.kt index a010eed..8393abd 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketAPICallback.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketAPICallback.kt @@ -1,16 +1,15 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.api.misc.MatchInfo -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.utils.readMatchInfo -import cc.maxmc.msm.common.utils.writeMatchInfo +import com.mohist.mistyrain.api.misc.MatchInfo +import com.mohist.mistyrain.common.utils.readMatchInfo +import com.mohist.mistyrain.common.utils.writeMatchInfo import io.netty.buffer.ByteBuf import net.md_5.bungee.protocol.DefinedPacket import java.util.* sealed class CPacketAPICallback( var uid: UUID -) : BungeePacket() { +) : com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { DefinedPacket.writeUUID(uid, buf) } diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketDebug.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketDebug.kt similarity index 79% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketDebug.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketDebug.kt index cb75485..95055c0 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketDebug.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketDebug.kt @@ -1,11 +1,10 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.common.network.BungeePacket import io.netty.buffer.ByteBuf data class CPacketDebug( var content: String = "" -) : BungeePacket() { +) : com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { val array = content.encodeToByteArray() diff --git a/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketEndServer.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketEndServer.kt new file mode 100644 index 0000000..0d09cf2 --- /dev/null +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketEndServer.kt @@ -0,0 +1,18 @@ +package com.mohist.mistyrain.common.network.packet + +import com.mohist.mistyrain.api.misc.ServerInfo +import com.mohist.mistyrain.common.utils.readServerInfo +import com.mohist.mistyrain.common.utils.writeServerInfo +import io.netty.buffer.ByteBuf + +class CPacketEndServer( + var server: ServerInfo +) : com.mohist.mistyrain.common.network.BungeePacket() { + override fun encode(buf: ByteBuf) { + buf.writeServerInfo(server) + } + + override fun decode(buf: ByteBuf) { + server = buf.readServerInfo() + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketGetInfo.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketGetInfo.kt new file mode 100644 index 0000000..2b43327 --- /dev/null +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketGetInfo.kt @@ -0,0 +1,10 @@ +package com.mohist.mistyrain.common.network.packet + +import io.netty.buffer.ByteBuf + +class CPacketGetInfo : com.mohist.mistyrain.common.network.BungeePacket() { + override fun encode(buf: ByteBuf) {} + + override fun decode(buf: ByteBuf) {} + +} \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketRequestServer.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketRequestServer.kt similarity index 62% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketRequestServer.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketRequestServer.kt index 62a00b1..5acceb1 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/CPacketRequestServer.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/CPacketRequestServer.kt @@ -1,16 +1,15 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.api.misc.ServerInfo -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.utils.readServerInfo -import cc.maxmc.msm.common.utils.writeServerInfo +import com.mohist.mistyrain.api.misc.ServerInfo +import com.mohist.mistyrain.common.utils.readServerInfo +import com.mohist.mistyrain.common.utils.writeServerInfo import io.netty.buffer.ByteBuf import net.md_5.bungee.protocol.DefinedPacket class CPacketRequestServer( var type: String = "", var serverInfo: ServerInfo = ServerInfo(), -) : BungeePacket() { +) : com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { DefinedPacket.writeString(type, buf) buf.writeServerInfo(serverInfo) diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketAPICall.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketAPICall.kt similarity index 93% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketAPICall.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketAPICall.kt index 14fea7e..75cdb9e 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketAPICall.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketAPICall.kt @@ -1,7 +1,6 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.api.misc.EnumAPI -import cc.maxmc.msm.common.network.BungeePacket +import com.mohist.mistyrain.api.misc.EnumAPI import io.netty.buffer.ByteBuf import net.md_5.bungee.protocol.DefinedPacket import java.util.* @@ -9,7 +8,7 @@ import java.util.* sealed class PPacketAPICall( var api: EnumAPI = EnumAPI.GET_SERVER, var uid: UUID = UUID.randomUUID() -) : BungeePacket() { +) : com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { DefinedPacket.writeVarInt(api.ordinal, buf) DefinedPacket.writeUUID(uid, buf) diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketChildInfo.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketChildInfo.kt similarity index 88% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketChildInfo.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketChildInfo.kt index 1073197..f755018 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketChildInfo.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketChildInfo.kt @@ -1,11 +1,10 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.common.network.BungeePacket import io.netty.buffer.ByteBuf import net.md_5.bungee.protocol.DefinedPacket class PPacketChildInfo(var portRange: MutableSet = HashSet(), var types: MutableSet = HashSet()) : - BungeePacket() { + com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { DefinedPacket.writeVarInt(portRange.size, buf) portRange.forEach { diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketDebug.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketDebug.kt similarity index 79% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketDebug.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketDebug.kt index b7c5104..d97cf4b 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketDebug.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketDebug.kt @@ -1,11 +1,10 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.common.network.BungeePacket import io.netty.buffer.ByteBuf data class PPacketDebug( var content: String = "" -) : BungeePacket() { +) : com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { val array = content.encodeToByteArray() diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketServerStarted.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketServerStarted.kt similarity index 51% rename from common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketServerStarted.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketServerStarted.kt index 416b187..6311295 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/network/packet/PPacketServerStarted.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/network/packet/PPacketServerStarted.kt @@ -1,14 +1,13 @@ -package cc.maxmc.msm.common.network.packet +package com.mohist.mistyrain.common.network.packet -import cc.maxmc.msm.api.misc.ServerInfo -import cc.maxmc.msm.common.network.BungeePacket -import cc.maxmc.msm.common.utils.readServerInfo -import cc.maxmc.msm.common.utils.writeServerInfo +import com.mohist.mistyrain.api.misc.ServerInfo +import com.mohist.mistyrain.common.utils.readServerInfo +import com.mohist.mistyrain.common.utils.writeServerInfo import io.netty.buffer.ByteBuf class PPacketServerStarted( var serverInfo: ServerInfo = ServerInfo() -) : BungeePacket() { +) : com.mohist.mistyrain.common.network.BungeePacket() { override fun encode(buf: ByteBuf) { buf.writeServerInfo(serverInfo) } diff --git a/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Coroutines.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Coroutines.kt new file mode 100644 index 0000000..f64206d --- /dev/null +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Coroutines.kt @@ -0,0 +1,26 @@ +package com.mohist.mistyrain.common.utils + +import io.netty.channel.Channel +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob +import kotlin.coroutines.Continuation +import kotlin.coroutines.suspendCoroutine + +val pluginScope = CoroutineScope(SupervisorJob() + CoroutineExceptionHandler { _, except -> + log("§c执行异步操作时出现异常 ${except.message}") + except.printStackTrace() +}) + +val awaiting = + ArrayList, (Channel, com.mohist.mistyrain.common.network.BungeePacket) -> Boolean, Continuation>>() + +suspend inline fun awaitPacket( + packetClass: Class, + noinline filter: (Channel, T) -> Boolean +) = + suspendCoroutine { + val triple = Triple(packetClass, filter, it) + @Suppress("UNCHECKED_CAST") + awaiting.add(triple as Triple, (Channel, com.mohist.mistyrain.common.network.BungeePacket) -> Boolean, Continuation>) + } \ No newline at end of file diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/utils/Logging.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Logging.kt similarity index 86% rename from common/src/main/kotlin/cc/maxmc/msm/common/utils/Logging.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/utils/Logging.kt index 67d6fc4..f6b1852 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/utils/Logging.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Logging.kt @@ -1,4 +1,4 @@ -package cc.maxmc.msm.common.utils +package com.mohist.mistyrain.common.utils import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.chat.TextComponent diff --git a/common/src/main/kotlin/cc/maxmc/msm/common/utils/Netty.kt b/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Netty.kt similarity index 79% rename from common/src/main/kotlin/cc/maxmc/msm/common/utils/Netty.kt rename to common/src/main/kotlin/com/mohist/mistyrain/common/utils/Netty.kt index 8d50f0e..92fe582 100644 --- a/common/src/main/kotlin/cc/maxmc/msm/common/utils/Netty.kt +++ b/common/src/main/kotlin/com/mohist/mistyrain/common/utils/Netty.kt @@ -1,10 +1,9 @@ -package cc.maxmc.msm.common.utils +package com.mohist.mistyrain.common.utils -import cc.maxmc.msm.api.misc.MatchInfo -import cc.maxmc.msm.api.misc.ServerInfo -import cc.maxmc.msm.common.network.ClusterPacketHandler -import cc.maxmc.msm.common.network.netty.ClusterMsgCodec -import cc.maxmc.msm.common.network.netty.NetworkRegistry +import com.mohist.mistyrain.api.misc.MatchInfo +import com.mohist.mistyrain.api.misc.ServerInfo +import com.mohist.mistyrain.common.network.netty.ClusterMsgCodec +import com.mohist.mistyrain.common.network.netty.NetworkRegistry import io.netty.buffer.ByteBuf import io.netty.channel.Channel import io.netty.channel.ChannelInitializer @@ -23,7 +22,7 @@ fun pipelineInit(direction: NetworkRegistry.PacketDirection) = channelInit