From 37f5a812f73a51b1ef2446e3bd2b941df81b7c42 Mon Sep 17 00:00:00 2001
From: Adrien Vidal <vidal.adrien2@gmail.com>
Date: Sun, 12 Oct 2025 18:48:45 +0200
Subject: [PATCH] Stone tfgfication pt3.5 (#2017)

* Quartz + Create Stone Support

+ Blackstone uniform model

* loose to gravel packer recipes

* Cobble unpacking recipes

---------

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
---
 kubejs/server_scripts/tfc/recipes.stone.js | 29 ++++++++++++++++------
 kubejs/server_scripts/tfg/recipes.rocks.js | 24 +++++++++++++++---
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js
index a4fe8287c..41cc3e426 100644
--- a/kubejs/server_scripts/tfc/recipes.stone.js
+++ b/kubejs/server_scripts/tfc/recipes.stone.js
@@ -72,18 +72,33 @@ function registerTFCStoneRecipes(event) {
 			`4x tfc:rock/gravel/${stone}`
 		]).id(`tfc:shapeless/gravel_to_loose_${stone}`)
 
-		// Cobble Unpacking
-		event.recipes.gtceu.packer(`tfc:gtceu/packer/unpacking_mossy_${stone}_cobble_into_loose`)
-			.itemInputs(`1x tfc:rock/mossy_cobble/${stone}`)
+		// Gravel Packing
+		event.recipes.gtceu.packer(`tfc:gtceu/packer/packing_loose_${stone}_to_gravel`)
+			.itemInputs(`4x tfc:rock/loose/${stone}`)
+			.itemOutputs(`1x tfc:rock/gravel/${stone}`)
+			.circuit(1)
+			.duration(30)
+			.EUt(GTValues.VA[GTValues.LV])
+
+		event.recipes.gtceu.packer(`tfc:gtceu/packer/packing_mossy_loose_${stone}_to_gravel`)
+			.itemInputs(`4x tfc:rock/mossy_loose/${stone}`)
+			.itemOutputs(`1x tfc:rock/gravel/${stone}`)
+			.circuit(1)
+			.duration(30)
+			.EUt(GTValues.VA[GTValues.LV])
+
+		// Cobble Unpacking
+		event.recipes.gtceu.packer(`tfc:gtceu/packer/unpacking_${stone}_cobble_into_loose`)
+			.itemInputs(`1x tfc:rock/cobble/${stone}`)
+			.itemOutputs(`4x tfc:rock/loose/${stone}`)
 			.circuit(1)
-			.itemOutputs(`4x tfc:rock/mossy_loose/${stone}`)
 			.duration(20)
 			.EUt(GTValues.VA[GTValues.ULV])
 
-		event.recipes.gtceu.packer(`tfc:gtceu/packer/unpacking_${stone}_cobble_into_loose`)
-			.itemInputs(`1x tfc:rock/cobble/${stone}`)
+		event.recipes.gtceu.packer(`tfc:gtceu/packer/unpacking_mossy_${stone}_cobble_into_loose`)
+			.itemInputs(`1x tfc:rock/mossy_cobble/${stone}`)
+			.itemOutputs(`4x tfc:rock/mossy_loose/${stone}`)
 			.circuit(1)
-			.itemOutputs(`4x tfc:rock/loose/${stone}`)
 			.duration(20)
 			.EUt(GTValues.VA[GTValues.ULV])
 
diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js
index 4ee425fce..5337d1a60 100644
--- a/kubejs/server_scripts/tfg/recipes.rocks.js
+++ b/kubejs/server_scripts/tfg/recipes.rocks.js
@@ -36,7 +36,7 @@ function registerTFGRockRecipes(event) {
 		{ loose: 'tfg:loose/deepslate',           block: 'minecraft:cobbled_deepslate' },
 		{ loose: 'tfg:brick/deepslate',           block: '4x minecraft:deepslate_bricks' },
 
-		{ loose: 'beneath:blackstone_pebble',     block: 'minecraft:blackstone' },
+		{ loose: 'beneath:blackstone_pebble',     block: 'tfg:rock/cobble_blackstone' },
 
 		{ loose: 'tfg:loose/dripstone',           block: 'tfg:rock/cobble_dripstone' },
 		{ loose: 'tfg:brick/dripstone',           block: '4x create:cut_dripstone_bricks' },
@@ -87,6 +87,15 @@ function registerTFGRockRecipes(event) {
 			.circuit(2)
 			.duration(50)
 			.EUt(2)
+
+		if( x.loose.includes('loose') || x.loose.includes('pebble') ){
+			event.recipes.gtceu.packer(`tfc:gtceu/packer/unpacking_${x.block}`.replace(/[: ]/g, '_'))
+				.itemInputs(`1x ${x.block}`)
+				.itemOutputs(`4x ${x.loose}`)
+				.circuit(1)
+				.duration(20)
+				.EUt(GTValues.VA[GTValues.ULV])
+		}
 	})
 	// #endregion GLUEING_TOGETHER
 
@@ -119,12 +128,22 @@ function registerTFGRockRecipes(event) {
 		{ loose: 'tfg:loose/venus_stone',     gravel: 'tfg:rock/gravel_venus' },
 		{ loose: 'tfg:loose/mercury_stone',   gravel: 'tfg:rock/gravel_mercury' },
 		{ loose: 'tfg:loose/permafrost',      gravel: 'tfg:rock/gravel_permafrost' },
-		{ loose: 'tfg:loose/red_granite',     gravel: 'tfg:rock/gravel_red_granite' },
+		{ loose: 'tfg:loose/red_granite',     gravel: 'tfg:rock/gravel_red_granite' }
 	]
 
 	LOOSE_TO_GRAVEL.forEach(x => {
 		event.shapeless(x.gravel, [`4x ${x.loose}`])
+		
 		event.shapeless(`16x ${x.loose}`, [`4x ${x.gravel}`])
+
+		var stone = x.gravel.replace('tfg:rock/gravel_', '')
+		event.recipes.gtceu.packer(`tfc:gtceu/packer/packing_loose_${stone}_to_gravel`)
+			.itemInputs(`4x ${x.loose}`)
+			.itemOutputs(x.gravel)
+			.circuit(2)
+			.duration(30)
+			.EUt(GTValues.VA[GTValues.LV])
+
 	})
 
 	// #region LOOSE_TO_BRICKS
@@ -1225,7 +1244,6 @@ function registerTFGRockRecipes(event) {
 	];
 
 	MAGMA_BLOCKS.forEach(block => {
-
 		event.recipes.gtceu.fluid_solidifier(`tfg:gtceu/fluid_solidifier/${block.magma}`.replace(/:/g, '/'))
 			.itemInputs(`1x ${block.rock}`)
 			.inputFluids(Fluid.of('minecraft:lava', 250))