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/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"))
+            }
         }
     }
 }