From f9fcb7031ef97fa322fce6ca996941adcafe39ad Mon Sep 17 00:00:00 2001 From: Etil <81570777+etil2jz@users.noreply.github.com> Date: Fri, 17 Dec 2021 20:47:26 +0100 Subject: [PATCH] 99% chance it works --- build.gradle.kts | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8b63868..5ed4a36 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { repositories { mavenCentral() maven("https://papermc.io/repo/repository/maven-public/") { - content { onlyForConfigurations(PAPERCLIP_CONFIG) } + content { onlyForConfigurations("paperclip") } } } @@ -29,9 +29,7 @@ subprojects { languageVersion.set(JavaLanguageVersion.of(17)) } } -} -subprojects { tasks.withType { options.encoding = Charsets.UTF_8.name() options.release.set(17) @@ -65,18 +63,16 @@ paperweight { useStandardUpstream("pufferfish") { url.set(github("pufferfish-gg", "Pufferfish")) ref.set(providers.gradleProperty("pufferfishRef")) - - 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")) - } + + withStandardPatcher { + apiSourceDirPath.set("pufferfish-api") + serverSourceDirPath.set("pufferfish-server") + + apiPatchDir.set(layout.projectDirectory.dir("patches/api")) + serverPatchDir.set(layout.projectDirectory.dir("patches/server")) + + apiOutputDir.set(layout.projectDirectory.dir("mirai-api")) + serverOutputDir.set(layout.projectDirectory.dir("mirai-server")) } } }