diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..351d25e
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..d4b7acc
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..03872dd
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..0b33847
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..8c0840c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1782581947132
+
+
+ 1782581947132
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index fc90377..034572b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,60 +1,6 @@
-plugins {
- id("java")
- id("io.freefair.lombok") version "9.2.0" apply false
-}
-
group = "de.kentoj.scrow"
version = "1.0.0"
-repositories {
- mavenCentral()
- scrowRepo(this)
-}
-
subprojects {
- apply(plugin = "java")
- apply(plugin = "io.freefair.lombok")
-
version = rootProject.version
-
- java {
- withSourcesJar()
- withJavadocJar()
- }
-
- tasks.withType().configureEach {
- (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:all,-missing", "-quiet")
- }
-
- repositories {
- mavenCentral()
- maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
- name = "spigotmc-repo"
- }
- scrowRepo(this)
- }
-
- dependencies {
- // https://mvnrepository.com/artifact/org.jetbrains/annotations
- implementation("org.jetbrains:annotations:26.0.2-1")
-
- // https://projectreactor.io/docs/core/release/reference/gettingStarted.html
- implementation(platform("io.projectreactor:reactor-bom:2025.0.3"))
- implementation("io.projectreactor:reactor-core")
-
- // https://mvnrepository.com/artifact/com.google.guava/guava
- implementation("com.google.guava:guava:33.5.0-jre")
-
- // https://www.mongodb.com/docs/languages/java/reactive-streams-driver/current/get-started/download-and-install/
- implementation(platform("org.mongodb:mongodb-driver-bom:5.6.1"))
- implementation("org.mongodb:mongodb-driver-reactivestreams")
-
- // https://mvnrepository.com/artifact/org.postgresql/r2dbc-postgresql
- // TODO remove or fully switch to postgres
- implementation("org.postgresql:r2dbc-postgresql:1.1.1.RELEASE")
- // https://mvnrepository.com/artifact/org.springframework.data/spring-data-r2dbc
- implementation("org.springframework.data:spring-data-r2dbc:4.1.0-RC1")
- // https://mvnrepository.com/artifact/io.r2dbc/r2dbc-pool
- implementation("io.r2dbc:r2dbc-pool:1.0.2.RELEASE")
- }
}
diff --git a/core-bukkit-api/build.gradle.kts b/core-bukkit-api/build.gradle.kts
index 2c6df38..b20cc6b 100644
--- a/core-bukkit-api/build.gradle.kts
+++ b/core-bukkit-api/build.gradle.kts
@@ -1,26 +1,32 @@
plugins {
id("java")
- id("java-library")
id("maven-publish")
+ id("de.kentoj.scrow.scrow-repository")
+ id("de.kentoj.scrow.base-dependencies")
+ id("de.kentoj.scrow.java-library")
}
group = "de.kentoj.scrow"
repositories {
mavenCentral()
+
+ maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
+ name = "spigotmc-repo"
+ }
}
dependencies {
api(project(":core-lib"))
-
api("org.spigotmc:spigot-api:1.21.11-R0.1-SNAPSHOT")
// https://mvnrepository.com/artifact/io.nats/jnats
- implementation("io.nats:jnats:2.25.2")
api("io.nats:jnats:2.25.2")
- api("de.kentoj.scrow:kencommandapi-core:0.8")
- api("de.kentoj.scrow:kencommandapi-bukkit:0.8")
+ // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
+ api("de.kentoj.scrow:kencommandapi-core:0.9")
+ // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-bukkit
+ api("de.kentoj.scrow:kencommandapi-bukkit:0.9")
}
publishing {
diff --git a/core-bukkit-impl/build.gradle.kts b/core-bukkit-impl/build.gradle.kts
index 089ef74..a20e7e9 100644
--- a/core-bukkit-impl/build.gradle.kts
+++ b/core-bukkit-impl/build.gradle.kts
@@ -1,20 +1,29 @@
-
plugins {
id("java")
id("com.gradleup.shadow") version "9.2.0"
id("xyz.jpenilla.run-paper") version "2.3.1"
+ id("de.kentoj.scrow.scrow-repository")
+ id("de.kentoj.scrow.base-dependencies")
+ id("de.kentoj.scrow.database")
}
group = "de.kentoj.scrow"
repositories {
mavenCentral()
+
+ maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
+ name = "spigotmc-repo"
+ }
}
dependencies {
implementation(project(":core-bukkit-api"))
- implementation(kotlin("stdlib-jdk8"))
+ // TODO remove, we use postgres now
+ // https://www.mongodb.com/docs/languages/java/reactive-streams-driver/current/get-started/download-and-install/
+ implementation(platform("org.mongodb:mongodb-driver-bom:5.6.1"))
+ implementation("org.mongodb:mongodb-driver-reactivestreams")
}
tasks {
@@ -29,9 +38,11 @@ tasks {
tasks.processResources {
filesMatching("plugin.yml") {
- expand(mapOf(
- "version" to project.version.toString()
- ))
+ expand(
+ mapOf(
+ "version" to project.version.toString()
+ )
+ )
}
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
index d0ff9e5..4784fee 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
@@ -17,7 +17,6 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
-import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import java.io.IOException;
diff --git a/core-lib/build.gradle.kts b/core-lib/build.gradle.kts
index a1c9d11..88a6835 100644
--- a/core-lib/build.gradle.kts
+++ b/core-lib/build.gradle.kts
@@ -1,10 +1,9 @@
-val scrowToken = providers.gradleProperty("scrowMavenToken")
- .orElse(providers.environmentVariable("SCROW_MAVEN_TOKEN")).get()
-
plugins {
id("java")
- id("java-library")
id("maven-publish")
+ id("de.kentoj.scrow.base-dependencies")
+ id("de.kentoj.scrow.database")
+ id("de.kentoj.scrow.java-library")
}
group = "de.kentoj.scrow"
@@ -32,7 +31,4 @@ publishing {
from(components["java"])
}
}
- repositories {
- scrowRepo(this)
- }
}
diff --git a/core-velocity-api/build.gradle.kts b/core-velocity-api/build.gradle.kts
index e3ea402..cd798f2 100644
--- a/core-velocity-api/build.gradle.kts
+++ b/core-velocity-api/build.gradle.kts
@@ -1,7 +1,9 @@
plugins {
id("java")
- id("java-library")
id("maven-publish")
+ id("de.kentoj.scrow.scrow-repository")
+ id("de.kentoj.scrow.base-dependencies")
+ id("de.kentoj.scrow.java-library")
}
group = "de.kentoj.scrow"
diff --git a/core-velocity-impl/build.gradle.kts b/core-velocity-impl/build.gradle.kts
index 330600a..463b32a 100644
--- a/core-velocity-impl/build.gradle.kts
+++ b/core-velocity-impl/build.gradle.kts
@@ -1,6 +1,9 @@
plugins {
id("java")
id("com.gradleup.shadow") version "9.2.0"
+ id("de.kentoj.scrow.scrow-repository")
+ id("de.kentoj.scrow.base-dependencies")
+ id("de.kentoj.scrow.database")
}
group = "de.kentoj.scrow"
@@ -15,14 +18,12 @@ repositories {
dependencies {
implementation(project(":core-velocity-api"))
-
// https://docs.papermc.io/velocity/dev/creating-your-first-plugin/
annotationProcessor("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
// https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine
implementation("com.github.ben-manes.caffeine:caffeine:3.2.4")
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-velocity
implementation("de.kentoj.scrow:kencommandapi-velocity")
}
@@ -45,6 +46,7 @@ val generateBuildInfo by tasks.registering {
)
}
}
+
sourceSets.main {
java.srcDir(generateBuildInfo)
}
\ No newline at end of file
diff --git a/gradle.properties.kts b/gradle.properties.kts
deleted file mode 100644
index 6b1fad6..0000000
--- a/gradle.properties.kts
+++ /dev/null
@@ -1,16 +0,0 @@
-val scrowToken = providers.gradleProperty("scrowMavenToken")
- .orElse(providers.environmentVariable("SCROW_MAVEN_TOKEN")).get()
-val scrowRepo: Action = Action {
- maven {
- name = "scrow"
- url = uri("http://forge.kentoj.de/api/packages/scrow/maven")
- isAllowInsecureProtocol = true
- credentials(HttpHeaderCredentials::class) {
- name = "Authorization"
- value = "token $scrowToken"
- }
- authentication {
- create("header")
- }
- }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 31edf26..c6b09dd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,14 +1,23 @@
pluginManagement {
plugins {
- kotlin("jvm") version "2.2.10"
+ id("de.kentoj.scrow.ScrowRepository")
+ }
+ repositories {
+ gradlePluginPortal()
+ mavenCentral()
}
}
+
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
+
rootProject.name = "core"
+
+includeBuild("../build-logic")
+
include("core-bukkit-api")
include("core-bukkit-impl")
include("core-lib")
include("core-velocity-api")
-include("core-velocity-impl")
+include("core-velocity-impl")
\ No newline at end of file