From 1753d6d39104613e7eafce5e604be29311965d33 Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Thu, 11 Jun 2026 11:50:50 +0200 Subject: [PATCH 1/6] feat(ignore): add new ignore part --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd00d92..7a34221 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,7 @@ bin/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store + +## Buildscript folder +buildSrc/.kotlin \ No newline at end of file From 6685c208a0024a9904cd8154c6a5faa9a650bfc1 Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Thu, 11 Jun 2026 11:51:21 +0200 Subject: [PATCH 2/6] feat(gradle): add conventions plugin --- buildSrc/build.gradle.kts | 7 +++++ .../kotlin/bounce.java-conventions.gradle.kts | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..876c922 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +} diff --git a/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts new file mode 100644 index 0000000..0d1cc71 --- /dev/null +++ b/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts @@ -0,0 +1,30 @@ +import org.gradle.api.tasks.testing.Test + +plugins { + java +} + +group = "net.theevilreaper" +version = "0.0.1" + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +dependencies { + // Gemeinsame JUnit 5 Test-Abhängigkeiten mit explizitem add() + add("testImplementation", "org.junit.jupiter:junit-jupiter-api") + add("testImplementation", "org.junit.jupiter:junit-jupiter-params") + add("testImplementation", "org.junit.platform:junit-platform-launcher") + add("testRuntimeOnly", "org.junit.jupiter:junit-jupiter-engine") +} + +tasks.withType().configureEach { + jvmArgs("-Dminestom.inside-test=true") + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } +} From 4dbe0a850306d50e2eb286ebf9e99df57f422a34 Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Thu, 11 Jun 2026 11:51:43 +0200 Subject: [PATCH 3/6] chore(build): add convention plugin usage --- block/build.gradle.kts | 24 +----------------------- common/build.gradle.kts | 25 +------------------------ setup/build.gradle.kts | 23 +---------------------- 3 files changed, 3 insertions(+), 69 deletions(-) diff --git a/block/build.gradle.kts b/block/build.gradle.kts index 1754a48..82b3d35 100644 --- a/block/build.gradle.kts +++ b/block/build.gradle.kts @@ -1,14 +1,6 @@ plugins { `java-library` -} - -group = "net.theevilreaper" -version = "0.0.1" - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } + id("bounce.java-conventions") } dependencies { @@ -17,18 +9,4 @@ dependencies { testImplementation(libs.minestom) testImplementation(libs.cyano) - testImplementation(libs.junit.api) - testImplementation(libs.junit.params) - testImplementation(libs.junit.platform.launcher) - testRuntimeOnly(libs.junit.engine) } - -tasks { - test { - jvmArgs("-Dminestom.inside-test=true") - useJUnitPlatform() - testLogging { - events("passed", "skipped", "failed") - } - } -} \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 3cdfb43..214cb71 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,14 +1,6 @@ plugins { `java-library` -} - -group = "net.theevilreaper" -version = "0.0.1" - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } + id("bounce.java-conventions") } dependencies { @@ -21,19 +13,4 @@ dependencies { testImplementation(libs.minestom) testImplementation(libs.aves) testImplementation(libs.cyano) - testImplementation(libs.junit.api) - testImplementation(libs.junit.params) - testImplementation(libs.junit.platform.launcher) - testRuntimeOnly(libs.junit.engine) } - -tasks { - test { - jvmArgs("-Dminestom.inside-test=true") - useJUnitPlatform() - testLogging { - events("passed", "skipped", "failed") - } - } -} - diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts index a23e39d..15ec664 100644 --- a/setup/build.gradle.kts +++ b/setup/build.gradle.kts @@ -1,12 +1,10 @@ plugins { - java `maven-publish` application alias(libs.plugins.shadow) + id("bounce.java-conventions") } -group = "net.theevilreaper" -version = "0.0.1" description = "Bounce Setup Server" dependencies { @@ -25,33 +23,14 @@ dependencies { testImplementation(libs.minestom) testImplementation(libs.aves) testImplementation(libs.cyano) - testImplementation(libs.junit.api) - testImplementation(libs.junit.params) - testImplementation(libs.junit.platform.launcher) - testRuntimeOnly(libs.junit.engine) } application { mainClass.set("net.theevilreaper.bounce.BounceSetupServer") } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(25)) - } -} - tasks { jar { dependsOn("shadowJar") } - - test { - jvmArgs("-Dminestom.inside-test=true") - useJUnitPlatform() - testLogging { - events("passed", "skipped", "failed") - } - } } - From b4db55d594794b4399cfd7153844ba5d0a20621d Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Thu, 11 Jun 2026 12:11:00 +0200 Subject: [PATCH 4/6] chore(ignore): modernize file content --- .gitignore | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 7a34221..1b71ca1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,35 @@ -.gradle +# Gradle & Kotlin +.gradle/ build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ +.kotlin/ -### IntelliJ IDEA ### -.idea +# IntelliJ IDEA +.idea/ *.iws *.iml *.ipr out/ -!**/src/main/**/out/ -!**/src/test/**/out/ -### Eclipse ### -.apt_generated +# Eclipse +.apt_generated/ .classpath .factorypath .project -.settings +.settings/ .springBeans -.sts4-cache +.sts4-cache/ bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ -### NetBeans ### +# NetBeans /nbproject/private/ /nbbuild/ /dist/ /nbdist/ /.nb-gradle/ -### VS Code ### +# VS Code .vscode/ -### Mac OS ### +# OS-spezifisch .DS_Store - -## Buildscript folder -buildSrc/.kotlin \ No newline at end of file +Thumbs.db \ No newline at end of file From 70913b74e3952c25aeb132d50282bd1d16da870d Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Thu, 11 Jun 2026 12:28:21 +0200 Subject: [PATCH 5/6] chore(settings): improve version catalog ordering --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 16c3737..5b8863e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,9 +27,9 @@ dependencyResolutionManagement { version("shadow", "9.4.2") version("aonyx", "0.7.1") version("pvp", "2026.05.30-26.1.1") + version("cloudnet", "4.0.0-RC17-SNAPSHOT") library("aonyx.bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx") - version("cloudnet", "4.0.0-RC17-SNAPSHOT") library("pvp", "io.github.togar2", "MinestomPvP").versionRef("pvp") library("minestom", "net.minestom", "minestom").withoutVersion() From 77a650520f0e6126a765ad2344e14d2927ed67d5 Mon Sep 17 00:00:00 2001 From: theEvilReaper Date: Thu, 11 Jun 2026 16:29:59 +0200 Subject: [PATCH 6/6] chore(deps): improve test dependency handling --- block/build.gradle.kts | 4 ++++ .../src/main/kotlin/bounce.java-conventions.gradle.kts | 8 -------- common/build.gradle.kts | 4 ++++ setup/build.gradle.kts | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/block/build.gradle.kts b/block/build.gradle.kts index 82b3d35..320e01d 100644 --- a/block/build.gradle.kts +++ b/block/build.gradle.kts @@ -9,4 +9,8 @@ dependencies { testImplementation(libs.minestom) testImplementation(libs.cyano) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.junit.platform.launcher) + testRuntimeOnly(libs.junit.engine) } diff --git a/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts index 0d1cc71..a6c4ba5 100644 --- a/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/bounce.java-conventions.gradle.kts @@ -13,14 +13,6 @@ java { } } -dependencies { - // Gemeinsame JUnit 5 Test-Abhängigkeiten mit explizitem add() - add("testImplementation", "org.junit.jupiter:junit-jupiter-api") - add("testImplementation", "org.junit.jupiter:junit-jupiter-params") - add("testImplementation", "org.junit.platform:junit-platform-launcher") - add("testRuntimeOnly", "org.junit.jupiter:junit-jupiter-engine") -} - tasks.withType().configureEach { jvmArgs("-Dminestom.inside-test=true") useJUnitPlatform() diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 214cb71..2681da8 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -13,4 +13,8 @@ dependencies { testImplementation(libs.minestom) testImplementation(libs.aves) testImplementation(libs.cyano) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.junit.platform.launcher) + testRuntimeOnly(libs.junit.engine) } diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts index 15ec664..83d5529 100644 --- a/setup/build.gradle.kts +++ b/setup/build.gradle.kts @@ -23,6 +23,10 @@ dependencies { testImplementation(libs.minestom) testImplementation(libs.aves) testImplementation(libs.cyano) + testImplementation(libs.junit.api) + testImplementation(libs.junit.params) + testImplementation(libs.junit.platform.launcher) + testRuntimeOnly(libs.junit.engine) } application {