From 7152b72d25af7f0f08bf30c5151f7eefdc0a5e9b Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com>
Date: Sat, 26 Dec 2020 00:34:57 -0800
Subject: [PATCH] [ci-skip] Use shadowJar output as input for paperclip

---
 buildSrc/src/main/kotlin/InitTasks.kt      | 5 +++--
 buildSrc/src/main/kotlin/task/Paperclip.kt | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/InitTasks.kt b/buildSrc/src/main/kotlin/InitTasks.kt
index e5ab4ca00..eaba0fa97 100644
--- a/buildSrc/src/main/kotlin/InitTasks.kt
+++ b/buildSrc/src/main/kotlin/InitTasks.kt
@@ -42,8 +42,9 @@ internal fun Project.initToothpickTasks() {
     }
 
     val paperclip = createPaperclipTask {
-        dependsOn(tasks.getByName("build"))
-        dependsOn(subprojects.map { it.tasks.getByName("build") })
+        val shadowJar = toothpick.serverProject.project.tasks.getByName("shadowJar")
+        dependsOn(shadowJar)
+        inputs.file(shadowJar.outputs.files.singleFile)
     }
 
     val applyPatches = createApplyPatchesTask {
diff --git a/buildSrc/src/main/kotlin/task/Paperclip.kt b/buildSrc/src/main/kotlin/task/Paperclip.kt
index d9db4ad40..51bb8ae54 100644
--- a/buildSrc/src/main/kotlin/task/Paperclip.kt
+++ b/buildSrc/src/main/kotlin/task/Paperclip.kt
@@ -19,9 +19,7 @@ internal fun Project.createPaperclipTask(
         val paperclipDir = workDir.resolve("Paperclip")
         val vanillaJarPath =
             workDir.resolve("Minecraft/${toothpick.minecraftVersion}/${toothpick.minecraftVersion}.jar").absolutePath
-        val patchedJarPath = toothpick.serverProject.projectDir.resolve(
-            "build/libs/${toothpick.forkNameLowercase}-server-$version.jar"
-        ).absolutePath
+        val patchedJarPath = inputs.files.singleFile.absolutePath
         logger.lifecycle(">>> Building paperclip")
         val paperclipCmd = arrayListOf(
             "mvn", "clean", "package",