Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ru.endlesscode.bukkitgradle.meta.PluginMetaPlugin
import ru.endlesscode.bukkitgradle.meta.extension.PluginMeta
import ru.endlesscode.bukkitgradle.meta.util.StringUtils
import ru.endlesscode.bukkitgradle.server.extension.RunConfiguration
import ru.endlesscode.bukkitgradle.server.legacy.LegacyDevServerPlugin

class BukkitGradlePlugin implements Plugin<Project> {
final static String GROUP = 'Bukkit'
Expand Down Expand Up @@ -45,7 +46,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
plugins.with {
apply('java')
apply(PluginMetaPlugin)
apply(DevServerPlugin)
apply(LegacyDevServerPlugin)
}

convention.getPlugin(JavaPluginConvention).with {
Expand Down
39 changes: 0 additions & 39 deletions src/main/groovy/ru/endlesscode/bukkitgradle/DevServerPlugin.groovy

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package ru.endlesscode.bukkitgradle.server.legacy

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.TaskProvider
import org.gradle.jvm.tasks.Jar
import ru.endlesscode.bukkitgradle.meta.extension.PluginMeta
import ru.endlesscode.bukkitgradle.server.ServerConstants
import ru.endlesscode.bukkitgradle.server.extension.RunConfiguration
import ru.endlesscode.bukkitgradle.server.task.CreateIdeaJarRunConfiguration
import ru.endlesscode.bukkitgradle.server.task.GenerateRunningScript
import ru.endlesscode.bukkitgradle.server.task.PrepareServer
import ru.endlesscode.bukkitgradle.server.task.RunServer

class LegacyDevServerPlugin implements Plugin<Project> {

@Override
void apply(Project project) {
ServerCore serverCore = new ServerCore(project)
def configuration = project.bukkit.run as RunConfiguration
def generateRunningScript = project.tasks.register('generateRunningScript', GenerateRunningScript) {
jvmArgs.set(configuration.buildJvmArgs())
bukkitArgs.set(configuration.bukkitArgs)
scriptDir.set(serverCore.serverDir)
}

def prepareServer = configurePrepareServerTask(project, serverCore)
project.tasks.register('runServer', RunServer) {
scriptFile.set(generateRunningScript.map { it.scriptFile.get().asFile })
dependsOn(prepareServer)
}

project.tasks.register('buildIdeaRun', CreateIdeaJarRunConfiguration) {
configurationName.set("$project.name: Run server")
beforeRunTask.set('prepareServer')
configurationsDir.set(project.rootProject.layout.projectDirectory.dir('.idea/runConfigurations'))
jarPath.set(new File(serverCore.serverDir, ServerConstants.FILE_CORE))
}
}

private static TaskProvider<PrepareServer> configurePrepareServerTask(Project project, ServerCore serverCore) {
def jarTaskName = project.plugins.hasPlugin("com.github.johnrengelman.shadow") ? "shadowJar" : "jar"
def jarTask = project.tasks.named(jarTaskName, Jar) as TaskProvider<Jar>
def meta = project.bukkit.meta as PluginMeta
def copyPlugins = project.tasks.register("copyPlugins", Copy) {
from(jarTask)
into(project.mkdir(new File(serverCore.serverDir, "plugins")))
rename { "${meta.name.get()}.jar" }
}

def run = project.bukkit.run as RunConfiguration
return project.tasks.register('prepareServer', PrepareServer) {
serverDir.set(serverCore.serverDir)
eula = run.eula
onlineMode = run.onlineMode
dependsOn('copyServerCore', copyPlugins)
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package ru.endlesscode.bukkitgradle.server
package ru.endlesscode.bukkitgradle.server.legacy

import de.undercouch.gradle.tasks.download.Download
import de.undercouch.gradle.tasks.download.DownloadExtension
import groovy.json.JsonSlurper
import org.gradle.api.Project
import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.JavaExec
import ru.endlesscode.bukkitgradle.BukkitGroovy
import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
import ru.endlesscode.bukkitgradle.server.util.MavenApi
import ru.endlesscode.bukkitgradle.BukkitGroovy
import ru.endlesscode.bukkitgradle.server.PaperConstants
import ru.endlesscode.bukkitgradle.server.ServerConstants
import ru.endlesscode.bukkitgradle.server.extension.CoreType
import ru.endlesscode.bukkitgradle.server.legacy.util.MavenApi

import javax.annotation.Nullable

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.endlesscode.bukkitgradle.server
package ru.endlesscode.bukkitgradle.server.legacy

import org.slf4j.Logger
import org.slf4j.LoggerFactory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.endlesscode.bukkitgradle.server.util
package ru.endlesscode.bukkitgradle.server.legacy.util

import org.gradle.api.Project

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading