From 70520af761a34be28ed59288bb580bcb40e46213 Mon Sep 17 00:00:00 2001
From: Daniel Scherf <35780068+dlsf@users.noreply.github.com>
Date: Sun, 21 Jul 2024 16:45:07 +0200
Subject: [PATCH] Relocate all included dependencies & Simplify shadowJar task
 replacement (#877)

---
 build.gradle.kts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cb51b0bca..235bb6e0d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,10 +38,9 @@ dependencies {
 }
 
 tasks {
-    // "Replace" the build task with the shadowJar task (probably bad but who cares)
-    jar {
-        dependsOn("shadowJar")
-        enabled = false
+    // Add the shadowJar task to the build task
+    build {
+        dependsOn(shadowJar)
     }
 
     shadowJar {
@@ -54,8 +53,11 @@ tasks {
         // Relocate dependencies
         relocate("com.iridium.iridiumcore")
         relocate("com.j256.ormlite")
-        relocate("org.bstats")
         relocate("de.jeff_media.updatechecker")
+        relocate("org.bstats")
+        relocate("org.intellij.lang.annotations")
+        relocate("org.jetbrains.annotations")
+        relocate("org.jnbt")
 
         // Remove unnecessary files from the jar
         minimize()