bloomery update

CHANGELOG.md

@@ -30,6 +30,7 @@
 - Added alloy smelter recipes for jar lids (#2705) @thederpysockdude123
 - Reduced the amount of ambient awoos at night, and crickets/cicadas now require grass plants instead of grass blocks (#2680) @Pyritie
 - You can now use any wrench to remove the extruder molds from the curving press instead of just the create wrench @Pyritie
+- You can now use coal as bloomery fuel! Both the vanilla item as well as any of the raw coals
 ### Bug fixes
 - Fixed not being able to craft Paracetamol or Rad-Away @Pyritie
 - Fixed the missing dried fruit to yeast starter recipe (#2673) @Mqrius

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json

@@ -6,7 +6,7 @@
 	"pages": [
 		{
 			"type": "patchouli:text",
-      "text": "The $(thing)Bloomery$() is a device used to smelt $(thing)Iron Ore$() into $(thing)Iron Blooms$() which can be worked into $(thing)Wrought Iron$(). The iron ores are $(l:the_world/ores_and_minerals#hematite)Hematite$(), $(l:the_world/ores_and_minerals#limonite)Limonite$(), and $(l:the_world/ores_and_minerals#magnetite)Magnetite$(). These ores melt into $(thing)Cast Iron$() rather than $(thing)Wrought Iron$(). All iron-bearing items melt into Cast Iron. To turn them into usable iron, the bloomery is needed. Any iron item can be used in the bloomery, including iron tools and cast iron ingots!"
+			"text": "The $(thing)Bloomery$() is a device used to smelt $(thing)Iron Ore$() into $(thing)Iron Blooms$() which can be worked into $(thing)Wrought Iron$(). Some common iron ores are $(l:tfg_ores/earth_vein_index#normal_hematite)Hematite$(), $(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$(), and $(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite$(). These ores melt into $(thing)Cast Iron$() rather than $(thing)Wrought Iron$(). All iron-bearing items melt into Cast Iron. To turn them into usable iron, the bloomery is needed. Any iron item can be used in the bloomery, including iron tools and cast iron ingots!"
 		},
 		{
 			"type": "patchouli:crafting",
@@ -22,19 +22,19 @@
 		},
 		{
 			"type": "patchouli:text",
-      "text": "The bloomery can contain up to a maximum of 48 $(thing)Inputs$(), with 16 items per layer of the chimney. To add layers to the chimney, stack up two more layers of stone blocks.$(br2)To add items to the bloomery, climb up to the top and throw items inside. A tower of grey ore should form."
+			"text": "The bloomery can contain up to a maximum of 48 $(thing)Inputs$(), with 16 items per layer of the chimney. To add layers to the chimney, stack up two more layers of stone blocks.$(br2)To add items to the bloomery, climb up to the top and throw items inside. A tower of grey ore should form.$(br2)You can use both $(item)Charcoal$() and $(item)Coal$() as fuel for your bloomery."
 		},
 		{
 			"type": "patchouli:image",
 			"images": [
 				"tfc:textures/gui/book/tutorial/bloomery_hole.png"
 			],
-      "text": "Adding items to the bloomery.",
+			"text": "The bloomery consumes $(thing)1 item of Fuel$() and $(thing)144 mB of Cast Iron$() to produce one $(thing)Bloom$().",
 			"border": true
 		},
 		{
 			"type": "patchouli:text",
-      "text": "The bloomery consumes $(thing)1 Charcoal$() and $(thing)144 mB of Cast Iron$() to produce one $(thing)Bloom$(). After filling the bloomery with a combination of $(thing)Charcoal$() and $(thing)Ore$(), light the bloomery block, and wait 15 hours for the bloomery to smelt. When the bloomery shuts off, it leaves behind a $(thing)Bloom$() block. This contains $(thing)Raw Iron Blooms$() which can be obtained by mining the $(thing)Bloom$() repeatedly with a pickaxe."
+			"text": "If you don't want to do the math, we recommend $(item)25 metal ore dusts$() and $(item)22 fuel items$().$(br2)After filling the bloomery with a combination of $(thing)Fuel$() and $(thing)Ore$(), light the bloomery block, and wait 15 hours for the bloomery to smelt. When the bloomery shuts off, it leaves behind a $(thing)Bloom$() block. This contains $(thing)Raw Iron Blooms$() which can be obtained by mining the $(thing)Bloom$() repeatedly with a pickaxe."
 		},
 		{
 			"type": "patchouli:multiblock",

kubejs/data/create_liquid_fuel/blaze_burner_fuel/light_oil.json

@@ -1,5 +1,5 @@
 {
-  "fluid": "gtceu:light_oil",
+  "fluid": "gtceu:oil_light",
   "burnTime": 50,
   "superHeat": false,
   "amountConsumedPerTick" : 32

kubejs/server_scripts/tfc/recipes.metals.js

@@ -273,7 +273,7 @@ function registerTFCMetalsRecipes(event) {
 		.id('tfc:anvil/blue_steel_ingot')
 
 	// Cast iron -> Raw Iron Bloom
-	event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('gtceu:iron', 144), 15000)
+	event.recipes.tfc.bloomery('tfc:raw_iron_bloom', '#tfg:bloomery_basic_fuels', Fluid.of('gtceu:iron', 144), 15000)
 		.id('tfc:bloomery/raw_iron_bloom')
 
 	// Cast Iron -> Pig Iron

kubejs/server_scripts/tfg/machines/recipes.steam_bloomery.js

@@ -3,7 +3,7 @@
 function registerTFGSteamBloomeryRecipes(event) {
 
 	event.recipes.gtceu.steam_bloomery('steam_raw_iron_bloom_coal')
-		.itemInputs('#forge:ingots/iron', '#tfg:steam_bloomery_basic_fuels')
+		.itemInputs('#forge:ingots/iron', '#tfg:bloomery_basic_fuels')
 		.itemOutputs('tfc:raw_iron_bloom')
 		.duration(2400)
 		.EUt(2)
@@ -23,7 +23,7 @@ function registerTFGSteamBloomeryRecipes(event) {
 		const outputMaterial = tfcProperty.getOutputMaterial() === null ? material : tfcProperty.getOutputMaterial()
 		if (outputMaterial === GTMaterials.Iron) {
 			event.recipes.gtceu.steam_bloomery(`steam_raw_iron_bloom_coal_${material.getName()}`)
-				.itemInputs(ChemicalHelper.get(TagPrefix.dust, material, 1), '#tfg:steam_bloomery_basic_fuels')
+				.itemInputs(ChemicalHelper.get(TagPrefix.dust, material, 1), '#tfg:bloomery_basic_fuels')
 				.itemOutputs('tfc:raw_iron_bloom')
 				.duration(2400)
 				.EUt(2)

kubejs/server_scripts/tfg/tags.js

@@ -82,13 +82,11 @@ const registerTFGItemTags = (event) => {
 	event.add('forge:screws/any_bronze', '#forge:screws/black_bronze')
 	
 	// Steam Bloomery
-    event.add("tfg:steam_bloomery_basic_fuels", "minecraft:coal");
-    event.add("tfg:steam_bloomery_basic_fuels", "minecraft:charcoal");
-    event.add("tfg:steam_bloomery_basic_fuels", "gtceu:rich_raw_coal");
-    event.add("tfg:steam_bloomery_basic_fuels", "gtceu:raw_coal");
-    event.add("tfg:steam_bloomery_basic_fuels", "gtceu:poor_raw_coal");
-    event.add("tfg:steam_bloomery_basic_fuels", "gtceu:coal_dust");
-    event.add("tfg:steam_bloomery_basic_fuels", "gtceu:charcoal_dust");
+    event.add("tfg:bloomery_basic_fuels", "minecraft:coal");
+    event.add("tfg:bloomery_basic_fuels", "minecraft:charcoal");
+    event.add("tfg:bloomery_basic_fuels", "gtceu:rich_raw_coal");
+    event.add("tfg:bloomery_basic_fuels", "gtceu:raw_coal");
+    event.add("tfg:bloomery_basic_fuels", "gtceu:poor_raw_coal");
 		
 	//#region holder materials
 	event.remove('forge:dusts', 'tfg:nitrocellulose')