From d0ccb5d33e021da2ea5d59625b9b924cd4ca9f81 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Fri, 17 Jan 2025 04:48:56 -0500
Subject: [PATCH] Update paperweight

---
 build.gradle.kts                   |  6 ------
 gale-api/build.gradle.kts.patch    |  9 +++++++++
 gale-server/build.gradle.kts.patch |  6 +-----
 settings.gradle.kts                | 18 ------------------
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 28d4a42..e210acb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    java
     `maven-publish`
     id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
 }
@@ -68,11 +67,6 @@ paperweight {
             patchesDir = file("gale-api/paper-patches") // Gale - build changes
             outputDir = file("paper-api")
         }
-        patchDir("paperApiGenerator") {
-            upstreamPath = "paper-api-generator"
-            patchesDir = file("gale-api-generator/paper-patches") // Gale - build changes
-            outputDir = file("paper-api-generator")
-        }
     }
 }
 
diff --git a/gale-api/build.gradle.kts.patch b/gale-api/build.gradle.kts.patch
index 1e0d6c8..fe44b4a 100644
--- a/gale-api/build.gradle.kts.patch
+++ b/gale-api/build.gradle.kts.patch
@@ -1,5 +1,14 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
+@@ -93,7 +_,7 @@
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+ }
+ 
+-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
++val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() // Gale - project setup
+ idea {
+     module {
+         generatedSourceDirs.add(generatedApiPath.toFile())
 @@ -103,6 +_,20 @@
      main {
          java {
diff --git a/gale-server/build.gradle.kts.patch b/gale-server/build.gradle.kts.patch
index e60163d..fed7e0f 100644
--- a/gale-server/build.gradle.kts.patch
+++ b/gale-server/build.gradle.kts.patch
@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -21,6 +_,23 @@
+@@ -21,6 +_,19 @@
      // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
      // gitFilePatches = true
  
@@ -15,10 +15,6 @@
 +    }
 +
 +    activeFork = gale
-+
-+    paper {
-+        paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
-+    }
 +    // Gale end - project setup
 +
      spigot {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1bf4074..2fa11e7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -41,21 +41,3 @@ for (name in listOf("gale-api", "gale-server",)) { // Gale - build changes
     include(projName)
     findProject(":$projName")!!.projectDir = file(name)
 }
-
-optionalInclude("paper-api-generator")
-
-fun optionalInclude(name: String, op: (ProjectDescriptor.() -> Unit)? = null) {
-    val settingsFile = file("$name.settings.gradle.kts")
-    if (settingsFile.exists()) {
-        apply(from = settingsFile)
-        findProject(":$name")?.let { op?.invoke(it) }
-    } else {
-        settingsFile.writeText(
-            """
-            // Uncomment to enable the '$name' project
-            // include(":$name")
-
-            """.trimIndent()
-        )
-    }
-}