This commit is contained in:
TONY_All 2023-05-04 21:37:17 +08:00
parent f971211e33
commit de1ad1d31b
8 changed files with 19 additions and 19 deletions

View File

@ -13,7 +13,7 @@ import cc.maxmc.msm.common.network.netty.NetworkRegistry
import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.ProxyServer
import net.md_5.bungee.api.plugin.Plugin import net.md_5.bungee.api.plugin.Plugin
class MultiServerMan : Plugin() { class Controlled : Plugin() {
init { init {
instance = this instance = this
} }
@ -34,6 +34,6 @@ class MultiServerMan : Plugin() {
} }
companion object { companion object {
lateinit var instance: MultiServerMan lateinit var instance: Controlled
} }
} }

View File

@ -1,6 +1,6 @@
package cc.maxmc.msm.controlled.listener package cc.maxmc.msm.controlled.listener
import cc.maxmc.msm.controlled.MultiServerMan import cc.maxmc.msm.controlled.Controlled
import cc.maxmc.msm.controlled.misc.SubServer import cc.maxmc.msm.controlled.misc.SubServer
import cc.maxmc.msm.controlled.netty.NetClient import cc.maxmc.msm.controlled.netty.NetClient
import cc.maxmc.msm.controlled.settings.Settings import cc.maxmc.msm.controlled.settings.Settings
@ -23,7 +23,7 @@ object ProtocolListener : Listener {
@EventHandler @EventHandler
fun onGetInfo(packetE: PacketReceiveEvent) { fun onGetInfo(packetE: PacketReceiveEvent) {
if (packetE.packet !is CPacketGetInfo) return if (packetE.packet !is CPacketGetInfo) return
val types = MultiServerMan.instance.dataFolder.toPath().resolve("patterns").listDirectoryEntries() val types = Controlled.instance.dataFolder.toPath().resolve("patterns").listDirectoryEntries()
.filter { it.isDirectory() }.map { it.name }.toMutableSet() .filter { it.isDirectory() }.map { it.name }.toMutableSet()
val packetCallBack = PPacketChildInfo(Settings.portRange.toHashSet(), types) val packetCallBack = PPacketChildInfo(Settings.portRange.toHashSet(), types)
NetClient.sendPacket(packetCallBack) NetClient.sendPacket(packetCallBack)

View File

@ -1,6 +1,6 @@
package cc.maxmc.msm.controlled.misc package cc.maxmc.msm.controlled.misc
import cc.maxmc.msm.controlled.MultiServerMan import cc.maxmc.msm.controlled.Controlled
import cc.maxmc.msm.controlled.settings.Settings import cc.maxmc.msm.controlled.settings.Settings
import cc.maxmc.msm.controlled.utils.ScriptRunner import cc.maxmc.msm.controlled.utils.ScriptRunner
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -16,7 +16,7 @@ import kotlin.io.path.deleteRecursively
@Suppress("CanBeParameter", "MemberVisibilityCanBePrivate") // API @Suppress("CanBeParameter", "MemberVisibilityCanBePrivate") // API
@OptIn(kotlin.io.path.ExperimentalPathApi::class) @OptIn(kotlin.io.path.ExperimentalPathApi::class)
class SubServer( class SubServer(
val uid: UUID, val type: String, val port: Int, baseFolder: Path = MultiServerMan.instance.dataFolder.toPath() val uid: UUID, val type: String, val port: Int, baseFolder: Path = Controlled.instance.dataFolder.toPath()
) { ) {
private val serverFolder = private val serverFolder =
baseFolder.resolve("cache").resolve(uid.toString().substring(0..7)).also { it.createDirectories() } baseFolder.resolve("cache").resolve(uid.toString().substring(0..7)).also { it.createDirectories() }

View File

@ -1,6 +1,6 @@
package cc.maxmc.msm.controlled.settings package cc.maxmc.msm.controlled.settings
import cc.maxmc.msm.controlled.MultiServerMan import cc.maxmc.msm.controlled.Controlled
import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.ProxyServer
import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.api.chat.TextComponent
import net.md_5.bungee.config.Configuration import net.md_5.bungee.config.Configuration
@ -9,17 +9,17 @@ import net.md_5.bungee.config.YamlConfiguration
import kotlin.io.path.* import kotlin.io.path.*
object SettingsReader { object SettingsReader {
private val file = MultiServerMan.instance.dataFolder.toPath().resolve("settings.yml") private val file = Controlled.instance.dataFolder.toPath().resolve("settings.yml")
val config: Configuration val config: Configuration
private val basePatternFolder = MultiServerMan.instance.dataFolder.toPath().resolve("patterns") private val basePatternFolder = Controlled.instance.dataFolder.toPath().resolve("patterns")
init { init {
if (!basePatternFolder.exists()) { if (!basePatternFolder.exists()) {
basePatternFolder.createDirectories() basePatternFolder.createDirectories()
} }
if (!file.exists()) { if (!file.exists()) {
MultiServerMan.instance.dataFolder.toPath().createDirectories() Controlled.instance.dataFolder.toPath().createDirectories()
val stream = MultiServerMan.instance.getResourceAsStream("settings.yml") val stream = Controlled.instance.getResourceAsStream("settings.yml")
file.createFile() file.createFile()
stream.copyTo(file.outputStream()) stream.copyTo(file.outputStream())
ProxyServer.getInstance().console.sendMessage(TextComponent("§b| §7配置文件不存在正在创建配置文件。")) ProxyServer.getInstance().console.sendMessage(TextComponent("§b| §7配置文件不存在正在创建配置文件。"))

View File

@ -1,3 +1,3 @@
name: Controlled name: Controlled
main: cc.maxmc.msm.controlled.MultiServerMan main: cc.maxmc.msm.controlled.Controlled
author: MistyRain author: MistyRain

View File

@ -9,7 +9,7 @@ import cc.maxmc.msm.mastercontrol.netty.NetManager
import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.ProxyServer
import net.md_5.bungee.api.plugin.Plugin import net.md_5.bungee.api.plugin.Plugin
class MultiServerMan : Plugin() { class MasterControl : Plugin() {
override fun onEnable() { override fun onEnable() {
instance = this instance = this
@ -26,7 +26,7 @@ class MultiServerMan : Plugin() {
} }
companion object { companion object {
lateinit var instance: MultiServerMan lateinit var instance: MasterControl
private set private set
} }

View File

@ -1,6 +1,6 @@
package cc.maxmc.msm.mastercontrol.settings package cc.maxmc.msm.mastercontrol.settings
import cc.maxmc.msm.mastercontrol.MultiServerMan import cc.maxmc.msm.mastercontrol.MasterControl
import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.ProxyServer
import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.api.chat.TextComponent
import net.md_5.bungee.config.Configuration import net.md_5.bungee.config.Configuration
@ -9,13 +9,13 @@ import net.md_5.bungee.config.YamlConfiguration
import kotlin.io.path.* import kotlin.io.path.*
object SettingsReader { object SettingsReader {
private val file = MultiServerMan.instance.dataFolder.toPath().resolve("settings.yml") private val file = MasterControl.instance.dataFolder.toPath().resolve("settings.yml")
val config: Configuration val config: Configuration
init { init {
if (!file.exists()) { if (!file.exists()) {
MultiServerMan.instance.dataFolder.toPath().createDirectories() MasterControl.instance.dataFolder.toPath().createDirectories()
val stream = MultiServerMan.instance.getResourceAsStream("settings.yml") val stream = MasterControl.instance.getResourceAsStream("settings.yml")
file.createFile() file.createFile()
stream.copyTo(file.outputStream()) stream.copyTo(file.outputStream())
ProxyServer.getInstance().console.sendMessage(TextComponent("§b| §7配置文件不存在正在创建配置文件。")) ProxyServer.getInstance().console.sendMessage(TextComponent("§b| §7配置文件不存在正在创建配置文件。"))

View File

@ -1,3 +1,3 @@
name: MasterControl name: MasterControl
main: cc.maxmc.msm.mastercontrol.MultiServerMan main: cc.maxmc.msm.mastercontrol.MasterControl
author: MistyRain author: MistyRain