diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java index 136db3d12..8306123f8 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java @@ -1,12 +1,14 @@ package com.dreammaster.bartworksHandler; -import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes; -import static bartworks.util.BWRecipes.calcDecayTicks; -import static gregtech.api.util.GTRecipeConstants.DECAY_TICKS; +import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchFakeRecipes; +import static bartworks.common.loaders.RadioHatchMaterialLoader.radioHatchMaterialAdder; +import static gregtech.api.util.GTRecipeConstants.MASS; +import static gregtech.api.util.GTRecipeConstants.SIEVERT; import net.minecraft.item.ItemStack; import gregtech.api.enums.GTValues; +import gregtech.api.util.recipe.Sievert; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -30,15 +32,15 @@ public static void runRadHatchAdder() { int level = (int) material.getProtons(); if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) { - GTValues.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level) - .metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes); + radioHatchMaterialAdder(material.getRod(1), level, (byte) 1); + GTValues.RA.stdBuilder().itemInputs(material.getRod(1)).duration(0).eut(0) + .metadata(SIEVERT, new Sievert(level)).metadata(MASS, 1).fake().addTo(radioHatchFakeRecipes); } if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) { - GTValues.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level) - .metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes); + radioHatchMaterialAdder(material.getLongRod(1), level, (byte) 2); + GTValues.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(0).eut(0) + .metadata(SIEVERT, new Sievert(level)).metadata(MASS, 2).fake().addTo(radioHatchFakeRecipes); } - } - } } 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 b89decccc..a99462b1d 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; @@ -19,6 +18,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.recipe.Scanning; public class BW_Recipe_Loader implements Runnable { @@ -29,9 +29,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(1 * MINUTES + 30 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0), CustomItemList.IceCompressedPlate.get(3L), diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java index 38301440a..2c8ec7177 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java @@ -3,7 +3,6 @@ import static bartworks.API.BioObjectAdder.*; import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes; -import static bartworks.util.BWRecipes.computeSieverts; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.Genetics; @@ -20,7 +19,8 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; -import static gregtech.api.util.GTRecipeConstants.SIEVERTS; +import static gregtech.api.util.GTRecipeConstants.GLASS; +import static gregtech.api.util.GTRecipeConstants.SIEVERT; import java.awt.Color; import java.util.LinkedHashMap; @@ -35,6 +35,7 @@ import com.dreammaster.gthandler.CustomItemList; import bartworks.common.loaders.BioItemList; +import bartworks.util.BWUtil; import bartworks.util.BioCulture; import bartworks.util.BioDNA; import bartworks.util.BioData; @@ -47,6 +48,7 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; +import gregtech.api.util.recipe.Sievert; public class BacteriaRegistry { @@ -267,8 +269,8 @@ private void runGTRecipes() { private void bacterialVatRecipes() { GTValues.RA.stdBuilder().itemInputs(AntimonyTrioxide.getDust(16), Osmium.getDust(16)) .special(BioItemList.getPetriDish(CultureSet.get("CombinedBac"))).fluidInputs(Oil.getFluid(20)) - .fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV) - .metadata(SIEVERTS, computeSieverts(Materials.NaquadahEnriched, 8, false, false, false)).noOptimize() + .fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV).metadata(GLASS, 8) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() @@ -279,8 +281,9 @@ private void bacterialVatRecipes() { Tritanium.getDust(4)) .special(BioItemList.getPetriDish(CultureSet.get("StemCellBac"))) .fluidInputs(GrowthMediumRaw.getFluid(8)).fluidOutputs(BioMediumRaw.getFluid(2)).duration(3 * MINUTES) - .eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, true, true, false)) - .requiresCleanRoom().noOptimize().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_LuV).metadata(GLASS, 6) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -290,8 +293,9 @@ private void bacterialVatRecipes() { InfinityCatalyst.getDustTiny(4)) .special(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))) .fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(5)).duration(3 * MINUTES) - .eut(TierEU.RECIPE_ZPM).metadata(SIEVERTS, computeSieverts(NaquadahEnriched, 7, true, true, false)) - .requiresCleanRoom().noOptimize().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_ZPM).metadata(GLASS, 7) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -300,114 +304,125 @@ private void bacterialVatRecipes() { InfinityCatalyst.getDust(4)) .special(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))) .fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(10)).duration(3 * MINUTES) - .eut(TierEU.RECIPE_UV).metadata(SIEVERTS, computeSieverts(Naquadria, 8, true, true, false)).noOptimize() - .requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_UV).metadata(GLASS, 8) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).noOptimize().requiresCleanRoom() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Genetics.ID, "misc", 2L, 4)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(4L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).metadata(SIEVERTS, computeSieverts(0, 4, false, false, false)).noOptimize() - .addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_HV).metadata(GLASS, 4).noOptimize().addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(8L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 4)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Bismuth, 5, false, false, false)).noOptimize() + .eut(TierEU.RECIPE_EV).metadata(GLASS, 5) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(16L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize() + .eut(TierEU.RECIPE_IV).metadata(GLASS, 5) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) .fluidInputs(GTModHandler.getDistilledWater(16L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8 * 9)) - .duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV) - .metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize() + .duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV).metadata(GLASS, 5) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(4L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).metadata(SIEVERTS, computeSieverts(Bismuth, 4, false, false, false)).noOptimize() + .eut(TierEU.RECIPE_HV).metadata(GLASS, 4) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(8L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize() + .eut(TierEU.RECIPE_EV).metadata(GLASS, 5) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(16L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false)) - .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_IV).metadata(GLASS, 6) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) .fluidInputs(GTModHandler.getDistilledWater(16L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8 * 9)).duration(9 * 15 * SECONDS) - .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false)) - .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_IV).metadata(GLASS, 6) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(4L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 1)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Bismuth, 5, false, false, false)).noOptimize() + .eut(TierEU.RECIPE_EV).metadata(GLASS, 5) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(8L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 2)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 6, false, true, false)).noOptimize() - .requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_IV).metadata(GLASS, 6) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(16L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)) - .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) .fluidInputs(GTModHandler.getDistilledWater(16L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4 * 9)).duration(9 * 30 * SECONDS) - .eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)) - .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() + .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4)) .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) .fluidInputs(GTModHandler.getDistilledWater(4L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1)) - .duration(1 * MINUTES).eut(TierEU.RECIPE_IV) - .metadata(SIEVERTS, computeSieverts(Uranium, 6, false, true, false)).noOptimize().requiresCleanRoom() + .duration(1 * MINUTES).eut(TierEU.RECIPE_IV).metadata(GLASS, 6) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) .fluidInputs(GTModHandler.getDistilledWater(8L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2)) - .duration(1 * MINUTES).eut(TierEU.RECIPE_LuV) - .metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)).noOptimize().requiresCleanRoom() + .duration(1 * MINUTES).eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1)) .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) .fluidInputs(GTModHandler.getDistilledWater(8L * 9L)) .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2 * 9)).duration(9 * MINUTES) - .eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)) - .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + .eut(TierEU.RECIPE_LuV).metadata(GLASS, 7) + .metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize() + .addTo(bacterialVatRecipes); } private void bioLabRecipes() { diff --git a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java index 235fb3606..a64824dc5 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java @@ -1,9 +1,11 @@ package com.dreammaster.bartworksHandler; import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; -import static bartworks.util.BWRecipes.computeSieverts; import static com.dreammaster.bartworksHandler.BacteriaRegistry.CultureSet; import static gregtech.api.enums.GTValues.*; +import static gregtech.api.enums.Materials.NaquadahEnriched; +import static gregtech.api.enums.Materials.Plutonium; +import static gregtech.api.enums.Materials.Uranium; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; @@ -13,7 +15,8 @@ import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; -import static gregtech.api.util.GTRecipeConstants.SIEVERTS; +import static gregtech.api.util.GTRecipeConstants.GLASS; +import static gregtech.api.util.GTRecipeConstants.SIEVERT; import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import net.minecraft.init.Items; @@ -29,6 +32,7 @@ import bartworks.MainMod; import bartworks.common.items.SimpleSubItemClass; import bartworks.common.loaders.BioItemList; +import bartworks.util.BWUtil; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.FluidState; import gregtech.api.enums.GTValues; @@ -38,6 +42,7 @@ import gregtech.api.fluid.GTFluidFactory; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; +import gregtech.api.util.recipe.Sievert; public class BioItemLoader { @@ -126,9 +131,8 @@ public static void registerRecipes() { GTModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 64)) .special(BioItemList.getPetriDish(CultureSet.get("TcetiEBac"))) .fluidInputs(new FluidStack(BIOFLUIDS[2], 50)).fluidOutputs(new FluidStack(BIOFLUIDS[3], 50)) - .duration(1 * MINUTES).eut(TierEU.RECIPE_UV) - .metadata(SIEVERTS, computeSieverts(100, 8, false, false, false)).noOptimize() - .addTo(bacterialVatRecipes); + .duration(1 * MINUTES).eut(TierEU.RECIPE_UV).metadata(GLASS, 8) + .metadata(SIEVERT, new Sievert(100, false)).noOptimize().addTo(bacterialVatRecipes); for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) { GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(i + 1)) @@ -146,7 +150,7 @@ public static void registerRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)) .fluidOutputs(Materials.GrowthMediumRaw.getFluid(1)).duration(1 * MINUTES).eut(TierEU.RECIPE_IV) - .metadata(SIEVERTS, computeSieverts(Materials.Uranium, 5, false, true, false)).noOptimize() + .metadata(GLASS, 5).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() @@ -158,7 +162,7 @@ public static void registerRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) .fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 4)) .fluidOutputs(Materials.GrowthMediumRaw.getFluid(2)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV) - .metadata(SIEVERTS, computeSieverts(Materials.Plutonium, 6, false, true, false)).noOptimize() + .metadata(GLASS, 6).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize() .addTo(bacterialVatRecipes); GTValues.RA.stdBuilder() @@ -170,7 +174,7 @@ public static void registerRecipes() { .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) .fluidInputs(FluidRegistry.getFluidStack("mutagen", 4)) .fluidOutputs(Materials.GrowthMediumRaw.getFluid(4)).duration(1 * MINUTES).eut(TierEU.RECIPE_ZPM) - .metadata(SIEVERTS, computeSieverts(Materials.NaquadahEnriched, 7, true, true, false)).noOptimize() - .addTo(bacterialVatRecipes); + .metadata(GLASS, 7).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)) + .noOptimize().addTo(bacterialVatRecipes); } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 4ffaeee3f..600f8f8db 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; @@ -61,6 +61,7 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; +import gregtech.api.util.recipe.Scanning; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.material.MaterialsElements; @@ -84,7 +85,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(1 * MINUTES + 40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( CustomItemList.HeavyDutyPlateTier4.get(1L), CustomItemList.QuantinumCompressedPlate.get(4L), @@ -96,7 +97,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(1 * MINUTES + 50 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( CustomItemList.HeavyDutyPlateTier5.get(1L), CustomItemList.LeadOriharukonPlate.get(5L), @@ -108,7 +109,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(2 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( CustomItemList.HeavyDutyPlateTier6.get(1L), CustomItemList.MysteriousCrystalCompressedPlate.get(6L), @@ -120,7 +121,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(2 * MINUTES + 10 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( CustomItemList.HeavyDutyPlateTier7.get(1L), CustomItemList.BlackPlutoniumCompressedPlate.get(7L), @@ -130,9 +131,9 @@ public void run() { .itemOutputs(CustomItemList.HeavyDutyAlloyIngotT8.get(1L)).eut(TierEU.RECIPE_UEV).duration(15 * SECONDS) .addTo(AssemblyLine); - // Mainframe Circuits and Neuro CPU + // Neuro CPU GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_Stemcell.get(1L)) - .metadata(RESEARCH_TIME, 1 * HOURS) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( ItemList.Circuit_Board_Wetware_Extreme.get(1L), ItemList.Circuit_Chip_Stemcell.get(16L), @@ -148,8 +149,9 @@ public void run() { .itemOutputs(ItemList.Circuit_Chip_NeuroCPU.get(1L)).eut(TierEU.RECIPE_ZPM).duration(30 * SECONDS) .addTo(AssemblyLine); + // Bio CPU GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_NeuroCPU.get(1L)) - .metadata(RESEARCH_TIME, 2 * HOURS) + .metadata(SCANNING, new Scanning(1 * MINUTES + 30 * SECONDS, TierEU.RECIPE_ZPM)) .itemInputs( ItemList.Circuit_Board_Bio_Ultra.get(1L), ItemList.Circuit_Chip_Biocell.get(16L), @@ -165,8 +167,9 @@ public void run() { .itemOutputs(ItemList.Circuit_Chip_BioCPU.get(1L)).eut(TierEU.RECIPE_UHV / 2).duration(30 * SECONDS) .addTo(AssemblyLine); + // Lapotronic Energy Orb Cluster GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Energy_LapotronicOrb.get(1L)) - .metadata(RESEARCH_TIME, 4 * HOURS) + .metadata(SCANNING, new Scanning(40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( ItemList.Circuit_Board_Multifiberglass.get(1L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64L), @@ -184,7 +187,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(50 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( ItemList.Hatch_Input_Bus_LuV.get(1L), GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1L), @@ -976,7 +979,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(1 * MINUTES + 40 * SECONDS, TierEU.RECIPE_EV)) + .itemInputs( ItemList.Hatch_Input_Bus_ME_Advanced.get(1L), // 4096k Me Storage Component GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), @@ -991,9 +995,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(2 * MINUTES + 20 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( GTModHandler.getIC2Item("quantumBodyarmor", 1L, WILDCARD), ItemList.Transformer_ZPM_LuV.get(1L), @@ -1011,8 +1016,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(2 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( ItemList.Casing_Fusion_Coil.get(16L), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUV, 16L), @@ -1038,7 +1044,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(40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.SteelMagnetic, 16L), @@ -1054,7 +1060,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(50 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.NeodymiumMagnetic, 16L), @@ -1070,7 +1076,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(1 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.SamariumMagnetic, 32L), @@ -1086,7 +1092,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(1 * MINUTES + 10 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 32L), GTOreDictUnificator.get(OrePrefixes.ring, Materials.TengamAttuned, 32L), @@ -1104,7 +1110,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(1 * MINUTES + 20 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( ItemList.Machine_Multi_IndustrialCompressor.get(4), ItemList.Heating_Duct_Casing.get(4L), @@ -1123,7 +1129,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(3 * MINUTES, TierEU.RECIPE_UEV)) .itemInputs( ItemList.Machine_Multi_HIPCompressor.get(1), ItemList.Machine_Multi_NeutroniumCompressor.get(1), @@ -1153,8 +1159,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(30 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tungsten, 4L), ItemList.BlockIndustrialWaterPlantCasing.get(8), @@ -1169,8 +1176,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(40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( ItemList.ActivatedCarbonFilterMesh.get(16), ItemList.BlockSterileWaterPlantCasing.get(8), @@ -1188,8 +1196,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(40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 8), ItemList.BlockOzoneCasing.get(8), @@ -1212,8 +1221,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(50 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), ItemList.BlockFlocculationCasing.get(8), @@ -1237,8 +1247,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(50 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 8), ItemList.BlockNaquadahReinforcedWaterPlantCasing.get(8), @@ -1262,8 +1273,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(1 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), ItemList.BlockPlasmaHeatingCasing.get(8), @@ -1287,8 +1299,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(1 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadria, 8), ItemList.BlockNaquadriaReinforcedWaterPlantCasing.get(8), @@ -1312,8 +1325,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(1 * MINUTES + 10 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 8), ItemList.BlockPlasmaHeatingCasing.get(8), @@ -1336,8 +1350,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(1 * MINUTES + 10 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16), ItemList.BlockQuarkContainmentCasing.get(8), @@ -1362,7 +1377,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(40 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator .get(OrePrefixes.frameGt, Materials.Longasssuperconductornameforuhvwire, 32), @@ -1388,7 +1403,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(40 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 16), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16), @@ -1412,7 +1427,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(40 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 16), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadria, 16), @@ -1440,7 +1455,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(40 * SECONDS, TierEU.RECIPE_IV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.HSSG, 2L), @@ -1456,7 +1471,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(40 * SECONDS, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 8L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 2L), @@ -1472,7 +1487,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(40 * SECONDS, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L), @@ -1489,7 +1504,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(40 * SECONDS, TierEU.RECIPE_UV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L), @@ -1506,7 +1521,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(40 * SECONDS, TierEU.RECIPE_UHV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUEV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L), @@ -1523,7 +1538,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(40 * SECONDS, TierEU.RECIPE_UEV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUIV, 16L), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 2L), @@ -1540,7 +1555,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(40 * SECONDS, TierEU.RECIPE_UIV)) .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 9e889f7d1..b64cedc97 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java @@ -22,6 +22,7 @@ import static gregtech.api.util.GTRecipeBuilder.QUARTER_INGOT; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.SCANNING; import static gregtech.api.util.GTUtility.getIntegratedCircuit; import java.util.Arrays; @@ -53,6 +54,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTRecipeConstants; import gregtech.api.util.GTUtility; +import gregtech.api.util.recipe.Scanning; import micdoodle8.mods.galacticraft.api.recipe.SpaceStationRecipe; import tectech.recipe.TTRecipeAdder; @@ -397,11 +399,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 +495,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,8 +506,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) - .addTo(GTRecipeConstants.AssemblyLine); + .metadata(SCANNING, new Scanning(2 * MINUTES + 20 * SECONDS, TierEU.RECIPE_UV)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_UEV).addTo(GTRecipeConstants.AssemblyLine); } @Optional.Method(modid = "GalacticraftAmunRa") diff --git a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java index 1355a51a0..9c943c337 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java @@ -280,8 +280,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