From f1fadb4e990a39e3abd665cb36c0fbe65ac009bb Mon Sep 17 00:00:00 2001
From: Zack <93035068+ZackH01@users.noreply.github.com>
Date: Mon, 12 May 2025 17:02:11 +0100
Subject: [PATCH] Add wrought iron alternatives for early game cast iron
 recipes (#985)

* Add wrought iron alternatives for early game cast iron recipes

* Change doulbe iron ingots tag to use #forge item tags
---
 kubejs/server_scripts/create/recipes.js        | 12 +++++++++++-
 .../gregtech/recipes.machines.js               | 18 ++++++++++++++++++
 kubejs/server_scripts/tfg/tags.js              |  6 ++++++
 .../vintage_improvements/recipes.js            |  6 +++---
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js
index e736ffa7b..e4a24671d 100644
--- a/kubejs/server_scripts/create/recipes.js
+++ b/kubejs/server_scripts/create/recipes.js
@@ -1037,7 +1037,17 @@ const registerCreateRecipes = (event) => {
 		B: 'tfc:metal/boots/copper',
 		C: '#forge:ingots/iron',
 		D: 'firmaciv:large_waterproof_hide'
-	}).id('tfg:create/shaped/copper_diving_boots')
+	}).id('tfg:create/shaped/copper_diving_boots_cast_iron')
+
+	event.shaped('create:copper_diving_boots', [
+		'ABA',
+		'CDC'
+	], {
+		A: '#forge:screws/copper',
+		B: 'tfc:metal/boots/copper',
+		C: '#forge:ingots/wrought_iron',
+		D: 'firmaciv:large_waterproof_hide'
+	}).id('tfg:create/shaped/copper_diving_boots_wrought_iron')
 
 	// Netherite backtank
 	event.shaped('create:netherite_backtank', [
diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js
index d8f9f5dd0..cf172f383 100644
--- a/kubejs/server_scripts/gregtech/recipes.machines.js
+++ b/kubejs/server_scripts/gregtech/recipes.machines.js
@@ -749,6 +749,24 @@ function registerGTCEuMachineRecipes(event) {
 			.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
 	})
 
+	// Wooden crate
+	event.recipes.shaped('gtceu:wood_crate', [
+		'ABA',
+		'BCB',
+		'ABA'
+	], {
+		A: '#forge:screws/wrought_iron',
+		B: '#minecraft:planks',
+		C: '#forge:tools/saws'
+	}).id('tfg:shaped/wooden_crate_wrought_iron')
+
+	event.recipes.gtceu.assembler('gtceu:wood_crate')
+		.itemInputs('4x #minecraft:planks', '4x #forge:screws/wrought_iron')
+		.itemOutputs('gtceu:wood_crate')
+		.duration(100)
+		.EUt(16)
+		.circuit(5)
+
 	// Steam multi parts
 
 	event.shaped('gtceu:steel_machine_casing', [
diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js
index f19ff1179..b254db754 100644
--- a/kubejs/server_scripts/tfg/tags.js
+++ b/kubejs/server_scripts/tfg/tags.js
@@ -129,6 +129,12 @@ const registerTFGItemTags = (event) => {
 
 	// #endregion
 
+	// Use either cast or wrought iron
+	event.add('forge:double_iron_ingots', '#forge:double_ingots/iron')
+	event.add('forge:double_iron_ingots', '#forge:double_ingots/wrought_iron')
+
+	// #endregion
+
 	// #region 0.7.19 -> 0.9 conversion
 
 	event.add('c:hidden_from_recipe_viewers', 'treetap:tap')
diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js
index 3b35c886a..787e5b3e9 100644
--- a/kubejs/server_scripts/vintage_improvements/recipes.js
+++ b/kubejs/server_scripts/vintage_improvements/recipes.js
@@ -84,7 +84,7 @@ function registerVintageImprovementsRecipes(event) {
 	], {
 		A: '#forge:frames/bronze',
 		B: '#tfg:hardwood',
-		C: '#forge:double_ingots/iron',
+		C: '#forge:double_iron_ingots',
 		D: 'greate:andesite_alloy_cogwheel',
 		E: '#minecraft:planks',
 		F: '#forge:tools/hammers'
@@ -97,7 +97,7 @@ function registerVintageImprovementsRecipes(event) {
 	], {
 		A: '#forge:frames/black_bronze',
 		B: '#tfg:hardwood',
-		C: '#forge:double_ingots/iron',
+		C: '#forge:double_iron_ingots',
 		D: 'greate:andesite_alloy_cogwheel',
 		E: '#minecraft:planks',
 		F: '#forge:tools/hammers'
@@ -110,7 +110,7 @@ function registerVintageImprovementsRecipes(event) {
 	], {
 		A: '#forge:frames/bismuth_bronze',
 		B: '#tfg:hardwood',
-		C: '#forge:double_ingots/iron',
+		C: '#forge:double_iron_ingots',
 		D: 'greate:andesite_alloy_cogwheel',
 		E: '#minecraft:planks',
 		F: '#forge:tools/hammers'