From de1ad8886a920d1bb63f0b9967fb0678da6cb3a2 Mon Sep 17 00:00:00 2001
From: JvstvsHD <79066214+JvstvsHD@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:58:47 +0100
Subject: [PATCH] Cleanup dependencies & relocation

---
 .../api/event/punishment/PunishmentLogEvent.java |  6 ++++++
 necrify-common/build.gradle.kts                  | 16 +++++++++++-----
 necrify-velocity/build.gradle.kts                |  4 +++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentLogEvent.java b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentLogEvent.java
index d7f2c54d..e91dcf90 100644
--- a/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentLogEvent.java
+++ b/necrify-api/src/main/java/de/jvstvshd/necrify/api/event/punishment/PunishmentLogEvent.java
@@ -20,7 +20,13 @@
 
 import de.jvstvshd.necrify.api.event.NecrifyEvent;
 import de.jvstvshd.necrify.api.punishment.log.PunishmentLogEntry;
+import org.jetbrains.annotations.ApiStatus;
 
+/**
+ * An event that is called when a punishment log entry is created.
+ * This part of the Event API is experimental and may be subject to change or may not work yet fully and under all circrumstances.
+ */
+@ApiStatus.Experimental
 public class PunishmentLogEvent extends NecrifyEvent {
 
     private final PunishmentLogEntry action;
diff --git a/necrify-common/build.gradle.kts b/necrify-common/build.gradle.kts
index a6cd2fc8..b85ef14c 100644
--- a/necrify-common/build.gradle.kts
+++ b/necrify-common/build.gradle.kts
@@ -24,17 +24,23 @@ dependencies {
     api(projects.necrifyApi)
     api(libs.bundles.jackson)
     runtimeDownload(libs.bundles.database.drivers) {
-        exclude(group = "org.slf4j", module = "slf4j-api")
+        exclude(group = "org.slf4j")
+    }
+    compileOnly(libs.bundles.database.drivers)
+    api(libs.bundles.database.helper) {
+        exclude(group = "org.slf4j")
+    }
+    api(libs.bundles.cloud) {
+        exclude(group = "net.kyori")
     }
-    api(libs.bundles.database.helper)
-    api(libs.bundles.cloud)
-    compileOnly(libs.cloud.brigadier)
     compileOnly(libs.brigadier)
     annotationProcessor(libs.cloud.annotations)
     compileOnly(libs.slf4j.api)
     compileOnly("com.google.code.gson:gson:2.11.0")
     compileOnly(libs.bundles.adventure)
-    api(libs.adventure.text.feature.pagination)
+    api(libs.adventure.text.feature.pagination) {
+        exclude(group = "net.kyori")
+    }
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)
 }
diff --git a/necrify-velocity/build.gradle.kts b/necrify-velocity/build.gradle.kts
index 4902a567..f4e64feb 100644
--- a/necrify-velocity/build.gradle.kts
+++ b/necrify-velocity/build.gradle.kts
@@ -17,10 +17,11 @@ repositories {
 
 dependencies {
     api(projects.necrifyApi)
-    compileOnly(libs.bundles.database.drivers)
     api(projects.necrifyCommon)
     api(libs.cloud.velocity)
     api(libs.minecraftdependencydownload.velocity)
+    compileOnly(libs.bundles.database.drivers)
+    compileOnly(libs.cloud.brigadier)
     annotationProcessor(libs.velocity.api)
     compileOnly(libs.velocity.api)
     compileOnly(libs.luckperms.api)
@@ -84,6 +85,7 @@ tasks {
             relocate("org.objectweb.asm", prefix("objectweb.asm"))
             relocate("org.apache.commons", prefix("commons"))
             relocate("org.checkerframework", prefix("checkerframework"))
+            relocate("org.greenrobot.eventbus", prefix("greenrobot.eventbus"))
             relocate("org.incendo.cloud", prefix("cloud"))
             relocate("org.intellij.lang.annotations", prefix("intellij.lang.annotations"))
             relocate("org.jetbrains.annotations", prefix("jetbrains.annotations"))