From 4c2ad35c96c7a6d77c0abfd2cd6a8639e43794a9 Mon Sep 17 00:00:00 2001
From: Dawson <dawson@funkemunky.cc>
Date: Wed, 8 Apr 2026 13:13:05 -0400
Subject: [PATCH] Fixing build

---
 Bukkit/Loader/build.gradle           | 2 +-
 Bukkit/Plugin/build.gradle           | 4 ++--
 Bungee/BungeeLoader/build.gradle     | 2 +-
 Bungee/BungeePlugin/build.gradle     | 4 ++--
 Common/Source/build.gradle           | 9 ++++++++-
 Sponge/SpongeLoader/build.gradle     | 2 +-
 Sponge/SpongePlugin/build.gradle     | 4 ++--
 Universal/build.gradle               | 2 +-
 Velocity/VelocityLoader/build.gradle | 2 +-
 Velocity/VelocityPlugin/build.gradle | 4 ++--
 build.gradle                         | 4 ++--
 11 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Bukkit/Loader/build.gradle b/Bukkit/Loader/build.gradle
index 3ee6618..bfef48f 100644
--- a/Bukkit/Loader/build.gradle
+++ b/Bukkit/Loader/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 evaluationDependsOn(':Bukkit:Plugin')
diff --git a/Bukkit/Plugin/build.gradle b/Bukkit/Plugin/build.gradle
index ec3c6de..c4f4cba 100644
--- a/Bukkit/Plugin/build.gradle
+++ b/Bukkit/Plugin/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT'
-    compileOnly project(':Common:Source')
+    compileOnly project(path: ':Common:Source', configuration: 'shadow')
     compileOnly project(':Common:loader-utils')
     implementation 'org.bstats:bstats-bukkit:2.2.1'
 }
diff --git a/Bungee/BungeeLoader/build.gradle b/Bungee/BungeeLoader/build.gradle
index ef6cf7e..8b9c8e0 100644
--- a/Bungee/BungeeLoader/build.gradle
+++ b/Bungee/BungeeLoader/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 evaluationDependsOn(':Bungee:BungeePlugin')
diff --git a/Bungee/BungeePlugin/build.gradle b/Bungee/BungeePlugin/build.gradle
index 7196c50..f752a6d 100644
--- a/Bungee/BungeePlugin/build.gradle
+++ b/Bungee/BungeePlugin/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 dependencies {
     compileOnly 'net.md-5:bungeecord-api:1.21-R0.2'
-    compileOnly project(':Common:Source')
+    compileOnly project(path: ':Common:Source', configuration: 'shadow')
     compileOnly project(':Common:loader-utils')
     implementation 'org.bstats:bstats-bungeecord:2.2.1'
 }
diff --git a/Common/Source/build.gradle b/Common/Source/build.gradle
index 901d6d0..bc89fd7 100644
--- a/Common/Source/build.gradle
+++ b/Common/Source/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 dependencies {
@@ -14,6 +14,10 @@ dependencies {
     compileOnly 'org.mongodb:mongo-java-driver:3.12.14'
 }
 
+jar {
+    enabled = false
+}
+
 shadowJar {
     archiveClassifier.set('')
     relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml'
@@ -31,3 +35,6 @@ shadowJar {
 }
 
 tasks.build.dependsOn shadowJar
+components.java.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
+    skip()
+}
diff --git a/Sponge/SpongeLoader/build.gradle b/Sponge/SpongeLoader/build.gradle
index 626a4d9..f9d5234 100644
--- a/Sponge/SpongeLoader/build.gradle
+++ b/Sponge/SpongeLoader/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 evaluationDependsOn(':Sponge:SpongePlugin')
diff --git a/Sponge/SpongePlugin/build.gradle b/Sponge/SpongePlugin/build.gradle
index 62284c8..a9c2b27 100644
--- a/Sponge/SpongePlugin/build.gradle
+++ b/Sponge/SpongePlugin/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 dependencies {
     compileOnly 'org.spongepowered:spongeapi:11.0.0'
-    compileOnly project(':Common:Source')
+    compileOnly project(path: ':Common:Source', configuration: 'shadow')
     compileOnly project(':Common:loader-utils')
 }
 
diff --git a/Universal/build.gradle b/Universal/build.gradle
index b286da5..7d04189 100644
--- a/Universal/build.gradle
+++ b/Universal/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 // Aggregate universal jar that embeds platform loaders and the common source jar
diff --git a/Velocity/VelocityLoader/build.gradle b/Velocity/VelocityLoader/build.gradle
index ba1542d..74bc7d1 100644
--- a/Velocity/VelocityLoader/build.gradle
+++ b/Velocity/VelocityLoader/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 evaluationDependsOn(':Velocity:VelocityPlugin')
diff --git a/Velocity/VelocityPlugin/build.gradle b/Velocity/VelocityPlugin/build.gradle
index 5dead1e..6754670 100644
--- a/Velocity/VelocityPlugin/build.gradle
+++ b/Velocity/VelocityPlugin/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
 }
 
 dependencies {
     compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT'
-    compileOnly project(':Common:Source')
+    compileOnly project(path: ':Common:Source', configuration: 'shadow')
     compileOnly project(':Common:loader-utils')
     implementation 'org.bstats:bstats-velocity:2.2.1'
 }
diff --git a/build.gradle b/build.gradle
index 6d9ad62..8a5f919 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.gradleup.shadow' version '9.4.1' apply false
 }
 
 allprojects {
@@ -21,7 +21,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(17)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }