From b2d535b33b74f65d1ed7fe9c2d62ca03d71254ba Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Wed, 21 May 2025 20:40:10 +0100
Subject: [PATCH] actually fixes #1053

---
 kubejs/server_scripts/createdeco/tags.js    | 19 ++++++++++++-------
 kubejs/server_scripts/main_server_script.js |  3 ++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/kubejs/server_scripts/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js
index 853de5e72..bd5a7cb04 100644
--- a/kubejs/server_scripts/createdeco/tags.js
+++ b/kubejs/server_scripts/createdeco/tags.js
@@ -1,4 +1,6 @@
-const registerCreatedecoItemTags = (event) => {
+const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zinc'];
+
+const registerCreateDecoItemTags = (event) => {
 
 	//#region Hidden Items  
 	global.CREATEDECO_DISABLED_ITEMS.forEach(item => {
@@ -10,14 +12,9 @@ const registerCreatedecoItemTags = (event) => {
 	event.remove('createdeco:internal/blocks/iron_blocks', '#forge:storage_blocks/iron')
 
 	//#region Apply Tags
-	const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zinc'];
-
 	metalBars.forEach(metalBars => {
 		event.add('tfg:metal_bars', `createdeco:${metalBars}_bars`)
 		event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`)
-		// The bars are missing mineable tags for some reason
-		event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`)
-		event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`)
 	});
 
 	event.add("createdeco:internal/plates/iron_plates", "#forge:plates/wrought_iron")
@@ -48,4 +45,12 @@ const registerCreatedecoItemTags = (event) => {
 	event.add("createdeco:internal/blocks/zinc_blocks", "#forge:storage_blocks/zinc")
 	event.add("createdeco:internal/blocks/andesite_blocks", "#forge:storage_blocks/tin_alloy")
 	//#endregion
-};
\ No newline at end of file
+};
+
+const registerCreateDecoBlockTags = (event) => {
+	metalBars.forEach(metalBars => {
+		// The bars are missing mineable tags for some reason
+		event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`)
+		event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`)
+	});
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js
index 0745c3183..dc1538047 100644
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@@ -18,7 +18,7 @@ ServerEvents.tags('item', event => {
     registerCreateItemTags(event)
     registerCreateAdditionsItemTags(event)
     registerCreateConnectedItemTags(event)
-    registerCreatedecoItemTags(event)
+    registerCreateDecoItemTags(event)
     registerDiggerHelmetItemTags(event)
     registerEndermanOverhaulItemTags(event)
     registerEveryCompatItemTags(event)
@@ -57,6 +57,7 @@ ServerEvents.tags('block', event => {
     registerComputerCraftBlockTags(event)
     registerCreateBlockTags(event)
     registerCreateAdditionsBlockTags(event)
+    registerCreateDecoBlockTags(event)
     registerDomumOrnamentumBlockTags(event)
     registerEndermanOverhaulBlockTags(event)
     registerExtendedAE2BlockTags(event)