From b6ce4fb066eb886a305f0678649c33d6f8ba4f76 Mon Sep 17 00:00:00 2001
From: Trikzon <trikzon@protonmail.com>
Date: Fri, 30 Apr 2021 13:53:19 -0400
Subject: [PATCH] Add barrels and barrels/wooden block and item tag (#7676)

---
 src/generated/resources/data/forge/tags/blocks/barrels.json | 6 ++++++
 .../resources/data/forge/tags/blocks/barrels/wooden.json    | 6 ++++++
 src/main/java/net/minecraftforge/common/Tags.java           | 4 ++++
 .../minecraftforge/common/data/ForgeBlockTagsProvider.java  | 2 ++
 .../minecraftforge/common/data/ForgeItemTagsProvider.java   | 2 ++
 5 files changed, 20 insertions(+)
 create mode 100644 src/generated/resources/data/forge/tags/blocks/barrels.json
 create mode 100644 src/generated/resources/data/forge/tags/blocks/barrels/wooden.json

diff --git a/src/generated/resources/data/forge/tags/blocks/barrels.json b/src/generated/resources/data/forge/tags/blocks/barrels.json
new file mode 100644
index 0000000000..4af754bdec
--- /dev/null
+++ b/src/generated/resources/data/forge/tags/blocks/barrels.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#forge:barrels/wooden"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/blocks/barrels/wooden.json b/src/generated/resources/data/forge/tags/blocks/barrels/wooden.json
new file mode 100644
index 0000000000..01825818a4
--- /dev/null
+++ b/src/generated/resources/data/forge/tags/blocks/barrels/wooden.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:barrel"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java
index 933a3cb82e..2dfadbe1bf 100644
--- a/src/main/java/net/minecraftforge/common/Tags.java
+++ b/src/main/java/net/minecraftforge/common/Tags.java
@@ -42,6 +42,8 @@ public class Tags
     {
         private static void init(){}
 
+        public static final IOptionalNamedTag<Block> BARRELS = tag("barrels");
+        public static final IOptionalNamedTag<Block> BARRELS_WOODEN = tag("barrels/wooden");
         public static final IOptionalNamedTag<Block> CHESTS = tag("chests");
         public static final IOptionalNamedTag<Block> CHESTS_ENDER = tag("chests/ender");
         public static final IOptionalNamedTag<Block> CHESTS_TRAPPED = tag("chests/trapped");
@@ -137,6 +139,8 @@ public class Tags
     {
         private static void init(){}
 
+        public static final IOptionalNamedTag<Item> BARRELS = tag("barrels");
+        public static final IOptionalNamedTag<Item> BARRELS_WOODEN = tag("barrels/wooden");
         public static final IOptionalNamedTag<Item> BONES = tag("bones");
         public static final IOptionalNamedTag<Item> BOOKSHELVES = tag("bookshelves");
         public static final IOptionalNamedTag<Item> CHESTS = tag("chests");
diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java
index c3c95b99f7..2c4dd3b692 100644
--- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java
+++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java
@@ -46,6 +46,8 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
     @Override
     public void addTags()
     {
+        tag(BARRELS).addTag(BARRELS_WOODEN);
+        tag(BARRELS_WOODEN).add(Blocks.BARREL);
         tag(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
         tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
         tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
index aeca1e5367..f25b77b663 100644
--- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
+++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
@@ -45,6 +45,8 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
     @Override
     public void addTags()
     {
+        copy(Tags.Blocks.BARRELS, Tags.Items.BARRELS);
+        copy(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN);
         tag(Tags.Items.BONES).add(Items.BONE);
         tag(Tags.Items.BOOKSHELVES).add(Items.BOOKSHELF);
         copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS);