diff options
| author | Newwind <[email protected]> | 2024-12-08 21:40:02 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-08 22:40:02 +0100 |
| commit | fabd8598785e1a6a143db6dd8191e5105dafc4ea (patch) | |
| tree | 764b154383716798c3e19e7453acbb35dfcf0fe6 | |
| parent | bdfa1f6864e7e6f484058d96f407ba7d1e3eac56 (diff) | |
| download | Paper-fabd8598785e1a6a143db6dd8191e5105dafc4ea.tar.gz Paper-fabd8598785e1a6a143db6dd8191e5105dafc4ea.zip | |
Add command block material tags (#11720)
| -rw-r--r-- | patches/api/0147-Add-Material-Tags.patch | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/patches/api/0147-Add-Material-Tags.patch b/patches/api/0147-Add-Material-Tags.patch index 49457e8365..6029e08ddc 100644 --- a/patches/api/0147-Add-Material-Tags.patch +++ b/patches/api/0147-Add-Material-Tags.patch @@ -9,6 +9,7 @@ are related to each other by a trait. Co-authored-by: Jake Potrebic <[email protected]> Co-authored-by: Lena Kolb <[email protected]> Co-authored-by: Layla Silbernberg <[email protected]> +Co-authored-by: Newwind <[email protected]> diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java new file mode 100644 @@ -118,10 +119,10 @@ index 0000000000000000000000000000000000000000..28282090c8b3668c11faefa0523f9e4a +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 0000000000000000000000000000000000000000..41eaa8159f8c028faa118300e95f6a0fb9cfe989 +index 0000000000000000000000000000000000000000..679f78e07a3a2de745fa237165d0a8db5e086f29 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,717 @@ +@@ -0,0 +1,724 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -702,6 +703,13 @@ index 0000000000000000000000000000000000000000..41eaa8159f8c028faa118300e95f6a0f + .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); + + /** ++ * Covers all command block types. ++ */ ++ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) ++ .endsWith("COMMAND_BLOCK") ++ .ensureSize("COMMAND_BLOCKS", 3).lock(); ++ ++ /** + * Covers the variants of deepslate ores. + */ + public static final MaterialSetTag DEEPSLATE_ORES = new MaterialSetTag(keyFor("deepslate_ores")) |