feat: Accept eula using CLI parameter

Author: osipxd

CHANGELOG.md

@@ -13,6 +13,7 @@
   instead of setting JVM target and source compatibility to 1.8.
   The default JVM version depends on [Paper requirements](https://docs.papermc.io/paper/getting-started#requirements).
 - Use lazy API for `bukkit.apiVersion` and `bukkit.generateMeta` properties.
+- Accept EULA using CLI parameter `-Dcom.mojang.eula.agree=true` instead of changing `eula.txt`
 
 ### Fixed
 

src/main/kotlin/server/extension/ServerConfigurationImpl.kt

@@ -49,7 +49,11 @@ public class ServerConfigurationImpl : ServerConfiguration {
     }
 
     override fun buildJvmArgs(debug: Boolean): List<String> {
-        return listOfNotNull(DEBUG_ARGS.takeIf { debug }, "-Dfile.encoding=$encoding") + javaArgs
+        return listOfNotNull(
+            DEBUG_ARGS.takeIf { debug },
+            ACCEPT_EULA_ARGS.takeIf { eula },
+            "-Dfile.encoding=$encoding"
+        ) + javaArgs
     }
 
     override fun toString(): String {
@@ -66,5 +70,6 @@ public class ServerConfigurationImpl : ServerConfiguration {
 
     private companion object {
         const val DEBUG_ARGS: String = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
+        const val ACCEPT_EULA_ARGS: String = "-Dcom.mojang.eula.agree=true"
     }
 }

src/main/kotlin/server/task/PrepareServer.kt

@@ -22,9 +22,6 @@ internal abstract class PrepareServer : DefaultTask() {
     @get:Input
     var onlineMode: Boolean = true
 
-    @get:OutputFile
-    val eulaFile: Provider<RegularFile> = serverDir.map { it.file("eula.txt") }
-
     @get:OutputFile
     val propertiesFile: Provider<RegularFile> = serverDir.map { it.file("server.properties") }
 
@@ -35,25 +32,9 @@ internal abstract class PrepareServer : DefaultTask() {
 
     @TaskAction
     fun prepareServer() {
-        resolveEula()
         resolveOnlineMode()
     }
 
-    private fun resolveEula() {
-        val eulaFile = eulaFile.get().asFile
-        if (!eulaFile.exists()) {
-            eulaFile.createNewFile()
-        }
-
-        val properties = Properties()
-        properties.load(eulaFile.reader())
-        properties.setProperty("eula", "$eula")
-        properties.store(
-            eulaFile.writer(),
-            "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula)."
-        )
-    }
-
     private fun resolveOnlineMode() {
         val propsFile = propertiesFile.get().asFile
         if (!propsFile.exists()) {

src/test/groovy/ru/endlesscode/bukkitgradle/server/task/PrepareServerSpec.groovy

@@ -29,13 +29,11 @@ class PrepareServerSpec extends PluginSpecification {
         taskOutcome(TASK_NAME) == TaskOutcome.UP_TO_DATE
     }
 
-    def "when run prepareServer - should set eula and online-mode"() {
-        given: "configured eula and online-mode"
+    def "when run prepareServer - should set online-mode"() {
+        given: "configured online-mode"
         buildFile << """
             bukkit {
-                version = '1.16.2'
                 run {
-                    eula = true
                     onlineMode = false
                 }
             }
@@ -45,10 +43,7 @@ class PrepareServerSpec extends PluginSpecification {
         when: "run prepareServer"
         run(TASK_NAME)
 
-        then: "eula should be true"
-        file("$serverDir/eula.txt").readLines().contains("eula=true")
-
-        and: "online-mode should be false"
+        then: "online-mode should be false"
         file("$serverDir/server.properties").readLines().contains("online-mode=false")
     }
 }