diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java index 901e0096a..c3d1957d1 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java @@ -1,6 +1,7 @@ package com.dreammaster.gthandler; import static com.dreammaster.gthandler.enums.MetaTileEntityIDs.*; +import static gregtech.api.enums.GTValues.VP; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -1187,10 +1188,10 @@ public void recipes() { for (int aTier = 10; aTier < 15; aTier++) { GTValues.RA.stdBuilder().itemInputs(flInputs[aTier - 10]).itemOutputs(inHatches[aTier - 10]) .fluidInputs(Materials.RadoxPolymer.getMolten((long) (2.25 * Math.pow(2, (aTier - 9))))) - .duration(24 * SECONDS).eut((int) (30 * Math.pow(4, (aTier - 1)))).addTo(assemblerRecipes); + .duration(24 * SECONDS).eut(VP[aTier]).addTo(assemblerRecipes); GTValues.RA.stdBuilder().itemInputs(flInputs2[aTier - 10]).itemOutputs(outHatches[aTier - 10]) .fluidInputs(Materials.RadoxPolymer.getMolten((long) (2.25 * Math.pow(2, (aTier - 9))))) - .duration(24 * SECONDS).eut((int) (30 * Math.pow(4, (aTier - 1)))).addTo(assemblerRecipes); + .duration(24 * SECONDS).eut(VP[aTier]).addTo(assemblerRecipes); } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 9792203c0..9e211f0be 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -341,7 +341,7 @@ public void run() { GTModHandler.getModItem(OpenComputers.ID, "item", 1, 91), 192_000, 512, - 8_000_000, + (int) TierEU.RECIPE_UEV, 16, new Object[] { ItemList.Cover_SolarPanel_LuV.get(4), GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 8, 3), @@ -358,7 +358,7 @@ public void run() { ItemList.Circuit_Chip_QPIC.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTUtility.copyAmount(4, ItemRegistry.energyDistributor[9]), ItemList.Circuit_Chip_QPIC.get(64), @@ -376,7 +376,7 @@ public void run() { GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 1, 3), 192000, 512, - 2000000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 64, 3), ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Reactor_Coolant_Sp_6.get(1), @@ -396,7 +396,7 @@ public void run() { ItemList.Quantum_Chest_IV.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 4), @@ -414,7 +414,7 @@ public void run() { new ItemStack(Blocks.dropper), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), ItemList.Conveyor_Module_UIV.get(32), ItemList.Robot_Arm_UIV.get(32), ItemList.Electric_Piston_UIV.get(32), @@ -432,7 +432,7 @@ public void run() { ItemList.PolarizerUEV.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 16), @@ -450,7 +450,7 @@ public void run() { tectech.thing.CustomItemList.Machine_Multi_Computer.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), GTModHandler.getModItem(OpenComputers.ID, "item", 4, 103), @@ -467,7 +467,7 @@ public void run() { tectech.thing.CustomItemList.tM_TeslaPrimary_6.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), @@ -485,7 +485,7 @@ public void run() { tectech.thing.CustomItemList.tM_TeslaSecondary.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), @@ -503,7 +503,7 @@ public void run() { tectech.thing.CustomItemList.tM_TeslaToroid.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 8), @@ -519,7 +519,7 @@ public void run() { GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1), 192_000, 512, - 8_000_000, + (int) TierEU.RECIPE_UEV, 16, new ItemStack[] { ItemList.Hull_UIV.get(4), CustomItemList.IrradiantReinforcedBedrockiumPlate.get(4), @@ -541,7 +541,7 @@ public void run() { ItemList.Circuit_Biomainframe.get(1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), ItemList.Circuit_Biomainframe.get(2L), ItemList.Circuit_Parts_CapacitorASMD.get(32L), @@ -563,7 +563,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Infinity, 1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1L), ItemList.Sensor_UV.get(16L), @@ -584,7 +584,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Electric_Piston_UV.get(16L), ItemList.Electric_Motor_UV.get(64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L), @@ -607,7 +607,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), @@ -625,7 +625,7 @@ public void run() { com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(1), 192000 * 2, 512 * 2, - 2_000_000 * 2, + 4_000_000, 32 * 2, new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), com.dreammaster.item.ItemList.PicoWafer.getIS(4), @@ -647,7 +647,7 @@ public void run() { com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(1), 192000 * 4, 512 * 4, - 2_000_000 * 4, + (int) TierEU.RECIPE_UEV, 32 * 4, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(2), @@ -668,7 +668,7 @@ public void run() { com.dreammaster.item.ItemList.GatePlateOrigin.getIS(1), 32_000_000 * 12, 8192, - 32_000_000, + (int) TierEU.RECIPE_UIV, 64, new ItemStack[] { GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1L), ItemList.Sensor_UEV.get(16L), @@ -689,7 +689,7 @@ public void run() { com.dreammaster.item.ItemList.ChevronOrigin.getIS(1), 32_000_000 * 12, 8192, - 32_000_000, + (int) TierEU.RECIPE_UIV, 64, new ItemStack[] { ItemList.Electric_Piston_UEV.get(16L), ItemList.Electric_Motor_UEV.get(64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L), @@ -712,7 +712,7 @@ public void run() { com.dreammaster.item.ItemList.FramePartOrigin.getIS(1), 32_000_000 * 12, 8192, - 32_000_000, + (int) TierEU.RECIPE_UIV, 64, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), @@ -730,7 +730,7 @@ public void run() { ItemList.Circuit_Wafer_NPIC.get(1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UEV, 32, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), ItemList.Circuit_Biomainframe.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(32L), @@ -774,7 +774,7 @@ public void run() { com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(1), 720_000, 2_048, - 8_000_000, + (int) TierEU.RECIPE_UEV, 128, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(2), @@ -795,7 +795,7 @@ public void run() { com.dreammaster.item.ItemList.GatePlatePolychrome.getIS(1), 2_000_000_000, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { ItemList.Casing_Dim_Bridge.get(64), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), @@ -821,7 +821,7 @@ public void run() { com.dreammaster.item.ItemList.ChevronPolychrome.getIS(1), 2_000_000_000, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), @@ -849,7 +849,7 @@ public void run() { com.dreammaster.item.ItemList.FramePartPolychrome.getIS(1), 2_000_000_000, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L), @@ -1432,7 +1432,7 @@ public void run() { CustomItemList.PikoCircuit.get(1L), 720000, 2048, - 8000000, + (int) TierEU.RECIPE_UEV, 128, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), CustomItemList.PikoCircuit.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index 52df0d875..14bf7e293 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -36,7 +36,7 @@ public void run() { GTValues.RA.stdBuilder().itemInputs(ItemList.Tesseract.get(1), GregtechItemList.Laser_Lens_Special.get(0)) .itemOutputs(ItemList.EnergisedTesseract.get(1)) .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(100)).requiresCleanRoom().duration(30 * SECONDS) - .eut(32_000_000).noOptimize().addTo(laserEngraverRecipes); + .eut(TierEU.RECIPE_UIV).noOptimize().addTo(laserEngraverRecipes); // Mysterious crystal upgrading diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 497819a3b..02be58bbc 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -640,7 +640,8 @@ public void run() { GTUtility.getIntegratedCircuit(2)) .itemOutputs( GTOreDictUnificator.getDust(Materials.NaquadahAlloy, 4L * OrePrefixes.dust.mMaterialAmount)) - .duration((int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(8000).addTo(mixerRecipes); + .duration((int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_IV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -652,7 +653,8 @@ public void run() { GTOreDictUnificator .getDust(Materials.YttriumBariumCuprate, 13L * OrePrefixes.dust.mMaterialAmount)) .fluidInputs(Materials.Oxygen.getGas(7000)) - .duration((int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(2000).addTo(mixerRecipes); + .duration((int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_EV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -662,7 +664,8 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L), GTUtility.getIntegratedCircuit(3)) .itemOutputs(GTOreDictUnificator.getDust(Materials.Duralumin, 9L * OrePrefixes.dust.mMaterialAmount)) - .duration((int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(2000).addTo(mixerRecipes); + .duration((int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_EV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs(