From ab402cee0629f604ad70a0ebe817d1a86b244ff3 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Wed, 15 Jan 2025 00:53:02 -0500 Subject: [PATCH] Change block autogen to use material mass for duration (#3804) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gregtech/loaders/oreprocessing/ProcessingBlock.java | 6 +++--- .../gregtech/loaders/oreprocessing/ProcessingShaping.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 555341aa45d..04e975aedbc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -141,8 +141,8 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { .itemInputs(ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(1296L)) - .duration(14 * SECONDS + 8 * TICKS) - .eut(8) + .duration(aMaterial.getMass() * 9 * TICKS) + .eut(calculateRecipeEU(aMaterial, 8)) .addTo(fluidSolidifierRecipes); } } @@ -171,7 +171,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) - .duration(15 * SECONDS) + .duration(aMaterial.getMass() * 2 * TICKS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(compressorRecipes); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 9a42178b1c4..97457466d9c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -58,7 +58,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) - .duration((10 * tAmount) * TICKS) + .duration(aMaterialMass * 9 * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); @@ -67,7 +67,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) - .duration((5 * tAmount) * TICKS) + .duration(aMaterialMass * 9 * TICKS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .recipeCategory(RecipeCategories.alloySmelterMolding) .addTo(alloySmelterRecipes);