3f15d7a684
Upstream has released updates that appear to apply and compile correctly. [Purpur Changes] PurpurMC/Purpur@e86a1b6: Updated Upstream (Paper) PurpurMC/Purpur@962ee30: Updated Upstream (Paper) PurpurMC/Purpur@74d1b4c: Updated Upstream (Paper) PurpurMC/Purpur@e2e8c61: Updated Upstream (Paper) PurpurMC/Purpur@7a01fd8: Updated Upstream (Paper) PurpurMC/Purpur@34c18f0: Updated Upstream (Paper) PurpurMC/Purpur@ca668ab: Updated Upstream (Paper) PurpurMC/Purpur@200178d: Updated Upstream (Paper) PurpurMC/Purpur@9968cbb: Updated Upstream (Paper) PurpurMC/Purpur@db09358: Fix clamp-levels option not being true by default (#1609) PurpurMC/Purpur@f289b6a: Updated Upstream (Paper) PurpurMC/Purpur@959c29d: Fix Tridents giving errors without having an Elytra equipped (#1612) PurpurMC/Purpur@68c1612: Fix villagers not spawning when the `follow-emerald-blocks` option is enabled (#1611) PurpurMC/Purpur@5b75c68: fix `bypass-mob-griefing` not being the inverse of mobgriefing gamerule, closes #1603 PurpurMC/Purpur@55d4309: Updated Upstream (Paper) PurpurMC/Purpur@0601f87: Updated Upstream (Paper) PurpurMC/Purpur@06dde9d: Add Ridable and Attribute options for Creaking mob (#1613) PurpurMC/Purpur@420a1ce: Set the bee's `takes-damage-from-water` option to true by default (#1614) PurpurMC/Purpur@2b6f273: Updated Upstream (Paper) PurpurMC/Purpur@504f311: Updated Upstream (Paper) PurpurMC/Purpur@2b694c9: Updated Upstream (Paper) PurpurMC/Purpur@96d7ef7: Updated Upstream (Paper) PurpurMC/Purpur@e141f68: Updated Upstream (Paper) PurpurMC/Purpur@7f6f667: Updated Upstream (Pufferfish) PurpurMC/Purpur@de20ba9: ignore `minecart.max-speed` config value if using minecart experiment, closes #1618 PurpurMC/Purpur@03062a8: fix ridable mobs not being controllable, closes #1620 PurpurMC/Purpur@0493ac3: Updated Upstream (Paper) PurpurMC/Purpur@16ce24a: fix(ridables/creaking): override tick method in look/move control
62 lines
2.6 KiB
Diff
62 lines
2.6 KiB
Diff
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 41eaa8159f8c028faa118300e95f6a0fb9cfe989..5b5ddb19b39d5201da422f9b10e2491ab9334925 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 028ac35df6c4d044d07b3869751736d418c1eb0e..dd9795e0725275b0fe5a3f4ecfd4d587a23f963f 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -3843,6 +3843,22 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
BIG_DRIPLEAF_STEM(13167, Dripleaf.class),
|
|
POTTED_AZALEA_BUSH(20430),
|
|
POTTED_FLOWERING_AZALEA_BUSH(10609),
|
|
+ // 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),
|