diff --git a/build.gradle.kts b/build.gradle.kts index 3a393cc..d5d3a3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,6 +107,13 @@ paperweight { patchDir = layout.projectDirectory.dir("patches/generated-api") outputDir = layout.projectDirectory.dir("paper-api-generator/generated") } + + patchTasks.register("mojangApi") { + isBareDirectory = true + upstreamDirPath = "Paper-MojangAPI" + patchDir = layout.projectDirectory.dir("patches/mojang-api") + outputDir = layout.projectDirectory.dir("Plazma-MojangAPI") + } } } diff --git a/patches/mojang-api/0001-Rebrand.patch b/patches/mojang-api/0001-Rebrand.patch new file mode 100644 index 0000000..5c675ee --- /dev/null +++ b/patches/mojang-api/0001-Rebrand.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alpha +Date: Tue, 27 Feb 2024 18:36:43 +0900 +Subject: [PATCH] Rebrand + + +diff --git a/build.gradle.kts b/build.gradle.kts +index a278ee93d7001e8dc7fd2f5409c2f528c637cb2f..a00cf1659f1fd9dff3ff34561d78732645b51dfb 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -9,7 +9,7 @@ java { + } + + dependencies { +- implementation(project(":paper-api")) ++ implementation(project(":plazma-api")) // Plazma - Rebrand + api("com.mojang:brigadier:1.0.18") + + compileOnly("it.unimi.dsi:fastutil:8.5.6") diff --git a/patches/server/0005-Rebrand.patch b/patches/server/0005-Rebrand.patch index d734f1a..dda319b 100644 --- a/patches/server/0005-Rebrand.patch +++ b/patches/server/0005-Rebrand.patch @@ -5,19 +5,27 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index be06b9b282c53bc135963447e19185d9ff41d19a..47eea572566d7ec26459403cd02aa4442ae969d7 100644 +index be06b9b282c53bc135963447e19185d9ff41d19a..97b12b0b00bdf37ab122f8b8ea8b42ac65e30bce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating +@@ -13,12 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { + val alsoShade: Configuration by configurations.creating dependencies { - // Purpur start +- // Purpur start - implementation(project(":purpur-api")) -+ implementation(project(":plazma-api")) // Plazma - Setup Gradle Project - implementation("io.papermc.paper:paper-mojangapi:${project.version}") { - exclude("io.papermc.paper", "paper-api") - } -@@ -118,7 +118,7 @@ tasks.jar { +- implementation("io.papermc.paper:paper-mojangapi:${project.version}") { +- exclude("io.papermc.paper", "paper-api") +- } +- // Purpur end ++ // Plazma start - Branding ++ implementation(project(":plazma-api")) ++ implementation(project(":plazma-mojangapi")) ++ // Plazma end - Branding + // Plazma start - Use Gradle version catalogs + /* + // Paper start +@@ -118,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 9fbfc70..8ff634e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,7 +23,7 @@ dependencyResolutionManagement { } rootProject.name = "plazma" -for (name in listOf("Plazma-API", "Plazma-Server")) { +for (name in listOf("Plazma-API", "Plazma-Server", "Plazma-MojangAPI")) { val projName = name.lowercase(Locale.ENGLISH) include(projName) findProject(":$projName")!!.projectDir = file(name)