diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index a3db0a528..722c6dd68 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -728,6 +728,14 @@ public void run() { OrePrefixes.circuit.get(Materials.IV), 'C', OrePrefixes.plate.get(Materials.TungstenSteel), 'E', ItemList.Electric_Motor_EV }); + // Large Fluid Extractor + GTModHandler.addCraftingRecipe( + ItemList.LargeFluidExtractor.get(1), + bits, + new Object[] { "TCT", "VMP", "TCT", 'M', ItemList.Machine_EV_FluidExtractor, 'V', + ItemList.Conveyor_Module_EV, 'P', ItemList.Electric_Pump_EV, 'T', + OrePrefixes.plate.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.IV) }); + // Item Pipe Casings // Tin GTModHandler.addCraftingRecipe( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 24bc355a1..b275889cb 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -1,6 +1,7 @@ package com.dreammaster.gthandler.recipes; import static bartworks.system.material.WerkstoffLoader.LuVTierMaterial; +import static gregtech.api.enums.GTValues.L; import static gregtech.api.enums.GTValues.W; import static gregtech.api.enums.Mods.*; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; @@ -51,6 +52,7 @@ import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtneioreplugin.plugin.block.ModBlocks; +import gtnhlanth.common.register.WerkstoffMaterialPool; import kekztech.common.TileEntities; public class AssemblerRecipes implements Runnable { @@ -2387,6 +2389,66 @@ public void run() { GTModHandler.getModItem(VisualProspecting.ID, "item.visualprospecting.prospectorslog", 1)) .duration(6 * SECONDS).eut(8).addTo(assemblerRecipes); } + + // Superconductor Solenoid MV + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(6), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 6L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.AnnealedCopper, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 8L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 2L), + new ItemStack[] { ItemList.Reactor_Coolant_He_1.get(1), ItemList.Reactor_Coolant_NaK_1.get(1) }, + ItemList.Electric_Pump_MV.get(1)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_MV.get(1)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); + + // Superconductor Solenoid HV + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(6), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Silver, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 8L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 2L), + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), ItemList.Reactor_Coolant_NaK_3.get(1) }, + ItemList.Electric_Pump_HV.get(1)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_HV.get(1)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Superconductor Solenoid EV + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(6), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1L), + WerkstoffMaterialPool.Permalloy.get(OrePrefixes.stickLong, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 2L), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1) }, + ItemList.Electric_Pump_EV.get(1)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_EV.get(1)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); + + // Superconductor Solenoid IV + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(6), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8L), + GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Tungsten, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L), + WerkstoffMaterialPool.Permalloy.get(OrePrefixes.stickLong, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.HSSG, 2L), + ItemList.Reactor_Coolant_Sp_3.get(1), + ItemList.Electric_Pump_IV.get(1)) + .fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_IV.get(1)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); } private void makeElectricMachinePartRecipes() { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 96a5770d5..ede839373 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -1,6 +1,7 @@ package com.dreammaster.gthandler.recipes; import static bartworks.system.material.WerkstoffLoader.Californium; +import static gregtech.api.enums.GTValues.L; import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Computronics; @@ -59,6 +60,7 @@ import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.material.Particle; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtnhlanth.common.register.WerkstoffMaterialPool; import tectech.recipe.TTRecipeAdder; public class AssemblingLineRecipes implements Runnable { @@ -1283,6 +1285,125 @@ public void run() { .addTo(AssemblyLine); } + // Superconducting Solenoids + { + // LuV + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_IV.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.HSSG, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 1L), + WerkstoffMaterialPool.MuMetal.get(OrePrefixes.stickLong, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.HSSS, 2L), + ItemList.Reactor_Coolant_Sp_6.get(1), + ItemList.Electric_Pump_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, (int) (L * 4))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_LuV.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_LuV).addTo(AssemblyLine); + + // ZPM + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_LuV.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 1L), + WerkstoffMaterialPool.MuMetal.get(OrePrefixes.stickLong, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.NaquadahAlloy, 2L), + ItemList.Reactor_Coolant_Sp_6.get(1), + ItemList.Reactor_Coolant_Sp_6.get(1), + ItemList.Electric_Pump_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, (int) (L * 4))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_ZPM.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); + + // UV + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_ZPM.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 16L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 1L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadria, 8L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 2L), + ItemList.Large_Fluid_Cell_Chrome.get(1), + ItemList.Electric_Pump_UV.get(1)) + .fluidInputs( + new FluidStack(Materials.SuperCoolant.mFluid, 16000), + new FluidStack(solderIndalloy, (int) (L * 16))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UV.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(AssemblyLine); + + // UHV + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UV.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 16L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 1L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadria, 8L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 2L), + ItemList.Large_Fluid_Cell_Iridium.get(1), + ItemList.Electric_Pump_UHV.get(1)) + .fluidInputs( + new FluidStack(Materials.SuperCoolant.mFluid, 64000), + new FluidStack(solderIndalloy, (int) (L * 64))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UHV.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_UHV).addTo(AssemblyLine); + + // UEV + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UHV.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUEV, 16L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 1L), + GGMaterial.metastableOganesson.get(OrePrefixes.stickLong, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Infinity, 2L), + ItemList.Large_Fluid_Cell_Iridium.get(1), + ItemList.Electric_Pump_UEV.get(1)) + .fluidInputs( + new FluidStack(Materials.SuperCoolant.mFluid, 256000), + new FluidStack(solderUEV, (int) (L * 8))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UEV.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_UEV).addTo(AssemblyLine); + + // UIV + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UEV.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUIV, 16L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 1L), + GGMaterial.metastableOganesson.get(OrePrefixes.stickLong, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.TranscendentMetal, 2L), + ItemList.Large_Fluid_Cell_Neutronium.get(1), + ItemList.Electric_Pump_UIV.get(1)) + .fluidInputs( + new FluidStack(MaterialsUEVplus.TranscendentMetal.mStandardMoltenFluid, (int) (L * 32)), + new FluidStack(solderUEV, (int) (L * 32))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UIV.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_UIV).addTo(AssemblyLine); + + // UMV + GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UIV.get(1)) + .metadata(RESEARCH_TIME, 120 * SECONDS) + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUMV, 16L), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 1L), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 8L), + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 2L), + ItemList.Large_Fluid_Cell_Neutronium.get(1), + ItemList.Electric_Pump_UMV.get(1)) + .fluidInputs( + new FluidStack(MaterialsUEVplus.SpaceTime.mStandardMoltenFluid, (int) (L * 16)), + new FluidStack(solderUEV, (int) (L * 128))) + .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UMV.get(1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_UMV).addTo(AssemblyLine); + } + // Piko Circuit TTRecipeAdder.addResearchableAssemblylineRecipe( ItemList.Circuit_OpticalMainframe.get(1L),