From 8a3165e9ba99288bde4791e1069e3b085b1b72b8 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Thu, 10 Sep 2020 00:33:47 +0200
Subject: [PATCH] Fixed some tags and added glass

---
 .../slimefun4/utils/tags/SlimefunTag.java     | 16 ++++++++++++++
 .../tags/explosive_shovel_blocks.json         |  6 +++++-
 src/main/resources/tags/glass.json            |  6 ++++++
 src/main/resources/tags/glass_blocks.json     | 21 +++++++++++++++++++
 src/main/resources/tags/glass_panes.json      | 21 +++++++++++++++++++
 .../tags/pickaxe_of_the_seeker_blocks.json    |  2 +-
 .../tags/smelters_pickaxe_blocks.json         |  7 ++++++-
 7 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/tags/glass.json
 create mode 100644 src/main/resources/tags/glass_blocks.json
 create mode 100644 src/main/resources/tags/glass_panes.json

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
index edeb7a241..9079d908e 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
@@ -50,6 +50,22 @@ public enum SlimefunTag implements Tag<Material> {
      */
     ORES,
 
+    /**
+     * Every glass variant, includes both blocks and panes.
+     * Also stained glass and stained glass panes.
+     */
+    GLASS,
+
+    /**
+     * All variants of glass, normal and stained.
+     */
+    GLASS_BLOCKS,
+
+    /**
+     * All variants of glass panes, normal and stained.
+     */
+    GLASS_PANES,
+
     /**
      * All variants of torches, normal, soulfire and redstone.
      */
diff --git a/src/main/resources/tags/explosive_shovel_blocks.json b/src/main/resources/tags/explosive_shovel_blocks.json
index 892676ece..da0f980ff 100644
--- a/src/main/resources/tags/explosive_shovel_blocks.json
+++ b/src/main/resources/tags/explosive_shovel_blocks.json
@@ -9,6 +9,10 @@
 		"minecraft:snow_block",
 		"minecraft:gravel",
 		"minecraft:clay",
-		"minecraft:soul_sand"
+		"minecraft:soul_sand",
+		{
+			"id" : "minecraft:soul_soil",
+			"required" : false
+		}
 	]
 }
diff --git a/src/main/resources/tags/glass.json b/src/main/resources/tags/glass.json
new file mode 100644
index 000000000..ef4c6c260
--- /dev/null
+++ b/src/main/resources/tags/glass.json
@@ -0,0 +1,6 @@
+{
+	"values" : [
+		"#slimefun:glass_blocks",
+		"#slimefun:glass_panes"
+	]
+}
diff --git a/src/main/resources/tags/glass_blocks.json b/src/main/resources/tags/glass_blocks.json
new file mode 100644
index 000000000..92346ab19
--- /dev/null
+++ b/src/main/resources/tags/glass_blocks.json
@@ -0,0 +1,21 @@
+{
+	"values" : [
+		"minecraft:glass",
+		"minecraft:white_stained_glass",
+		"minecraft:orange_stained_glass",
+		"minecraft:magenta_stained_glass",
+		"minecraft:light_blue_stained_glass",
+		"minecraft:yellow_stained_glass",
+		"minecraft:lime_stained_glass",
+		"minecraft:pink_stained_glass",
+		"minecraft:gray_stained_glass",
+		"minecraft:light_gray_stained_glass",
+		"minecraft:cyan_stained_glass",
+		"minecraft:purple_stained_glass",
+		"minecraft:blue_stained_glass",
+		"minecraft:brown_stained_glass",
+		"minecraft:green_stained_glass",
+		"minecraft:red_stained_glass",
+		"minecraft:black_stained_glass"
+	]
+}
diff --git a/src/main/resources/tags/glass_panes.json b/src/main/resources/tags/glass_panes.json
new file mode 100644
index 000000000..2defd74ca
--- /dev/null
+++ b/src/main/resources/tags/glass_panes.json
@@ -0,0 +1,21 @@
+{
+	"values" : [
+		"minecraft:glass_pane",
+		"minecraft:white_stained_glass_pane",
+		"minecraft:orange_stained_glass_pane",
+		"minecraft:magenta_stained_glass_pane",
+		"minecraft:light_blue_stained_glass_pane",
+		"minecraft:yellow_stained_glass_pane",
+		"minecraft:lime_stained_glass_pane",
+		"minecraft:pink_stained_glass_pane",
+		"minecraft:gray_stained_glass_pane",
+		"minecraft:light_gray_stained_glass_pane",
+		"minecraft:cyan_stained_glass_pane",
+		"minecraft:purple_stained_glass_pane",
+		"minecraft:blue_stained_glass_pane",
+		"minecraft:brown_stained_glass_pane",
+		"minecraft:green_stained_glass_pane",
+		"minecraft:red_stained_glass_pane",
+		"minecraft:black_stained_glass_pane"
+	]
+}
diff --git a/src/main/resources/tags/pickaxe_of_the_seeker_blocks.json b/src/main/resources/tags/pickaxe_of_the_seeker_blocks.json
index 7f21a6746..901df5bb8 100644
--- a/src/main/resources/tags/pickaxe_of_the_seeker_blocks.json
+++ b/src/main/resources/tags/pickaxe_of_the_seeker_blocks.json
@@ -2,7 +2,7 @@
 	"values" : [
 		"#slimefun:ores",
 		{
-			"id" : "#minecraft:ancient_debris",
+			"id" : "minecraft:ancient_debris",
 			"required" : false
 		}
 	]
diff --git a/src/main/resources/tags/smelters_pickaxe_blocks.json b/src/main/resources/tags/smelters_pickaxe_blocks.json
index f3eed4e22..79444a5aa 100644
--- a/src/main/resources/tags/smelters_pickaxe_blocks.json
+++ b/src/main/resources/tags/smelters_pickaxe_blocks.json
@@ -1,5 +1,10 @@
 {
 	"values" : [
-		"#slimefun:ores"
+		{
+			"id" : "#minecraft:gold_ores",
+			"required" : false
+		},
+		"minecraft:gold_ore",
+		"minecraft:iron_ore"
 	]
 }