Merge branch 'master' into tier-drop-steam-machines

Author: tier940

CHANGELOG.md

@@ -1,8 +1,13 @@
-# v2.4.1
+# v2.4.2
 - Delete unused steam machines.
 
 * * *
 
+# 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)

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gtexpert
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.4.0-release
+modVersion = 2.4.1-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java

@@ -4,6 +4,9 @@
 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;
 import gregtech.api.recipes.category.RecipeCategories;
@@ -15,6 +18,7 @@
 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;
@@ -325,6 +329,11 @@ 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 +386,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() {