diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index f90ab8c..b192514 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    `java-library`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
     `el-version`
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index ba6a196..22d7467 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-    entitylib.`java-conventions`
-    id("java-library")
+    entitylib.`library-conventions`
 }
 
 group = "me.tofaa.entitylib"
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 77bf5d3..6bdb120 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -9,5 +9,10 @@ kotlin {
 }
 
 repositories {
+    gradlePluginPortal()
     mavenCentral()
+}
+
+dependencies {
+    implementation(libs.shadow)
 }
\ No newline at end of file
diff --git a/buildSrc/libs.versions.toml b/buildSrc/libs.versions.toml
new file mode 100644
index 0000000..4407c6d
--- /dev/null
+++ b/buildSrc/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+shadow = "8.1.8"
+
+[libraries]
+shadow = { group = "io.github.goooler.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" }
\ No newline at end of file
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 0000000..71b8251
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("libs.versions.toml"))
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts
similarity index 83%
rename from buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts
rename to buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts
index 0808888..e4718a2 100644
--- a/buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    java
+    `java-library`
     `maven-publish`
 }
 
@@ -32,8 +32,6 @@ tasks {
 
     withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
-        // See https://openjdk.java.net/jeps/247 for more information.
         options.release = 8
     }
 
diff --git a/buildSrc/src/main/kotlin/entitylib.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/entitylib.shadow-conventions.gradle.kts
new file mode 100644
index 0000000..00d91ac
--- /dev/null
+++ b/buildSrc/src/main/kotlin/entitylib.shadow-conventions.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    java
+    io.github.goooler.shadow
+}
+
+tasks {
+    shadowJar {
+        archiveFileName = "EntityLib-${project.name}-${project.version}.jar"
+        archiveClassifier = null
+
+        mergeServiceFiles()
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+}
+
+configurations.implementation.get().extendsFrom(configurations.shadow.get())
\ No newline at end of file
diff --git a/code-gen/build.gradle.kts b/code-gen/build.gradle.kts
index 880dfbe..cde7c53 100644
--- a/code-gen/build.gradle.kts
+++ b/code-gen/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 dependencies {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index e2cf686..e8b8cb1 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    `java-library`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 dependencies {
diff --git a/libs.versions.toml b/libs.versions.toml
index d0ac5e4..745095a 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -6,7 +6,6 @@ packetevents = "2.4.1-SNAPSHOT"
 paper = "1.21-R0.1-SNAPSHOT"
 velocity = "3.3.0-SNAPSHOT"
 run-paper = "2.3.0"
-shadow = "8.1.1"
 javapoet = "1.13.0"
 
 [libraries]
@@ -29,5 +28,4 @@ adventure = ["adventure-api", "adventure-text-serializer-gson", "adventure-text-
 
 [plugins]
 run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" }
-run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-paper" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
\ No newline at end of file
+run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-paper" }
\ No newline at end of file
diff --git a/model-engine-addon/build.gradle.kts b/model-engine-addon/build.gradle.kts
index 7b901a0..e5436d9 100644
--- a/model-engine-addon/build.gradle.kts
+++ b/model-engine-addon/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    `java-library`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 repositories {
diff --git a/platforms/spigot/build.gradle.kts b/platforms/spigot/build.gradle.kts
index e6ac43b..e52a692 100644
--- a/platforms/spigot/build.gradle.kts
+++ b/platforms/spigot/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    `java-library`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 repositories {
diff --git a/platforms/standalone/build.gradle.kts b/platforms/standalone/build.gradle.kts
index 48225d7..b414df6 100644
--- a/platforms/standalone/build.gradle.kts
+++ b/platforms/standalone/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    `java-library`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 dependencies {
diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts
index 78ce677..71fc835 100644
--- a/platforms/velocity/build.gradle.kts
+++ b/platforms/velocity/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    `java-library`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 repositories {
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
index 56baa3f..1b4c6cb 100644
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
-    alias(libs.plugins.shadow)
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
     alias(libs.plugins.run.paper)
 }