Update
This commit is contained in:
@@ -19,10 +19,10 @@ abstract class RunBrokerSubserverExtension {
|
||||
abstract val subServerCount: Property<Int>
|
||||
|
||||
@get:Input
|
||||
abstract val brokerBukkitPluginPath: Property<String>
|
||||
abstract val brokerBukkitPluginDownloadUrl: Property<String>
|
||||
|
||||
@get:Input
|
||||
abstract val brokerBungeeCordPluginPath: Property<String>
|
||||
abstract val brokerBungeeCordPluginDownloadUrl: Property<String>
|
||||
|
||||
@get:Input
|
||||
abstract val javaExecPath: Property<JavaExecPath>
|
||||
@@ -30,8 +30,8 @@ abstract class RunBrokerSubserverExtension {
|
||||
init {
|
||||
subServerCount.convention(2)
|
||||
minecraftServerPath.convention("./server.jar")
|
||||
brokerBukkitPluginPath.convention("./plugin.jar")
|
||||
brokerBungeeCordPluginPath.convention("./plugin.jar")
|
||||
brokerBukkitPluginDownloadUrl.convention("https://pub-0d3d8f5b51ea4506827ee6da1f0d8c9b.r2.dev/afybroker-bukkit-2.4-all.jar")
|
||||
brokerBungeeCordPluginDownloadUrl.convention("https://pub-0d3d8f5b51ea4506827ee6da1f0d8c9b.r2.dev/afybroker-bungee-2.4-all.jar")
|
||||
javaExecPath.convention(JavaExecPath.DEFAULT)
|
||||
}
|
||||
}
|
||||
@@ -8,13 +8,17 @@
|
||||
package cn.rtast.runbroker.subserver.bukkit
|
||||
|
||||
import cn.rtast.runbroker.common.util.readBytesFromFile
|
||||
import cn.rtast.runbroker.common.util.toURL
|
||||
import cn.rtast.runbroker.subserver.RunBrokerSubserverExtension
|
||||
import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.tasks.TaskAction
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.io.File
|
||||
|
||||
abstract class RunBrokerSubServerTask : DefaultTask() {
|
||||
|
||||
private val logger = LoggerFactory.getLogger("RunBrokerSubServer")
|
||||
|
||||
init {
|
||||
dependsOn(project.tasks.named("shadowJar"))
|
||||
}
|
||||
@@ -29,9 +33,11 @@ abstract class RunBrokerSubServerTask : DefaultTask() {
|
||||
val serverCore = File(runDir, "server.jar")
|
||||
val pluginsDir = File(runDir, "plugins").apply { mkdirs() }
|
||||
val brokerPluginFile = File(pluginsDir, "broker-bukkit.jar")
|
||||
if (!brokerPluginFile.exists()) brokerPluginFile.writeBytes(
|
||||
settings.brokerBukkitPluginPath.get().readBytesFromFile()
|
||||
)
|
||||
if (!brokerPluginFile.exists()) {
|
||||
logger.info("Downloading broker bukkit plugin...")
|
||||
brokerPluginFile.writeBytes(settings.brokerBukkitPluginDownloadUrl.get().toURL().readBytes())
|
||||
logger.info("Downloaded...")
|
||||
}
|
||||
if (!serverCore.exists()) serverCore.writeBytes(settings.minecraftServerPath.get().readBytesFromFile())
|
||||
val previousPluginJar = File(pluginsDir, "_broker-plugin.jar")
|
||||
if (previousPluginJar.exists()) previousPluginJar.delete()
|
||||
@@ -43,6 +49,6 @@ abstract class RunBrokerSubServerTask : DefaultTask() {
|
||||
it.workingDir = project.layout.projectDirectory.dir("run/server/$currentTaskName").asFile
|
||||
it.args = listOf("-jar", serverCore.absolutePath, "nogui")
|
||||
}
|
||||
println("Server $currentTaskName started...")
|
||||
logger.info("Server $currentTaskName started...")
|
||||
}
|
||||
}
|
||||
@@ -7,10 +7,11 @@
|
||||
|
||||
package cn.rtast.runbroker.subserver.bungeecord
|
||||
|
||||
import cn.rtast.runbroker.common.util.readBytesFromFile
|
||||
import cn.rtast.runbroker.common.util.toURL
|
||||
import cn.rtast.runbroker.subserver.RunBrokerSubserverExtension
|
||||
import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.tasks.TaskAction
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.io.File
|
||||
import java.net.URI
|
||||
|
||||
@@ -19,6 +20,8 @@ private const val BUNGEECORD_DOWNLOAD_URL =
|
||||
|
||||
abstract class RunBrokerBungeeCordTask : DefaultTask() {
|
||||
|
||||
private val logger = LoggerFactory.getLogger("RunBrokerBungeeCord")
|
||||
|
||||
@TaskAction
|
||||
fun runSubserver() {
|
||||
val settings = project.extensions.getByType(RunBrokerSubserverExtension::class.java)
|
||||
@@ -26,12 +29,14 @@ abstract class RunBrokerBungeeCordTask : DefaultTask() {
|
||||
val bungeeCord = File(runDir, "bungee.jar")
|
||||
val pluginsDir = File(runDir, "plugins").apply { mkdirs() }
|
||||
val brokerBungeePluginFile = File(pluginsDir, "broker-bungee.jar")
|
||||
if (!brokerBungeePluginFile.exists()) brokerBungeePluginFile.writeBytes(
|
||||
settings.brokerBungeeCordPluginPath.get().readBytesFromFile()
|
||||
)
|
||||
println("Downloading Bungeecord...")
|
||||
if (!brokerBungeePluginFile.exists()) {
|
||||
logger.info("Downloading broker BungeeCord plugin...")
|
||||
brokerBungeePluginFile.writeBytes(settings.brokerBungeeCordPluginDownloadUrl.get().toURL().readBytes())
|
||||
logger.info("Downloaded...")
|
||||
}
|
||||
logger.info("Downloading BungeeCord...")
|
||||
val bungeeCordBytes = URI(BUNGEECORD_DOWNLOAD_URL).toURL().readBytes()
|
||||
println("BungeeCord downloaded...")
|
||||
logger.info("BungeeCord downloaded...")
|
||||
if (!bungeeCord.exists()) bungeeCord.writeBytes(bungeeCordBytes)
|
||||
val executablePath = settings.javaExecPath.get().path
|
||||
project.exec {
|
||||
@@ -39,6 +44,6 @@ abstract class RunBrokerBungeeCordTask : DefaultTask() {
|
||||
it.workingDir = project.layout.projectDirectory.dir("run/bungee/").asFile
|
||||
it.args = listOf("-jar", bungeeCord.absolutePath)
|
||||
}
|
||||
println("BungeeCord started...")
|
||||
logger.info("BungeeCord started...")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user