From e445d896028766b8a7debce17ea46e00a5396d82 Mon Sep 17 00:00:00 2001
From: tracer4b <61507029+tracer4b@users.noreply.github.com>
Date: Mon, 9 May 2022 19:04:38 +0800
Subject: [PATCH] move to new devtech oreprefix system

---
 overrides/scripts/Midgame.zs                  | 21 ++++++++-----------
 overrides/scripts/materials.zs                |  6 +++---
 .../{oreprefix.zs.disabled => oreprefix.zs}   |  0
 3 files changed, 12 insertions(+), 15 deletions(-)
 rename overrides/scripts/{oreprefix.zs.disabled => oreprefix.zs} (100%)

diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs
index f888f0b..a737b04 100644
--- a/overrides/scripts/Midgame.zs
+++ b/overrides/scripts/Midgame.zs
@@ -5,7 +5,6 @@ import mods.gregtech.ore.OrePrefix;
 import mods.gregtech.ore.IOreRecipeHandler;
 import mods.gregtech.material.Material;
 import mods.gregtech.recipe.helpers;
-import mods.gregtech.recipe.IRecipeUtils;
 import crafttweaker.data.IData;
 
 recipes.remove(<thermalexpansion:satchel:2>);
@@ -140,14 +139,12 @@ recipes.addShaped(<draconicevolution:info_tablet>, [
 ]);
 
 // Perfect Gems
-//val gemPerfect as OrePrefix = OrePrefix.getPrefix("gemPerfect");
-//
-//gemPerfect.generateRecipes(function(orePrefix as OrePrefix, material as Material) {
-//	val utils as IRecipeUtils = IRecipeUtils.utils;
-//
-//    <recipemap:cutter>.recipeBuilder()
-//        .inputs(utils.item(orePrefix, material))
-//        .fluidInputs(<liquid:lubricant> * 100)
-//        .outputs(utils.item("gemExquisite", material) * 2)
-//        .duration(100).EUt(1920).buildAndRegister();
-//} as IOreRecipeHandler);
+val gemPerfect as OrePrefix = OrePrefix.getPrefix("gemPerfect");
+
+gemPerfect.generateRecipes(function(orePrefix as OrePrefix, material as Material) {
+    <recipemap:cutter>.recipeBuilder()
+        .inputs(helpers.item(orePrefix, material))
+        .fluidInputs(<liquid:lubricant> * 100)
+        .outputs(helpers.item("gemExquisite", material) * 2)
+        .duration(100).EUt(1920).buildAndRegister();
+} as IOreRecipeHandler);
diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs
index 3fff89e..c65c813 100644
--- a/overrides/scripts/materials.zs
+++ b/overrides/scripts/materials.zs
@@ -7,9 +7,9 @@ import mods.gregtech.material.Material;
 import mods.gregtech.material.Elements;
 import mods.gregtech.ore.OrePrefix;
 
-val gemPerfect as OrePrefix = OrePrefix.registerOrePrefix("gemPerfect", 8, "gemPerfect", 1);
-gemPerfect.setGenerationPredicate(IMaterialPredicate.hasGem);
-gemPerfect.createMaterialItem();
+//val gemPerfect as OrePrefix = OrePrefix.registerOrePrefix("gemPerfect", 8, "gemPerfect", 1);
+//gemPerfect.setGenerationPredicate(IMaterialPredicate.hasGem);
+//gemPerfect.createMaterialItem();
 
 var element_omnium = Elements.add(130, 234, -1, null, "Omnium", "Nm", false);
 var element_draconium = Elements.add(149, 264, -1, null, "Draconium", "Dc", false);
diff --git a/overrides/scripts/oreprefix.zs.disabled b/overrides/scripts/oreprefix.zs
similarity index 100%
rename from overrides/scripts/oreprefix.zs.disabled
rename to overrides/scripts/oreprefix.zs