Fix #105, add /heal command, etc.

PlazmaMC · Dec 25, 2024 · b136873 · b136873
1 parent ebe98dd
commit b136873
Show file tree

Hide file tree

Showing 65 changed files with 2,960 additions and 2,710 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,13 +17,13 @@ version = 1.21.4-R0.1-SNAPSHOT
 mcVersion = 1.21.4
 jdkVersion = 21
 
-paperRepo = https://github.com/PaperMC/Paper
-paperBranch = master
-purpurRepo = https://github.com/PurpurMC/Purpur
+paperRepo = https://github.com/PaperMC/Paper-archive
+paperBranch = ver/1.21.4
+purpurRepo = https://github.com/PlazmaMC/Purpur
 purpurBranch = ver/1.21.4
 pufferfishRepo = https://github.com/pufferfish-gg/Pufferfish
 pufferfishBranch = ver/1.21
 usePufferfish = false
 
 paperCommit = b746d9df0b6b7765478b2a72c2d963b6e668fa35
-purpurCommit = 4a204f1bd7cde4bd1a99673bf46f2373d3bcb7e5
+purpurCommit = f06fd5bb3880e660ecfb43beaadf8ddac175fa8f
diff --git a/patches/api/0001-Purpur-API-Changes.patch b/patches/api/0001-Purpur-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: granny <contact@granny.dev>
-Date: Sat, 14 Dec 2024 20:26:32 +0900
+Date: Wed, 25 Dec 2024 15:15:22 +0900
 Subject: [PATCH] Purpur API Changes
 
 PurpurMC

diff --git a/patches/server/0001-Purpur-Server-Changes.patch b/patches/server/0001-Purpur-Server-Changes.patch
diff --git a/patches/server/0004-Build-System-Changes.patch b/patches/server/0004-Build-System-Changes.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Build System Changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 74d7aaae57e0e9ea9e31c4b2189ba50a0ac83bea..20abf704decfad4dc1744b6515f540d0f871fcb7 100644
+index 624588207afdc52adae14e5de3d18fe1c330d832..a40dc8b2560b8cd124d961f3dfd5865efd2a3b9e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,73 +25,35 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
  // Paper end - configure mockito agent that is needed in newer java versions
 
  dependencies {
--    implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur
+-    implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur - Rebrand
 -    implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
 -    // Paper start
 -    implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
@@ -43,22 +43,41 @@ index 74d7aaae57e0e9ea9e31c4b2189ba50a0ac83bea..20abf704decfad4dc1744b6515f540d0
 -        isTransitive = false
 -    }
 -    // Paper end - Use Velocity cipher
--
++    implementation(project(":${rootProject.providers.gradleProperty("brandName").get().lowercase()}-api")) // Pufferfish // Paper // Purpur // Plazma - Fork-friendly Rebranding
++    // Plazma start - Use Gradle Version Catalogs
++    implementation(server.bundles.implementation)
++    implementation(common.adventure.serializer.ansi)
++    implementation(common.log4j.stream)
+
 -    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
--
++    implementation(common.log4j)
++    log4jPlugins.annotationProcessorConfigurationName(common.log4j)
++    runtimeOnly(log4jPlugins.output) // diff on change
++    alsoShade(log4jPlugins.output) // diff on change
+
 -    // Pufferfish start
 -    implementation("org.yaml:snakeyaml:1.32")
--    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { // Purpur
+-    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { // Purpur - Fix pufferfish issues
 -        exclude(group="org.yaml", module="snakeyaml")
 -    }
 -    // Pufferfish end
--
--    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
--    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
--    implementation("dev.omega24:upnp4j:1.0") // Purpur
--
++    runtimeOnly(server.bundles.runtime)
++
++    implementation(common.bundles.asm)
++    implementation(common.commons.lang2)
++    implementation(server.velocity.native) { isTransitive = false }
++
++    runtimeOnly(common.mvn)
++    runtimeOnly(common.bundles.mvn)
+
+-    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur - Rebrand
+-    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur - Rebrand
+-    implementation("dev.omega24:upnp4j:1.0") // Purpur - Rebrand
++    implementation(common.snakeyaml)
++    implementation(server.simpleyaml) { exclude(group="org.yaml", module="snakeyaml") }
+
 -    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 -    testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
@@ -79,29 +98,6 @@ index 74d7aaae57e0e9ea9e31c4b2189ba50a0ac83bea..20abf704decfad4dc1744b6515f540d0
 -    implementation("me.lucko:spark-api:0.1-20240720.200737-2")
 -    implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
 -    // Paper end - spark
-+    implementation(project(":${rootProject.providers.gradleProperty("brandName").get().lowercase()}-api")) // Pufferfish // Paper // Purpur // Plazma - Fork-friendly Rebranding
-+    // Plazma start - Use Gradle Version Catalogs
-+    implementation(server.bundles.implementation)
-+    implementation(common.adventure.serializer.ansi)
-+    implementation(common.log4j.stream)
-+ 
-+    implementation(common.log4j)
-+    log4jPlugins.annotationProcessorConfigurationName(common.log4j)
-+    runtimeOnly(log4jPlugins.output) // diff on change
-+    alsoShade(log4jPlugins.output) // diff on change
-+ 
-+    runtimeOnly(server.bundles.runtime)
-+
-+    implementation(common.bundles.asm)
-+    implementation(common.commons.lang2)
-+    implementation(server.velocity.native) { isTransitive = false }
-+ 
-+    runtimeOnly(common.mvn)
-+    runtimeOnly(common.bundles.mvn)
-+ 
-+    implementation(common.snakeyaml)
-+    implementation(server.simpleyaml) { exclude(group="org.yaml", module="snakeyaml") }
-+ 
 +    testImplementation(server.classgraph)
 +    testImplementation(common.bundles.test)
 +    testImplementation(common.junit)
@@ -115,19 +111,19 @@ index 74d7aaae57e0e9ea9e31c4b2189ba50a0ac83bea..20abf704decfad4dc1744b6515f540d0
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
--            "Implementation-Title" to "Purpur", // Pufferfish // Purpur
-+            "Implementation-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+-            "Implementation-Title" to "Purpur", // Pufferfish // Purpur - Rebrand
++            "Implementation-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date, // Paper
--            "Specification-Title" to "Purpur", // Pufferfish // Purpur
-+            "Specification-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+-            "Specification-Title" to "Purpur", // Pufferfish // Purpur - Rebrand
++            "Specification-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
              "Specification-Version" to project.version,
--            "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur
--            "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur
--            "Brand-Name" to "Purpur", // Pufferfish // Purpur
-+            "Specification-Vendor" to rootProject.providers.gradleProperty("providerName").get(), // Purpur // Plazma - Fork-friendly Rebranding
-+            "Brand-Id" to rootProject.providers.gradleProperty("brandKey").get(), // Purpur // Plazma - Fork-friendly Rebranding
-+            "Brand-Name" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+-            "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur - Rebrand
+-            "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur - Rebrand
+-            "Brand-Name" to "Purpur", // Pufferfish // Purpur - Rebrand
++            "Specification-Vendor" to rootProject.providers.gradleProperty("providerName").get(), // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
++            "Brand-Id" to rootProject.providers.gradleProperty("brandKey").get(), // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
++            "Brand-Name" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper