diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7b8811e..f846740 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,54 +4,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
-
-
-
-
-
-
+
@@ -148,7 +117,8 @@
-
+
+
@@ -173,7 +143,9 @@
"keyToString": {
"Gradle.Download Sources.executor": "Run",
"Gradle.core [:core-velocity-impl:shadowJar].executor": "Run",
- "Gradle.core [build].executor": "Debug",
+ "Gradle.core [a].executor": "Run",
+ "Gradle.core [buildEnvironment].executor": "Run",
+ "Gradle.core [build].executor": "Run",
"Gradle.core [clean].executor": "Run",
"Gradle.core [publishAllPublicationsToScrowRepository].executor": "Run",
"Gradle.core [publishCoreLibPublicationToScrowRepository].executor": "Run",
@@ -193,7 +165,7 @@
"RunOnceActivity.git.unshallow": "true",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "/home/a/src/scrow",
+ "last_opened_file_path": "/home/a/src/scrow/core",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.6268199",
@@ -224,6 +196,7 @@
+
@@ -249,7 +222,7 @@
false
-
+
@@ -260,7 +233,7 @@
@@ -271,10 +244,32 @@
false
-
+
-
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- true
- true
- false
- false
-
-
@@ -351,10 +324,10 @@
@@ -397,6 +370,7 @@
-
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index ba45ef8..4b85cba 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ TODO
- notification: Friend is now offline/online
- messages across server
- /ignore command
+- maybe make kencommandapi-{bukkit,velocity} depend on -core
environment
-----------
diff --git a/build.gradle.kts b/build.gradle.kts
index d4c61fa..3b40b84 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,4 +7,4 @@ subprojects {
tasks.withType {
archiveVersion = ""
}
-}
+}
\ No newline at end of file
diff --git a/core-bukkit-api/build.gradle.kts b/core-bukkit-api/build.gradle.kts
index 1f54bb7..06cfc06 100644
--- a/core-bukkit-api/build.gradle.kts
+++ b/core-bukkit-api/build.gradle.kts
@@ -1,31 +1,20 @@
plugins {
id("java")
id("maven-publish")
- id("de.kentoj.scrow.scrow-repository")
- id("de.kentoj.scrow.base-dependencies")
- id("de.kentoj.scrow.java-library")
- id("de.kentoj.scrow.database")
+ alias(libs.plugins.scrow.database)
+ alias(libs.plugins.scrow.basedependencies)
+ alias(libs.plugins.scrow.javalibrary)
}
group = "de.kentoj.scrow"
-repositories {
- mavenCentral()
- maven("https://repo.papermc.io/repository/maven-public/") {
- name = "papermc"
- }
-}
-
dependencies {
api(project(":core-lib"))
- compileOnly("io.papermc.paper:paper-api:1.21.11-rc3-R0.1-SNAPSHOT")
+ compileOnly(libs.papermc.api)
- // https://mvnrepository.com/artifact/io.nats/jnats
- api("io.nats:jnats:2.25.2")
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- api("de.kentoj.scrow:kencommandapi-core:0.30")
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-bukkit
- api("de.kentoj.scrow:kencommandapi-bukkit:0.30")
+ api(libs.nats)
+ api(libs.scrow.commandapi.core)
+ api(libs.scrow.commandapi.bukkit)
}
publishing {
diff --git a/core-bukkit-impl/build.gradle.kts b/core-bukkit-impl/build.gradle.kts
index 546d20f..44ea2bf 100644
--- a/core-bukkit-impl/build.gradle.kts
+++ b/core-bukkit-impl/build.gradle.kts
@@ -1,36 +1,22 @@
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")
+ alias(libs.plugins.runpaper)
+ alias(libs.plugins.shadow)
+ alias(libs.plugins.scrow.basedependencies)
+ alias(libs.plugins.scrow.database)
}
group = "de.kentoj.scrow"
-repositories {
- mavenCentral()
-
- maven("https://repo.papermc.io/repository/maven-public/") {
- name = "papermc"
- }
-}
-
dependencies {
- compileOnly("io.papermc.paper:paper-api:1.21.11-rc3-R0.1-SNAPSHOT")
implementation(project(":core-bukkit-api"))
+ compileOnly(libs.papermc.api)
- // https://mvnrepository.com/artifact/org.mongodb/bson
- implementation("org.mongodb:bson:5.8.0")
- // https://mvnrepository.com/artifact/io.nats/jnats
- implementation("io.nats:jnats:2.25.2")
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- implementation("de.kentoj.scrow:kencommandapi-core:0.30")
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-bukkit
- implementation("de.kentoj.scrow:kencommandapi-bukkit:0.30")
- // https://mvnrepository.com/artifact/org.postgresql/postgresql
- implementation("org.postgresql:postgresql:42.7.12")
+ implementation(libs.bson)
+ implementation(libs.nats)
+ implementation(libs.scrow.commandapi.core)
+ implementation(libs.scrow.commandapi.bukkit)
+ implementation(libs.postgres)
}
tasks {
diff --git a/core-lib/build.gradle.kts b/core-lib/build.gradle.kts
index f316c69..4c8697a 100644
--- a/core-lib/build.gradle.kts
+++ b/core-lib/build.gradle.kts
@@ -1,30 +1,19 @@
plugins {
id("java")
id("maven-publish")
- id("de.kentoj.scrow.scrow-repository")
- id("de.kentoj.scrow.base-dependencies")
- id("de.kentoj.scrow.database")
- id("de.kentoj.scrow.java-library")
+ alias(libs.plugins.scrow.basedependencies)
+ alias(libs.plugins.scrow.javalibrary)
+ alias(libs.plugins.scrow.database)
}
group = "de.kentoj.scrow"
-repositories {
- mavenCentral()
-}
-
dependencies {
- // https://mvnrepository.com/artifact/io.nats/jnats
- api("io.nats:jnats:2.25.2")
-
- // https://mvnrepository.com/artifact/org.mongodb/bson
- api("org.mongodb:bson:5.8.0")
-
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- api("de.kentoj.scrow:kencommandapi-core:0.30")
-
- compileOnly("net.kyori:adventure-api:5.2.0")
- compileOnly("net.kyori:adventure-text-minimessage:5.2.0")
+ api(libs.nats)
+ api(libs.bson)
+ api(libs.scrow.commandapi.core)
+ compileOnly(libs.adventure.api)
+ compileOnly(libs.adventure.minimessage)
}
publishing {
diff --git a/core-velocity-api/build.gradle.kts b/core-velocity-api/build.gradle.kts
index 2266d0d..c0dbfb4 100644
--- a/core-velocity-api/build.gradle.kts
+++ b/core-velocity-api/build.gradle.kts
@@ -1,32 +1,19 @@
plugins {
id("java")
id("maven-publish")
- id("de.kentoj.scrow.scrow-repository")
- id("de.kentoj.scrow.base-dependencies")
- id("de.kentoj.scrow.java-library")
- id("de.kentoj.scrow.database")
+ alias(libs.plugins.scrow.basedependencies)
+ alias(libs.plugins.scrow.javalibrary)
+ alias(libs.plugins.scrow.database)
}
group = "de.kentoj.scrow"
-repositories {
- mavenCentral()
- maven {
- name = "papermc"
- url = uri("https://repo.papermc.io/repository/maven-public/")
- }
-}
-
dependencies {
api(project(":core-lib"))
- // https://docs.papermc.io/velocity/dev/creating-your-first-plugin/
- api("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
-
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- api("de.kentoj.scrow:kencommandapi-core:0.30")
- // http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-velocity
- api("de.kentoj.scrow:kencommandapi-velocity:0.30")
+ api(libs.velocity.api)
+ api(libs.scrow.commandapi.core)
+ api(libs.scrow.commandapi.velocity)
}
publishing {
diff --git a/core-velocity-impl/build.gradle.kts b/core-velocity-impl/build.gradle.kts
index 316fe6d..cf96d40 100644
--- a/core-velocity-impl/build.gradle.kts
+++ b/core-velocity-impl/build.gradle.kts
@@ -1,30 +1,18 @@
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")
+ alias(libs.plugins.shadow)
+ alias(libs.plugins.scrow.basedependencies)
+ alias(libs.plugins.scrow.database)
}
group = "de.kentoj.scrow"
-repositories {
- mavenCentral()
- maven {
- name = "papermc"
- url = uri("https://repo.papermc.io/repository/maven-public/")
- }
-}
-
dependencies {
implementation(project(":core-velocity-api")) {
isTransitive = true
}
- // https://docs.papermc.io/velocity/dev/creating-your-first-plugin/
- annotationProcessor("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
-
- // https://mvnrepository.com/artifact/org.postgresql/postgresql
- implementation("org.postgresql:postgresql:42.7.12")
+ annotationProcessor(libs.velocity.api)
+ implementation(libs.postgres)
}
tasks.build {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..d548266
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,39 @@
+[versions]
+shadow = "9.2.0"
+run-paper = "2.3.1"
+scrow-commandapi = "0.30"
+postgress = "42.7.12"
+nats = "2.25.2"
+papermc = "1.21.11-rc3-R0.1-SNAPSHOT"
+velocity = "3.5.0-SNAPSHOT"
+bson = "5.8.0"
+adventure = "5.2.0"
+
+[plugins]
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+runpaper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" }
+scrow-scrowrepository = { id = "scrow.scrow-repository" }
+scrow-basedependencies = { id = "scrow.base-dependencies" }
+scrow-javalibrary = { id = "scrow.java-library" }
+scrow-database = { id = "scrow.database" }
+
+[libraries]
+# https://mvnrepository.com/artifact/org.postgresql/postgresql
+postgres = { module = "org.postgresql:postgresql", version.ref = "postgress" }
+# https://mvnrepository.com/artifact/org.mongodb/bson
+bson = { module = "org.mongodb:bson", version.ref = "bson" }
+# https://mvnrepository.com/artifact/io.nats/jnats
+nats = { module = "io.nats:jnats", version.ref = "nats" }
+# https://docs.papermc.io/paper/dev/project-setup/
+papermc-api = { module = "io.papermc.paper:paper-api", version.ref = "papermc" }
+# https://docs.papermc.io/velocity/dev/creating-your-first-plugin/
+velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
+adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }
+adventure-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
+
+# http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
+scrow-commandapi-core = { module = "de.kentoj.scrow:kencommandapi-core", version.ref = "scrow-commandapi" }
+# http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-bukkit
+scrow-commandapi-bukkit = { module = "de.kentoj.scrow:kencommandapi-bukkit", version.ref = "scrow-commandapi" }
+# http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-velocity
+scrow-commandapi-velocity = { module = "de.kentoj.scrow:kencommandapi-velocity", version.ref = "scrow-commandapi" }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c6b09dd..466b1be 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,21 +1,28 @@
pluginManagement {
- plugins {
- id("de.kentoj.scrow.ScrowRepository")
- }
+ includeBuild("../build-logic")
repositories {
- gradlePluginPortal()
- mavenCentral()
+ maven {
+ name = "papermc"
+ url = uri("https://repo.papermc.io/repository/maven-public/")
+ }
+ }
+}
+
+dependencyResolutionManagement {
+ repositories {
+ maven {
+ name = "papermc"
+ url = uri("https://repo.papermc.io/repository/maven-public/")
+ }
}
}
plugins {
- id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+ id("scrow.scrow-repository")
}
rootProject.name = "core"
-includeBuild("../build-logic")
-
include("core-bukkit-api")
include("core-bukkit-impl")
include("core-lib")