Skip to content

Spotless apply for branch tier-fix-fluixAlloy for #307 #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tier940 merged 1 commit into from
Jan 11, 2025
Merged

Spotless apply for branch tier-fix-fluixAlloy for #307 #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand Down Expand Up @@ -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
Expand Down