From 1a4ac7e0ca3c889b8cbed1a29da3e15e588926cd Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Thu, 24 Apr 2025 20:57:22 +0100
Subject: [PATCH] removed VI laser engraver

---
 .../assets/emi/recipe/filters/categories.json |  3 +++
 kubejs/server_scripts/create/recipes.js       | 14 +++++------
 kubejs/server_scripts/tfg/recipes.rocks.js    | 14 +++++------
 .../vintage_improvements/recipes.js           | 25 ++++++++++---------
 .../vintage_improvements/constants.js         |  1 +
 5 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json
index 19a43d2d5..8b7fd72fd 100644
--- a/kubejs/assets/emi/recipe/filters/categories.json
+++ b/kubejs/assets/emi/recipe/filters/categories.json
@@ -92,6 +92,9 @@
         },
         {
             "category": "vintageimprovements:auto_curving"
+        },
+        {
+            "category": "vintageimprovements:laser_cutting"
         }
     ]
 }
\ No newline at end of file
diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js
index 4b422b1dc..f923bcec3 100644
--- a/kubejs/server_scripts/create/recipes.js
+++ b/kubejs/server_scripts/create/recipes.js
@@ -1450,13 +1450,13 @@ const registerCreateRecipes = (event) => {
 			.duration(32)
 			.EUt(GTValues.VA[GTValues.ULV])
 
-		event.custom({
-			type: 'vintageimprovements:laser_cutting',
-			ingredients: [{ item: x.base }],
-			results: [{item: x.cut }],
-			energy: GTValues.VA[GTValues.ULV] * 32 * 4,
-			maxChargeRate: GTValues.VA[GTValues.ULV] * 4
-		}).id(`tfg:vi/laser/create/${x.cut.split(':')[1]}`)
+		//event.custom({
+		//	type: 'vintageimprovements:laser_cutting',
+		//	ingredients: [{ item: x.base }],
+		//	results: [{item: x.cut }],
+		//	energy: GTValues.VA[GTValues.ULV] * 32 * 4,
+		//	maxChargeRate: GTValues.VA[GTValues.ULV] * 4
+		//}).id(`tfg:vi/laser/create/${x.cut.split(':')[1]}`)
 
 		event.shaped(`2x create:layered_${x.cut.split('_')[1]}`, [
 			'AA'
diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js
index 69b315b72..b5df6af20 100644
--- a/kubejs/server_scripts/tfg/recipes.rocks.js
+++ b/kubejs/server_scripts/tfg/recipes.rocks.js
@@ -75,13 +75,13 @@ function registerTFGRockRecipes(event) {
 			.duration(30)
 			.EUt(GTValues.VA[GTValues.ULV])
 
-		event.custom({
-			type: 'vintageimprovements:laser_cutting',
-			ingredients: [{ item: x.raw }],
-			results: [{item: x.polished }],
-			energy: GTValues.VA[GTValues.ULV] * 30 * 4,
-			maxChargeRate: GTValues.VA[GTValues.ULV] * 4
-		}).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`)
+		//event.custom({
+		//	type: 'vintageimprovements:laser_cutting',
+		//	ingredients: [{ item: x.raw }],
+		//	results: [{item: x.polished }],
+		//	energy: GTValues.VA[GTValues.ULV] * 30 * 4,
+		//	maxChargeRate: GTValues.VA[GTValues.ULV] * 4
+		//}).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`)
 	})
 
 	// cracked bricks
diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js
index 9020b87cd..506ad7b32 100644
--- a/kubejs/server_scripts/vintage_improvements/recipes.js
+++ b/kubejs/server_scripts/vintage_improvements/recipes.js
@@ -130,18 +130,19 @@ function registerVintageImprovementsRecipes(event) {
 		G: 'create:precision_mechanism'
 	}).id('tfg:vi/mechanical_crafting/lathe')
 
-	event.shaped('vintageimprovements:laser', [
-		'FBF',
-		'EAE',
-		'DCD'
-	], {
-		A: 'gtceu:ulv_machine_hull',
-		B: 'create:precision_mechanism',
-		C: 'tfc:lens',
-		D: 'gtceu:red_alloy_single_wire',
-		E: 'minecraft:piston',
-		F: '#gtceu:circuits/ulv'
-	}).id('tfg:vi/shaped/laser')
+	// Re-enable this thing's EMI category as well, if we end up using it
+	//event.shaped('vintageimprovements:laser', [
+	//	'FBF',
+	//	'EAE',
+	//	'DCD'
+	//], {
+	//	A: 'gtceu:ulv_machine_hull',
+	//	B: 'create:precision_mechanism',
+	//	C: 'tfc:lens',
+	//	D: 'gtceu:red_alloy_single_wire',
+	//	E: 'minecraft:piston',
+	//	F: '#gtceu:circuits/ulv'
+	//}).id('tfg:vi/shaped/laser')
 
 	// #endregion
 
diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js
index 80cfd1bd3..3843fe607 100644
--- a/kubejs/startup_scripts/vintage_improvements/constants.js
+++ b/kubejs/startup_scripts/vintage_improvements/constants.js
@@ -13,6 +13,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [
 	'vintageimprovements:v_shaped_curving_head',
 	'vintageimprovements:grinder_belt',
 	'vintageimprovements:spring_coiling_machine_wheel',
+	'vintageimprovements:laser',
 	'vintageimprovements:laser_item',
 	'vintageimprovements:sulfur_chunk',
 	'vintageimprovements:sulfur',