From 0a615fc1007ffb787ff4c3fde077976404cfe400 Mon Sep 17 00:00:00 2001 From: lexikiq Date: Thu, 13 Jan 2022 14:27:11 -0500 Subject: [PATCH] Update project directories/artifact IDs --- .gitignore | 6 ++++-- build.gradle.kts | 8 ++++---- patches/server/0001-Build-changes.patch | 2 +- settings.gradle.kts | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c053360..7dd15a4 100644 --- a/.gitignore +++ b/.gitignore @@ -45,8 +45,10 @@ out/ # other stuff run/ -Parchment-Server -Parchment-API +/Parchment-Server/ +/parchment-server/ +/Parchment-API/ +/parchment-api/ # Compiled class file *.class diff --git a/build.gradle.kts b/build.gradle.kts index e67fa15..4ccea85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ allprojects { } subprojects { - tasks.withType().configureEach { + tasks.withType { options.encoding = Charsets.UTF_8.name() options.release.set(17) } @@ -51,7 +51,7 @@ subprojects { } paperweight { - serverProject.set(project(":Parchment-Server")) + serverProject.set(project(":parchment-server")) remapRepo.set("https://maven.fabricmc.net/") decompileRepo.set("https://files.minecraftforge.net/maven/") @@ -59,10 +59,10 @@ paperweight { usePaperUpstream(providers.gradleProperty("paperRef")) { withPaperPatcher { apiPatchDir.set(layout.projectDirectory.dir("patches/api")) - apiOutputDir.set(layout.projectDirectory.dir("Parchment-API")) + apiOutputDir.set(layout.projectDirectory.dir("parchment-api")) serverPatchDir.set(layout.projectDirectory.dir("patches/server")) - serverOutputDir.set(layout.projectDirectory.dir("Parchment-Server")) + serverOutputDir.set(layout.projectDirectory.dir("parchment-server")) } } } diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 9f29c31..8e30f20 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -14,7 +14,7 @@ index da31e84cb558e6fad9cab015cfae753ce7be7db0..bc67fde546f837f73fd8bed4d37b35db dependencies { - implementation(project(":paper-api")) - implementation(project(":paper-mojangapi")) -+ implementation(project(":Parchment-API")) // Parchment ++ implementation(project(":parchment-api")) // Parchment + implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") // Parchment // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") diff --git a/settings.gradle.kts b/settings.gradle.kts index 8570343..db56c82 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,6 @@ pluginManagement { } } -rootProject.name = "Parchment" +rootProject.name = "parchment" -include("Parchment-API", "Parchment-Server") +include("parchment-api", "parchment-server")