From 87684abbbbafefc6f8925b2bec1a5d978ccaf5ae Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 2 Mar 2022 11:28:16 +0000
Subject: [PATCH] Fixed NMS buildscripts some more

---
 eco-core/core-nms/v1_17_R1/build.gradle.kts | 12 ++++++------
 eco-core/core-nms/v1_18_R1/build.gradle.kts | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eco-core/core-nms/v1_17_R1/build.gradle.kts b/eco-core/core-nms/v1_17_R1/build.gradle.kts
index c232ca95..08a171a4 100644
--- a/eco-core/core-nms/v1_17_R1/build.gradle.kts
+++ b/eco-core/core-nms/v1_17_R1/build.gradle.kts
@@ -11,18 +11,18 @@ dependencies {
 }
 
 tasks {
-    reobfJar {
-        dependsOn(shadowJar)
-    }
-
     build {
         dependsOn(reobfJar)
     }
 
+    reobfJar {
+        mustRunAfter(shadowJar)
+    }
+
     shadowJar {
         relocate(
-            "com.willfp.internal.spigot.proxy.common",
-            "com.willfp.internal.spigot.proxy.v1_17_R1.common"
+            "com.willfp.eco.internal.spigot.proxy.common",
+            "com.willfp.eco.internal.spigot.proxy.v1_17_R1.common"
         )
     }
 }
diff --git a/eco-core/core-nms/v1_18_R1/build.gradle.kts b/eco-core/core-nms/v1_18_R1/build.gradle.kts
index ae031aac..4a555980 100644
--- a/eco-core/core-nms/v1_18_R1/build.gradle.kts
+++ b/eco-core/core-nms/v1_18_R1/build.gradle.kts
@@ -11,18 +11,18 @@ dependencies {
 }
 
 tasks {
-    reobfJar {
-        dependsOn(shadowJar)
-    }
-
     build {
         dependsOn(reobfJar)
     }
 
+    reobfJar {
+        mustRunAfter(shadowJar)
+    }
+
     shadowJar {
         relocate(
-            "com.willfp.internal.spigot.proxy.common",
-            "com.willfp.internal.spigot.proxy.v1_18_R1.common"
+            "com.willfp.eco.internal.spigot.proxy.common",
+            "com.willfp.eco.internal.spigot.proxy.v1_18_R1.common"
         )
     }
 }