From 251408afdffcb5ae6591bfb51f0847715781d12e Mon Sep 17 00:00:00 2001
From: Pelfox <me@pelfox.dev>
Date: Tue, 14 Dec 2021 23:27:08 +0300
Subject: [PATCH 1/2] Fix build.gradle.kts and exclude Mirai-API and
 Mirai-Server from git

---
 .gitignore       |  4 ++--
 Mirai-API        |  1 +
 Mirai-Server     |  1 +
 build.gradle.kts | 26 +++++++++++++++++---------
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 160000 Mirai-API
 create mode 160000 Mirai-Server

diff --git a/.gitignore b/.gitignore
index 5ff2022..d9e8a97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,7 @@ out/
 # other stuff
 run/
 
-ForkTest-Server
-ForkTest-API
+Mirai-Server
+Mirai-API
 
 !gradle/wrapper/gradle-wrapper.jar
diff --git a/Mirai-API b/Mirai-API
new file mode 160000
index 0000000..3e3be66
--- /dev/null
+++ b/Mirai-API
@@ -0,0 +1 @@
+Subproject commit 3e3be66e1201ee1f6f179cb9da9f3b8765b73f60
diff --git a/Mirai-Server b/Mirai-Server
new file mode 160000
index 0000000..a7cb6fe
--- /dev/null
+++ b/Mirai-Server
@@ -0,0 +1 @@
+Subproject commit a7cb6feb992e2b05019b1f15f64aaac85c888e92
diff --git a/build.gradle.kts b/build.gradle.kts
index 0647d41..b70db81 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -62,16 +62,24 @@ paperweight {
     remapRepo.set("https://maven.fabricmc.net/")
     decompileRepo.set("https://files.minecraftforge.net/maven/")
 
-    useStandardUpstream("Pufferfish") {
-		url.set(github("pufferfish-gg", "Pufferfish"))
-		ref.set(providers.gradleProperty("pufferfishRef"))
-		
-        withStandardPatcher {
-			baseName("Pufferfish")
-			
-            apiOutputDir.set(layout.projectDirectory.dir("Mirai-API"))
+    useStandardUpstream("pufferfish") {
+        remapRepo.set("https://maven.fabricmc.net/")
+        decompileRepo.set("https://maven.quiltmc.org")
 
-            serverOutputDir.set(layout.projectDirectory.dir("Mirai-Server"))
+        url.set(github("pufferfish-gg", "Pufferfish"))
+        ref.set(providers.gradleProperty("pufferfishRef"))
+
+        patchTasks {
+            register("api") {
+                upstreamDirPath.set("pufferfish-api")
+                patchDir.set(layout.projectDirectory.dir("patches/api"))
+                outputDir.set(layout.projectDirectory.dir("Mirai-API"))
+            }
+            register("server") {
+                upstreamDirPath.set("pufferfish-server")
+                patchDir.set(layout.projectDirectory.dir("patches/server"))
+                outputDir.set(layout.projectDirectory.dir("Mirai-Server"))
+            }
         }
     }
 }

From aee970b3415df2b220bd54a06b2ee18b7eb96f81 Mon Sep 17 00:00:00 2001
From: Pelfox <me@pelfox.dev>
Date: Tue, 14 Dec 2021 23:28:39 +0300
Subject: [PATCH 2/2] Deleted Server and API folder from git

---
 Mirai-API    | 1 -
 Mirai-Server | 1 -
 2 files changed, 2 deletions(-)
 delete mode 160000 Mirai-API
 delete mode 160000 Mirai-Server

diff --git a/Mirai-API b/Mirai-API
deleted file mode 160000
index 3e3be66..0000000
--- a/Mirai-API
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e3be66e1201ee1f6f179cb9da9f3b8765b73f60
diff --git a/Mirai-Server b/Mirai-Server
deleted file mode 160000
index a7cb6fe..0000000
--- a/Mirai-Server
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a7cb6feb992e2b05019b1f15f64aaac85c888e92