From 21f9074a0047663c7e1a2de08ce2d2521becfdc6 Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Sun, 4 Jan 2026 14:45:07 +0000
Subject: [PATCH] fixed bacon deleting all the food traits on crafting

---
 CHANGELOG.md                                  |  1 +
 kubejs/server_scripts/firmalife/recipes.js    | 25 ++++++++++++-------
 .../server_scripts/tfg/food/recipes.food.js   |  9 +++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dd91a947..97a69ae52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - Fixed incorrect fluid tooltips for the silica glass bottle and iron flask (#2608) @JeanRdSz @Pyritie
 - Removed some dough mixing bowl recipes that tried to output more than 5 ingredients because that's the mixing bowl's maximum (#2612) @Pyritie
 - Fixed missing heat definition for soybeans (#2603) @Pyritie
+- Fixed crafting bacon removing all the other food traits @Pyritie
 ### Translation updates
 - Chinese (simplified) @jmecn
 - Russian @Petr211071
diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js
index 5e194056a..868eb0a84 100644
--- a/kubejs/server_scripts/firmalife/recipes.js
+++ b/kubejs/server_scripts/firmalife/recipes.js
@@ -1000,24 +1000,31 @@ const registerFirmaLifeRecipes = (event) => {
 
 	// #endregion
 
-	// #region How do I make yeast starter???
-
-	event.recipes.kubejs.shapeless(Item.of('4x firmalife:food/bacon').withName(Text.translate('tfg.emi.bacon_requirement')), [
-		'tfc:food/pork',
-		'#forge:tools/knives',
-		'tfc:powder/salt'
-	])
+	// Adds a tooltip to the bacon craft to tell people it needs to be smoked first,
+	// and adds traits that normally disappear on the craft
+		
+	event.recipes.tfc.advanced_shapeless_crafting(
+		TFC.isp.of(Item.of('4x firmalife:food/bacon')
+			.withName(Text.translate('tfg.emi.bacon_requirement')))
+			.addTrait("firmalife:smoked")
+			.addTrait("tfc:brined")
+			.addTrait("tfc:salted"), 
+		[
+			TFC.ingredient.notRotten(TFC.ingredient.hasTrait('tfc:food/pork', "firmalife:smoked")),
+			'#forge:tools/knives',
+			'tfc:powder/salt'
+		])
 		.modifyResult((craftingGrid, result) => {
 			result.resetHoverName();
 			return result;
 		})
 		.id('firmalife:crafting/bacon')
 
+	// Replacement for yeast starter recipe that uses a different, more descriptive tag
+
 	event.recipes.tfc.barrel_sealed(72000)
 		.inputFluid(Fluid.of('minecraft:water', 100))
 		.inputItem(TFC.ingredient.hasTrait(Ingredient.of('#tfg:dried_fruit'), "firmalife:dried"))
 		.outputFluid(Fluid.of('firmalife:yeast_starter', 100))
 		.id('firmalife:barrel/yeast_starter')
-
-	// #endregion
 }
diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js
index d475724d6..17feb698f 100644
--- a/kubejs/server_scripts/tfg/food/recipes.food.js
+++ b/kubejs/server_scripts/tfg/food/recipes.food.js
@@ -841,7 +841,7 @@ function registerTFGFoodRecipes(event) {
 	global.processorRecipe(event, "yeast_starter_from_water", 7200, 8, {
 		circuit: 10,
 		itemInputs: ['#tfc:foods/fruits'],
-		fluidInputs: ['#tfg:clean_water 100'],
+		fluidInputs: ['#tfg:clean_water 100', 'gtceu:nitrogen 100'],
 		fluidOutputs: [Fluid.of('firmalife:yeast_starter', 100)]
 	})
 	
@@ -926,7 +926,12 @@ function registerTFGFoodRecipes(event) {
 		circuit: 1,
 		itemInputs: ['tfc:food/pork', 'tfc:powder/salt'],
 		itemOutputs: ['4x firmalife:food/bacon'],
-		itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon').copyFood()
+		fluidInputs: ['gtceu:wood_gas 5', 'tfc:brine 100'],
+		itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon')
+			.addTrait("firmalife:smoked")
+			.addTrait("tfc:brined")
+			.addTrait("tfc:salted")
+			.copyFood()
 	})
 
 	global.processorRecipe(event, "pickled_egg", 1000, 8, {