Updated Upstream (Plazma)

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"

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

patches/mojang-api/0001-Rebrand.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alpha <[email protected]>
+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")

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",

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)