From d474df438cf5797746b636b6e9f42903f9c82b47 Mon Sep 17 00:00:00 2001
From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:17:43 -0300
Subject: [PATCH] Melhoria da compatibilidade com shadowJar

---
 build.gradle.kts                                 | 1 -
 buildSrc/build.gradle.kts                        | 6 +-----
 buildSrc/src/main/kotlin/paper-plugin.gradle.kts | 7 -------
 buildSrc/src/main/kotlin/root-plugin.gradle.kts  | 6 ++++++
 gradle/libs.versions.toml                        | 8 +++-----
 paper/build.gradle.kts                           | 8 --------
 paper/run/server.properties                      | 2 +-
 7 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f87074bfc..19441aab9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,6 @@ import org.gradle.kotlin.dsl.support.uppercaseFirstChar
 
 plugins {
     id("root-plugin")
-    id("com.gradleup.shadow") version "8.3.1"
 }
 
 java {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f0d906b69..474bb7463 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,12 +2,8 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    gradlePluginPortal()
-    mavenCentral()
-}
-
 dependencies {
     implementation(libs.paperweight)
+    implementation(libs.shadowjar)
     implementation(libs.runpaper)
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/paper-plugin.gradle.kts b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts
index fe8e43139..cab2555a0 100644
--- a/buildSrc/src/main/kotlin/paper-plugin.gradle.kts
+++ b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
     id("io.papermc.paperweight.userdev")
-
     id("xyz.jpenilla.run-paper")
-
     id("root-plugin")
 }
 
@@ -12,15 +10,10 @@ base {
 
 repositories {
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-
     maven("https://repo.papermc.io/repository/maven-public/")
-
     maven("https://repo.codemc.io/repository/maven-public/")
-
     maven("https://repo.triumphteam.dev/snapshots/")
-
     maven("https://repo.oraxen.com/releases/")
-
     flatDir { dirs("libs") }
 }
 
diff --git a/buildSrc/src/main/kotlin/root-plugin.gradle.kts b/buildSrc/src/main/kotlin/root-plugin.gradle.kts
index 4e36522ee..f2d2d9e46 100644
--- a/buildSrc/src/main/kotlin/root-plugin.gradle.kts
+++ b/buildSrc/src/main/kotlin/root-plugin.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    id("com.gradleup.shadow")
     `java-library`
     `maven-publish`
 }
@@ -23,6 +24,11 @@ tasks {
     processResources {
         filteringCharset = Charsets.UTF_8.name()
     }
+
+    shadowJar {
+        archiveClassifier.set("")
+        exclude("META-INF/**")
+    }
 }
 
 java {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a984507b..d94a8e4cc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,25 +1,23 @@
 [versions]
 kyori_version = "4.17.0"
-
 paperweight_version = "1.7.2"
 runpaper_version = "2.2.3"
-
+shadow_version = "8.3.2"
 modrinth_version = "2.8.7"
 hangar_version = "0.1.2"
 
 [plugins]
 hangar = { id = "io.papermc.hangar-publish-plugin", version.ref = "hangar_version" }
 modrinth = { id = "com.modrinth.minotaur", version.ref = "modrinth_version" }
-
+shadowjar = { id = "com.gradleup.shadow.shadow-gradle-plugin", version.ref = "shadow_version" }
 paperweight = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight_version" }
 runpaper = { id = "xyz.jpenilla.run-paper", version.ref = "runpaper_version" }
 
 [libraries]
 adventure = { module = "net.kyori:adventure-api", version.ref = "kyori_version" }
 minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "kyori_version" }
-
 paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version.ref = "paperweight_version" }
 runpaper = { module = "xyz.jpenilla:run-task", version.ref = "runpaper_version" }
-
+shadowjar = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow_version" }
 hangar = { module = "io.papermc:hangar-publish-plugin", version.ref = "hangar_version" }
 modrinth = { module = "com.modrinth.minotaur:Minotaur", version.ref = "modrinth_version" }
\ No newline at end of file
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
index dbb12bd48..dcc63a6cd 100644
--- a/paper/build.gradle.kts
+++ b/paper/build.gradle.kts
@@ -1,23 +1,15 @@
 plugins {
     id("paper-plugin")
-    id("com.gradleup.shadow") version "8.3.1"
 }
 
 dependencies {
     api(project(":common"))
-
     implementation(libs.cluster.paper)
-
     implementation(libs.triumphcmds)
-
     implementation(libs.nbtapi)
-
     compileOnly(libs.decentholograms)
-
     compileOnly(libs.placeholderapi)
-
     compileOnly(libs.oraxen)
-
     compileOnly(fileTree("libs").include("*.jar"))
 }
 
diff --git a/paper/run/server.properties b/paper/run/server.properties
index 2572c8a61..d07e47d76 100644
--- a/paper/run/server.properties
+++ b/paper/run/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Wed Sep 18 10:49:27 GMT-03:00 2024
+#Wed Sep 18 10:59:37 GMT-03:00 2024
 accepts-transfers=false
 allow-flight=false
 allow-nether=false