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 --- src/main/java/kubatech/loaders/DEFCRecipes.java | 35 ++++++++++----------- src/main/java/kubatech/loaders/RecipeLoader.java | 39 ++++++++++++------------ 2 files changed, 38 insertions(+), 36 deletions(-) (limited to 'src/main/java/kubatech') 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); } -- cgit