Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-19 23:19:22 +00:00
Code Issues Releases Activity

Update to Paper 1.21.5

Browse Source 
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
This commit is contained in:
MrPowerGamerBR
2025-05-25 20:23:19 -03:00
parent 13aff42523
commit af3b1442a9
54 changed files with 516 additions and 3059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sparklypaper-api/paper-patches/files/src/main/java/com/destroystokyo/paper/MaterialTags.java.patch Normal file
View File

@@ -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();
/**

11
sparklypaper-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch
View File

@@ -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.

19
sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch Normal file
View File

@@ -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),