diff --git a/build.gradle.kts b/build.gradle.kts
index 94a36c5..de50047 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -63,17 +63,20 @@ paperweight {
     decompileRepo.set("https://files.minecraftforge.net/maven/")
 
     useStandardUpstream("pufferfish") {
+        baseName("pufferfish")
         url.set(github("pufferfish-gg", "Pufferfish"))
         ref.set(providers.gradleProperty("pufferfishRef"))
         
-
-        withStandardPatcher {
-            baseName("pufferfish")
+    patchTasks {
+        register("api") {
+            upstreamDirPath.set("pufferfish-api")
             apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
             apiOutputDir.set(layout.projectDirectory.dir("mirai-api"))
-
+        }
+        register("server") {
+            upstreamDirPath.set("pufferfish-server")
             serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
             serverOutputDir.set(layout.projectDirectory.dir("mirai-server"))
         }
     }
-}
\ No newline at end of file
+}