From e4b0a602f06e9e9db96ea10a85fa24bd5033de8d Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Mon, 15 Nov 2021 18:04:00 +0000
Subject: [PATCH] Gradle changes

---
 build.gradle                                |  3 ++
 eco-core/core-nms/v1_17_R1/build.gradle     | 31 --------------------
 eco-core/core-nms/v1_17_R1/build.gradle.kts | 32 +++++++++++++++++++++
 settings.gradle                             |  2 +-
 4 files changed, 36 insertions(+), 32 deletions(-)
 delete mode 100644 eco-core/core-nms/v1_17_R1/build.gradle
 create mode 100644 eco-core/core-nms/v1_17_R1/build.gradle.kts

diff --git a/build.gradle b/build.gradle
index 4db7eb32..5c0e3190 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,14 @@ plugins {
 
 dependencies {
     implementation project(":eco-api")
+    implementation project(":eco-core").getSubprojects()
+    /*
     implementation project(":eco-core:core-plugin")
     implementation project(":eco-core:core-proxy")
     implementation project(":eco-core:core-backend")
     implementation project(":eco-core:core-nms:v1_16_R3")
     implementation project(path: ":eco-core:core-nms:v1_17_R1", configuration: 'mapped')
+     */
 }
 
 allprojects {
diff --git a/eco-core/core-nms/v1_17_R1/build.gradle b/eco-core/core-nms/v1_17_R1/build.gradle
deleted file mode 100644
index ed6a17ce..00000000
--- a/eco-core/core-nms/v1_17_R1/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-plugins {
-    id 'xyz.jpenilla.special-gradle' version '1.0.0-SNAPSHOT'
-}
-
-group 'com.willfp'
-version rootProject.version
-
-dependencies {
-    compileOnly 'org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:remapped-mojang'
-    compileOnly 'net.kyori:adventure-api:4.9.1'
-    compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
-}
-
-specialGradle {
-    minecraftVersion.set("1.17")
-    specialSourceVersion.set("1.10.0")
-}
-
-buildTools {
-    quiet.set(true);
-}
-
-configurations.create('mapped')
-
-artifacts {
-    mapped jar.outputs.files.files.toArray()[0]
-}
-
-productionMappedJar.mustRunAfter(clean)
-productionMappedJar.mustRunAfter(compileKotlin)
-build.dependsOn productionMappedJar
\ No newline at end of file
diff --git a/eco-core/core-nms/v1_17_R1/build.gradle.kts b/eco-core/core-nms/v1_17_R1/build.gradle.kts
new file mode 100644
index 00000000..2b57669d
--- /dev/null
+++ b/eco-core/core-nms/v1_17_R1/build.gradle.kts
@@ -0,0 +1,32 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "1.1.14"
+    id("xyz.jpenilla.run-paper") version "1.0.4"
+}
+
+group = "com.willfp"
+version = rootProject.version
+
+dependencies {
+    paperDevBundle("1.17.1-R0.1-SNAPSHOT")
+    compileOnly("net.kyori:adventure-api:4.9.1")
+    compileOnly("net.kyori:adventure-text-serializer-gson:4.8.1")
+}
+
+tasks {
+    build {
+        dependsOn(reobfJar)
+    }
+
+    compileJava {
+        options.encoding = "UTF_8"
+        options.release.set(16)
+    }
+
+    javadoc {
+        options.encoding = "UTF_8"
+    }
+
+    processResources {
+        filteringCharset = "UTF_8"
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index f1e39915..68016547 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url "https://repo.jpenilla.xyz/snapshots/" }
+        maven { url "https://papermc.io/repo/repository/maven-public/" }
     }
 }