From aaf88d87a2111ced5c381a016dbed6c136edb7fc Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 4 Aug 2024 05:49:03 +0100 Subject: Circuit material overhaul (#2814) * first push to use new Materials for circuits * dont deprecate or redefine ultimate * sa * move it * second round * dont deprecate or redefine advanced * part 3 * part 4 * part 5 * part 6 * mini fix --- src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java | 4 ++-- .../java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload/chains') diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index 1765d9693a..7143c8e7e1 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -51,7 +51,7 @@ public class GT_NaniteChain { ItemList.Field_Generator_ZPM.get(16), ItemList.Conveyor_Module_UV.get(16), ItemList.Electric_Motor_UV.get(32), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 }, GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32)) .fluidInputs( new FluidStack(solderIndalloy, 144 * 32), @@ -66,7 +66,7 @@ public class GT_NaniteChain { .metadata(RESEARCH_ITEM, ItemList.Circuit_Crystalmainframe.get(1)) .metadata(RESEARCH_TIME, 2 * HOURS) .itemInputs( - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, ItemList.Robot_Arm_UV.get(16), ItemList.Circuit_Chip_Stemcell.get(32), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 7c3beec6aa..c9dafacf52 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -50,7 +50,7 @@ public class GT_PCBFactoryRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32), ItemList.Machine_ZPM_CircuitAssembler.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 }, ItemList.Robot_Arm_ZPM.get(8)) .fluidInputs(new FluidStack(solderLuV, 144 * 36), Materials.Naquadah.getMolten(144 * 18)) .itemOutputs(ItemList.PCBFactory.get(1)) -- cgit