From 3d7df537c1eb2a97b93c88841e5ecc7603bcbeb2 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <ben@omega24.dev>
Date: Mon, 29 Nov 2021 18:04:05 -0500
Subject: [PATCH] some build system stuff

---
 build.gradle.kts                  | 35 +++++++++++++++++++++----------
 patches/server/0002-Rebrand.patch |  4 ++--
 settings.gradle.kts               | 10 +++++++--
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 65d810a7c..97ee4866f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     paperclip("io.papermc:paperclip:3.0.2-SNAPSHOT")
 }
 
-subprojects {
+allprojects {
     apply(plugin = "java")
     apply(plugin = "maven-publish")
 
@@ -29,12 +29,22 @@ subprojects {
             languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
+}
 
+subprojects {
     tasks.withType<JavaCompile>().configureEach {
-        options.encoding = "UTF-8"
+        options.encoding = Charsets.UTF_8.name()
         options.release.set(17)
     }
 
+    tasks.withType<Javadoc> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+
+    tasks.withType<ProcessResources> {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+
     repositories {
         mavenCentral()
         maven("https://oss.sonatype.org/content/groups/public/")
@@ -45,18 +55,10 @@ subprojects {
         maven("https://hub.spigotmc.org/nexus/content/groups/public/")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }
-
-    configure<PublishingExtension> {
-        repositories.maven {
-            name = "purpur"
-            url = uri("https://repo.purpurmc.org/snapshots")
-            credentials(PasswordCredentials::class)
-        }
-    }
 }
 
 paperweight {
-    serverProject.set(project(":Purpur-Server"))
+    serverProject.set(project(":purpur-server"))
 
     remapRepo.set("https://maven.fabricmc.net/")
     decompileRepo.set("https://files.minecraftforge.net/maven/")
@@ -71,3 +73,14 @@ paperweight {
         }
     }
 }
+
+allprojects {
+    publishing {
+        repositories {
+            maven("https://repo.purpurmc.org/snapshots") {
+                name = "purpur"
+                credentials(PasswordCredentials::class)
+            }
+        }
+    }
+}
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index bac1852f2..284e2bcdb 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cd74406039704e5a880f00b9b60bb7b1dedc5398..034d1058c7a7c1ed1a4a2c7ac23ec00f72ac63dd 100644
+index cd74406039704e5a880f00b9b60bb7b1dedc5398..66406248e2aa3e422abebfdb4d8f2bdbe0395cfb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,8 +18,8 @@ repositories {
@@ -14,7 +14,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..034d1058c7a7c1ed1a4a2c7ac23ec00f
  dependencies {
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
-+    implementation(project(":Purpur-API")) // Purpur
++    implementation(project(":purpur-api")) // Purpur
 +    implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Purpur
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index babdf4736..fa5a3bd3b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,5 @@
+import java.util.Locale
+
 pluginManagement {
     repositories {
         gradlePluginPortal()
@@ -5,5 +7,9 @@ pluginManagement {
     }
 }
 
-rootProject.name = "Purpur"
-include("Purpur-API", "Purpur-Server")
+rootProject.name = "purpur"
+for (name in listOf("Purpur-API", "Purpur-Server")) {
+    val projName = name.toLowerCase(Locale.ENGLISH)
+    include(projName)
+    findProject(":$projName")!!.projectDir = file(name)
+}