fix build

fabianmakila · Nov 9, 2024 · 36e627d · 36e627d
1 parent 6d5e0d2
commit 36e627d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/buildSrc/src/main/kotlin/proxychat.platform-conventions.gradle.kts b/buildSrc/src/main/kotlin/proxychat.platform-conventions.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.support.uppercaseFirstChar
+
 plugins {
 	id("proxychat.java-conventions")
 	id("com.gradleup.shadow")
@@ -16,17 +18,6 @@ tasks {
 
 		destinationDirectory.set(file("${rootProject.rootDir}/dist"))
 		archiveClassifier.set("")
-		archiveBaseName.set("${rootProject.name}-${project.name.replaceFirstChar(Char::titlecase)}")
-
-		shadowJar {
-			sequenceOf(
-				"org.incendo.cloud",
-				"io.leangen",
-				"space.arim",
-				"org.bstats"
-			).forEach {
-				relocate(it, "${project.group}.${rootProject.name.lowercase()}.dependency.$it")
-			}
-		}
+		archiveBaseName.set("${rootProject.name}-${project.name.uppercaseFirstChar()}")
 	}
 }
diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
@@ -23,8 +23,12 @@ tasks {
 	}
 	shadowJar {
 		sequenceOf(
+			"org.incendo.cloud",
+			"io.leangen",
+			"space.arim",
+			"org.bstats",
 			"net.kyori",
-			"org.slf4j",
+			"org.slf4j"
 		).forEach {
 			relocate(it, "${project.group}.${rootProject.name.lowercase()}.dependency.$it")
 		}

diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -18,6 +18,16 @@ tasks {
 	runVelocity {
 		velocityVersion("3.3.0-SNAPSHOT")
 	}
+	shadowJar {
+		sequenceOf(
+			"org.incendo.cloud",
+			"io.leangen",
+			"space.arim",
+			"org.bstats"
+		).forEach {
+			relocate(it, "${project.group}.${rootProject.name.lowercase()}.dependency.$it")
+		}
+	}
 }
 
 velocityPluginJson {

diff --git a/velocity/src/main/java/fi/fabianadrian/proxychat/velocity/ProxyChatVelocity.java b/velocity/src/main/java/fi/fabianadrian/proxychat/velocity/ProxyChatVelocity.java
@@ -8,8 +8,6 @@
 import com.velocitypowered.api.event.EventManager;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Dependency;
-import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;