diff options
Diffstat (limited to 'src')
34 files changed, 364 insertions, 402 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 140485c317..ed1d90df49 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -182,7 +182,7 @@ public class RecipeLoader { ) .itemOutputs(LanthItemList.SOURCE_CHAMBER) .duration(30 * GT_RecipeBuilder.SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // LINAC @@ -201,7 +201,7 @@ public class RecipeLoader { ) .itemOutputs(LanthItemList.LINAC) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // TC @@ -220,7 +220,7 @@ public class RecipeLoader { ) .itemOutputs(LanthItemList.TARGET_CHAMBER) .duration(30 * GT_RecipeBuilder.SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Synchrotron @@ -237,7 +237,7 @@ public class RecipeLoader { GT_Utility.getIntegratedCircuit(16)) .itemOutputs(LanthItemList.SYNCHROTRON) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); /* @@ -254,7 +254,7 @@ public class RecipeLoader { Materials.Chrome.getDust(1)) .itemOutputs(WerkstoffMaterialPool.MuMetal.get(OrePrefixes.ingot, 11)) .duration(20 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .specialValue(4500) .addTo(blastFurnaceRecipes); @@ -267,7 +267,7 @@ public class RecipeLoader { .fluidInputs(Materials.SolderingAlloy.getMolten(144)) .itemOutputs(new ItemStack(LanthItemList.SHIELDED_ACCELERATOR_CASING, 1)) .duration(40 * SECONDS) - .eut(7980) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Accelerator Electrode Casing @@ -280,7 +280,7 @@ public class RecipeLoader { .fluidInputs(Materials.SolderingAlloy.getMolten(288)) .itemOutputs(new ItemStack(LanthItemList.ELECTRODE_CASING, 1)) .duration(40 * SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); ItemStack insulator = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorSheet", 1); @@ -305,7 +305,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_ITEM, ItemList.Casing_Pipe_TungstenSteel.get(1L)) .metadata(GT_RecipeConstants.RESEARCH_TIME, 72000) .duration(50 * SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(AssemblyLine); // T1 Antenna Casing @@ -329,7 +329,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_TIME, 30 * GT_RecipeBuilder.MINUTES) .duration(30 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(AssemblyLine); // T2 Antenna Casing @@ -351,7 +351,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_ITEM, new ItemStack(LanthItemList.ANTENNA_CASING_T1)) .metadata(GT_RecipeConstants.RESEARCH_TIME, 40 * GT_RecipeBuilder.MINUTES) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(AssemblyLine); // Focus Manipulator @@ -374,7 +374,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_ITEM, new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK1))) .metadata(GT_RecipeConstants.RESEARCH_TIME, 20 * GT_RecipeBuilder.MINUTES) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(AssemblyLine); // Target Holder @@ -422,7 +422,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_ITEM, ItemList.Circuit_Silicon_Wafer.get(1)) .metadata(GT_RecipeConstants.RESEARCH_TIME, 20 * GT_RecipeBuilder.MINUTES) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(AssemblyLine); // Capillary Exchange @@ -437,7 +437,7 @@ public class RecipeLoader { .fluidInputs(Materials.Silicone.getMolten(288L)) .itemOutputs(new ItemStack(LanthItemList.CAPILLARY_EXCHANGE, 1)) .duration(20 * SECONDS) - .eut(7680) + .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Mu-metal lattice @@ -448,7 +448,7 @@ public class RecipeLoader { .fluidInputs(Materials.SolderingAlloy.getMolten(144)) .itemOutputs(new ItemStack(LanthItemList.MM_LATTICE, 1)) .duration(15 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Shielded Accelerator Glass @@ -457,7 +457,7 @@ public class RecipeLoader { .fluidInputs(Materials.BorosilicateGlass.getMolten(144)) .itemOutputs(new ItemStack(LanthItemList.SHIELDED_ACCELERATOR_GLASS, 1)) .duration(25 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(fluidSolidifierRecipes); // Beamline Pipe @@ -471,7 +471,7 @@ public class RecipeLoader { .fluidInputs(Materials.SolderingAlloy.getMolten(144)) .itemOutputs(LanthItemList.BEAMLINE_PIPE) .duration(20 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Beamline Input Hatch @@ -495,7 +495,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_ITEM, ItemList.Hatch_Input_LuV.get(1)) .metadata(GT_RecipeConstants.RESEARCH_TIME, 30 * GT_RecipeBuilder.MINUTES) .duration(2 * GT_RecipeBuilder.MINUTES) - .eut(30720) + .eut(TierEU.RECIPE_LuV) .addTo(AssemblyLine); // Beamline Output Hatch @@ -521,7 +521,7 @@ public class RecipeLoader { .metadata(GT_RecipeConstants.RESEARCH_ITEM, ItemList.Hatch_Output_LuV.get(1)) .metadata(GT_RecipeConstants.RESEARCH_TIME, 40 * GT_RecipeBuilder.MINUTES) .duration(4 * GT_RecipeBuilder.MINUTES) - .eut(30720) + .eut(TierEU.RECIPE_LuV) .addTo(AssemblyLine); GT_Values.RA.stdBuilder() @@ -530,7 +530,7 @@ public class RecipeLoader { WerkstoffMaterialPool.Fluoroform.getFluidOrGas(1000), Materials.HydrochloricAcid.getFluid(3000)) .duration(15 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); // NB: http://www.smfl.rit.edu/pdf/process/process_nitride_etch_paper.pdf @@ -541,14 +541,14 @@ public class RecipeLoader { .fluidOutputs(WerkstoffMaterialPool.FluoroformOxygenMix.getFluidOrGas(5000)) .itemOutputs(Materials.Empty.getCells(4)) .duration(15 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Iron.getDust(2), Materials.NetherQuartz.getPlates(1)) .itemOutputs(new ItemStack(LanthItemList.IRON_COATED_QUARTZ)) .duration(10 * GT_RecipeBuilder.SECONDS) - .eut(480) + .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); // Masks @@ -562,7 +562,7 @@ public class RecipeLoader { .outputChances(10000) .requiresCleanRoom() .duration(12 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(autoclaveRecipes); /* @@ -580,7 +580,7 @@ public class RecipeLoader { .fluidInputs(Materials.Silane.getGas(4000)) .itemOutputs(new ItemStack(LanthItemList.SUBSTRATE_PRECURSOR)) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(480) + .eut(TierEU.RECIPE_HV) .requiresCleanRoom() .addTo(autoclaveRecipes); @@ -591,7 +591,7 @@ public class RecipeLoader { .fluidOutputs(Materials.Nitrogen.getGas(3000)) .itemOutputs(new ItemStack(LanthItemList.MASK_SUBSTRATE), Materials.Empty.getCells(2)) .duration(30 * GT_RecipeBuilder.SECONDS) - .eut(TierEU.EV) + .eut(TierEU.RECIPE_EV) .specialValue(3200) .requiresCleanRoom() .addTo(blastFurnaceRecipes); @@ -610,7 +610,7 @@ public class RecipeLoader { .itemInputs(GT_Utility.copyAmount(0, lens), new ItemStack(LanthItemList.MASK_SUBSTRATE)) .itemOutputs(new ItemStack(LanthItemList.MASKED_MASK)) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .requiresCleanRoom() .addTo(WaferEngravingRecipes); @@ -621,7 +621,7 @@ public class RecipeLoader { .fluidInputs(WerkstoffMaterialPool.FluoroformOxygenMix.getFluidOrGas(4000)) .itemOutputs(new ItemStack(LanthItemList.ETCHED_MASK_1)) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .requiresCleanRoom() .addTo(autoclaveRecipes); @@ -634,7 +634,7 @@ public class RecipeLoader { GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2))) .duration(25 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .specialValue(2400) .addTo(blastFurnaceRecipes); @@ -647,7 +647,7 @@ public class RecipeLoader { .fluidInputs(Materials.Hydrogen.getGas(1000)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK3))) .duration(10 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .specialValue(3600) .addTo(blastFurnaceRecipes); @@ -681,7 +681,7 @@ public class RecipeLoader { .fluidInputs(Materials.VanadiumGallium.getMolten(288L)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.HPIC))) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(7860) + .eut(TierEU.RECIPE_IV) .requiresCleanRoom() .addTo(UniversalChemical); @@ -750,7 +750,7 @@ public class RecipeLoader { .itemOutputs(new ItemStack(LanthItemList.maskMap.get(mask))) .requiresCleanRoom() .duration(120 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); } else if (mask == MaskList.NOR) { @@ -762,7 +762,7 @@ public class RecipeLoader { .itemOutputs(new ItemStack(LanthItemList.maskMap.get(mask))) .requiresCleanRoom() .duration(120 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); } @@ -780,7 +780,7 @@ public class RecipeLoader { .itemOutputs(new ItemStack(LanthItemList.maskMap.get(mask))) .requiresCleanRoom() .duration(120 * SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(WaferEngravingRecipes); } @@ -1039,7 +1039,7 @@ public class RecipeLoader { .itemInputs(WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dust, 4)) .itemOutputs(WerkstoffMaterialPool.LanthanumOxide.get(OrePrefixes.dust, 1)) .duration(10 * GT_RecipeBuilder.SECONDS) - .eut(480) + .eut(TierEU.RECIPE_HV) .addTo(UniversalChemical); // Boron Trioxide @@ -1048,7 +1048,7 @@ public class RecipeLoader { .fluidOutputs(new FluidStack(FluidRegistry.WATER, 3000)) .itemOutputs(WerkstoffMaterialPool.BoronTrioxide.get(OrePrefixes.dust, 1)) .duration(15 * GT_RecipeBuilder.SECONDS) - .eut(1920) + .eut(TierEU.RECIPE_EV) .addTo(UniversalChemical); // Boron Trichloride @@ -1058,7 +1058,7 @@ public class RecipeLoader { .itemInputs(WerkstoffMaterialPool.BoronTrioxide.get(OrePrefixes.dust, 1), Materials.Empty.getCells(3)) .itemOutputs(Materials.CarbonMonoxide.getCells(3)) .duration(10 * GT_RecipeBuilder.SECONDS) - .eut(480) + .eut(TierEU.RECIPE_HV) .addTo(UniversalChemical); // Lanthanum Hexaboride @@ -1068,7 +1068,7 @@ public class RecipeLoader { .itemInputs(WerkstoffMaterialPool.LanthanumOxide.get(OrePrefixes.dust, 1)) .itemOutputs(WerkstoffMaterialPool.LanthanumHexaboride.get(OrePrefixes.gemChipped)) .duration(60 * GT_RecipeBuilder.SECONDS) - .eut(7980) + .eut(TierEU.RECIPE_IV) .addTo(autoclaveRecipes); } @@ -1161,7 +1161,7 @@ public class RecipeLoader { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4), WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), Materials.Monazite.getDustTiny(2)) - .eut(480) + .eut(TierEU.RECIPE_HV) .duration(900) .metadata(DISSOLUTION_TANK_RATIO, 10) .noOptimize() @@ -1177,7 +1177,7 @@ public class RecipeLoader { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4), WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9), Materials.Monazite.getDust(2)) - .eut(480) + .eut(TierEU.RECIPE_HV) .duration(8100) .metadata(DISSOLUTION_TANK_RATIO, 10) .noOptimize() @@ -1239,7 +1239,7 @@ public class RecipeLoader { .itemInputs(WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1)) .itemOutputs(WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1)) .duration(15 * SECONDS) - .eut(128) + .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); @@ -1463,7 +1463,7 @@ public class RecipeLoader { .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2)) .fluidOutputs(WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(400)) .itemOutputs(Materials.SiliconDioxide.getDust(1)) - .eut(1920) + .eut(TierEU.RECIPE_EV) .duration(400) .metadata(COIL_HEAT, 800) .addTo(digesterRecipes); @@ -1495,7 +1495,7 @@ public class RecipeLoader { WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000)) .itemInputs(Materials.Saltpeter.getDust(1)) .fluidOutputs(WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000)) - .eut(1920) + .eut(TierEU.RECIPE_EV) .duration(1000) .metadata(DISSOLUTION_TANK_RATIO, 10) .noOptimize() @@ -3214,13 +3214,13 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs(SamariumChloride.get(OrePrefixes.dust, 2), Materials.Salt.getDust(1)) .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)) - .eut(30) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(SamariumChloride.get(OrePrefixes.dust, 2), Materials.Sodium.getDust(1)) .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)) - .eut(30) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerNonCellRecipes); @@ -3247,7 +3247,7 @@ public class RecipeLoader { Materials.Sodium.getDust(9), RarestEarthResidue.get(OrePrefixes.dust, 2)) .fluidOutputs(Materials.Chlorine.getGas(36000)) - .eut(30720) + .eut(TierEU.RECIPE_LuV) .duration(2 * SECONDS) .addTo(electrolyzerRecipes); @@ -3351,7 +3351,7 @@ public class RecipeLoader { .fluidInputs(WerkstoffMaterialPool.Butanediol.getFluidOrGas(1000)) .fluidOutputs(WerkstoffMaterialPool.AcidicButanediol.getFluidOrGas(1000)) .duration(30 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); // Butanediol @@ -3554,7 +3554,7 @@ public class RecipeLoader { .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gem, 1)) .fluidInputs(Materials.Lutetium.getMolten(144 * 8)) .outputChances(514) - .eut(500000) + .eut(TierEU.RECIPE_UV) .duration(500) .addTo(autoclaveRecipes); @@ -3620,7 +3620,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) .fluidOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(144)) - .eut(30000) + .eut(TierEU.RECIPE_LuV) .duration(1 * SECONDS) .addTo(fluidExtractionRecipes); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java index 187456a3b4..8c08160588 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java @@ -287,7 +287,7 @@ public class GemLoader implements IWerkstoffRunnable { .itemInputs(werkstoff.get(gemFlawless, 3), is) .itemOutputs(werkstoff.get(gemExquisite, 1)) .duration(2 * MINUTES) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); } diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index 7198832c4f..0f7eb196eb 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -52,7 +52,7 @@ public class Assembler implements Runnable { .itemOutputs(new ItemStack(QuantumGlassBlock.INSTANCE, 1)) .fluidInputs(getOrDefault("Trinium", Materials.Osmium).getMolten(576)) .duration(10 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // recipe for assline data hatches @@ -122,7 +122,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_Containment.get(1)) .fluidInputs(Materials.Osmium.getMolten(1296)) .duration(40 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Tesla Base GT_Values.RA.stdBuilder() @@ -292,7 +292,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti4_UHV.get(1)) .fluidInputs(Materials.Silver.getMolten(2304)) .duration(5 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Dynamo UEV 4A GT_Values.RA.stdBuilder() @@ -304,7 +304,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti4_UEV.get(1)) .fluidInputs(Materials.Silver.getMolten(4608)) .duration(5 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Dynamo UIV 4A GT_Values.RA.stdBuilder() @@ -316,7 +316,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti4_UIV.get(1)) .fluidInputs(Materials.Silver.getMolten(9216)) .duration(5 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Dynamo UMV 4A GT_Values.RA.stdBuilder() @@ -327,7 +327,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti4_UMV.get(1)) .fluidInputs(Materials.Silver.getMolten(9216)) .duration(5 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); // Dynamo UXV 4A GT_Values.RA.stdBuilder() @@ -418,7 +418,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti16_UHV.get(1)) .fluidInputs(Materials.Electrum.getMolten(2304)) .duration(10 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Dynamo UEV 16A GT_Values.RA.stdBuilder() @@ -431,7 +431,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti16_UEV.get(1)) .fluidInputs(Materials.Electrum.getMolten(4608)) .duration(10 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Dynamo UIV 16A GT_Values.RA.stdBuilder() @@ -444,7 +444,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti16_UIV.get(1)) .fluidInputs(Materials.Electrum.getMolten(9216)) .duration(10 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Dynamo UMV 16A GT_Values.RA.stdBuilder() @@ -456,7 +456,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti16_UMV.get(1)) .fluidInputs(Materials.Electrum.getMolten(9216)) .duration(10 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); // Dynamo UXV 16A GT_Values.RA.stdBuilder() @@ -548,7 +548,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti64_UHV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(2304)) .duration(20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Dynamo UEV 64A GT_Values.RA.stdBuilder() @@ -561,7 +561,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti64_UEV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(4608)) .duration(20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Dynamo UIV 64A GT_Values.RA.stdBuilder() @@ -574,7 +574,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti64_UIV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(9216)) .duration(20 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Dynamo UMV 64A GT_Values.RA.stdBuilder() @@ -586,7 +586,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_dynamoMulti64_UMV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(9216)) .duration(20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); // Dynamo UXV 64A GT_Values.RA.stdBuilder() @@ -675,7 +675,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti4_UHV.get(1)) .fluidInputs(Materials.Silver.getMolten(2304)) .duration(5 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Energy Hatch UEV 4A GT_Values.RA.stdBuilder() @@ -687,7 +687,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti4_UEV.get(1)) .fluidInputs(Materials.Silver.getMolten(4608)) .duration(5 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Energy Hatch UIV 4A GT_Values.RA.stdBuilder() @@ -699,7 +699,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti4_UIV.get(1)) .fluidInputs(Materials.Silver.getMolten(9216)) .duration(5 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Energy Hatch UMV 4A GT_Values.RA.stdBuilder() @@ -710,7 +710,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti4_UMV.get(1)) .fluidInputs(Materials.Silver.getMolten(9216)) .duration(5 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); // Energy Hatch UXV 4A GT_Values.RA.stdBuilder() @@ -801,7 +801,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti16_UHV.get(1)) .fluidInputs(Materials.Electrum.getMolten(2304)) .duration(10 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Energy Hatch UEV 16A GT_Values.RA.stdBuilder() @@ -814,7 +814,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti16_UEV.get(1)) .fluidInputs(Materials.Electrum.getMolten(4608)) .duration(10 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Energy Hatch UIV 16A GT_Values.RA.stdBuilder() @@ -827,7 +827,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti16_UIV.get(1)) .fluidInputs(Materials.Electrum.getMolten(9216)) .duration(10 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Energy Hatch UMV 16A GT_Values.RA.stdBuilder() @@ -839,7 +839,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti16_UMV.get(1)) .fluidInputs(Materials.Electrum.getMolten(9216)) .duration(10 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); // Energy Hatch UXV 16A GT_Values.RA.stdBuilder() @@ -931,7 +931,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti64_UHV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(2304)) .duration(20 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Energy Hatch UEV 64A GT_Values.RA.stdBuilder() @@ -944,7 +944,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti64_UEV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(4608)) .duration(20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Energy Hatch UIV 64A GT_Values.RA.stdBuilder() @@ -957,7 +957,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti64_UIV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(9216)) .duration(20 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Energy Hatch UMV 64A GT_Values.RA.stdBuilder() @@ -969,7 +969,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.eM_energyMulti64_UMV.get(1)) .fluidInputs(Materials.Tungsten.getMolten(9216)) .duration(20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); // Energy Hatch UXV 64A GT_Values.RA.stdBuilder() @@ -1045,7 +1045,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.Machine_BuckConverter_UV.get(1)) .fluidInputs(Materials.Osmium.getMolten(288)) .duration(5 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Buck Converter UHV GT_Values.RA.stdBuilder() @@ -1059,7 +1059,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.Machine_BuckConverter_UHV.get(1)) .fluidInputs(Materials.Neutronium.getMolten(288)) .duration(5 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); // Buck Converter UEV GT_Values.RA.stdBuilder() @@ -1073,7 +1073,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.Machine_BuckConverter_UEV.get(1)) .fluidInputs(getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288)) .duration(5 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Buck Converter UIV GT_Values.RA.stdBuilder() @@ -1087,7 +1087,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.Machine_BuckConverter_UIV.get(1)) .fluidInputs(getOrDefault("BlackPlutonium", Materials.Neutronium).getMolten(288)) .duration(10 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); // Laser Dynamo @@ -1140,7 +1140,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_dynamoTunnel1_UV.get(1)) .duration(50 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1152,7 +1152,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_dynamoTunnel1_UHV.get(1)) .duration(50 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1164,7 +1164,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_dynamoTunnel1_UEV.get(1)) .duration(50 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1176,7 +1176,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_dynamoTunnel1_UIV.get(1)) .duration(50 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1188,7 +1188,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_dynamoTunnel1_UMV.get(1)) .duration(50 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1200,7 +1200,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_dynamoTunnel1_UXV.get(1)) .duration(50 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1241,7 +1241,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_dynamoTunnel2_UV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1253,7 +1253,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_dynamoTunnel2_UHV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1265,7 +1265,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_dynamoTunnel2_UEV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1277,7 +1277,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_dynamoTunnel2_UIV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1289,7 +1289,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_dynamoTunnel2_UMV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1301,7 +1301,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_dynamoTunnel2_UXV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1330,7 +1330,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_dynamoTunnel3_UV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1342,7 +1342,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_dynamoTunnel3_UHV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1354,7 +1354,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_dynamoTunnel3_UEV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1366,7 +1366,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_dynamoTunnel3_UIV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1378,7 +1378,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_dynamoTunnel3_UMV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1390,7 +1390,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_dynamoTunnel3_UXV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1407,7 +1407,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_dynamoTunnel4_UV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1419,7 +1419,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_dynamoTunnel4_UHV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1431,7 +1431,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_dynamoTunnel4_UEV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1443,7 +1443,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_dynamoTunnel4_UIV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1455,7 +1455,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_dynamoTunnel4_UMV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1467,7 +1467,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_dynamoTunnel4_UXV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1484,7 +1484,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_dynamoTunnel5_UHV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1496,7 +1496,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_dynamoTunnel5_UEV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1508,7 +1508,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_dynamoTunnel5_UIV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1520,7 +1520,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_dynamoTunnel5_UMV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1532,7 +1532,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_dynamoTunnel5_UXV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1549,7 +1549,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_dynamoTunnel6_UEV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1561,7 +1561,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_dynamoTunnel6_UIV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1573,7 +1573,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_dynamoTunnel6_UMV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1585,7 +1585,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_dynamoTunnel6_UXV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1602,7 +1602,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(7)) .itemOutputs(CustomItemList.eM_dynamoTunnel7_UIV.get(1)) .duration(53 * MINUTES + 20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1614,7 +1614,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(7)) .itemOutputs(CustomItemList.eM_dynamoTunnel7_UMV.get(1)) .duration(53 * MINUTES + 20 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1626,7 +1626,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(7)) .itemOutputs(CustomItemList.eM_dynamoTunnel7_UXV.get(1)) .duration(53 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1682,7 +1682,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_energyTunnel1_UV.get(1)) .duration(50 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1694,7 +1694,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_energyTunnel1_UHV.get(1)) .duration(50 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1706,7 +1706,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_energyTunnel1_UEV.get(1)) .duration(50 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1718,7 +1718,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_energyTunnel1_UIV.get(1)) .duration(50 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1730,7 +1730,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_energyTunnel1_UMV.get(1)) .duration(50 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1742,7 +1742,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(CustomItemList.eM_energyTunnel1_UXV.get(1)) .duration(50 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1783,7 +1783,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_energyTunnel2_UV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1795,7 +1795,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_energyTunnel2_UHV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1807,7 +1807,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_energyTunnel2_UEV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1819,7 +1819,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_energyTunnel2_UIV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1831,7 +1831,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_energyTunnel2_UMV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1843,7 +1843,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(CustomItemList.eM_energyTunnel2_UXV.get(1)) .duration(1 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1872,7 +1872,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_energyTunnel3_UV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1884,7 +1884,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_energyTunnel3_UHV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1896,7 +1896,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_energyTunnel3_UEV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1908,7 +1908,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_energyTunnel3_UIV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1920,7 +1920,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_energyTunnel3_UMV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1932,7 +1932,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(CustomItemList.eM_energyTunnel3_UXV.get(1)) .duration(3 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -1949,7 +1949,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_energyTunnel4_UV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1961,7 +1961,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_energyTunnel4_UHV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1973,7 +1973,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_energyTunnel4_UEV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1985,7 +1985,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_energyTunnel4_UIV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1997,7 +1997,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_energyTunnel4_UMV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2009,7 +2009,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(4)) .itemOutputs(CustomItemList.eM_energyTunnel4_UXV.get(1)) .duration(6 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -2026,7 +2026,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_energyTunnel5_UHV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2038,7 +2038,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_energyTunnel5_UEV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2050,7 +2050,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_energyTunnel5_UIV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2062,7 +2062,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_energyTunnel5_UMV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2074,7 +2074,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(5)) .itemOutputs(CustomItemList.eM_energyTunnel5_UXV.get(1)) .duration(13 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -2091,7 +2091,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_energyTunnel6_UEV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut(8000000) + .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2103,7 +2103,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_energyTunnel6_UIV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2115,7 +2115,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_energyTunnel6_UMV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2127,7 +2127,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(6)) .itemOutputs(CustomItemList.eM_energyTunnel6_UXV.get(1)) .duration(26 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -2144,7 +2144,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(7)) .itemOutputs(CustomItemList.eM_energyTunnel7_UIV.get(1)) .duration(53 * MINUTES + 20 * SECONDS) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2156,7 +2156,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(7)) .itemOutputs(CustomItemList.eM_energyTunnel7_UMV.get(1)) .duration(53 * MINUTES + 20 * SECONDS) - .eut(128000000) + .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -2168,7 +2168,7 @@ public class Assembler implements Runnable { GT_Utility.getIntegratedCircuit(7)) .itemOutputs(CustomItemList.eM_energyTunnel7_UXV.get(1)) .duration(53 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UXV) + .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); } @@ -2901,7 +2901,7 @@ public class Assembler implements Runnable { .itemOutputs(CustomItemList.LASERpipe.get(1)) .requiresCleanRoom() .duration(5 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); // Laser Casing GT_Values.RA.stdBuilder() diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 6d63f76edf..1b31ed3552 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -107,7 +107,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.OilDrill4.get(1), 16777216, 2048, - 2000000, + (int) TierEU.RECIPE_UHV, 4, new Object[] { ItemList.OilDrill4.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), @@ -119,14 +119,14 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Neutronium.getMolten(576) }, ItemList.OilDrillInfinite.get(1), 6000, - 2000000); + (int) TierEU.RECIPE_UHV); // Infinity Coil TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_Coil_AwakenedDraconium.get(1), 16_777_216, 2048, - 8_000_000, + (int) TierEU.RECIPE_UEV, 1, new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), @@ -136,14 +136,14 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { Materials.DraconiumAwakened.getMolten(576), }, ItemList.Casing_Coil_Infinity.get(1), 60 * 20, - 8_000_000); + (int) TierEU.RECIPE_UEV); // Hypogen Coil TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_Coil_Infinity.get(1), 16_777_216 * 2, 2048 * 2, - 32_000_000, + (int) TierEU.RECIPE_UIV, 1, new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, GT_OreDictUnificator.get("wireGt02Hypogen", 8L), HYPOGEN.getScrew(8), @@ -153,14 +153,14 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { Materials.Infinity.getMolten(576), }, ItemList.Casing_Coil_Hypogen.get(1), 60 * 20, - 8000000 * 4); + (int) TierEU.RECIPE_UIV); // Eternal coil TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_Coil_Hypogen.get(1), 16_777_216 * 4, 8_192, - 128_000_000, + (int) TierEU.RECIPE_UMV, 1, new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, GT_OreDictUnificator.get(OrePrefixes.wireGt02, MaterialsUEVplus.SpaceTime, 8), @@ -175,7 +175,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), }, ItemList.Casing_Coil_Eternal.get(1), 60 * 20, - 8_000_000 * 16); + (int) TierEU.RECIPE_UMV); // UHV-UMV Energy Hatch & Dynamo { @@ -213,7 +213,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderIndalloy, 40 * 144) }, ItemList.Hatch_Energy_UHV.get(1L), 1000, - 2000000); + (int) TierEU.RECIPE_UHV); // Energy Hatch UEV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -232,7 +232,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(8000L) }, ItemList.Hatch_Energy_UEV.get(1L), 1000, - 8000000); + (int) TierEU.RECIPE_UEV); // Energy Hatch UIV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -252,7 +252,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.UUMatter.getFluid(16_000L) }, ItemList.Hatch_Energy_UIV.get(1L), 1000, - 32_000_000); + (int) TierEU.RECIPE_UIV); // Energy Hatch UMV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -274,7 +274,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.UUMatter.getFluid(32000L) }, ItemList.Hatch_Energy_UMV.get(1L), 1000, - 128_000_000); + (int) TierEU.RECIPE_UMV); // Energy Hatch UXV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -297,7 +297,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.UUMatter.getFluid(64000L) }, ItemList.Hatch_Energy_UXV.get(1L), 1000, - 512_000_000); + (int) TierEU.RECIPE_UXV); } // Dynamo Hatch @@ -334,7 +334,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderIndalloy, 40 * 144) }, ItemList.Hatch_Dynamo_UHV.get(1L), 1000, - 2000000); + (int) TierEU.RECIPE_UHV); // Dynamo Hatch UEV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -353,7 +353,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(8000L) }, ItemList.Hatch_Dynamo_UEV.get(1L), 1000, - 8000000); + (int) TierEU.RECIPE_UEV); // Dynamo Hatch UIV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -373,7 +373,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.UUMatter.getFluid(16_000L) }, ItemList.Hatch_Dynamo_UIV.get(1L), 1000, - 32_000_000); + (int) TierEU.RECIPE_UIV); // Dynamo Hatch UMV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -395,7 +395,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.UUMatter.getFluid(32000L) }, ItemList.Hatch_Dynamo_UMV.get(1L), 1000, - 128_000_000); + (int) TierEU.RECIPE_UMV); // Dynamo Hatch UXV TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -418,7 +418,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.UUMatter.getFluid(64000L) }, ItemList.Hatch_Dynamo_UXV.get(1L), 1000, - 512_000_000); + (int) TierEU.RECIPE_UXV); } } @@ -459,7 +459,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Circuit_Biowarecomputer.get(1L), 48000, 128, - 500000, + (int) TierEU.RECIPE_UV, 8, new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(2L), ItemList.Circuit_Biowarecomputer.get(2L), new ItemStack[] { ItemList.Circuit_Parts_TransistorASMD.get(16L), @@ -476,7 +476,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.SuperCoolant.getFluid(10_000L), }, ItemList.Circuit_Biowaresupercomputer.get(1L), 4000, - 500000); + (int) TierEU.RECIPE_UV); // Bio Mainframe TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -507,14 +507,14 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.SuperCoolant.getFluid(20_000L), }, ItemList.Circuit_Biomainframe.get(1L), 6000, - 2000000); + (int) TierEU.RECIPE_UHV); // Optical Assembly TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Circuit_OpticalProcessor.get(1L), 192_000, 256, - 2_000_000, + (int) TierEU.RECIPE_UHV, 16, new Object[] { ItemList.Circuit_Board_Optical.get(1L), ItemList.Circuit_OpticalProcessor.get(2L), ItemList.Circuit_Parts_InductorXSMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(20L), @@ -528,7 +528,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.SuperCoolant.getFluid(10_000L), new FluidStack(FluidRegistry.getFluid("oganesson"), 500) }, ItemList.Circuit_OpticalAssembly.get(1L), 20 * 20, - 2_000_000); + (int) TierEU.RECIPE_UHV); // Optical Computer TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -551,14 +551,14 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 2) }, ItemList.Circuit_OpticalComputer.get(1L), 200 * 20, - 2_000_000); + (int) TierEU.RECIPE_UHV); // Optical Mainframe TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Circuit_OpticalComputer.get(1L), 768_000, 1024, - 8_000_000, + (int) TierEU.RECIPE_UEV, 64, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), ItemList.Circuit_OpticalComputer.get(2L), ItemList.Circuit_Parts_InductorXSMD.get(32L), @@ -577,7 +577,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 4) }, ItemList.Circuit_OpticalMainframe.get(1L), 300 * 20, - 8_000_000); + (int) TierEU.RECIPE_UEV); // Laser Vacuum Mirror TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -692,7 +692,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), (int) TierEU.RECIPE_MAX, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L), @@ -727,7 +727,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Casing_Dim_Bridge.get(1), 32_000_000, 4096, - 32_000_000, + (int) TierEU.RECIPE_UIV, 1, new Object[] { ItemList.Casing_Dim_Bridge.get(4), ItemRegistry.megaMachines[0], ItemList.Hatch_Energy_UEV.get(4L), @@ -753,7 +753,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Casing_Dim_Injector.get(1), 8_000_000, 4096, - 32_000_000, + (int) TierEU.RECIPE_UIV, 1, new Object[] { ItemList.Casing_Dim_Trans.get(1), ItemList.MicroTransmitter_UV.get(1), new Object[] { OrePrefixes.circuit.get(Materials.UV), 2L }, @@ -764,14 +764,14 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderUEV, 1152 * 8), Materials.NaquadahEnriched.getMolten(1296L) }, ItemList.Casing_Dim_Bridge.get(1), 240 * 20, - 32_000_000); + (int) TierEU.RECIPE_UIV); // Dimensional injection casing. TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_Dim_Trans.get(1), 2_000_000, 2048, - 32_000_000, + (int) TierEU.RECIPE_UIV, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), @@ -785,14 +785,14 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderUEV, 576), Materials.NaquadahEnriched.getMolten(288L) }, ItemList.Casing_Dim_Injector.get(1), 20 * 20, - 32_000_000); + (int) TierEU.RECIPE_UIV); // Dimensionally Transcendent Casing. TT_recipeAdder.addResearchableAssemblylineRecipe( getModItem(Avaritia.ID, "Singularity", 1L, 0), 2_000_000, 2048, - 32_000_000, + (int) TierEU.RECIPE_UIV, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), LAURENIUM.getScrew(12), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -801,7 +801,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack(solderUEV, 288), Materials.NaquadahEnriched.getMolten(144L) }, ItemList.Casing_Dim_Trans.get(1), 20 * 20, - 32_000_000); + (int) TierEU.RECIPE_UIV); // Transdimensional Alignment Matrix TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -829,7 +829,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier8", 1, 0), 16_777_216, 2048, - 2_000_000, + (int) TierEU.RECIPE_UHV, 64, new Object[] { getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 7), getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), @@ -898,7 +898,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.ZPM3.get(1L), 1_200_000, 128, - 8_000_000, + (int) TierEU.RECIPE_UEV, 16, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), @@ -922,7 +922,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.ZPM4.get(1), 24_000_000, 1_280, - 32_000_000, + (int) TierEU.RECIPE_UIV, 32, new Object[] { HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, @@ -946,7 +946,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.ZPM5.get(1L), 480_000_000, 12_288, - 128_000_000, + (int) TierEU.RECIPE_UMV, 64, new Object[] { ELEMENT.STANDALONE.DRAGON_METAL.getPlateDouble(32), ELEMENT.STANDALONE.DRAGON_METAL.getPlateDouble(32), @@ -974,7 +974,7 @@ public class ResearchStationAssemblyLine implements Runnable { GregtechItemList.Compressed_Fusion_Reactor.get(1), 320000, 512, - 2000000, + (int) TierEU.RECIPE_UHV, 1, new Object[] { GregtechItemList.Casing_Fusion_Internal.get(1), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, @@ -988,14 +988,14 @@ public class ResearchStationAssemblyLine implements Runnable { ALLOY.OCTIRON.getFluidStack(9216), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(9216), }, GregtechItemList.FusionComputer_UV2.get(1), 6000, - 2000000); + (int) TierEU.RECIPE_UHV); // MK4 Coils TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_Fusion_Coil.get(1L), 160000, 512, - 2000000, + (int) TierEU.RECIPE_UHV, 1, new Object[] { ItemList.Energy_LapotronicOrb2.get(16L), new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16L }, @@ -1006,14 +1006,14 @@ public class ResearchStationAssemblyLine implements Runnable { ALLOY.OCTIRON.getFluidStack(2304), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(2304), }, GregtechItemList.Casing_Fusion_Internal.get(1), 1200, - 2000000); + (int) TierEU.RECIPE_UHV); // MK4 Casing TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_Fusion2.get(1L), 80000, 512, - 2000000, + (int) TierEU.RECIPE_UHV, 1, new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.EV), 16L }, new Object[] { OrePrefixes.circuit.get(Materials.IV), 8L }, @@ -1025,7 +1025,7 @@ public class ResearchStationAssemblyLine implements Runnable { ALLOY.OCTIRON.getFluidStack(576), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(576), }, GregtechItemList.Casing_Fusion_External.get(1), 300, - 2000000); + (int) TierEU.RECIPE_UHV); // MK5 Computer TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -1091,7 +1091,7 @@ public class ResearchStationAssemblyLine implements Runnable { new ItemStack(defcCasingBlock, 1, 8), 16_777_216, 1024, - 2_000_000, + (int) TierEU.RECIPE_UHV, 8, new Object[] { ItemList.AssemblingMachineUHV.get(1), new ItemStack(defcCasingBlock, 1, 8), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), @@ -1104,7 +1104,7 @@ public class ResearchStationAssemblyLine implements Runnable { Materials.DraconiumAwakened.getMolten(1440), }, DraconicEvolutionFusionCrafter.get(1), 1500, - 8_000_000); + (int) TierEU.RECIPE_UEV); // DE Schematics Cores Tier 1 TT_recipeAdder.addResearchableAssemblylineRecipe( new ItemStack(defcCasingBlock, 1, 9), @@ -1119,7 +1119,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, DEFCDraconicSchematic.get(1), 6000, - 500_000); + (int) TierEU.RECIPE_UV); // DE Schematics Cores Tier 2 TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -1135,7 +1135,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, DEFCWyvernSchematic.get(1), 12000, - 2_000_000); + (int) TierEU.RECIPE_UHV); // DE Schematics Cores Tier 3 TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -1151,7 +1151,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, DEFCAwakenedSchematic.get(1), 24000, - 8_000_000); + (int) TierEU.RECIPE_UEV); // DE Schematics Cores Tier 4 TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -1167,7 +1167,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, DEFCChaoticSchematic.get(1), 36000, - 32_000_000); + (int) TierEU.RECIPE_UIV); } // Debug maintenance hatch @@ -1175,7 +1175,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Hatch_AutoMaintenance.get(1L), 2764800, 128, - 500000, + (int) TierEU.RECIPE_UV, 6, new Object[] { ItemList.Hatch_AutoMaintenance.get(1L), ItemList.Robot_Arm_UV.get(1L), ItemList.Electric_Pump_UV.get(1L), ItemList.Conveyor_Module_UV.get(1L), @@ -1185,7 +1185,7 @@ public class ResearchStationAssemblyLine implements Runnable { new FluidStack[] { Materials.Lubricant.getFluid(256000), new FluidStack(solderIndalloy, 1296), }, CustomItemList.hatch_CreativeMaintenance.get(1), 6000, - 500000); + (int) TierEU.RECIPE_UV); // Debug uncertainty resolver TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -1218,7 +1218,7 @@ public class ResearchStationAssemblyLine implements Runnable { int total_computation = 24000; int comp_per_second = 32; - int research_eu_per_tick = 500_000; + int research_eu_per_tick = (int) TierEU.RECIPE_UV; int research_amperage = 1; FluidStack fluid_0 = Materials.Naquadria.getMolten(2592); @@ -1226,7 +1226,7 @@ public class ResearchStationAssemblyLine implements Runnable { FluidStack fluid_2 = Materials.Lubricant.getFluid(4000); int crafting_time_in_ticks = 1000; - int crafting_eu_per_tick = 500_000; + int crafting_eu_per_tick = (int) TierEU.RECIPE_UV; // ------------------------------------------------------------- @@ -1432,7 +1432,7 @@ public class ResearchStationAssemblyLine implements Runnable { int total_computation = 48_000; int comp_per_second = 64; - int research_eu_per_tick = 2_000_000; + int research_eu_per_tick = (int) TierEU.RECIPE_UHV; int research_amperage = 1; FluidStack fluid_0 = Materials.Quantium.getMolten(2592); @@ -1440,7 +1440,7 @@ public class ResearchStationAssemblyLine implements Runnable { FluidStack fluid_2 = Materials.Lubricant.getFluid(4000); int crafting_time_in_ticks = 1000; - int crafting_eu_per_tick = 2_000_000; + int crafting_eu_per_tick = (int) TierEU.RECIPE_UHV; // ------------------------------------------------------------- @@ -1647,7 +1647,7 @@ public class ResearchStationAssemblyLine implements Runnable { int total_computation = 96_000; int comp_per_second = 128; - int research_eu_per_tick = 8_000_000; + int research_eu_per_tick = (int) TierEU.RECIPE_UEV; int research_amperage = 1; FluidStack fluid_0 = celestialTungsten != null ? new FluidStack(celestialTungsten, 576) : null; @@ -1655,7 +1655,7 @@ public class ResearchStationAssemblyLine implements Runnable { FluidStack fluid_2 = Materials.Lubricant.getFluid(4000); int crafting_time_in_ticks = 1000; - int crafting_eu_per_tick = 8_000_000; + int crafting_eu_per_tick = (int) TierEU.RECIPE_UEV; // ------------------------------------------------------------- @@ -1863,7 +1863,7 @@ public class ResearchStationAssemblyLine implements Runnable { int total_computation = 192_000; int comp_per_second = 256; - int research_eu_per_tick = 32_000_000; + int research_eu_per_tick = (int) TierEU.RECIPE_UIV; int research_amperage = 1; FluidStack fluid_0 = hypogen != null ? new FluidStack(hypogen, 576) : null; @@ -1872,7 +1872,7 @@ public class ResearchStationAssemblyLine implements Runnable { FluidStack fluid_3 = Materials.Lubricant.getFluid(4000); int crafting_time_in_ticks = 1000; - int crafting_eu_per_tick = 32_000_000; + int crafting_eu_per_tick = (int) TierEU.RECIPE_UIV; // ------------------------------------------------------------- @@ -2981,9 +2981,9 @@ public class ResearchStationAssemblyLine implements Runnable { : FluidRegistry.getFluid("molten.solderingalloy"); int recipeDurationTicks = 20 * 20; - int recipeEuPerTick = 128_000_000; + int recipeEuPerTick = (int) TierEU.RECIPE_UMV; - int researchEuPerTick = 128_000_000; + int researchEuPerTick = (int) TierEU.RECIPE_UMV; int researchAmperage = 4; int compPerSecond = 2000; int totalComputation = 500_000; diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index c71e0c07b9..39e3a035b0 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -33,7 +33,7 @@ public class ResearchableAssemblyLine implements Runnable { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5), 1200000, 128, - 8000000, + (int) TierEU.RECIPE_UEV, 16, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), @@ -58,7 +58,7 @@ public class ResearchableAssemblyLine implements Runnable { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8), 24_000_000, 1_280, - 32_000_000, + (int) TierEU.RECIPE_UIV, 32, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), @@ -84,7 +84,7 @@ public class ResearchableAssemblyLine implements Runnable { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), 480_000_000, 12_288, - 128_000_000, + (int) TierEU.RECIPE_UMV, 64, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 79787fa567..fd1950c6ef 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -21,6 +21,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.material.ELEMENT; @@ -195,7 +196,7 @@ public class FuelRecipeLoader { FluidRegistry.getFluidStack("molten.shirabon", 1440)) .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) .duration(4 * SECONDS) - .eut(530_000_000) + .eut(TierEU.RECIPE_UXV) .metadata(NFR_COIL_TIER, 4) .noOptimize() .addTo(naquadahFuelRefineFactoryRecipes); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index e7411f3c6c..59b139ff41 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -1518,7 +1518,7 @@ public class RecipeLoader_02 { FluidRegistry.getFluidStack("molten.energycrystal", 1152), FluidRegistry.getFluidStack("molten.laurenium", 144)) .duration(1 * MINUTES + 40 * SECONDS) - .eut(520000) + .eut(TierEU.RECIPE_UV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) .noOptimize() .addTo(preciseAssemblerRecipes); diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index ff897438cf..5acb15b242 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -3,6 +3,7 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.L; import static gregtech.api.enums.GT_Values.M; import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GT_Values.VP; import static gregtech.api.enums.Materials.Bronze; import static gregtech.api.enums.Materials.Cobalt; import static gregtech.api.enums.Materials.DarkSteel; @@ -28,6 +29,7 @@ import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.RECYCLE; import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import static gregtech.api.util.GT_Utility.getTier; import java.lang.reflect.Field; import java.util.ArrayList; @@ -222,9 +224,15 @@ public class GT_RecipeRegistrator { if (recipeOutput != null) { builder.itemOutputs(recipeOutput); } + long powerUsage = Math.max(8, (long) Math.sqrt(2 * aMaterial.mSmeltInto.mStandardMoltenFluid.getTemperature())); + // avoid full amp recipes + int powerTier = getTier(powerUsage); + if (powerTier > 0 && powerTier < VP.length && powerUsage > VP[powerTier]) { + powerUsage = VP[powerTier]; + } builder.fluidOutputs(aMaterial.mSmeltInto.getMolten((L * aMaterialAmount) / (M * aStack.stackSize))) .duration((int) Math.max(1, (24 * aMaterialAmount) / M)) - .eut(Math.max(8, (int) Math.sqrt(2 * aMaterial.mSmeltInto.mStandardMoltenFluid.getTemperature()))) + .eut(powerUsage) .recipeCategory(RecipeCategories.fluidExtractorRecycling) .addTo(fluidExtractionRecipes); } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d4a4b184a0..857de00e6a 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2871,7 +2871,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .itemInputs(ItemList.Tesseract.get(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L)) .duration(5 * SECONDS) - .eut(32_000_000) + .eut(TierEU.RECIPE_UIV) .addTo(maceratorRecipes); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 35bd3b8cfd..76e60e18c5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -602,7 +602,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra .itemInputs(GT_Utility.copyAmount(3, aStack), is) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1L)) .duration(2 * MINUTES) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 1b4f3e3396..159b91d39a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -540,7 +540,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) .fluidInputs(Materials.Polybenzimidazole.getMolten(1152L)) .duration(5 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -550,7 +550,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)) .duration(10 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -560,7 +560,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) .fluidInputs(Materials.Polybenzimidazole.getMolten(4608L)) .duration(15 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -570,7 +570,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) .fluidInputs(Materials.Polybenzimidazole.getMolten(9216L)) .duration(30 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -580,7 +580,7 @@ public class AssemblerRecipes implements Runnable { .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) .fluidInputs(Materials.Polybenzimidazole.getMolten(18432L)) .duration(60 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); } @@ -809,7 +809,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_UV.get(1)) .duration(2 * SECONDS + 10 * TICKS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -1339,7 +1339,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Hatch_Muffler_UV.get(1)) .duration(10 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -1351,7 +1351,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Hatch_Muffler_MAX.get(1)) .duration(10 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -2112,7 +2112,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.UV_Coil.get(1)) .duration(10 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -2122,7 +2122,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.UHV_Coil.get(1)) .duration(10 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index 1a71f037fd..6a95493f8c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -635,7 +635,7 @@ public class BlastFurnaceRecipes implements Runnable { .fluidInputs(Materials.Tungsten.getMolten(144)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) .duration(3 * MINUTES) - .eut(32000000) + .eut(TierEU.RECIPE_UIV) .metadata(COIL_HEAT, 11701) .addTo(blastFurnaceRecipes); @@ -648,7 +648,7 @@ public class BlastFurnaceRecipes implements Runnable { .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) .fluidInputs(Materials.Chlorine.getGas(3000)) .duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_HV) + .eut(TierEU.RECIPE_HV) .metadata(COIL_HEAT, 573) .addTo(blastFurnaceRecipes); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index 534a5e5c63..c9e8e631bf 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -140,7 +140,7 @@ public class CannerRecipes implements Runnable { ItemList.BatteryHull_UV.get(1L)) .itemOutputs(ItemList.BatteryHull_UV_Full.get(1L)) .duration(15 * SECONDS) - .eut(7860) + .eut(TierEU.RECIPE_IV) .addTo(cannerRecipes); // UHV 2097152 @@ -160,7 +160,7 @@ public class CannerRecipes implements Runnable { ItemList.BatteryHull_UEV.get(1L)) .itemOutputs(ItemList.BatteryHull_UEV_Full.get(1L)) .duration(20 * SECONDS) - .eut(31440) + .eut(TierEU.RECIPE_LuV) .addTo(cannerRecipes); // UIV 33554432 @@ -180,7 +180,7 @@ public class CannerRecipes implements Runnable { ItemList.BatteryHull_UMV.get(1L)) .itemOutputs(ItemList.BatteryHull_UMV_Full.get(1L)) .duration(25 * SECONDS) - .eut(125760) + .eut(TierEU.RECIPE_ZPM) .addTo(cannerRecipes); // UxV 536870912 diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index 9d7927b074..c4cfca5aba 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -682,7 +682,7 @@ public class CentrifugeRecipes implements Runnable { .fluidInputs(Materials.EnrichedNaquadria.getFluid(9216)) .fluidOutputs(Materials.FluidNaquadahFuel.getFluid(4806)) .duration(30 * SECONDS) - .eut(2000000) + .eut(TierEU.RECIPE_UHV) .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() @@ -762,7 +762,7 @@ public class CentrifugeRecipes implements Runnable { .itemInputs(new ItemStack(combs, 1, 152), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .duration(6 * SECONDS + 8 * TICKS) - .eut(512) + .eut(TierEU.RECIPE_HV) .addTo(centrifugeRecipes); // Endshard @@ -771,7 +771,7 @@ public class CentrifugeRecipes implements Runnable { .itemInputs(new ItemStack(combs, 1, 153), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .duration(6 * SECONDS + 8 * TICKS) - .eut(512) + .eut(TierEU.RECIPE_HV) .addTo(centrifugeRecipes); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index e4d316e101..3df932edd2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -140,7 +140,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.BioMediumSterilized.getFluid(2000)) .fluidOutputs(getFluidStack("mutagen", 2000)) .duration(60 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(UniversalChemical); GT_Values.RA.stdBuilder() @@ -4742,7 +4742,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Ammonia.getGas(1000)) .fluidOutputs(MaterialsKevlar.Methylamine.getGas(1000), Materials.Water.getFluid(1000)) .duration(1 * MINUTES + 15 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() @@ -4754,7 +4754,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(MaterialsKevlar.Ethyleneglycol.getFluid(4000), MaterialsKevlar.SiliconOil.getFluid(1000)) .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)) .duration(10 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() @@ -4766,7 +4766,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(MaterialsKevlar.Ethyleneglycol.getFluid(36000), MaterialsKevlar.SiliconOil.getFluid(9000)) .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(9000)) .duration(1 * MINUTES + 15 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); // 3NH3 + 6CH4O =Al2O3,SiO2= CH5N + C2H7N + C3H9N + 6H2O @@ -5628,7 +5628,7 @@ public class ChemicalRecipes implements Runnable { Materials.Radon.getGas(16000)) .fluidOutputs(Materials.EnrichedNaquadria.getFluid(9216)) .duration(30 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O @@ -5783,7 +5783,7 @@ public class ChemicalRecipes implements Runnable { MaterialsKevlar.IVNitroaniline.getFluid(1000)) .fluidOutputs(Materials.Water.getFluid(2000)) .duration(20 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); // C4H10O2 =Cu= C4H6O2 + 4H @@ -5850,7 +5850,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.Hydrogen.getGas(4000)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) .duration(15 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() @@ -5864,7 +5864,7 @@ public class ChemicalRecipes implements Runnable { MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000), Materials.DilutedHydrochloricAcid.getFluid(2000)) .duration(30 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() @@ -5878,7 +5878,7 @@ public class ChemicalRecipes implements Runnable { MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000), Materials.DilutedHydrochloricAcid.getFluid(14000)) .duration(2 * MINUTES + 55 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O @@ -5935,7 +5935,7 @@ public class ChemicalRecipes implements Runnable { .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) .fluidOutputs(Materials.Hydrogen.getGas(11000)) .duration(40 * SECONDS) - .eut(500000) + .eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 532c592b78..d27e85ab2d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -535,7 +535,7 @@ public class FluidExtractorRecipes implements Runnable { .outputChances(1000) .fluidOutputs(Materials.Lava.getFluid(800L)) .duration(12 * SECONDS + 16 * TICKS) - .eut(128) + .eut(TierEU.RECIPE_MV) .addTo(fluidExtractionRecipes); // Beecombs fluid extractor recipes diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java index bbe10d89f6..88c07e365e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java @@ -40,7 +40,7 @@ public class FusionReactorRecipes implements Runnable { .fluidInputs(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125)) .fluidOutputs(Materials.Helium.getPlasma(125)) .duration(16 * TICKS) - .eut(2048) + .eut(TierEU.RECIPE_EV) .metadata(FUSION_THRESHOLD, 60000000) .addTo(fusionRecipes); // FT1 Expensive // @@ -64,7 +64,7 @@ public class FusionReactorRecipes implements Runnable { .fluidInputs(Materials.Silicon.getMolten(16), Materials.Magnesium.getMolten(16)) .fluidOutputs(Materials.Iron.getPlasma(144)) .duration(1 * SECONDS + 12 * TICKS) - .eut(8192) + .eut(TierEU.RECIPE_IV) .metadata(FUSION_THRESHOLD, 360000000) .addTo(fusionRecipes); // FT1++ Cheap // @@ -137,7 +137,7 @@ public class FusionReactorRecipes implements Runnable { .fluidInputs(Materials.Manganese.getMolten(16), Materials.Hydrogen.getGas(16)) .fluidOutputs(Materials.Iron.getMolten(16)) .duration(3 * SECONDS + 4 * TICKS) - .eut(8192) + .eut(TierEU.RECIPE_IV) .metadata(FUSION_THRESHOLD, 120000000) .addTo(fusionRecipes); // FT1 - utility @@ -145,7 +145,7 @@ public class FusionReactorRecipes implements Runnable { .fluidInputs(Materials.Magnesium.getMolten(128), Materials.Oxygen.getGas(128)) .fluidOutputs(Materials.Calcium.getPlasma(16)) .duration(6 * SECONDS + 8 * TICKS) - .eut(8192) + .eut(TierEU.RECIPE_IV) .metadata(FUSION_THRESHOLD, 120000000) .addTo(fusionRecipes); // diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index 3974dd2b68..5dbe86b0f0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -241,7 +241,7 @@ public class MixerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(2)) .itemOutputs(GT_OreDictUnificator.getDust(Materials.Ultimet, 9L * OrePrefixes.dust.mMaterialAmount)) .duration(45 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() @@ -326,7 +326,7 @@ public class MixerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.getDust(Materials.Osmiridium, 4L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() @@ -336,7 +336,7 @@ public class MixerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.getDust(Materials.NiobiumTitanium, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() @@ -346,7 +346,7 @@ public class MixerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.getDust(Materials.VanadiumGallium, 4L * OrePrefixes.dust.mMaterialAmount)) .duration(2 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() @@ -356,7 +356,7 @@ public class MixerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.getDust(Materials.TungstenCarbide, 2L * OrePrefixes.dust.mMaterialAmount)) .duration(10 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 0b25dc76cd..ecede7ebb9 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -40,6 +40,7 @@ import gregtech.api.enums.MaterialsKevlar; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; +import gregtech.api.enums.TierEU; import gregtech.api.fluid.GT_FluidFactory; import gregtech.api.items.GT_Block_LongDistancePipe; import gregtech.api.items.GT_BreederCell_Item; @@ -359,7 +360,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(25 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() @@ -373,7 +374,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(50 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() @@ -387,7 +388,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(100 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); ItemList.Depleted_MNq_1.set(new GT_DepletetCell_Item("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1)); @@ -438,7 +439,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(25 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() @@ -452,7 +453,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(50 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() @@ -466,7 +467,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(100 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); ItemList.Uraniumcell_1.set( 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); } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 30011cddbc..de5e010350 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -675,7 +675,7 @@ public class BioRecipes { FluidUtils.getFluidStack(BioRecipes.mAcetone, 9000), FluidUtils.getFluidStack(BioRecipes.mEthanol, 3000)) .duration(100 * SECONDS) - .eut(32) + .eut(TierEU.RECIPE_LV) .metadata(CHEMPLANT_CASING_TIER, 1) .noOptimize() .addTo(chemicalPlantRecipes); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 3cd82939d4..ec9416be02 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -341,14 +341,14 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GT_Values.RA.stdBuilder() .itemInputs(GregtechItemList.Pellet_RTG_SR90.get(1)) .duration(0) - .eut(32) + .eut(TierEU.RECIPE_LV) .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(28.8f)) .addTo(rtgFuels); GT_Values.RA.stdBuilder() .itemInputs(GregtechItemList.Pellet_RTG_PO210.get(1)) .duration(0) - .eut(TierEU.HV) + .eut(TierEU.RECIPE_HV) .metadata(RTG_DURATION_IN_DAYS, 1) .addTo(rtgFuels); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index 40cf569df6..da4a68d7f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -62,7 +62,7 @@ public class RecipeLoader_GlueLine { FluidUtils.getFluidStack("methylacetate", 1000)) .fluidOutputs(MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)) .duration(10 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); GT_Values.RA.stdBuilder() @@ -129,7 +129,7 @@ public class RecipeLoader_GlueLine { FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100)) .fluidOutputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)) .duration(10 * SECONDS) - .eut(8000) + .eut(TierEU.RECIPE_IV) .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // CH4 + NH3 + 3O = HCN + 3H2O @@ -141,7 +141,7 @@ public class RecipeLoader_GlueLine { FluidUtils.getFluidStack("oxygen", 6000)) .fluidOutputs(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)) .duration(10 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); @@ -234,7 +234,7 @@ public class RecipeLoader_GlueLine { .fluidInputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100)) .fluidOutputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(45 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidHeaterRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index df9ef3b1b3..b1d71ca120 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -80,7 +80,7 @@ public class RecipeLoader_MolecularTransformer { .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4)) .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(1 * TICKS) - .eut(1996080) + .eut(TierEU.RECIPE_UHV) .addTo(molecularTransformerRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java index e6e529ff3a..d8faac834d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -82,7 +82,7 @@ public class RecipeLoader_Nuclear { .itemInputs(FLUORIDES.LITHIUM_FLUORIDE.getDust(4), FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3)) .itemOutputs(NUCLIDE.Li2BeF4.getDust(7)) .duration(2 * MINUTES + 20 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .metadata(COIL_HEAT, 3000) .addTo(blastFurnaceRecipes); @@ -389,7 +389,7 @@ public class RecipeLoader_Nuclear { .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 400)) .fluidOutputs(aHydrogenChloride) - .eut(500) + .eut(TierEU.RECIPE_HV) .duration(15 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -401,7 +401,7 @@ public class RecipeLoader_Nuclear { .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 800)) .fluidOutputs(aHydrogenChloride) - .eut(500) + .eut(TierEU.RECIPE_HV) .duration(30 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -497,7 +497,7 @@ public class RecipeLoader_Nuclear { .itemInputs(NUCLIDE.Li2BeF4.getDust(1)) .fluidOutputs(NUCLIDE.Li2BeF4.getFluidStack(144)) .duration(5 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // Lithium Fluoride @@ -505,7 +505,7 @@ public class RecipeLoader_Nuclear { .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 1)) .fluidOutputs(FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(144)) .duration(5 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // LFTR Fuel 1 @@ -527,7 +527,7 @@ public class RecipeLoader_Nuclear { .itemInputs(NUCLIDE.LiFBeF2ThF4UF4.getDust(1)) .fluidOutputs(NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144)) .duration(7 * SECONDS + 10 * TICKS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(fluidExtractionRecipes); // ZIRCONIUM_TETRAFLUORIDE @@ -640,7 +640,7 @@ public class RecipeLoader_Nuclear { .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 10000)) .fluidOutputs(FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(3600)) .duration(2 * MINUTES + 30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); } @@ -658,7 +658,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1)) .outputChances(5000, 278, 1000, 1000, 300, 300) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1)) @@ -671,7 +671,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)) .outputChances(10000, 556, 1500, 1000, 500, 500) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1)) @@ -684,7 +684,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)) .outputChances(10000, 556, 1500, 1000, 500, 500) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); // Radium GT_Values.RA.stdBuilder() @@ -698,7 +698,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 500, 300, 200, 100, 100) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1)) @@ -711,7 +711,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 556, 1000, 500, 500, 500) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1)) @@ -724,7 +724,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 556, 500, 250, 250, 250) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1)) @@ -737,7 +737,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 556, 500, 250, 250, 250) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); } @@ -747,7 +747,7 @@ public class RecipeLoader_Nuclear { .itemInputs(FLUORIDES.SODIUM_FLUORIDE.getDust(1)) .fluidOutputs(FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144)) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidHeaterRecipes); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index f747b8bc20..9b12d4ca11 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -157,15 +157,6 @@ public class GregtechConduits { Logger.INFO("Failed during Hexadecuple pipe generation. [Ecx]"); e.printStackTrace(); } - - // Generate Heat Pipes - // GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021, "gtpp.pipe.heat.basic.01", "Lead Heat - // Pipe (500C)", Materials.Lead, 500).getStackForm(1L)); - // GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022, "gtpp.pipe.heat.basic.02", "Iron Heat - // Pipe (500C)", Materials.Iron, 500).getStackForm(1L)); - // GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023, "gtpp.pipe.heat.basic.03", "Silver - // Heat Pipe (1500C)", Materials.Silver, 1500).getStackForm(1L)); - } private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial, @@ -636,37 +627,6 @@ public class GregtechConduits { } } - private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID, - final long insulatedLoss, final long uninsulatedLoss, final long Amps) { - final GT_Materials T = Material; - int V = 0; - if (Voltage == 8) { - V = 0; - } else if (Voltage == 32) { - V = 1; - } else if (Voltage == 128) { - V = 2; - } else if (Voltage == 512) { - V = 3; - } else if (Voltage == 2048) { - V = 4; - } else if (Voltage == 8196) { - V = 5; - } else if (Voltage == 32768) { - V = 6; - } else if (Voltage == 131072) { - V = 7; - } else if (Voltage == 524288) { - V = 8; - } else if (Voltage == Integer.MAX_VALUE) { - V = 9; - } else { - Logger.ERROR("Failed to set voltage on " + Material.name() + ". Invalid voltage of " + Voltage + "V set."); - Logger.ERROR(Material.name() + " has defaulted to 8v."); - V = 0; - } - } - private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) { final int transferRatePerTick = transferRatePerSec / 20; @@ -727,20 +687,11 @@ public class GregtechConduits { transferRatePerTick * 48, heatResistance, isGasProof).getStackForm(1L)); - // generatePipeRecipes(material.mDefaultLocalName, mass, voltage); } private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) { final int transferRatePerTick = transferRatePerSec / 20; - long mass; - if (myMaterial != null) { - mass = myMaterial.getMass(); - } else { - mass = ELEMENT.getInstance().IRON.getMass(); - } - - int tVoltageMultiplier = (material.mBlastFurnaceTemp >= 2800) ? 64 : 16; GT_OreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), @@ -797,7 +748,6 @@ public class GregtechConduits { transferRatePerTick * 48, heatResistance, isGasProof).getStackForm(1L)); - // generatePipeRecipes(material.mDefaultLocalName, mass, tVoltageMultiplier); } @@ -844,8 +794,7 @@ public class GregtechConduits { + "? " + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true : false)); - int eut = 120; - eut = (int) (8 * vMulti); + int eut = (int) (8 * vMulti); // Add the Three Shaped Recipes First RecipeUtils.addShapedRecipe( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index c3233bf0d5..c3cfd04418 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -45,7 +45,7 @@ public class GregtechIndustrialMassFabricator { ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrap"), 9)) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) - .eut(TierEU.LV) + .eut(TierEU.RECIPE_LV) .noOptimize() .addTo(multiblockMassFabricatorRecipes); @@ -56,7 +56,7 @@ public class GregtechIndustrialMassFabricator { ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrapbox"))) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) - .eut(TierEU.LV) + .eut(TierEU.RECIPE_LV) .noOptimize() .addTo(multiblockMassFabricatorRecipes); diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java index 9c3f501dfc..921feffbd0 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java @@ -243,7 +243,7 @@ public class RECIPE_IC2 { .itemInputs(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T2) .duration(4 * MINUTES + 16 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(extruderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -251,7 +251,7 @@ public class RECIPE_IC2 { GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T2) .duration(4 * MINUTES + 16 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(extruderRecipes); Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]"); @@ -259,7 +259,7 @@ public class RECIPE_IC2 { .itemInputs(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T3) .duration(8 * MINUTES + 32 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(extruderRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -267,7 +267,7 @@ public class RECIPE_IC2 { GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T3) .duration(8 * MINUTES + 32 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(extruderRecipes); Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index bbdddd2f97..ebea8d751f 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -27,6 +27,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; @@ -61,7 +62,7 @@ public class DEFCRecipes { .fluidInputs(Materials.Radon.getPlasma(144)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) - .eut(1_966_080) + .eut(TierEU.RECIPE_UHV) .duration(14_000) .addTo(mixerRecipes); @@ -73,7 +74,7 @@ public class DEFCRecipes { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingBase.get(1)) - .eut(491_520) + .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -82,7 +83,7 @@ public class DEFCRecipes { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT1.get(1)) - .eut(491_520) + .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -92,7 +93,7 @@ public class DEFCRecipes { GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .fluidInputs(Materials.Void.getMolten(2304L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT2.get(1)) - .eut(491_520) + .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -102,7 +103,7 @@ public class DEFCRecipes { GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0)) .fluidInputs(Materials.Void.getMolten(4608L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT3.get(1)) - .eut(1_996_080) + .eut(TierEU.RECIPE_UHV) .duration(12000) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -112,7 +113,7 @@ public class DEFCRecipes { GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0)) .fluidInputs(Materials.Void.getMolten(9216L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT4.get(1)) - .eut(7_864_320) + .eut(TierEU.RECIPE_UEV) .duration(12000) .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() @@ -122,7 +123,7 @@ public class DEFCRecipes { GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0)) .fluidInputs(Materials.Void.getMolten(18432L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT5.get(1)) - .eut(31_457_280) + .eut(TierEU.RECIPE_UIV) .duration(12000) .addTo(assemblerRecipes); @@ -176,7 +177,7 @@ public class DEFCRecipes { kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(0L)) .fluidInputs(Materials.Sunnarium.getMolten(1440)) .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) - .eut(500_000) + .eut(TierEU.RECIPE_UV) .duration(400) .metadata(DEFC_CASING_TIER, 1) .addTo(fusionCraftingRecipes) @@ -191,7 +192,7 @@ public class DEFCRecipes { kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) .fluidInputs(Materials.Neutronium.getMolten(1440)) .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0)) - .eut(2_000_000) + .eut(TierEU.RECIPE_UHV) .duration(800) .metadata(DEFC_CASING_TIER, 2) .addTo(fusionCraftingRecipes) @@ -207,7 +208,7 @@ public class DEFCRecipes { kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) - .eut(8_000_000) + .eut(TierEU.RECIPE_UEV) .duration(1600) .metadata(DEFC_CASING_TIER, 3) .addTo(fusionCraftingRecipes) @@ -222,7 +223,7 @@ public class DEFCRecipes { kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) - .eut(8_000_000) + .eut(TierEU.RECIPE_UEV) .duration(1600) .metadata(DEFC_CASING_TIER, 3) .addTo(fusionCraftingRecipes) @@ -254,7 +255,7 @@ public class DEFCRecipes { GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0)) - .eut(500_000) + .eut(TierEU.RECIPE_UV) .duration(1000) .metadata(DEFC_CASING_TIER, 2) .addTo(fusionCraftingRecipes) @@ -268,7 +269,7 @@ public class DEFCRecipes { GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1)) - .eut(2_000_000) + .eut(TierEU.RECIPE_UHV) .duration(2000) .metadata(DEFC_CASING_TIER, 3) .addTo(fusionCraftingRecipes) @@ -282,7 +283,7 @@ public class DEFCRecipes { GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(144)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) - .eut(1_966_080) + .eut(TierEU.RECIPE_UHV) .duration(4200) .metadata(DEFC_CASING_TIER, 3) .noOptimize() @@ -295,7 +296,7 @@ public class DEFCRecipes { GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(72)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) - .eut(1_966_080) + .eut(TierEU.RECIPE_UHV) .duration(3600) .metadata(DEFC_CASING_TIER, 3) .noOptimize() @@ -308,7 +309,7 @@ public class DEFCRecipes { GTPP_CombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(216)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) - .eut(1_966_080) + .eut(TierEU.RECIPE_UHV) .duration(2800) .metadata(DEFC_CASING_TIER, 3) .noOptimize() @@ -321,7 +322,7 @@ public class DEFCRecipes { GTPP_CombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(108)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) - .eut(1_966_080) + .eut(TierEU.RECIPE_UHV) .duration(2400) .metadata(DEFC_CASING_TIER, 3) .noOptimize() diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 62f3219c07..995583aad4 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -84,6 +84,7 @@ import forestry.plugins.PluginCore; 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_ModHandler; import gregtech.api.util.GT_Utility; import ic2.core.Ic2Items; @@ -159,7 +160,7 @@ public class RecipeLoader { FluidRegistry.getFluidStack("molten.indalloy140", 28800), FluidRegistry.getFluidStack("for.honey", 20000)) .itemOutputs(ExtremeIndustrialApiary.get(1)) - .eut(2_048_000) + .eut(TierEU.RECIPE_UHV) .duration(5 * MINUTES) .addTo(AssemblyLine); @@ -200,14 +201,14 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs(GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1)) .itemOutputs(TeaLeafDehydrated.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(WhiteTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -215,77 +216,77 @@ public class RecipeLoader { .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(SteamedTeaLeaf.get(1)) .fluidInputs(FluidRegistry.getFluidStack("water", 50)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(SteamedTeaLeaf.get(1)) .itemOutputs(YellowTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(RolledTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs(RolledTeaLeaf.get(1)) .itemOutputs(GreenTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(OxidizedTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(UniversalChemical); GT_Values.RA.stdBuilder() .itemInputs(OxidizedTeaLeaf.get(1)) .itemOutputs(BlackTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(FermentedTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(10 * SECONDS) .addTo(UniversalChemical); GT_Values.RA.stdBuilder() .itemInputs(FermentedTeaLeaf.get(1)) .itemOutputs(PuerhTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); GT_Values.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(BruisedTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(PartiallyOxidizedTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(2 * SECONDS + 10 * TICKS) .addTo(UniversalChemical); GT_Values.RA.stdBuilder() .itemInputs(PartiallyOxidizedTeaLeaf.get(1)) .itemOutputs(OolongTeaLeaf.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -295,7 +296,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs(BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1)) .itemOutputs(EarlGrayTea.get(1)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerRecipes); @@ -305,7 +306,7 @@ public class RecipeLoader { .itemInputs(BlackTea.get(1)) .itemOutputs(LemonTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 1000)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerRecipes); @@ -313,7 +314,7 @@ public class RecipeLoader { .itemInputs(BlackTea.get(1)) .itemOutputs(MilkTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("milk", 1000)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerRecipes); @@ -323,7 +324,7 @@ public class RecipeLoader { .itemInputs(GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1)) .itemOutputs(PeppermintTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("water", 1000)) - .eut(32) + .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(mixerRecipes); @@ -346,7 +347,7 @@ public class RecipeLoader { new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }) .fluidInputs(FluidRegistry.getFluidStack("molten.indalloy140", 28800)) .itemOutputs(TeaAcceptor.get(1)) - .eut(2_048_000) + .eut(TierEU.RECIPE_UHV) .duration(5 * MINUTES) .addTo(AssemblyLine); } |