Update to Paper 1.21.5

Not all patches are migrated yet, I'm commiting right now to avoid losing my progress This time I've moved the patches to file patches instead of feature patches, this DOES NOT include the parallel world ticking patch yet
2025-12-21 16:09:30 +00:00 · 2025-05-25 20:23:19 -03:00
parent 13aff42523
commit af3b1442a9
54 changed files with 516 additions and 3059 deletions
--- a/sparklypaper-api/build.gradle.kts.patch
+++ b/sparklypaper-api/build.gradle.kts.patch
@@ -1,18 +1,18 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -93,7 +_,7 @@
+@@ -90,7 +_,7 @@
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
-+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
+-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
+val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
 idea {
     module {
-         generatedSourceDirs.add(generatedApiPath.toFile())
-@@ -103,6 +_,18 @@
+         generatedSourceDirs.add(generatedDir.toFile())
+@@ -100,10 +_,21 @@
     main {
         java {
-             srcDir(generatedApiPath)
+             srcDir(generatedDir)
 +            srcDir(file("../paper-api/src/main/java"))
 +        }
 +        resources {
@@ -28,7 +28,11 @@
         }
     }
 }
-@@ -169,7 +_,7 @@
+-
+ val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
+ val mainCapability = "${project.group}:${project.name}:${project.version}"
+ configurations {
+@@ -166,7 +_,7 @@
 
 tasks.withType<Javadoc> {
     val options = options as StandardJavadocDocletOptions
@@ -37,7 +41,7 @@
     options.use()
     options.isDocFilesSubDirs = true
     options.links(
-@@ -202,11 +_,11 @@
+@@ -199,11 +_,11 @@
     }
 
     // workaround for https://github.com/gradle/gradle/issues/4046
--- a/sparklypaper-api/paper-patches/features/0001-SPARKLYPOWER-Add-custom-blocks.patch
+++ b/sparklypaper-api/paper-patches/features/0001-SPARKLYPOWER-Add-custom-blocks.patch
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrPowerGamerBR <git@mrpowergamerbr.com>
-Date: Wed, 12 Jun 2024 11:53:27 -0300
-Subject: [PATCH] SPARKLYPOWER Add custom blocks
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-index 679f78e07a3a2de745fa237165d0a8db5e086f29..a083aac89cbe397545f34f0e9312fc8fb66dec85 100644
--- a/src/main/java/com/destroystokyo/paper/MaterialTags.java
-+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -83,6 +83,7 @@ public class MaterialTags {
-      */
-     public static final MaterialSetTag CONCRETES = new MaterialSetTag(keyFor("concretes"))
-         .endsWith("_CONCRETE")
-+        .notStartsWith("SPARKLYPOWER_") // SparklyPaper - custom blocks
-         .ensureSize("CONCRETES", 16).lock();
- 
-     /**
-@@ -161,6 +162,7 @@ public class MaterialTags {
-         .endsWith("TERRACOTTA")
-         .not(Material.TERRACOTTA)
-         .notEndsWith("GLAZED_TERRACOTTA")
-+        .notStartsWith("SPARKLYPOWER_") // SparklyPaper - custom blocks
-         .ensureSize("STAINED_TERRACOTTA", 16).lock();
- 
-     /**
-@@ -168,6 +170,7 @@ public class MaterialTags {
-      */
-     public static final MaterialSetTag TERRACOTTA = new MaterialSetTag(keyFor("terracotta"))
-         .endsWith("TERRACOTTA")
-+        .notStartsWith("SPARKLYPOWER_") // SparklyPaper - custom blocks
-         .ensureSize("TERRACOTTA", 33).lock();
- 
-     /**
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 9afafc00e457c721a1b20b05c6a5d330caa40dfb..34049b57f5e481e3e8a3eb22cc73dcfda39c6116 100644
--- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -3814,6 +3814,22 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-     POTTED_FLOWERING_AZALEA_BUSH(10609),
-     POTTED_OPEN_EYEBLOSSOM(24999),
-     POTTED_CLOSED_EYEBLOSSOM(16694),
-+    // SparklyPaper start - SparklyPower Survival custom blocks
-+    // The IDs themselves doesn't have any correlation with anything, Spigot invented that for backwards compatibility
-+    SPARKLYPOWER_RAINBOW_WOOL(13003),
-+    SPARKLYPOWER_RAINBOW_CONCRETE(13004),
-+    SPARKLYPOWER_RAINBOW_TERRACOTTA(13005),
-+    SPARKLYPOWER_ASPHALT_SERVER(13006),
-+    /**
-+     * BlockData: {@link Slab}
-+     */
-+    SPARKLYPOWER_ASPHALT_SERVER_SLAB(13007, Slab.class),
-+    SPARKLYPOWER_ASPHALT_PLAYER(13008),
-+    /**
-+     * BlockData: {@link Slab}
-+     */
-+    SPARKLYPOWER_ASPHALT_PLAYER_SLAB(13009, Slab.class),
-+    // SparklyPaper end
-     // ----- Legacy Separator -----
-     @Deprecated(since = "1.13")
-     LEGACY_AIR(0, 0),
--- a/sparklypaper-api/paper-patches/files/src/main/java/com/destroystokyo/paper/MaterialTags.java.patch
+++ b/sparklypaper-api/paper-patches/files/src/main/java/com/destroystokyo/paper/MaterialTags.java.patch
@@ -0,0 +1,18 @@
+--- a/src/main/java/com/destroystokyo/paper/MaterialTags.java
+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
+@@ -83,6 +_,7 @@
+      */
+     public static final MaterialSetTag CONCRETES = new MaterialSetTag(keyFor("concretes"))
+         .endsWith("_CONCRETE")
+        .notStartsWith("SPARKLYPOWER_") // SparklyPaper - custom blocks
+         .ensureSize("CONCRETES", 16).lock();
+ 
+     /**
+@@ -152,6 +_,7 @@
+      */
+     public static final MaterialSetTag GLAZED_TERRACOTTA = new MaterialSetTag(keyFor("glazed_terracotta"))
+         .endsWith("GLAZED_TERRACOTTA")
+        .notStartsWith("SPARKLYPOWER_") // SparklyPaper - custom blocks
+         .ensureSize("GLAZED_TERRACOTTA", 16).lock();
+ 
+     /**
--- a/sparklypaper-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch
+++ b/sparklypaper-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch
@@ -1,11 +0,0 @@
--- a/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java
-+++ b/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java
-@@ -27,7 +_,7 @@
-      *
-      * @return the frame type
-      */
-    Frame frame();
-+    Frame frame(); // patch
- 
-     /**
-      * Gets the advancement title.
--- a/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
+++ b/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
@@ -0,0 +1,19 @@
+--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
+@@ -1697,6 +_,16 @@
+     ZOMBIE_HEAD(-1, Skull.class),
+     ZOMBIE_WALL_HEAD(-1, WallSkull.class),
+     // End generate - Blocks
+    // SparklyPaper start - SparklyPower Survival custom blocks
+    // The IDs themselves doesn't have any correlation with anything, Spigot invented that for backwards compatibility
+    SPARKLYPOWER_RAINBOW_WOOL(-1),
+    SPARKLYPOWER_RAINBOW_CONCRETE(-1),
+    SPARKLYPOWER_RAINBOW_TERRACOTTA(-1),
+    SPARKLYPOWER_ASPHALT_SERVER(-1),
+    SPARKLYPOWER_ASPHALT_SERVER_SLAB(-1, Slab.class),
+    SPARKLYPOWER_ASPHALT_PLAYER(-1),
+    SPARKLYPOWER_ASPHALT_PLAYER_SLAB(-1, Slab.class),
+    // SparklyPaper end
+     // ----- Legacy Separator -----
+     @Deprecated(since = "1.13", forRemoval = true)
+     LEGACY_AIR(0, 0),