From 32703c6659e024954ca1c87281702698df664d21 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 17 Apr 2025 10:40:50 +0200
Subject: [PATCH] Enable Velocity, prio Setup needed for that

---
 VelocityCore/build.gradle.kts          | 10 +++++++-
 buildSrc/src/steamwar.devserver.gradle | 34 +++++++++++++++-----------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/VelocityCore/build.gradle.kts b/VelocityCore/build.gradle.kts
index 844e9f21..90d43d36 100644
--- a/VelocityCore/build.gradle.kts
+++ b/VelocityCore/build.gradle.kts
@@ -66,4 +66,12 @@ dependencies {
     implementation(libs.apolloprotos)
 
     implementation(libs.nbt)
-}
\ No newline at end of file
+}
+
+tasks.register<DevServer>("DevVelocity") {
+    group = "run"
+    description = "Run a Dev Velocity"
+    dependsOn(":VelocityCore:shadowJar")
+    dependsOn(":VelocityCore:Persistent:jar")
+    template = "Velocity"
+}
diff --git a/buildSrc/src/steamwar.devserver.gradle b/buildSrc/src/steamwar.devserver.gradle
index 35bfcab1..eb1dec46 100644
--- a/buildSrc/src/steamwar.devserver.gradle
+++ b/buildSrc/src/steamwar.devserver.gradle
@@ -71,16 +71,16 @@ class DevServer extends DefaultTask {
 
     void uploadDependencies() {
         this.dependsOn.forEach {
-            Project resolved;
-            if (it instanceof Project) {
-                resolved = (Project) it;
-            } else if (it instanceof String) {
+            Project resolved
+            AbstractArchiveTask archiveTask
+            if (it instanceof String) {
                 resolved = project.findProject(it.substring(0, it.lastIndexOf(':')))
+                archiveTask = (AbstractArchiveTask) resolved.tasks.findByName(it.substring(it.lastIndexOf(':') + 1))
             } else {
                 throw new GradleException("Illegal argument for uploading dependencies")
             }
 
-            def archive = ((AbstractArchiveTask) resolved.tasks.findByName("shadowJar")).archiveFile.get().asFile
+            def archive = archiveTask.archiveFile.get().asFile
             println("Uploading $archive to ~/plugins/${template}")
             new ProcessBuilder("scp", archive.absolutePath, "sw:~/plugins/$template/${archive.name.replace("-all", "")}").start().waitFor()
             println("Uploaded  $archive to ~/plugins/${template}")
@@ -88,15 +88,21 @@ class DevServer extends DefaultTask {
     }
 
     void startDevServer() {
-        def devPy = new StringBuilder().append("dev.py")
-        if (port != null) devPy.append(" --port $port")
-        if (worldName != null) devPy.append(" -w $worldName")
-        devPy.append(" -p plugins/$template")
-        if (profile) devPy.append(" --profile")
-        if (forceUpgrade) devPy.append(" --forceUpgrade")
-        if (jar != null) devPy.append(" --jar $jar")
-        println("Starting $template with command ${devPy.toString()}")
-        devPy.append(" $template")
+        def devPy = new StringBuilder()
+        if (template.endsWith("Velocity")) {
+            devPy.append("cd DevVelocity")
+            devPy.append("; java -jar Velocity.jar --port 25566")
+        } else {
+            devPy.append("dev.py")
+            if (port != null) devPy.append(" --port $port")
+            if (worldName != null) devPy.append(" -w $worldName")
+            devPy.append(" -p plugins/$template")
+            if (profile) devPy.append(" --profile")
+            if (forceUpgrade) devPy.append(" --forceUpgrade")
+            if (jar != null) devPy.append(" --jar $jar")
+            println("Starting $template with command ${devPy.toString()}")
+            devPy.append(" $template")
+        }
 
         def process = new ProcessBuilder("ssh", "sw", "-T", devPy.toString()).start();
         def running = true;