Skip to content

Commit 10e8860

Browse files
committed
feat: Disable server debugging by default
1 parent 26983e5 commit 10e8860

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
By default, the minimal supported JVM version compatible with the specified `bukkit.server.version` is used.
1515
- Use lazy API for `bukkit.apiVersion` and `bukkit.generateMeta` properties.
1616
- Accept EULA using CLI parameter `-Dcom.mojang.eula.agree=true` instead of changing `eula.txt`
17+
- Change the default value of `bukkit.server.debug` to `false`.
18+
It is recommended to use IDE facilities to run server with enabled debugging.
1719

1820
### Fixed
1921

src/main/kotlin/server/DevServerPlugin.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import org.gradle.api.file.Directory
66
import org.gradle.api.provider.Provider
77
import org.gradle.api.tasks.TaskContainer
88
import org.gradle.api.tasks.TaskProvider
9+
import org.gradle.kotlin.dsl.apply
910
import org.gradle.kotlin.dsl.named
1011
import org.gradle.kotlin.dsl.register
1112
import ru.endlesscode.bukkitgradle.Bukkit
1213
import ru.endlesscode.bukkitgradle.bukkit
1314
import ru.endlesscode.bukkitgradle.server.extension.ServerConfiguration
1415
import ru.endlesscode.bukkitgradle.server.task.CreateIdeaGradleRunConfiguration
1516
import ru.endlesscode.bukkitgradle.server.task.PrepareServer
17+
import xyz.jpenilla.runpaper.RunPaperPlugin
1618
import xyz.jpenilla.runpaper.task.RunServer
1719
import java.io.File
1820

@@ -32,7 +34,7 @@ public class DevServerPlugin : Plugin<Project> {
3234
project = target
3335
bukkit = project.bukkit
3436

35-
target.plugins.apply("xyz.jpenilla.run-paper")
37+
target.apply<RunPaperPlugin>()
3638
val configuredServerDir = target.resolveConfiguredServerDir()
3739

3840
// Preconfigure RunServer task
@@ -42,6 +44,12 @@ public class DevServerPlugin : Plugin<Project> {
4244
if (configuredServerDir != null) runDirectory.convention(configuredServerDir)
4345
jvmArgs(serverConfiguration.buildJvmArgs())
4446
args(serverConfiguration.bukkitArgs)
47+
48+
defaultCharacterEncoding = serverConfiguration.encoding
49+
debugOptions {
50+
enabled.convention(serverConfiguration.debug)
51+
suspend.convention(false)
52+
}
4553
}
4654

4755
val prepareServer = registerPrepareServerTask(runServer)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ public interface ServerConfiguration {
1212
public val coreType: CoreType
1313

1414
/** Returns arguments for JVM. */
15-
public fun buildJvmArgs(debug: Boolean = this.debug): List<String>
15+
public fun buildJvmArgs(): List<String>
1616
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ServerConfigurationImpl : ServerConfiguration {
1111
override var version: String? = null
1212
override var eula: Boolean = false
1313
override var onlineMode: Boolean = false
14-
override var debug: Boolean = true
14+
override var debug: Boolean = false
1515
override var encoding: String = "UTF-8"
1616

1717
override var javaArgs: List<String> = listOf("-Xmx1G")
@@ -48,11 +48,9 @@ public class ServerConfigurationImpl : ServerConfiguration {
4848
bukkitArgs = bukkitArgs + args.toList()
4949
}
5050

51-
override fun buildJvmArgs(debug: Boolean): List<String> {
51+
override fun buildJvmArgs(): List<String> {
5252
return listOfNotNull(
53-
DEBUG_ARGS.takeIf { debug },
5453
ACCEPT_EULA_ARGS.takeIf { eula },
55-
"-Dfile.encoding=$encoding"
5654
) + javaArgs
5755
}
5856

@@ -69,7 +67,6 @@ public class ServerConfigurationImpl : ServerConfiguration {
6967
}
7068

7169
private companion object {
72-
const val DEBUG_ARGS: String = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
7370
const val ACCEPT_EULA_ARGS: String = "-Dcom.mojang.eula.agree=true"
7471
}
7572
}

src/test/groovy/ru/endlesscode/bukkitgradle/server/extension/ServerConfigurationSpec.groovy

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,13 @@ class ServerConfigurationSpec extends Specification {
1111
serverConfiguration = new ServerConfigurationImpl()
1212
}
1313

14-
void 'when build args - should return args with debug flags'() {
14+
void 'when build args - should return args with eula flag'() {
1515
when:
16-
def args = serverConfiguration.buildJvmArgs(true)
16+
serverConfiguration.eula = true
17+
def args = serverConfiguration.buildJvmArgs()
1718

1819
then:
19-
["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Dfile.encoding=UTF-8", "-Xmx1G"] == args
20-
}
21-
22-
void 'when build args - and debug disabled - should return args without debug flags'() {
23-
when:
24-
def args = serverConfiguration.buildJvmArgs(false)
25-
26-
then:
27-
["-Dfile.encoding=UTF-8", "-Xmx1G"] == args
20+
["-Dcom.mojang.eula.agree=true", "-Xmx1G"] == args
2821
}
2922

3023
void 'when set existing core - should set core successfully'() {

0 commit comments

Comments
 (0)