From 20e8821e7c322e7ac1f1e49c412c77e7291e488e Mon Sep 17 00:00:00 2001
From: tracer4b <61507029+tracer4b@users.noreply.github.com>
Date: Sat, 14 Jan 2023 13:48:35 +0800
Subject: [PATCH] fix tools in ct

---
 overrides/scripts/electronics.zs         |  4 +--
 overrides/scripts/gregtech_recipemaps.zs | 46 +++++++++++-------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs
index f1e459e..df43fac 100644
--- a/overrides/scripts/electronics.zs
+++ b/overrides/scripts/electronics.zs
@@ -127,7 +127,7 @@ mods.jei.JEI.removeAndHide(<enderio:item_endergy_conduit:8>);
 mods.jei.JEI.removeAndHide(<enderio:item_endergy_conduit:9>);
 
 
-val wrench = <ore:craftingToolWrench>;
+val wrench = <ore:gtceWrenches>;
 
 // Microversium Machine Casing
 makeShaped("of_microverse_casing", <contenttweaker:microverse_casing> * 2,
@@ -158,7 +158,7 @@ assembler.recipeBuilder()
 //	[<ore:cableGtSingleTin>, <gregtech:machine_casing:1>, <ore:cableGtSingleTin>]]);	
 
 //Wood Pulp
-recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<ore:craftingToolMortar>]);	
+recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<ore:gtceMortars>]);	
 
 //Pyrolyse Oven
 recipes.removeByRecipeName("gregtech:pyrolyse_oven");	
diff --git a/overrides/scripts/gregtech_recipemaps.zs b/overrides/scripts/gregtech_recipemaps.zs
index 0a77585..82605b7 100644
--- a/overrides/scripts/gregtech_recipemaps.zs
+++ b/overrides/scripts/gregtech_recipemaps.zs
@@ -69,35 +69,31 @@ global wiremill                     as RecipeMap = RecipeMap.getByName("wiremill
 
 
 // Tools
-// Not needed because of new GTCEu oredicts
-//<ore:gtceWrenches>.addItems([
-	//<gregtech:meta_tool:8>.withEmptyTag(), 
-	//<gregtech:meta_tool:28>.withEmptyTag(), 
-	//<gregtech:meta_tool:29>.withEmptyTag(), 
-	//<gregtech:meta_tool:30>.withEmptyTag()]);
+<ore:gtceWrenches>.addItems([
+	<gregtech:wrench>.withEmptyTag(), 
+	<gregtech:wrench_lv>.withEmptyTag(), 
+	<gregtech:wrench_hv>.withEmptyTag(), 
+	<gregtech:wrench_iv>.withEmptyTag()]);
 
-//<ore:gtceScrewdrivers>.addItems([
-	//<gregtech:meta_tool:11>.withEmptyTag(), 
-	//<gregtech:meta_tool:31>.withEmptyTag()]);
+<ore:gtceScrewdrivers>.addItems([
+	<gregtech:screwdriver>.withEmptyTag(), 
+	<gregtech:screwdriver_lv>.withEmptyTag()]);
 
-//<ore:gtceHardHammers>.addItems([
-	//<gregtech:meta_tool:6>.withEmptyTag()]);
+<ore:gtceHardHammers>.addItems([
+	<gregtech:hammer>.withEmptyTag()]);
 
-//<ore:gtceSaws>.addItems([
-	//<gregtech:meta_tool:5>.withEmptyTag(),
-	//<gregtech:meta_tool:25>.withEmptyTag(), 
-	//<gregtech:meta_tool:26>.withEmptyTag(), 
-	//<gregtech:meta_tool:27>.withEmptyTag(),
-	//<gregtech:meta_tool:32>.withEmptyTag()]);
+<ore:gtceSaws>.addItems([
+	<gregtech:saw>.withEmptyTag(),
+	<gregtech:buzzsaw>.withEmptyTag()]);
 
-//<ore:gtceFiles>.addItems([
-	//<gregtech:meta_tool:9>.withEmptyTag()]);
+<ore:gtceFiles>.addItems([
+	<gregtech:file>.withEmptyTag()]);
 
-//<ore:gtceWireCutters>.addItems([
-	//<gregtech:meta_tool:13>.withEmptyTag()]);
+<ore:gtceWireCutters>.addItems([
+	<gregtech:wire_cutter>.withEmptyTag()]);
 
-//<ore:gtceSoftHammers>.addItems([
-	//<gregtech:meta_tool:7>.withEmptyTag()]);
+<ore:gtceSoftHammers>.addItems([
+	<gregtech:mallet>.withEmptyTag()]);
 
-//<ore:gtceMortars>.addItems([
-	//<gregtech:meta_tool:12>.withEmptyTag()]);
+<ore:gtceMortars>.addItems([
+	<gregtech:mortar>.withEmptyTag()]);