From 903be368b23039d46be8bd9acfad7125de934eb3 Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Tue, 29 Jul 2025 18:44:20 +0100
Subject: [PATCH] fixes #1445, also added gt recipes to make alcohol for bio
 diesel

---
 CHANGELOG.md                              |  2 ++
 kubejs/server_scripts/tfc/recipes.js      |  2 +-
 kubejs/server_scripts/tfg/recipes.food.js | 11 +++++++++++
 kubejs/startup_scripts/tfc/constants.js   | 18 +++++++++---------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d7542b99..efdb07c11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Made "Etched" more accessible (#1473) @Nebby1999
 - Added faster recipes for crafting dough @Pyritie
 - Black bronze now has a fluid pipe instead of an item pipe, so the drum has proper containment info @Pyritie
+- Added recipes to create basic TFC alcohol in the food processor @Pyritie
 ### Bug fixes
 - Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie
 - Fixed cobalt brass and potin double plates not being obtainable until MV @Pyritie
@@ -22,6 +23,7 @@
 - Fixed wire cutter head extruder recipes missing a mold @Pyritie
 - Possibly fixed the issue with airplanes and akistor carts not appearing when placing them (#1447) @Pyritie
 - Fixed not being able to make sea water with TFC salt in a barrel (#1476) @Pyritie
+- Fixed the electric greenhouse fruit tree recipes making more saplings instead of fruit (#1445) @Pyritie
 ### Translations
 - Ukranian @Furryks
 
diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js
index 4a890a506..7b2e482f4 100644
--- a/kubejs/server_scripts/tfc/recipes.js
+++ b/kubejs/server_scripts/tfc/recipes.js
@@ -85,7 +85,7 @@ const registerTFCRecipes = (event) => {
 	})
 
 	// Растения
-	Ingredient.of('#tfc:plants').stacks.forEach(element => {
+	Ingredient.of('#tfc:plants').subtract('#tfc:wild_fruits').stacks.forEach(element => {
 		const itemId = element.id;
 		const recipeId = `greenhouse_${itemId.replace(':', '_')}`;
 
diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js
index e72356a45..db5be8ec0 100644
--- a/kubejs/server_scripts/tfg/recipes.food.js
+++ b/kubejs/server_scripts/tfg/recipes.food.js
@@ -719,6 +719,17 @@ function registerTFGFoodRecipes(event) {
 		itemOutputProvider: TFC.isp.of('firmalife:food/soy_mixture').copyOldestFood()
 	})
 
+	// Alcohols
+
+	global.TFC_ALCOHOL.forEach(alcohol => {
+		processorRecipe(alcohol.id.replace(/:/g, "_"), 2400, 1, {
+			itemInputs: [alcohol.ingredient],
+			fluidInputs: ['#tfg:clean_water 500', 'firmalife:yeast_starter 10'],
+			fluidOutputs: [Fluid.of(alcohol.id, 500)],
+			circuit: 11
+		}).notConsumable('#tfc:barrels')
+	})
+
 	// Cakes
 
 	processorRecipe("cake_base", 300, 8, {
diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js
index 0440e70ad..35cf71720 100644
--- a/kubejs/startup_scripts/tfc/constants.js
+++ b/kubejs/startup_scripts/tfc/constants.js
@@ -1061,15 +1061,15 @@ global.TFC_CURDS_AND_CHEESES = [
 ];
 
 global.TFC_ALCOHOL = [
-    {id: 'tfc:beer'},
-    {id: 'tfc:cider'},
-    {id: 'tfc:rum'},
-    {id: 'tfc:sake'},
-    {id: 'tfc:vodka'},
-    {id: 'tfc:whiskey'},
-    {id: 'tfc:corn_whiskey'},
-    {id: 'tfc:rye_whiskey'},
-    {id: 'firmalife:mead'},
+    {id: 'tfc:beer', ingredient: 'tfc:food/barley_flour'},
+    {id: 'tfc:cider', ingredient: '#tfc:foods/apples'},
+    {id: 'tfc:rum', ingredient: '#tfg:sugars'},
+    {id: 'tfc:sake', ingredient: 'tfc:food/rice_flour'},
+    {id: 'tfc:vodka', ingredient: 'tfc:food/potato'},
+    {id: 'tfc:whiskey', ingredient: 'tfc:food/wheat_flour'},
+    {id: 'tfc:corn_whiskey', ingredient: 'tfc:food/maize_flour'},
+    {id: 'tfc:rye_whiskey', ingredient: 'tfc:food/rye_flour'},
+    {id: 'firmalife:mead', ingredient: 'firmalife:raw_honey'},
 ];
 
 global.TFC_MAGMA_BLOCKS = [