From 2be9beb5dcf323e37cddb1a333229ce2bd2c270f Mon Sep 17 00:00:00 2001 From: Jacob Andersen Date: Sun, 9 Jan 2022 20:25:22 -0800 Subject: [PATCH] Add material tags for deepslate ores (#7174) --- patches/api/0156-Add-Material-Tags.patch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0156-Add-Material-Tags.patch index 4c4d13632a..3c306dc784 100644 --- a/patches/api/0156-Add-Material-Tags.patch +++ b/patches/api/0156-Add-Material-Tags.patch @@ -113,10 +113,10 @@ index 0000000000000000000000000000000000000000..a02a02aa0c87e0f0ed9e509e4dcab015 +} 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..a5fc48df2f1f04d836c5ae3dae7dce8acdb2de32 +index 0000000000000000000000000000000000000000..4606fcbb4a7e3857a5d74dac96aed4d29b5066a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,646 @@ +@@ -0,0 +1,652 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -682,12 +682,18 @@ index 0000000000000000000000000000000000000000..a5fc48df2f1f04d836c5ae3dae7dce8a + .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON); + + /** ++ * Covers the variants of deepslate ores. ++ */ ++ public static final MaterialSetTag DEEPSLATE_ORES = new MaterialSetTag(keyFor("deepslate_ores")) ++ .add(material -> material.name().startsWith("DEEPSLATE_") && material.name().endsWith("_ORE")) ++ .ensureSize("DEEPSLATE_ORES", 8); ++ ++ /** + * Covers the variants of raw ore blocks. + */ + public static final MaterialSetTag RAW_ORE_BLOCKS = new MaterialSetTag(keyFor("raw_ore_blocks")) + .add(Material.RAW_COPPER_BLOCK, Material.RAW_GOLD_BLOCK, Material.RAW_IRON_BLOCK); + -+ + /** + * Covers all oxidized copper blocks. + */