From 91520a17262ab493f6d050f8b18676e6f17e7244 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:25:17 +0100 Subject: [PATCH] Change metadata for assembly line recipes --- .../bartworksHandler/BW_Recipe_Loader.java | 4 +- .../recipes/AssemblingLineRecipes.java | 86 +++++++++++-------- .../com/dreammaster/scripts/ScriptAmunRa.java | 15 +++- .../scripts/ScriptGalaxySpace.java | 8 +- 4 files changed, 68 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java b/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java index b89decccc5..a2a3fa6657 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java @@ -9,7 +9,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.AssemblyLine; import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; import net.minecraftforge.fluids.FluidRegistry; @@ -29,9 +28,10 @@ public void run() { .metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 32).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) .addTo(implosionRecipes); + // Heavy Duty Alloy Ingot T4 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0)) - .metadata(RESEARCH_TIME, 2 * MINUTES + 5 * SECONDS) + .metadata(SCANNING, new SCANNING(12 * MINUTES, TierEU.RECIPE_EV)) .itemInputs( GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0), CustomItemList.IceCompressedPlate.get(3L), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 4ffaeee3f6..ac4f785070 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -20,7 +20,7 @@ import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import static gregtech.api.util.GTRecipeConstants.AssemblyLine; import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeConstants.SCANNING; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_X; import static tectech.thing.CustomItemList.DATApipe; @@ -84,7 +84,7 @@ public void run() { // Heavy duty alloy ingot T5 GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, CustomItemList.HeavyDutyPlateTier4.get(1L)) - .metadata(RESEARCH_TIME, 4 * MINUTES + 10 * SECONDS) + .metadata(SCANNING, new SCANNING(13 * MINUTES + 20 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( CustomItemList.HeavyDutyPlateTier4.get(1L), CustomItemList.QuantinumCompressedPlate.get(4L), @@ -96,7 +96,7 @@ public void run() { // Heavy duty alloy ingot T6 GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, CustomItemList.HeavyDutyPlateTier5.get(1L)) - .metadata(RESEARCH_TIME, 375 * SECONDS) + .metadata(SCANNING, new SCANNING(13 * MINUTES + 20 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( CustomItemList.HeavyDutyPlateTier5.get(1L), CustomItemList.LeadOriharukonPlate.get(5L), @@ -108,7 +108,7 @@ public void run() { // Heavy duty alloy ingot T7 GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, CustomItemList.HeavyDutyPlateTier6.get(1L)) - .metadata(RESEARCH_TIME, 500 * SECONDS) + .metadata(SCANNING, new SCANNING(13 * MINUTES + 20 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( CustomItemList.HeavyDutyPlateTier6.get(1L), CustomItemList.MysteriousCrystalCompressedPlate.get(6L), @@ -120,7 +120,7 @@ public void run() { // Heavy duty alloy ingot T8 GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, CustomItemList.HeavyDutyPlateTier7.get(1L)) - .metadata(RESEARCH_TIME, 625 * SECONDS) + .metadata(SCANNING, new SCANNING(13 * MINUTES + 20 * SECONDS, TierEU.RECIPE_ZPM)) .itemInputs( CustomItemList.HeavyDutyPlateTier7.get(1L), CustomItemList.BlackPlutoniumCompressedPlate.get(7L), @@ -132,7 +132,7 @@ public void run() { // Mainframe Circuits and Neuro CPU GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_Stemcell.get(1L)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(8 * MINUTES, TierEU.RECIPE_IV)) .itemInputs( ItemList.Circuit_Board_Wetware_Extreme.get(1L), ItemList.Circuit_Chip_Stemcell.get(16L), @@ -149,7 +149,7 @@ public void run() { .addTo(AssemblyLine); GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_NeuroCPU.get(1L)) - .metadata(RESEARCH_TIME, 2 * HOURS) + .metadata(SCANNING, new SCANNING(12 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( ItemList.Circuit_Board_Bio_Ultra.get(1L), ItemList.Circuit_Chip_Biocell.get(16L), @@ -166,7 +166,7 @@ public void run() { .addTo(AssemblyLine); GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Energy_LapotronicOrb.get(1L)) - .metadata(RESEARCH_TIME, 4 * HOURS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( ItemList.Circuit_Board_Multifiberglass.get(1L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64L), @@ -184,7 +184,7 @@ public void run() { // Advanced Stocking Input Bus (ME) GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Input_Bus_ME.get(1L)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(6 * MINUTES + 40 * SECONDS, TierEU.RECIPE_HV)) .itemInputs( ItemList.Hatch_Input_Bus_LuV.get(1L), GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1L), @@ -976,7 +976,8 @@ public void run() { } GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Input_Bus_ME_Advanced.get(1L)) - .metadata(RESEARCH_TIME, 1 * HOURS).itemInputs( + .metadata(SCANNING, new SCANNING(13 * MINUTES + 20 * SECONDS , TierEU.RECIPE_HV)) + .itemInputs( ItemList.Hatch_Input_Bus_ME_Advanced.get(1L), // 4096k Me Storage Component GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), @@ -991,9 +992,10 @@ public void run() { .duration(30 * SECONDS).addTo(AssemblyLine); if (GraviSuite.isModLoaded()) { + // GraviChestPlate GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GTModHandler.getIC2Item("quantumBodyarmor", 1L, GTValues.W)) - .metadata(RESEARCH_TIME, 2 * HOURS) + .metadata(SCANNING, new SCANNING(18 * MINUTES + 40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTModHandler.getIC2Item("quantumBodyarmor", 1L, WILDCARD), ItemList.Transformer_ZPM_LuV.get(1L), @@ -1011,8 +1013,9 @@ public void run() { .itemOutputs(GTModHandler.getModItem(GraviSuite.ID, "graviChestPlate", 1, 26)) .eut(TierEU.RECIPE_LuV / 2).duration(1 * MINUTES + 15 * SECONDS).addTo(AssemblyLine); + // Relocator GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Casing_Coil_Superconductor.get(1L)) - .metadata(RESEARCH_TIME, 4 * HOURS) + .metadata(SCANNING, new SCANNING(16 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( ItemList.Casing_Fusion_Coil.get(16L), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUV, 16L), @@ -1038,7 +1041,7 @@ public void run() { { // Steel Electromagnet GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electromagnet_Iron.get(1)) - .metadata(RESEARCH_TIME, 60 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.SteelMagnetic, 16L), @@ -1054,7 +1057,7 @@ public void run() { // Neodymium Electromagnet GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electromagnet_Steel.get(1)) - .metadata(RESEARCH_TIME, 60 * SECONDS) + .metadata(SCANNING, new SCANNING(6 * MINUTES + 40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.NeodymiumMagnetic, 16L), @@ -1070,7 +1073,7 @@ public void run() { // Samarium Electromagnet GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electromagnet_Neodymium.get(1)) - .metadata(RESEARCH_TIME, 60 * SECONDS) + .metadata(SCANNING, new SCANNING(8 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.SamariumMagnetic, 32L), @@ -1086,7 +1089,7 @@ public void run() { // Tengam Electromagnet GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electromagnet_Samarium.get(1)) - .metadata(RESEARCH_TIME, 60 * SECONDS) + .metadata(SCANNING, new SCANNING(9 * MINUTES + 20 * SECONDS, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.TengamAttuned, 32L), @@ -1104,7 +1107,7 @@ public void run() { // Compressor controllers { GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_Multi_IndustrialCompressor.get(1)) - .metadata(RESEARCH_TIME, 1800 * SECONDS) + .metadata(SCANNING, new SCANNING(9 * MINUTES + 20 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( ItemList.Machine_Multi_IndustrialCompressor.get(4), ItemList.Heating_Duct_Casing.get(4L), @@ -1123,7 +1126,7 @@ public void run() { .duration(120 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, getModItem(Avaritia.ID, "Singularity", 1L, 0)) - .metadata(RESEARCH_TIME, 7200 * SECONDS) + .metadata(SCANNING, new SCANNING(24 * MINUTES, TierEU.RECIPE_UHV)) .itemInputs( ItemList.Machine_Multi_HIPCompressor.get(1), ItemList.Machine_Multi_NeutroniumCompressor.get(1), @@ -1153,8 +1156,9 @@ public void run() { // Waterline controllers { + // Water Purification Plant GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Items.water_bucket, 1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(4 * MINUTES, TierEU.RECIPE_EV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tungsten, 4L), ItemList.BlockIndustrialWaterPlantCasing.get(8), @@ -1169,8 +1173,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationPlant.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV).addTo(AssemblyLine); + // Clarifier Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, GregtechItemList.Industrial_Sifter.get(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( ItemList.ActivatedCarbonFilterMesh.get(16), ItemList.BlockSterileWaterPlantCasing.get(8), @@ -1188,8 +1193,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitClarifier.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV).addTo(AssemblyLine); + // Ozonation Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade1PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 8), ItemList.BlockOzoneCasing.get(8), @@ -1212,8 +1218,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitOzonation.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV).addTo(AssemblyLine); + // Flocculation Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade2PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(6 * MINUTES + 40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), ItemList.BlockFlocculationCasing.get(8), @@ -1237,8 +1244,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitFlocculator.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); + // pH Neutralization Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade3PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(6 * MINUTES + 40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 8), ItemList.BlockNaquadahReinforcedWaterPlantCasing.get(8), @@ -1262,8 +1270,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitPhAdjustment.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); + // Extreme Temperature Fluctuation Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade4PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(8 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), ItemList.BlockPlasmaHeatingCasing.get(8), @@ -1287,8 +1296,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitPlasmaHeater.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_UV).addTo(AssemblyLine); + // High Energy Laser Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade5PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(8 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadria, 8), ItemList.BlockNaquadriaReinforcedWaterPlantCasing.get(8), @@ -1312,8 +1322,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitUVTreatment.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_UV).addTo(AssemblyLine); + // Residual Decontaminant Degasser Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade6PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(9 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 8), ItemList.BlockPlasmaHeatingCasing.get(8), @@ -1336,8 +1347,9 @@ public void run() { .itemOutputs(ItemList.Machine_Multi_PurificationUnitDegasifier.get(1)).duration(60 * SECONDS) .eut(TierEU.RECIPE_UEV).addTo(AssemblyLine); + // Absolute Baryonic Perfection Purification Unit GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Materials.Grade7PurifiedWater.getCells(1)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(9 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16), ItemList.BlockQuarkContainmentCasing.get(8), @@ -1362,7 +1374,7 @@ public void run() { // Quark exclusion casing GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Particle.getBaseParticle(Particle.STRANGE)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator .get(OrePrefixes.frameGt, Materials.Longasssuperconductornameforuhvwire, 32), @@ -1388,7 +1400,7 @@ public void run() { // Femtometer-calibrated particle beam casing GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Particle.getBaseParticle(Particle.TOP)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 16), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16), @@ -1412,7 +1424,7 @@ public void run() { // Particle beam guidance pipe casing GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, Particle.getBaseParticle(Particle.BOTTOM)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 16), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadria, 16), @@ -1440,7 +1452,7 @@ public void run() { { // LuV GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_IV.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.HSSG, 2L), @@ -1456,7 +1468,7 @@ public void run() { // ZPM GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_LuV.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 2L), @@ -1472,7 +1484,7 @@ public void run() { // UV GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_ZPM.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L), @@ -1489,7 +1501,7 @@ public void run() { // UHV GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UV.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L), @@ -1506,7 +1518,7 @@ public void run() { // UEV GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UHV.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUEV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L), @@ -1523,7 +1535,7 @@ public void run() { // UIV GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UEV.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUIV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L), @@ -1540,7 +1552,7 @@ public void run() { // UMV GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Superconducting_Magnet_Solenoid_UIV.get(1)) - .metadata(RESEARCH_TIME, 120 * SECONDS) + .metadata(SCANNING, new SCANNING(5 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UEV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUMV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java index 9e889f7d1c..ce9356f8e4 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java @@ -397,11 +397,15 @@ public void loadRecipes() { 64, (int) TierEU.RECIPE_UHV, 8, - new Object[] { new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3), - new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3), + new Object[] { + new ItemStack(dysonSwarmParts, 64, 3), + new ItemStack(dysonSwarmParts, 64, 3), + new ItemStack(dysonSwarmParts, 64, 3), + new ItemStack(dysonSwarmParts, 64, 3), com.dreammaster.item.ItemList.HeavyDutyRocketEngineTier4.getIS(64), new Object[] { OrePrefixes.pipeHuge.get(Materials.Infinity), 8 }, - ItemList.Electric_Pump_UHV.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8 }, + ItemList.Electric_Pump_UHV.get(16), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8 }, new ItemStack(baseItem, 4, 27) }, new FluidStack[] { Materials.Infinity.getMolten(50 * INGOTS), Materials.SuperCoolant.getFluid(64 * BUCKETS), @@ -489,6 +493,8 @@ public void loadRecipes() { GameRegistry.findItemStack(GalacticraftAmunRa.ID, "item.schematic", 1), 15 * MINUTES, (int) TierEU.RECIPE_UHV); + + // Lightweight Alloy Ingot GTValues.RA.stdBuilder() .itemInputs( com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS(), @@ -498,7 +504,8 @@ public void loadRecipes() { .fluidInputs(Materials.RadoxPolymer.getMolten(4 * INGOTS)) .itemOutputs(com.dreammaster.item.ItemList.HeavyDutyAlloyIngotT9.getIS()) .metadata(GTRecipeConstants.RESEARCH_ITEM, com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS()) - .metadata(GTRecipeConstants.RESEARCH_TIME, 750 * SECONDS).duration(15 * SECONDS).eut(TierEU.RECIPE_UEV) + .metadata(SCANNING, new SCANNING(18 * MINUTES + 40 * SECONDS, TierEU.RECIPE_ZPM)) + .duration(15 * SECONDS).eut(TierEU.RECIPE_UEV) .addTo(GTRecipeConstants.AssemblyLine); } diff --git a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java index 18dea90546..6c906c9c1d 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java @@ -279,8 +279,12 @@ public void loadRecipes() { .fluidInputs(FluidRegistry.getFluidStack("molten.adamantium alloy", 144)).duration(25 * SECONDS) .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(IGItems.DysonSwarmItems, 4, 1), new ItemStack(IGItems.DysonSwarmItems, 4, 2)) - .itemOutputs(new ItemStack(IGItems.DysonSwarmItems, 1, 3)).duration(10 * SECONDS).eut(TierEU.RECIPE_LuV) + .itemInputs( + new ItemStack(IGItems.DysonSwarmItems, 4, 1), + new ItemStack(IGItems.DysonSwarmItems, 4, 2)) + .itemOutputs(new ItemStack(IGItems.DysonSwarmItems, 1, 3)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); // Chemical Reactor