OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-18 12:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add command block material tags (#11720)

Browse source
This commit is contained in:
Newwind 2024-12-08 21:40:02 +00:00 committed by GitHub
parent bdfa1f6864
commit fabd859878
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
patches/api/0147-Add-Material-Tags.patch
View file

@ -9,6 +9,7 @@ are related to each other by a trait.
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Lena Kolb <lenakolb2204@gmail.com> Co-authored-by: Lena Kolb <lenakolb2204@gmail.com>
Co-authored-by: Layla Silbernberg <livsilbernberg@gmail.com> Co-authored-by: Layla Silbernberg <livsilbernberg@gmail.com>
Co-authored-by: Newwind <newwindserver@gmail.com>
diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
new file mode 100644 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 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..41eaa8159f8c028faa118300e95f6a0fb9cfe989 index 0000000000000000000000000000000000000000..679f78e07a3a2de745fa237165d0a8db5e086f29
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java +++ 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 + * 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(); + .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. + * Covers the variants of deepslate ores.
+ */ + */
+ public static final MaterialSetTag DEEPSLATE_ORES = new MaterialSetTag(keyFor("deepslate_ores")) + public static final MaterialSetTag DEEPSLATE_ORES = new MaterialSetTag(keyFor("deepslate_ores"))