From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrPowerGamerBR 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),