From 74b34eec9581e97e5331fde39e4338fa83ab2635 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 2 Dec 2021 20:58:35 -0800
Subject: [PATCH] Lowercase project names and exclude paper-api from
 paper-mojangapi

---
 .gitignore                              |  4 ++--
 build.gradle.kts                        |  6 +++---
 patches/server/0001-Build-changes.patch | 16 ++++++++++------
 settings.gradle.kts                     |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ff2022..615b683 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,7 @@ out/
 # other stuff
 run/
 
-ForkTest-Server
-ForkTest-API
+forktest-server
+forktest-api
 
 !gradle/wrapper/gradle-wrapper.jar
diff --git a/build.gradle.kts b/build.gradle.kts
index 90c4d7f..087ba05 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,7 +50,7 @@ subprojects {
 }
 
 paperweight {
-    serverProject.set(project(":ForkTest-Server"))
+    serverProject.set(project(":forktest-server"))
 
     remapRepo.set("https://maven.fabricmc.net/")
     decompileRepo.set("https://files.minecraftforge.net/maven/")
@@ -58,10 +58,10 @@ paperweight {
     usePaperUpstream(providers.gradleProperty("paperRef")) {
         withPaperPatcher {
             apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("ForkTest-API"))
+            apiOutputDir.set(layout.projectDirectory.dir("forktest-api"))
 
             serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("ForkTest-Server"))
+            serverOutputDir.set(layout.projectDirectory.dir("forktest-server"))
         }
     }
 }
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index a165114..7250160 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,21 +5,25 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466de50d3a18 100644
+index cd74406039704e5a880f00b9b60bb7b1dedc5398..c4dfc34277e59143d346725c9ef2bfbcee59bc06 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -18,8 +18,8 @@ repositories {
+@@ -18,8 +18,12 @@ repositories {
  }
  
  dependencies {
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
-+    implementation(project(":ForkTest-API")) // ForkTest
-+    implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // ForkTest
++    // ForkTest start
++    implementation(project(":forktest-api"))
++    implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") {
++        exclude("io.papermc.paper", "paper-api")
++    }
++    // ForkTest end
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -67,7 +67,7 @@ tasks.jar {
+@@ -67,7 +71,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -28,7 +32,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466d
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -158,7 +158,7 @@ fun TaskContainer.registerRunTask(
+@@ -158,7 +162,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8fabfcf..81a9c0f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,6 +5,6 @@ pluginManagement {
     }
 }
 
-rootProject.name = "ForkTest"
+rootProject.name = "forktest"
 
-include("ForkTest-API", "ForkTest-Server")
+include("forktest-api", "forktest-server")