From 09d30a5d9fb5d896b24c90cc2f960db0217e2199 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 15 May 2024 11:32:49 +0900
Subject: [PATCH] some cleanups

---
 .editorconfig    |  5 +----
 build.gradle.kts | 12 ++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 6def68162..b0747d3a2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -32,10 +32,7 @@ ij_java_imports_layout = *,|,$*
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 
-[test-plugin/**/*.java]
-ij_java_use_fq_class_names = false
-
-[Paper-Server/src/main/resources/data/**/*.json]
+[*-Server/src/main/resources/data/**/*.json]
 indent_size = 2
 
 [paper-api-generator/generated/**/*.java]
diff --git a/build.gradle.kts b/build.gradle.kts
index c2b2d46f7..2caf34622 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -98,18 +98,18 @@ paperweight {
 
     usePaperUpstream(providers.gradleProperty("paperCommit")) {
         withPaperPatcher {
-            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("$projectName-API"))
+            apiPatchDir.set(projectDir.resolve("patches/api"))
+            apiOutputDir.set(projectDir.resolve("$projectName-API"))
 
-            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("$projectName-Server"))
+            serverPatchDir.set(projectDir.resolve("patches/server"))
+            serverOutputDir.set(projectDir.resolve("$projectName-Server"))
         }
 
         patchTasks.register("generatedApi") {
             isBareDirectory = true
             upstreamDirPath = "paper-api-generator/generated"
-            patchDir = layout.projectDirectory.dir("patches/generated-api")
-            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
+            patchDir = projectDir.resolve("patches/generated-api")
+            outputDir = projectDir.resolve("paper-api-generator/generated")
         }
     }
 }