tony_all/MultiServerMan
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

repackage

Browse Source
This commit is contained in:
tony_all
2023-05-04 21:46:09 +08:00
parent de1ad1d31b
commit 4db42f957c
61 changed files with 276 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MasterControl/build.gradle.kts
+2 -2
View File
@@ -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 {
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/MasterControl.kt
+7 -7
View File
@@ -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
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/api/APIImpl.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/api/APIImpl.kt
+5 -5
View File
@@ -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<String>): MatchInfo {
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/database/SQLDatabase.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/database/SQLDatabase.kt
+4 -4
View File
@@ -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
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/listener/PacketListener.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/listener/PacketListener.kt
+12 -15
View File
@@ -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)
}
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ChildManager.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ChildManager.kt
+7 -7
View File
@@ -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.*
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/MatchManager.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/MatchManager.kt
+3 -3
View File
@@ -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 {
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/manager/ServerManager.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/manager/ServerManager.kt
+7 -7
View File
@@ -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
}
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/misc/ChildBungee.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/misc/ChildBungee.kt
+7 -8
View File
@@ -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<Int>, val types: Set<String>, val usedPorts: MutableSet<Int> = HashSet()
) {
fun sendPacket(packet: BungeePacket) {
fun sendPacket(packet: com.mohist.mistyrain.common.network.BungeePacket) {
channel.writeAndFlush(packet)
}
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/netty/NetManager.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/netty/NetManager.kt
+5 -5
View File
@@ -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
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/Settings.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/Settings.kt
+2 -2
View File
@@ -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
MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt → MasterControl/src/main/kotlin/com/github/mistyrain/mastercontrol/settings/SettingsReader.kt
+2 -2
View File
@@ -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
MasterControl/src/main/resources/bungee.yml
+1 -1
View File
@@ -1,3 +1,3 @@
name: MasterControl
main: cc.maxmc.msm.mastercontrol.MasterControl
main: com.mohist.mistyrain.mastercontrol.MasterControl
author: MistyRain