diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/MultiServerMan.kt b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/Controlled.kt similarity index 94% rename from Controlled/src/main/kotlin/cc/maxmc/msm/controlled/MultiServerMan.kt rename to Controlled/src/main/kotlin/cc/maxmc/msm/controlled/Controlled.kt index 14b1bc5..55a462d 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/MultiServerMan.kt +++ b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/Controlled.kt @@ -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.plugin.Plugin -class MultiServerMan : Plugin() { +class Controlled : Plugin() { init { instance = this } @@ -34,6 +34,6 @@ class MultiServerMan : Plugin() { } companion object { - lateinit var instance: MultiServerMan + lateinit var instance: Controlled } } \ No newline at end of file diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt index 8db3bd0..53e61dd 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt +++ b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/listener/ProtocolListener.kt @@ -1,6 +1,6 @@ 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.netty.NetClient import cc.maxmc.msm.controlled.settings.Settings @@ -23,7 +23,7 @@ object ProtocolListener : Listener { @EventHandler fun onGetInfo(packetE: PacketReceiveEvent) { 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() val packetCallBack = PPacketChildInfo(Settings.portRange.toHashSet(), types) NetClient.sendPacket(packetCallBack) diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt index f0d30a8..2575936 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt +++ b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/misc/SubServer.kt @@ -1,6 +1,6 @@ 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.utils.ScriptRunner import kotlinx.coroutines.Dispatchers @@ -16,7 +16,7 @@ import kotlin.io.path.deleteRecursively @Suppress("CanBeParameter", "MemberVisibilityCanBePrivate") // API @OptIn(kotlin.io.path.ExperimentalPathApi::class) 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 = baseFolder.resolve("cache").resolve(uid.toString().substring(0..7)).also { it.createDirectories() } diff --git a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt index b60914f..10506cf 100644 --- a/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt +++ b/Controlled/src/main/kotlin/cc/maxmc/msm/controlled/settings/SettingsReader.kt @@ -1,6 +1,6 @@ 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.chat.TextComponent import net.md_5.bungee.config.Configuration @@ -9,17 +9,17 @@ import net.md_5.bungee.config.YamlConfiguration import kotlin.io.path.* 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 - private val basePatternFolder = MultiServerMan.instance.dataFolder.toPath().resolve("patterns") + private val basePatternFolder = Controlled.instance.dataFolder.toPath().resolve("patterns") init { if (!basePatternFolder.exists()) { basePatternFolder.createDirectories() } if (!file.exists()) { - MultiServerMan.instance.dataFolder.toPath().createDirectories() - val stream = MultiServerMan.instance.getResourceAsStream("settings.yml") + Controlled.instance.dataFolder.toPath().createDirectories() + val stream = Controlled.instance.getResourceAsStream("settings.yml") file.createFile() stream.copyTo(file.outputStream()) ProxyServer.getInstance().console.sendMessage(TextComponent("§b| §7配置文件不存在,正在创建配置文件。")) diff --git a/Controlled/src/main/resources/bungee.yml b/Controlled/src/main/resources/bungee.yml index ddb23b9..0142bd9 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.MultiServerMan +main: cc.maxmc.msm.controlled.Controlled author: MistyRain \ No newline at end of file diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MultiServerMan.kt b/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt similarity index 91% rename from MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MultiServerMan.kt rename to MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt index 5d6c050..d63a709 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MultiServerMan.kt +++ b/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/MasterControl.kt @@ -9,7 +9,7 @@ import cc.maxmc.msm.mastercontrol.netty.NetManager import net.md_5.bungee.api.ProxyServer import net.md_5.bungee.api.plugin.Plugin -class MultiServerMan : Plugin() { +class MasterControl : Plugin() { override fun onEnable() { instance = this @@ -26,7 +26,7 @@ class MultiServerMan : Plugin() { } companion object { - lateinit var instance: MultiServerMan + lateinit var instance: MasterControl private set } diff --git a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt b/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt index 810b822..b3f42a9 100644 --- a/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt +++ b/MasterControl/src/main/kotlin/cc/maxmc/msm/mastercontrol/settings/SettingsReader.kt @@ -1,6 +1,6 @@ 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.chat.TextComponent import net.md_5.bungee.config.Configuration @@ -9,13 +9,13 @@ import net.md_5.bungee.config.YamlConfiguration import kotlin.io.path.* 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 init { if (!file.exists()) { - MultiServerMan.instance.dataFolder.toPath().createDirectories() - val stream = MultiServerMan.instance.getResourceAsStream("settings.yml") + MasterControl.instance.dataFolder.toPath().createDirectories() + val stream = MasterControl.instance.getResourceAsStream("settings.yml") file.createFile() stream.copyTo(file.outputStream()) ProxyServer.getInstance().console.sendMessage(TextComponent("§b| §7配置文件不存在,正在创建配置文件。")) diff --git a/MasterControl/src/main/resources/bungee.yml b/MasterControl/src/main/resources/bungee.yml index 1df6f91..75c4553 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.MultiServerMan +main: cc.maxmc.msm.mastercontrol.MasterControl author: MistyRain \ No newline at end of file