From f99119eb81e1ab7f38005beabd3891ee240967dd Mon Sep 17 00:00:00 2001
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
Date: Mon, 30 Aug 2021 15:55:11 +0100
Subject: [PATCH] Add MaterialTags for raw ores and raw ore blocks (#6516)

---
 patches/api/0157-Add-Material-Tags.patch | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
index 07fa706a3..08a520884 100644
--- a/patches/api/0157-Add-Material-Tags.patch
+++ b/patches/api/0157-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..e8e6b2156b72bc5c115ac522a36efeeff8acd557
+index 0000000000000000000000000000000000000000..8a44ea4feff2c54a315c75c8032044c33f5a3c83
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -0,0 +1,558 @@
+@@ -0,0 +1,570 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -674,6 +674,18 @@ index 0000000000000000000000000000000000000000..e8e6b2156b72bc5c115ac522a36efeef
 +            .add(PICKAXES, SWORDS, SHOVELS, AXES, HOES, HELMETS, CHEST_EQUIPPABLE, LEGGINGS, BOOTS, BOWS)
 +            .add(Material.TRIDENT, Material.SHIELD, Material.FISHING_ROD, Material.SHEARS, Material.FLINT_AND_STEEL, Material.CARROT_ON_A_STICK, Material.WARPED_FUNGUS_ON_A_STICK)
 +            .ensureSize("ENCHANTABLE", 65);
++
++    /**
++     * Covers the variants of raw ores.
++     */
++    public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores"))
++            .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON);
++
++    /**
++     * 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);
 +}
 diff --git a/src/main/java/io/papermc/paper/tag/BaseTag.java b/src/main/java/io/papermc/paper/tag/BaseTag.java
 new file mode 100644