From cf3dbf14b281535298e8fa9075a57e119a8c5b95 Mon Sep 17 00:00:00 2001
From: kento2 <kento@placeq.com>
Date: Sun, 5 Jul 2026 23:26:54 +0200
Subject: [PATCH] cleaned up build process

---
 .idea/workspace.xml                 | 41 ++++++++++++++++++-----------
 README.md                           | 13 +++++----
 core-bukkit-api/build.gradle.kts    |  3 +--
 core-bukkit-impl/build.gradle.kts   |  1 -
 core-lib/build.gradle.kts           |  8 +++---
 core-velocity-api/build.gradle.kts  |  3 +--
 core-velocity-impl/build.gradle.kts |  5 ++--
 gradle/libs.versions.toml           |  2 +-
 8 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f846740..2afdb85 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,23 +4,19 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment="move some stuff around">
-      <change afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/ScrowRepositoryConvention.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/libs.versions.toml" afterDir="false" />
+    <list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment="cleaned up build process">
+      <change afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/ScrowPublishConvention.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/configureScrowRepo.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../build-logic/convention/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/../build-logic/convention/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/de/kentoj/scrow/BaseDependenciesConvention.kt" beforeDir="false" afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/BaseDependenciesConvention.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/de/kentoj/scrow/DatabaseConvention.kt" beforeDir="false" afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/DatabaseConvention.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/de/kentoj/scrow/JavaLibraryConvention.kt" beforeDir="false" afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/JavaLibraryConvention.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/de/kentoj/scrow/ScrowRepositoryConvention.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/ScrowRepositoryConvention.kt" beforeDir="false" afterPath="$PROJECT_DIR$/../build-logic/convention/src/main/kotlin/scrow/ScrowRepositoryConvention.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-bukkit-api/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-bukkit-impl/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-lib/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/core-lib/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-velocity-api/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/core-velocity-api/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-velocity-impl/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/core-velocity-impl/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradle/libs.versions.toml" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/libs.versions.toml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -78,6 +74,13 @@
                 <item name="Tasks" type="e4a08cd1:TasksNode" />
                 <item name="build" type="c8890929:TasksNode$1" />
               </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="core" type="f1a62948:ProjectNode" />
+                <item name="core" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="publishing" type="c8890929:TasksNode$1" />
+              </path>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="core" type="f1a62948:ProjectNode" />
@@ -113,11 +116,12 @@
         <option value="Interface" />
         <option value="package-info" />
         <option value="Class" />
+        <option value="Kotlin File" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../build-logic" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="ROOT_SYNC" value="SYNC" />
   </component>
   <component name="GradleScriptDefinitionsStorage" workingDir="$PROJECT_DIR$" gradleHome="$USER_HOME$/.gradle/wrapper/dists/gradle-8.11-bin/c4te04g51qsyw1bxcb929u7br/gradle-8.11" javaHome="/usr/lib/jvm/openjdk21" gradleVersion="8.11" />
@@ -149,6 +153,7 @@
     "Gradle.core [clean].executor": "Run",
     "Gradle.core [publishAllPublicationsToScrowRepository].executor": "Run",
     "Gradle.core [publishCoreLibPublicationToScrowRepository].executor": "Run",
+    "Gradle.core [publish].executor": "Run",
     "Gradle.core:core-bukkit-api [build].executor": "Run",
     "Gradle.core:core-bukkit-api [clean].executor": "Run",
     "Gradle.core:core-bukkit-impl [build].executor": "Run",
@@ -184,6 +189,9 @@
     <key name="ExtractSuperBase.RECENT_KEYS">
       <recent name="de.kentoj.scrow.bukkit.region" />
     </key>
+    <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="scrow" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="de.kentoj.scrow.bukkit.player" />
       <recent name="de.kentoj.scrow.bukkit.friends.command" />
@@ -199,7 +207,7 @@
       <command value="gradlew buildEnvironment" />
     </option>
   </component>
-  <component name="RunManager" selected="Gradle.core [build]">
+  <component name="RunManager" selected="Gradle.core [publish]">
     <configuration name="core [:core-velocity-impl:shadowJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -288,10 +296,10 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
-    <configuration name="core:core-velocity-impl [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="core [publish]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$/core-velocity-impl" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="externalSystemIdString" value="GRADLE" />
         <option name="scriptParameters" />
         <option name="taskDescriptions">
@@ -299,7 +307,7 @@
         </option>
         <option name="taskNames">
           <list>
-            <option value="build" />
+            <option value="publish" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -323,11 +331,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.core [publish]" />
         <item itemvalue="Gradle.core [build]" />
         <item itemvalue="Gradle.core [a]" />
         <item itemvalue="Gradle.core [buildEnvironment]" />
         <item itemvalue="Gradle.core [:core-velocity-impl:shadowJar]" />
-        <item itemvalue="Gradle.core:core-velocity-impl [build]" />
       </list>
     </recent_temporary>
   </component>
@@ -371,6 +379,7 @@
     <MESSAGE value="currently refactoring a lot" />
     <MESSAGE value="." />
     <MESSAGE value="move some stuff around" />
-    <option name="LAST_COMMIT_MESSAGE" value="move some stuff around" />
+    <MESSAGE value="cleaned up build process" />
+    <option name="LAST_COMMIT_MESSAGE" value="cleaned up build process" />
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 4b85cba..827cf10 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,15 @@
 TODO
-- /friend add command is behaving weird: silent return no error
-  - improve error handling in Task ig
-  - try with InMemory db and debug postgres implementation
+- fix kencommandapi greedy strings & arguments: probably issue with shading
+- make core-lib-impl: a library -> avoid shading massive core-lib
 - logging in general, log some exceptions to game chat
 - notification: Friend is now offline/online
-- messages across server
 - /ignore command
-- maybe make kencommandapi-{bukkit,velocity} depend on -core
 
 environment
 -----------
 
 - **core-lib**: stateless library
-- **core-bukkit** stateful plugin/api for minecraft development, depends on core-lib
-- **core-velocity** stateful plugin/api for proxy development, depends on core-lib
\ No newline at end of file
+- **core-bukkit-api** stateful api, for minecraft development, depends on core-lib
+- **core-bukkit-api** stateful plugin, same as core-bukkit-api but implements it
+- **core-velocity-api** stateful api, for proxy development, depends on core-lib
+- **core-velocity-impl** stateful plugin, same as core-velocity-api but implements it
diff --git a/core-bukkit-api/build.gradle.kts b/core-bukkit-api/build.gradle.kts
index 06cfc06..9c64d47 100644
--- a/core-bukkit-api/build.gradle.kts
+++ b/core-bukkit-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("maven-publish")
+    id("scrow.scrow-publish")
     alias(libs.plugins.scrow.database)
     alias(libs.plugins.scrow.basedependencies)
     alias(libs.plugins.scrow.javalibrary)
@@ -13,7 +13,6 @@ dependencies {
     compileOnly(libs.papermc.api)
 
     api(libs.nats)
-    api(libs.scrow.commandapi.core)
     api(libs.scrow.commandapi.bukkit)
 }
 
diff --git a/core-bukkit-impl/build.gradle.kts b/core-bukkit-impl/build.gradle.kts
index 44ea2bf..b0d7520 100644
--- a/core-bukkit-impl/build.gradle.kts
+++ b/core-bukkit-impl/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
 
     implementation(libs.bson)
     implementation(libs.nats)
-    implementation(libs.scrow.commandapi.core)
     implementation(libs.scrow.commandapi.bukkit)
     implementation(libs.postgres)
 }
diff --git a/core-lib/build.gradle.kts b/core-lib/build.gradle.kts
index 4c8697a..73fbe7d 100644
--- a/core-lib/build.gradle.kts
+++ b/core-lib/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("maven-publish")
+    id("scrow.scrow-publish")
     alias(libs.plugins.scrow.basedependencies)
     alias(libs.plugins.scrow.javalibrary)
     alias(libs.plugins.scrow.database)
@@ -9,11 +9,11 @@ plugins {
 group = "de.kentoj.scrow"
 
 dependencies {
-    api(libs.nats)
-    api(libs.bson)
-    api(libs.scrow.commandapi.core)
+    compileOnly(libs.nats)
     compileOnly(libs.adventure.api)
     compileOnly(libs.adventure.minimessage)
+    api(libs.bson)
+    api(libs.scrow.commandapi.core)
 }
 
 publishing {
diff --git a/core-velocity-api/build.gradle.kts b/core-velocity-api/build.gradle.kts
index c0dbfb4..f14fdac 100644
--- a/core-velocity-api/build.gradle.kts
+++ b/core-velocity-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("maven-publish")
+    id("scrow.scrow-publish")
     alias(libs.plugins.scrow.basedependencies)
     alias(libs.plugins.scrow.javalibrary)
     alias(libs.plugins.scrow.database)
@@ -12,7 +12,6 @@ dependencies {
     api(project(":core-lib"))
 
     api(libs.velocity.api)
-    api(libs.scrow.commandapi.core)
     api(libs.scrow.commandapi.velocity)
 }
 
diff --git a/core-velocity-impl/build.gradle.kts b/core-velocity-impl/build.gradle.kts
index cf96d40..8777908 100644
--- a/core-velocity-impl/build.gradle.kts
+++ b/core-velocity-impl/build.gradle.kts
@@ -8,10 +8,9 @@ plugins {
 group = "de.kentoj.scrow"
 
 dependencies {
-    implementation(project(":core-velocity-api")) {
-        isTransitive = true
-    }
+    implementation(project(":core-velocity-api"))
     annotationProcessor(libs.velocity.api)
+    implementation(libs.nats)
     implementation(libs.postgres)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d548266..3f8689d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 shadow = "9.2.0"
 run-paper = "2.3.1"
-scrow-commandapi = "0.30"
+scrow-commandapi = "0.31"
 postgress = "42.7.12"
 nats = "2.25.2"
 papermc = "1.21.11-rc3-R0.1-SNAPSHOT"