diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
5 files changed, 21 insertions, 20 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 1a2da7c060..65bc52739d 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -728,7 +728,7 @@ public class GenericChem extends ItemPackage { .fluidInputs(FluidUtils.getFluidStack(NitroBenzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Aniline, 1000)) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); @@ -746,7 +746,7 @@ public class GenericChem extends ItemPackage { FluidUtils.getDistilledWater(10000)) .fluidOutputs(FluidUtils.getFluidStack(NitroBenzene, 5000)) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 4) .addTo(chemicalPlantRecipes); @@ -791,7 +791,7 @@ public class GenericChem extends ItemPackage { .fluidOutputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4)) .duration(100 * SECONDS) - .eut(120) + .eut(TierEU.RECIPE_MV) .noOptimize() .addTo(chemicalDehydratorRecipes); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index b1e6b976ff..9cc82b2f1d 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -812,7 +812,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(16)) .fluidInputs(Materials.SulfuricAcid.getFluid(1250)) .fluidOutputs(ELEMENT.getInstance().THALLIUM.getFluidStack(288)) - .eut(8000) + .eut(TierEU.RECIPE_IV) .duration(1 * MINUTES + 15 * SECONDS) .noOptimize() .addTo(alloyBlastSmelterRecipes); @@ -889,7 +889,7 @@ public class RECIPES_GREGTECH { .outputChances(20_00, 5_00, 10, 7, 6, 5, 4, 3, 2) .fluidInputs(FluidUtils.getFluidStack("sludge", 1000)) .fluidOutputs(Materials.Methane.getGas(100)) - .eut(500) + .eut(TierEU.RECIPE_HV) .duration(2 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -1567,7 +1567,7 @@ public class RECIPES_GREGTECH { .outputChances(100) .fluidInputs(FluidUtils.getFluidStack("molten.bismuth", 1)) .duration(8 * HOURS + 20 * MINUTES) - .eut(8160) + .eut(TierEU.RECIPE_IV) .addTo(cyclotronRecipes); // Americium @@ -1627,7 +1627,7 @@ public class RECIPES_GREGTECH { .outputChances(500) .fluidInputs(FluidUtils.getFluidStack("deuterium", 400)) .duration(5 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(cyclotronRecipes); /* diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index 7a88062345..454810ae47 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -364,7 +364,7 @@ public class RECIPES_General { // No Material for void, natch. if (Thaumcraft.isModLoaded()) { - generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 16); + generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15); } Material[] gtpp = new Material[] { ALLOY.STABALLOY, ALLOY.TANTALLOY_60, ALLOY.TANTALLOY_61, ALLOY.POTIN, @@ -385,7 +385,7 @@ public class RECIPES_General { continue; } } - int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16; + int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 60 : 15; generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index ac940aeecf..f8acb12367 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -949,7 +949,7 @@ public class RECIPES_Machines { .itemOutputs(GregtechItemList.Gregtech_Computer_Cube.get(1)) .fluidInputs(ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16)) .duration(3 * MINUTES) - .eut(8000) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Circuit programmer GT_Values.RA.stdBuilder() @@ -986,7 +986,7 @@ public class RECIPES_Machines { .itemOutputs(GregtechItemList.RTG.get(1)) .fluidInputs(ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16)) .duration(10 * MINUTES) - .eut(8000) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Super Jukebox GT_Values.RA.stdBuilder() @@ -1024,7 +1024,7 @@ public class RECIPES_Machines { .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1)) .fluidInputs(CI.getAlternativeTieredFluid(5, 144 * 9)) .duration(5 * MINUTES) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1); @@ -1960,7 +1960,7 @@ public class RECIPES_Machines { .itemOutputs(washers.get(i)) .fluidInputs(CI.getTieredFluid(tier, 144 * tier)) .duration(20 * 5 * tier) - .eut(GT_Values.V[tier]) + .eut(GT_Values.VP[tier]) .addTo(assemblerRecipes); } @@ -2249,7 +2249,7 @@ public class RECIPES_Machines { CI.fieldGenerator_HV) .itemOutputs(controlCircuit) .duration(4 * MINUTES) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); // Fission Fuel Plant @@ -2906,7 +2906,7 @@ public class RECIPES_Machines { .itemOutputs(GregtechItemList.Casing_BedrockMiner.get(1)) .fluidInputs(ALLOY.MARAGING350.getFluidStack(144 * 16 * 1)) .duration((int) GT_Values.V[4]) - .eut(GT_Values.V[6]) + .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); int aCostMultiplier = 1; @@ -3355,7 +3355,7 @@ public class RECIPES_Machines { .itemInputs(CI.getTieredMachineCasing(i)) .itemOutputs(aTier[i]) .duration(i * 5 * SECONDS) - .eut(GT_Values.V[i]) + .eut(GT_Values.VP[i]) .addTo(cutterRecipes); } } @@ -3400,7 +3400,7 @@ public class RECIPES_Machines { .itemOutputs(mSuperBusesInput[tier - 1].get(1)) .fluidInputs(CI.getAlternativeTieredFluid(tier, 144 * 8)) .duration(60 * SECONDS) - .eut(GT_Values.V[tier]) + .eut(GT_Values.VP[tier]) .addTo(assemblerRecipes); } @@ -3417,7 +3417,7 @@ public class RECIPES_Machines { .itemOutputs(mSuperBusesOutput[tier - 1].get(1)) .fluidInputs(CI.getTertiaryTieredFluid(tier, 144 * 8)) .duration(60 * SECONDS) - .eut(GT_Values.V[tier]) + .eut(GT_Values.VP[tier]) .addTo(assemblerRecipes); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java index 1192a68d45..454e24f0d1 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java @@ -9,6 +9,7 @@ import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; @@ -43,7 +44,7 @@ public class RECIPES_SeleniumProcessing { .fluidInputs(FluidUtils.getHotWater(4000)) .fluidOutputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000)) .duration(24 * SECONDS) - .eut(2048) + .eut(TierEU.RECIPE_EV) .addTo(pyrolyseRecipes); // Make Selenium @@ -53,7 +54,7 @@ public class RECIPES_SeleniumProcessing { .outputChances(100_00, 20_00) .fluidInputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000)) .fluidOutputs(ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1)) - .eut(7200) + .eut(TierEU.RECIPE_IV) .duration(5 * MINUTES) .addTo(alloyBlastSmelterRecipes); } |