From dba626989a4fef47edafcb74692149c795bf22ac Mon Sep 17 00:00:00 2001 From: tier940 Date: Sat, 11 Jan 2025 12:17:05 +0900 Subject: [PATCH 1/2] Fixed problem with missing recipe from MoltenFluix Alloy to FluixAlloy Ingot --- CHANGELOG.md | 5 ++++ .../ae/recipes/AEMaterialsRecipe.java | 30 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eee9cc0..8e2c13cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v2.4.1 +- A recipe for processing FluixAlloy Molten in AlloyBlastFurnace into Ingot using Mold has been added + +* * * + # v2.4.0 - Disable automatic meal function for helmets [#300](https://github.com/GTModpackTeam/GTExpert-Core/pull/300) - Removed conflicts with GTWP [#303](https://github.com/GTModpackTeam/GTExpert-Core/pull/303) diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java index 989f55e6..9d17f30f 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java +++ b/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java @@ -4,6 +4,7 @@ import static gregtech.api.unification.ore.OrePrefix.*; import static gtexpert.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; +import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.category.RecipeCategories; @@ -19,11 +20,15 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; +import gregtech.common.items.MetaItems; + import gtexpert.api.GTEValues; import gtexpert.api.unification.material.GTEMaterials; import gtexpert.api.util.Mods; import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler; +import net.minecraftforge.fluids.FluidStack; + public class AEMaterialsRecipe { public static void init() { @@ -325,6 +330,9 @@ public static void init() { int durationFluixAlloy = propertyFluixAlloy.getDurationOverride(); if (durationFluixAlloy < 0) durationFluixAlloy = Math.max(1, (int) (GTEMaterials.FluixAlloy.getMass() * propertyFluixAlloy.getBlastTemperature() / 100L)); + int vacuumEUt = propertyFluixAlloy.getVacuumEUtOverride() != -1 ? propertyFluixAlloy.getVacuumEUtOverride() : VA[MV]; + int vacuumDuration = propertyFluixAlloy.getVacuumDurationOverride() != -1 ? propertyFluixAlloy.getVacuumDurationOverride() : + (int) GTEMaterials.FluixAlloy.getMass() * 3; // Fluid if (Mods.DraconicEvolution.isModLoaded()) { @@ -377,6 +385,28 @@ public static void init() { .output(dust, GTEMaterials.FluixAlloy, 8) .duration(200).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); + + // Ingot + RecipeMaps.VACUUM_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_INGOT) + .fluidInputs(new FluidStack(GTEMaterials.FluixAlloy.getFluid(GCYMFluidStorageKeys.MOLTEN), 144)) + .fluidInputs(Materials.Helium.getFluid(FluidStorageKeys.LIQUID, 500)) + .fluidOutputs(Materials.Helium.getFluid(250)) + .output(ingot, GTEMaterials.FluixAlloy, 1) + .duration(vacuumDuration) + .EUt(vacuumEUt) + .buildAndRegister(); + if (Mods.DraconicEvolution.isModLoaded()) { + RecipeMaps.VACUUM_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_INGOT) + .fluidInputs(new FluidStack(GTEMaterials.FluixAlloy.getFluid(GCYMFluidStorageKeys.MOLTEN), 144)) + .fluidInputs(GTEMaterials.Cryotheum.getFluid(250)) + .fluidOutputs(GTEMaterials.Pyrotheum.getFluid(GCYMFluidStorageKeys.MOLTEN, 50)) + .output(ingot, GTEMaterials.FluixAlloy, 1) + .duration(vacuumDuration / 2) + .EUt(vacuumEUt) + .buildAndRegister(); + } } public static void remove() { From bc0aa2e8e59caf21a717919f327818b29f7da4e1 Mon Sep 17 00:00:00 2001 From: GitHub Actions <> Date: Sat, 11 Jan 2025 03:20:51 +0000 Subject: [PATCH 2/2] spotlessApply --- .../integration/ae/recipes/AEMaterialsRecipe.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java index 9d17f30f..25174752 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java +++ b/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java @@ -4,6 +4,8 @@ import static gregtech.api.unification.ore.OrePrefix.*; import static gtexpert.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.fluids.store.FluidStorageKeys; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; @@ -16,19 +18,16 @@ import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; +import gregtech.common.items.MetaItems; import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gregtech.common.items.MetaItems; - import gtexpert.api.GTEValues; import gtexpert.api.unification.material.GTEMaterials; import gtexpert.api.util.Mods; import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler; -import net.minecraftforge.fluids.FluidStack; - public class AEMaterialsRecipe { public static void init() { @@ -330,8 +329,10 @@ public static void init() { int durationFluixAlloy = propertyFluixAlloy.getDurationOverride(); if (durationFluixAlloy < 0) durationFluixAlloy = Math.max(1, (int) (GTEMaterials.FluixAlloy.getMass() * propertyFluixAlloy.getBlastTemperature() / 100L)); - int vacuumEUt = propertyFluixAlloy.getVacuumEUtOverride() != -1 ? propertyFluixAlloy.getVacuumEUtOverride() : VA[MV]; - int vacuumDuration = propertyFluixAlloy.getVacuumDurationOverride() != -1 ? propertyFluixAlloy.getVacuumDurationOverride() : + int vacuumEUt = propertyFluixAlloy.getVacuumEUtOverride() != -1 ? propertyFluixAlloy.getVacuumEUtOverride() : + VA[MV]; + int vacuumDuration = propertyFluixAlloy.getVacuumDurationOverride() != -1 ? + propertyFluixAlloy.getVacuumDurationOverride() : (int) GTEMaterials.FluixAlloy.getMass() * 3; // Fluid