From de0452c4d800d671bc38757c85966850cfd4b8b2 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:37:02 +0100 Subject: Fix full amp recipes (#2930) * round 1 * RS-AL recipes * round 3 with a bit of cleanup * round 4 --------- Co-authored-by: Martin Robertz --- .../common/items/MetaGeneratedGregtechItems.java | 4 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 8 ++-- .../recipe/RecipeLoader_MolecularTransformer.java | 2 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 30 ++++++------ .../registration/gregtech/GregtechConduits.java | 53 +--------------------- .../gregtech/GregtechIndustrialMassFabricator.java | 4 +- 6 files changed, 25 insertions(+), 76 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') 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 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); -- cgit