diff options
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java | 153 |
1 files changed, 58 insertions, 95 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index e7633f0d4d..2a148f4277 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -245,13 +245,13 @@ public class ResearchStationAssemblyLine implements Runnable { 16, new Object[] { getItemContainer("Hull_UMV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUMV, 2L), - ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("PikoCircuit").get(2), - ItemList.UHV_Coil.get(16L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Circuit_Chip_QPIC.get(4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 2), ItemList.UHV_Coil.get(16L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UMV.get(1L) }, + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UMV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40 * 144), Materials.UUMatter.getFluid(32000L) }, getItemContainer("Hatch_Energy_UMV").get(1L), @@ -267,13 +267,14 @@ public class ResearchStationAssemblyLine implements Runnable { 32, new Object[] { getItemContainer("Hull_UXV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUMV, 4L), - ItemList.Circuit_Chip_QPIC.get(16L), getItemContainer("QuantumCircuit").get(2), - ItemList.UHV_Coil.get(32L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Circuit_Chip_QPIC.get(16L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 2), ItemList.UHV_Coil.get(32L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UXV.get(1L) }, + ItemList.Electric_Pump_UXV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(64_000L), new FluidStack(solderUEV, 80 * 144), Materials.UUMatter.getFluid(64000L) }, getItemContainer("Hatch_Energy_UXV").get(1L), @@ -366,13 +367,13 @@ public class ResearchStationAssemblyLine implements Runnable { 32, new Object[] { getItemContainer("Hull_UMV").get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 8L), - ItemList.Circuit_Chip_QPIC.get(4L), getItemContainer("PikoCircuit").get(2), - ItemList.UHV_Coil.get(16L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Circuit_Chip_QPIC.get(4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 2), ItemList.UHV_Coil.get(16L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UMV.get(1L) }, + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UMV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40 * 144), Materials.UUMatter.getFluid(32000L) }, getItemContainer("Hatch_Dynamo_UMV").get(1L), @@ -388,13 +389,14 @@ public class ResearchStationAssemblyLine implements Runnable { 32, new Object[] { getItemContainer("Hull_UXV").get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 16L), - ItemList.Circuit_Chip_QPIC.get(16L), getItemContainer("QuantumCircuit").get(2), - ItemList.UHV_Coil.get(32L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Circuit_Chip_QPIC.get(16L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 2), ItemList.UHV_Coil.get(32L), + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UXV.get(1L) }, + ItemList.Electric_Pump_UXV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(64_000L), new FluidStack(solderUEV, 80 * 144), Materials.UUMatter.getFluid(64000L) }, getItemContainer("Hatch_Dynamo_UXV").get(1L), @@ -560,48 +562,6 @@ public class ResearchStationAssemblyLine implements Runnable { 300 * 20, 8_000_000); - // Piko Circuit - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Circuit_OpticalMainframe.get(1L), - 384000, - 1024, - 4000000, - 64, - new Object[] { ItemList.Circuit_Board_Optical.get(1L), getItemContainer("PicoWafer").get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, - ItemList.Circuit_Parts_TransistorXSMD.get(48L), ItemList.Circuit_Parts_ResistorXSMD.get(48L), - ItemList.Circuit_Parts_CapacitorXSMD.get(48L), ItemList.Circuit_Parts_DiodeXSMD.get(48L), - ItemList.Circuit_Chip_PPIC.get(64L), GT_OreDictUnificator.get("foilRadoxPoly", 16L), - GT_OreDictUnificator.get(OrePrefixes.bolt, MaterialsUEVplus.TranscendentMetal, 32), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Neutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, - new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(8000L), - Materials.Osmium.getMolten(1152L) }, - getItemContainer("PikoCircuit").get(1L), - 10000, - 128_000_000); - - // Quantum Circuit - TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("PikoCircuit").get(1L), - 720000, - 2048, - 8000000, - 128, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), - getItemContainer("PikoCircuit").get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L), - ItemList.Circuit_Parts_DiodeXSMD.get(64L), ItemList.Circuit_Parts_TransistorXSMD.get(64L), - ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L), - GT_OreDictUnificator.get("foilShirabon", 64), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 16) }, - new FluidStack[] { new FluidStack(solderUEV, 3744), Materials.UUMatter.getFluid(24000L), - Materials.Osmium.getMolten(2304L) }, - getItemContainer("QuantumCircuit").get(1L), - 20000, - (int) TierEU.RECIPE_UMV); - // Transcendent Plasma Mixer - TPM. TT_recipeAdder.addResearchableAssemblylineRecipe( CustomItemList.eM_energyTunnel7_UV.get(1), @@ -610,7 +570,7 @@ public class ResearchStationAssemblyLine implements Runnable { (int) TierEU.RECIPE_UIV, 1, new Object[] { CustomItemList.eM_energyTunnel7_UV.get(32), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 32L }, ItemList.Electric_Pump_UIV.get(16), + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 32L }, ItemList.Electric_Pump_UIV.get(16), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 64), GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 16), @@ -684,7 +644,8 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get("plateDenseShirabon", 8), ItemList.Electric_Motor_UXV.get(64L), ItemList.Electric_Piston_UXV.get(64L), - ItemList.Field_Generator_UXV.get(16L), getItemContainer("QuantumCircuit").get(1L) + ItemList.Field_Generator_UXV.get(16L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1L) .splitStack(32) }, new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), @@ -845,10 +806,10 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 7), getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UMV.get(4), ItemList.Emitter_UMV.get(4), ItemList.Sensor_UMV.get(4), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 50000), @@ -937,10 +898,10 @@ public class ResearchStationAssemblyLine implements Runnable { 32, new Object[] { ELEMENT.STANDALONE.HYPOGEN.getPlateDouble(32), ELEMENT.STANDALONE.HYPOGEN.getPlateDouble(32), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, ItemList.ZPM4.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, ItemList.ZPM4.get(8L), ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), @@ -962,10 +923,10 @@ public class ResearchStationAssemblyLine implements Runnable { 64, new Object[] { ELEMENT.STANDALONE.DRAGON_METAL.getPlateDouble(32), ELEMENT.STANDALONE.DRAGON_METAL.getPlateDouble(32), - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, ItemList.ZPM5.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, ItemList.ZPM5.get(8L), ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), @@ -1178,7 +1139,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(DraconicEvolution.ID, "awakenedCore", 8, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 1L), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, }, new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, getModItem(KubaTech.ID, "kubaitems", 1, 41), 36000, @@ -1211,7 +1172,7 @@ public class ResearchStationAssemblyLine implements Runnable { 6, new Object[] { CustomItemList.eM_Computer_Bus.get(1), CustomItemList.hatch_CreativeMaintenance.get(1), ItemList.Field_Generator_UIV.get(1L), GregtechItemList.Laser_Lens_Special.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 2 }, CustomItemList.DATApipe.get(64), + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 2 }, CustomItemList.DATApipe.get(64), CustomItemList.DATApipe.get(64), ItemList.Cover_Screen.get(1) }, new FluidStack[] { Materials.Iridium.getMolten(INGOTS * 100), new FluidStack(solderUEV, 2592), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 20000), @@ -1851,7 +1812,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 6L), ItemList.Gravistar.get(16L), ItemList.Emitter_UIV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), @@ -1981,7 +1942,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.SpaceTime, 2L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 6L), ItemList.Electric_Motor_UMV.get(2L), ItemList.Electric_Piston_UMV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 2L }, new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8L }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 6L) }, @@ -2026,7 +1987,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), ItemList.Electric_Motor_UMV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 16L), - ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, + ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4L }, getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilAstralTitanium", 64, 0), @@ -2050,7 +2011,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), ItemList.Electric_Motor_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 8L), ItemList.Gravistar.get(64), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4L }, getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilAstralTitanium", 64, 0), @@ -2074,7 +2035,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6L), ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4 }, getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), @@ -2231,8 +2192,8 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator .get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L), GT_OreDictUnificator.get("gearGtSmallShirabon", 6L), ItemList.Electric_Motor_UXV.get(2L), - ItemList.Electric_Piston_UXV.get(1L), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 2L }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, + ItemList.Electric_Piston_UXV.get(1L), new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4L }, new Object[] { OrePrefixes.circuit.get(Materials.Optical), 8L }, GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 6L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 6L), @@ -2291,7 +2252,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UXV.get(1L), GT_OreDictUnificator .get(OrePrefixes.stick, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L), - ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4L }, + ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4L }, GT_OreDictUnificator .get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64), GT_OreDictUnificator.get("foilShirabon", 64), @@ -2323,7 +2284,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UXV.get(1L), GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L), - ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4L }, + ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4L }, GT_OreDictUnificator .get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64), GT_OreDictUnificator.get("foilShirabon", 64), @@ -2353,7 +2314,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L), ItemList.NuclearStar.get(64L), ItemList.Emitter_UXV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 8 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L), @@ -2514,7 +2475,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Cosmic fabric manipulator getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, - plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, + plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), @@ -2538,7 +2499,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Cosmic fabric manipulator getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, ME_Singularity, - plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, + plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1), @@ -2562,7 +2523,8 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Cosmic fabric manipulator getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, ME_Singularity, - ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, + ME_Singularity, plateList[absoluteTier], + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1), @@ -2590,7 +2552,7 @@ public class ResearchStationAssemblyLine implements Runnable { // Infinity infused manipulator getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 9), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], - getItemContainer("QuantumCircuit").get(set) }, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1), @@ -2615,7 +2577,7 @@ public class ResearchStationAssemblyLine implements Runnable { // Infinity infused manipulator getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 9), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], - getItemContainer("QuantumCircuit").get(set) }, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1), @@ -2640,7 +2602,7 @@ public class ResearchStationAssemblyLine implements Runnable { // Infinity infused manipulator getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 9), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], - getItemContainer("QuantumCircuit").get(set) }, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier5.get(1), @@ -2668,7 +2630,7 @@ public class ResearchStationAssemblyLine implements Runnable { // Spacetime continuum ripper getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 10), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, - plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, + plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier6.get(1), @@ -2693,7 +2655,8 @@ public class ResearchStationAssemblyLine implements Runnable { // Spacetime continuum ripper getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 10), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, - ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, + ME_Singularity, plateList[absoluteTier], + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier7.get(1), @@ -2719,7 +2682,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 10), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], - getItemContainer("QuantumCircuit").get(set) }, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier8.get(1), @@ -2795,7 +2758,7 @@ public class ResearchStationAssemblyLine implements Runnable { // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", absoluteTier + 1, 0), - getItemContainer("QuantumCircuit").get(absoluteTier + 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, absoluteTier + 1), // Red Spectral Component spectralComponents[absoluteTier % spectralComponents.length], // Green Spectral Component @@ -2900,7 +2863,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(GraviSuite.ID, "itemSimpleItem", 64, 3), plateList[absoluteTier], - getItemContainer("QuantumCircuit").get(2 * (absoluteTier + 1)), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 2 * (absoluteTier + 1)), GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, absoluteTier + 1), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, absoluteTier + 1) @@ -3084,12 +3047,12 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, // UHV new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, // UEV new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, // UIV - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1L }, // UMV - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1L }, // UXV - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 4L }, // MAX (Technically not MAX, can be + new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1L }, // UMV + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1L }, // UXV + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4L }, // MAX (Technically not MAX, can be // changed once MAX circuits become // craftable) - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 16L } // MAX (Technically not MAX, can be + new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 16L } // MAX (Technically not MAX, can be // changed once MAX circuits become // craftable) }; |