From 08c343f231e16fa1067fa53d2eb05fac2039cd69 Mon Sep 17 00:00:00 2001
From: Alpha <dev@alpha93.kr>
Date: Wed, 28 Feb 2024 10:47:13 +0900
Subject: [PATCH] Updated Upstream (Plazma)

---
 build.gradle.kts                      |  7 +++++++
 gradle.properties                     |  6 ++++--
 patches/mojang-api/0001-Rebrand.patch | 19 +++++++++++++++++++
 patches/server/0001-Rebrand.patch     | 24 +++++++++++++++---------
 settings.gradle.kts                   |  2 +-
 5 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 patches/mojang-api/0001-Rebrand.patch

diff --git a/build.gradle.kts b/build.gradle.kts
index ee95aae..6f1f4fd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -101,6 +101,13 @@ paperweight {
             serverOutputDir = layout.projectDirectory.dir("Thunderbolt-Server")
         }
 
+        patchTasks.register("mojangApi") {
+            isBareDirectory = true
+            upstreamDirPath = "Plazma-MojangAPI"
+            patchDir = layout.projectDirectory.dir("patches/mojang-api")
+            outputDir = layout.projectDirectory.dir("Thunderbolt-MojangAPI")
+        }
+
         patchTasks.register("generatedApi") {
             isBareDirectory = true
             upstreamDirPath = "paper-api-generator/generated"
diff --git a/gradle.properties b/gradle.properties
index cf639c6..36dafc3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,13 @@
-group = org.plazmamc.thunderbolt
+org.gradle.deamon = true
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx4G -Dfile.encoding=UTF-8 -Dgraal.CompilerConfiguration=community -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.SpeculativeGuardMovement=true -Dgraal.WriteableCodeCache=true
 
+group = org.plazmamc.thunderbolt
+
 version = 1.20.4-R0.1-SNAPSHOT
 mcVersion = 1.20.4
 plazmaRef = dev/1.20.4
 
-plazmaCommit = 3852ef88c46a5be0ef6ac4babe80c2b9fbb81067
+plazmaCommit = 38c2cfa282974909a61247dbc5eee42a9d87ed90
diff --git a/patches/mojang-api/0001-Rebrand.patch b/patches/mojang-api/0001-Rebrand.patch
new file mode 100644
index 0000000..5377431
--- /dev/null
+++ b/patches/mojang-api/0001-Rebrand.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alpha <dev@alpha93.kr>
+Date: Wed, 28 Feb 2024 10:46:38 +0900
+Subject: [PATCH] Rebrand
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index a00cf1659f1fd9dff3ff34561d78732645b51dfb..870b4278ba15aef04e8ca42e506c8758b12930fc 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -9,7 +9,7 @@ java {
+ }
+ 
+ dependencies {
+-    implementation(project(":plazma-api")) // Plazma - Rebrand
++    implementation(project(":thunderbolt-api")) // Plazma - Rebrand // Thunderbolt - Rebrand
+     api("com.mojang:brigadier:1.0.18")
+ 
+     compileOnly("it.unimi.dsi:fastutil:8.5.6")
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index c4e86fb..dc7e5fb 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -5,19 +5,25 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 47eea572566d7ec26459403cd02aa4442ae969d7..b6fe3888ad34ef0f647619a67d8f484a753fce2f 100644
+index 97b12b0b00bdf37ab122f8b8ea8b42ac65e30bce..d8c55ff99bfdb57e02db872fc3c14e998f2dbea7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
+@@ -13,10 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ val alsoShade: Configuration by configurations.creating
  
  dependencies {
-     // Purpur start
--    implementation(project(":plazma-api")) // Plazma - Setup Gradle Project
-+    implementation(project(":thunderbolt-api")) // Plazma - Setup Gradle Project // Thunderbolt - Setup Gradle Project
-     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
-         exclude("io.papermc.paper", "paper-api")
-     }
-@@ -118,7 +118,7 @@ tasks.jar {
+-    // Plazma start - Branding
+-    implementation(project(":plazma-api"))
+-    implementation(project(":plazma-mojangapi"))
+-    // Plazma end - Branding
++    // Thunderbolt start - Branding
++    implementation(project(":thunderbolt-api"))
++    implementation(project(":thunderbolt-mojangapi"))
++    // Thunderbolt end - Branding
+     // Plazma start - Use Gradle version catalogs
+     /*
+     // Paper start
+@@ -116,7 +116,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3a557d3..92c5b3b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,7 +44,7 @@ if (file("libs").exists()) {
 }
 
 rootProject.name = "thunderbolt"
-for (name in listOf("Thunderbolt-API", "Thunderbolt-Server", "paper-api-generator")) {
+for (name in listOf("Thunderbolt-API", "Thunderbolt-Server", "Thunderbolt-MojangAPI", "paper-api-generator")) {
     val projName = name.lowercase(Locale.ENGLISH)
     include(projName)
     findProject(":$projName")!!.projectDir = file(name)