diff --git a/src/main/resources/data/forge/tags/blocks/glass.json b/src/main/resources/data/forge/tags/blocks/glass.json new file mode 100644 index 0000000000..6df0a8cbcc --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/glass.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:glass/colorless", + "#forge:stained_glass" + ] +} diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/black.json b/src/main/resources/data/forge/tags/blocks/glass/black.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/black.json rename to src/main/resources/data/forge/tags/blocks/glass/black.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/blue.json b/src/main/resources/data/forge/tags/blocks/glass/blue.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/blue.json rename to src/main/resources/data/forge/tags/blocks/glass/blue.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/brown.json b/src/main/resources/data/forge/tags/blocks/glass/brown.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/brown.json rename to src/main/resources/data/forge/tags/blocks/glass/brown.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/colorless.json b/src/main/resources/data/forge/tags/blocks/glass/colorless.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/colorless.json rename to src/main/resources/data/forge/tags/blocks/glass/colorless.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/cyan.json b/src/main/resources/data/forge/tags/blocks/glass/cyan.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/cyan.json rename to src/main/resources/data/forge/tags/blocks/glass/cyan.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/gray.json b/src/main/resources/data/forge/tags/blocks/glass/gray.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/gray.json rename to src/main/resources/data/forge/tags/blocks/glass/gray.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/green.json b/src/main/resources/data/forge/tags/blocks/glass/green.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/green.json rename to src/main/resources/data/forge/tags/blocks/glass/green.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/light_blue.json b/src/main/resources/data/forge/tags/blocks/glass/light_blue.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/light_blue.json rename to src/main/resources/data/forge/tags/blocks/glass/light_blue.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/light_gray.json b/src/main/resources/data/forge/tags/blocks/glass/light_gray.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/light_gray.json rename to src/main/resources/data/forge/tags/blocks/glass/light_gray.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/lime.json b/src/main/resources/data/forge/tags/blocks/glass/lime.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/lime.json rename to src/main/resources/data/forge/tags/blocks/glass/lime.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/magenta.json b/src/main/resources/data/forge/tags/blocks/glass/magenta.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/magenta.json rename to src/main/resources/data/forge/tags/blocks/glass/magenta.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/orange.json b/src/main/resources/data/forge/tags/blocks/glass/orange.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/orange.json rename to src/main/resources/data/forge/tags/blocks/glass/orange.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/pink.json b/src/main/resources/data/forge/tags/blocks/glass/pink.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/pink.json rename to src/main/resources/data/forge/tags/blocks/glass/pink.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/purple.json b/src/main/resources/data/forge/tags/blocks/glass/purple.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/purple.json rename to src/main/resources/data/forge/tags/blocks/glass/purple.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/red.json b/src/main/resources/data/forge/tags/blocks/glass/red.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/red.json rename to src/main/resources/data/forge/tags/blocks/glass/red.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/white.json b/src/main/resources/data/forge/tags/blocks/glass/white.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/white.json rename to src/main/resources/data/forge/tags/blocks/glass/white.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks/yellow.json b/src/main/resources/data/forge/tags/blocks/glass/yellow.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/glass_blocks/yellow.json rename to src/main/resources/data/forge/tags/blocks/glass/yellow.json diff --git a/src/main/resources/data/forge/tags/blocks/glass_blocks.json b/src/main/resources/data/forge/tags/blocks/glass_blocks.json deleted file mode 100644 index 277a252b4c..0000000000 --- a/src/main/resources/data/forge/tags/blocks/glass_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:glass_blocks/colorless", - "#forge:stained_glass_blocks" - ] -} diff --git a/src/main/resources/data/forge/tags/blocks/stained_glass.json b/src/main/resources/data/forge/tags/blocks/stained_glass.json new file mode 100644 index 0000000000..a2789b37f8 --- /dev/null +++ b/src/main/resources/data/forge/tags/blocks/stained_glass.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#forge:glass/white", + "#forge:glass/orange", + "#forge:glass/magenta", + "#forge:glass/light_blue", + "#forge:glass/yellow", + "#forge:glass/lime", + "#forge:glass/pink", + "#forge:glass/gray", + "#forge:glass/light_gray", + "#forge:glass/cyan", + "#forge:glass/purple", + "#forge:glass/blue", + "#forge:glass/brown", + "#forge:glass/green", + "#forge:glass/red", + "#forge:glass/black" + ] +} diff --git a/src/main/resources/data/forge/tags/blocks/stained_glass_blocks.json b/src/main/resources/data/forge/tags/blocks/stained_glass_blocks.json deleted file mode 100644 index 0af4fa4703..0000000000 --- a/src/main/resources/data/forge/tags/blocks/stained_glass_blocks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:glass_blocks/white", - "#forge:glass_blocks/orange", - "#forge:glass_blocks/magenta", - "#forge:glass_blocks/light_blue", - "#forge:glass_blocks/yellow", - "#forge:glass_blocks/lime", - "#forge:glass_blocks/pink", - "#forge:glass_blocks/gray", - "#forge:glass_blocks/light_gray", - "#forge:glass_blocks/cyan", - "#forge:glass_blocks/purple", - "#forge:glass_blocks/blue", - "#forge:glass_blocks/brown", - "#forge:glass_blocks/green", - "#forge:glass_blocks/red", - "#forge:glass_blocks/black" - ] -} diff --git a/src/main/resources/data/forge/tags/items/glass.json b/src/main/resources/data/forge/tags/items/glass.json new file mode 100644 index 0000000000..6df0a8cbcc --- /dev/null +++ b/src/main/resources/data/forge/tags/items/glass.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:glass/colorless", + "#forge:stained_glass" + ] +} diff --git a/src/main/resources/data/forge/tags/items/glass_blocks.json b/src/main/resources/data/forge/tags/items/glass_blocks.json deleted file mode 100644 index 277a252b4c..0000000000 --- a/src/main/resources/data/forge/tags/items/glass_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:glass_blocks/colorless", - "#forge:stained_glass_blocks" - ] -} diff --git a/src/main/resources/data/forge/tags/items/stained_glass.json b/src/main/resources/data/forge/tags/items/stained_glass.json new file mode 100644 index 0000000000..a2789b37f8 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/stained_glass.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "#forge:glass/white", + "#forge:glass/orange", + "#forge:glass/magenta", + "#forge:glass/light_blue", + "#forge:glass/yellow", + "#forge:glass/lime", + "#forge:glass/pink", + "#forge:glass/gray", + "#forge:glass/light_gray", + "#forge:glass/cyan", + "#forge:glass/purple", + "#forge:glass/blue", + "#forge:glass/brown", + "#forge:glass/green", + "#forge:glass/red", + "#forge:glass/black" + ] +} diff --git a/src/main/resources/data/forge/tags/items/stained_glass_blocks.json b/src/main/resources/data/forge/tags/items/stained_glass_blocks.json deleted file mode 100644 index 0af4fa4703..0000000000 --- a/src/main/resources/data/forge/tags/items/stained_glass_blocks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:glass_blocks/white", - "#forge:glass_blocks/orange", - "#forge:glass_blocks/magenta", - "#forge:glass_blocks/light_blue", - "#forge:glass_blocks/yellow", - "#forge:glass_blocks/lime", - "#forge:glass_blocks/pink", - "#forge:glass_blocks/gray", - "#forge:glass_blocks/light_gray", - "#forge:glass_blocks/cyan", - "#forge:glass_blocks/purple", - "#forge:glass_blocks/blue", - "#forge:glass_blocks/brown", - "#forge:glass_blocks/green", - "#forge:glass_blocks/red", - "#forge:glass_blocks/black" - ] -}