Skip to content

Commit 7114413

Browse files
authored
Merge pull request #48 from EndlessCodeGroup/feature/to_kotlin
Scripts to Kotlin
2 parents 0067f09 + 50f82ae commit 7114413

36 files changed

+664
-529
lines changed

src/main/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePlugin.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import ru.endlesscode.bukkitgradle.meta.PluginMetaPlugin
99
import ru.endlesscode.bukkitgradle.meta.extension.PluginMeta
1010
import ru.endlesscode.bukkitgradle.meta.util.StringUtils
1111
import ru.endlesscode.bukkitgradle.server.extension.RunConfiguration
12+
import ru.endlesscode.bukkitgradle.server.legacy.LegacyDevServerPlugin
1213

1314
class BukkitGradlePlugin implements Plugin<Project> {
1415
final static String GROUP = 'Bukkit'
@@ -45,7 +46,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
4546
plugins.with {
4647
apply('java')
4748
apply(PluginMetaPlugin)
48-
apply(DevServerPlugin)
49+
apply(LegacyDevServerPlugin)
4950
}
5051

5152
convention.getPlugin(JavaPluginConvention).with {

src/main/groovy/ru/endlesscode/bukkitgradle/DevServerPlugin.groovy

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/main/groovy/ru/endlesscode/bukkitgradle/server/Constants.groovy

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/groovy/ru/endlesscode/bukkitgradle/server/CoreType.groovy

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/groovy/ru/endlesscode/bukkitgradle/server/extension/RunConfiguration.groovy

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package ru.endlesscode.bukkitgradle.server.legacy
2+
3+
import org.gradle.api.Plugin
4+
import org.gradle.api.Project
5+
import org.gradle.api.tasks.Copy
6+
import org.gradle.api.tasks.TaskProvider
7+
import org.gradle.jvm.tasks.Jar
8+
import ru.endlesscode.bukkitgradle.meta.extension.PluginMeta
9+
import ru.endlesscode.bukkitgradle.server.ServerConstants
10+
import ru.endlesscode.bukkitgradle.server.extension.RunConfiguration
11+
import ru.endlesscode.bukkitgradle.server.task.CreateIdeaJarRunConfiguration
12+
import ru.endlesscode.bukkitgradle.server.task.GenerateRunningScript
13+
import ru.endlesscode.bukkitgradle.server.task.PrepareServer
14+
import ru.endlesscode.bukkitgradle.server.task.RunServer
15+
16+
class LegacyDevServerPlugin implements Plugin<Project> {
17+
18+
@Override
19+
void apply(Project project) {
20+
ServerCore serverCore = new ServerCore(project)
21+
def configuration = project.bukkit.run as RunConfiguration
22+
def generateRunningScript = project.tasks.register('generateRunningScript', GenerateRunningScript) {
23+
jvmArgs.set(configuration.buildJvmArgs())
24+
bukkitArgs.set(configuration.bukkitArgs)
25+
scriptDir.set(serverCore.serverDir)
26+
}
27+
28+
def prepareServer = configurePrepareServerTask(project, serverCore)
29+
project.tasks.register('runServer', RunServer) {
30+
scriptFile.set(generateRunningScript.map { it.scriptFile.get().asFile })
31+
dependsOn(prepareServer)
32+
}
33+
34+
project.tasks.register('buildIdeaRun', CreateIdeaJarRunConfiguration) {
35+
configurationName.set("$project.name: Run server")
36+
beforeRunTask.set('prepareServer')
37+
configurationsDir.set(project.rootProject.layout.projectDirectory.dir('.idea/runConfigurations'))
38+
jarPath.set(new File(serverCore.serverDir, ServerConstants.FILE_CORE))
39+
}
40+
}
41+
42+
private static TaskProvider<PrepareServer> configurePrepareServerTask(Project project, ServerCore serverCore) {
43+
def jarTaskName = project.plugins.hasPlugin("com.github.johnrengelman.shadow") ? "shadowJar" : "jar"
44+
def jarTask = project.tasks.named(jarTaskName, Jar) as TaskProvider<Jar>
45+
def meta = project.bukkit.meta as PluginMeta
46+
def copyPlugins = project.tasks.register("copyPlugins", Copy) {
47+
from(jarTask)
48+
into(project.mkdir(new File(serverCore.serverDir, "plugins")))
49+
rename { "${meta.name.get()}.jar" }
50+
}
51+
52+
def run = project.bukkit.run as RunConfiguration
53+
return project.tasks.register('prepareServer', PrepareServer) {
54+
serverDir.set(serverCore.serverDir)
55+
eula = run.eula
56+
onlineMode = run.onlineMode
57+
dependsOn('copyServerCore', copyPlugins)
58+
}
59+
}
60+
}

src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerCore.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/server/legacy/ServerCore.groovy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
package ru.endlesscode.bukkitgradle.server
1+
package ru.endlesscode.bukkitgradle.server.legacy
22

33
import de.undercouch.gradle.tasks.download.Download
44
import de.undercouch.gradle.tasks.download.DownloadExtension
55
import groovy.json.JsonSlurper
66
import org.gradle.api.Project
77
import org.gradle.api.tasks.Copy
88
import org.gradle.api.tasks.JavaExec
9-
import ru.endlesscode.bukkitgradle.BukkitGroovy
109
import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
11-
import ru.endlesscode.bukkitgradle.server.util.MavenApi
10+
import ru.endlesscode.bukkitgradle.BukkitGroovy
11+
import ru.endlesscode.bukkitgradle.server.PaperConstants
12+
import ru.endlesscode.bukkitgradle.server.ServerConstants
13+
import ru.endlesscode.bukkitgradle.server.extension.CoreType
14+
import ru.endlesscode.bukkitgradle.server.legacy.util.MavenApi
1215

1316
import javax.annotation.Nullable
1417

src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerProperties.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/server/legacy/ServerProperties.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.endlesscode.bukkitgradle.server
1+
package ru.endlesscode.bukkitgradle.server.legacy
22

33
import org.slf4j.Logger
44
import org.slf4j.LoggerFactory

src/main/groovy/ru/endlesscode/bukkitgradle/server/util/MavenApi.groovy renamed to src/main/groovy/ru/endlesscode/bukkitgradle/server/legacy/util/MavenApi.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.endlesscode.bukkitgradle.server.util
1+
package ru.endlesscode.bukkitgradle.server.legacy.util
22

33
import org.gradle.api.Project
44

src/main/groovy/ru/endlesscode/bukkitgradle/server/script/BashScript.groovy

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)