From 959a58268d0bc357b294d270e105b8e0eb5c981b Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:37:44 +0100
Subject: Add oredict for LV and HV circuits (try no 2) (#2682)

* blacklist ic2 ciruits from unificator

* fix 2 circuit oredicts

* move cleanroom assembler recipe

* remove unittest that needs nhcoremod to work

* fix electronic circuit recipe

* move recipe to better place and avoid duplicates

* move fluid filter recipe
---
 src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gtPlusPlus')

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 5c5c439d47..a0b2e22353 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -759,8 +759,8 @@ public class RECIPES_Machines {
         CORE.RA.addSixSlotAssemblingRecipe(
             new ItemStack[] { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)),
                 ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV,
-                ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
-                ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) },
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2) },
             ELEMENT.getInstance().IRON.getFluidStack(144 * 4),
             ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
             60 * 10 * 1,
@@ -790,7 +790,7 @@ public class RECIPES_Machines {
 
         // Super Jukebox
         CORE.RA.addSixSlotAssemblingRecipe(
-            new ItemStack[] { CI.machineHull_LV, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
+            new ItemStack[] { CI.machineHull_LV, GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 4),
                 ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
                 ItemUtils.getSimpleStack(Blocks.jukebox) },
             ELEMENT.getInstance().COPPER.getFluidStack(144 * 2),
-- 
cgit