Skip to content

Add command block material tags #11720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lynxplay merged 5 commits into from
Dec 8, 2024
Merged

Add command block material tags #11720

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
053fbf2
Create 0501-Command-block-materialtags.patch
NewwindServer Dec 7, 2024
a65e6bb
Move into material tags patch?
NewwindServer Dec 7, 2024
13267a2
Revert "Move into material tags patch?"
NewwindServer Dec 7, 2024
fcc2c0e
oops
NewwindServer Dec 7, 2024
666f669
Merge into correct patch
lynxplay Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions patches/api/0147-Add-Material-Tags.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: Lena Kolb <lenakolb2204@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
new file mode 100644
Expand Down Expand Up @@ -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
+ *
Expand Down Expand Up @@ -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"))
Expand Down