From 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 10 Apr 2023 17:49:16 +0100 Subject: Update spotless config to 0.2.2 --- src/main/java/gregtech/api/fluid/FluidTankGT.java | 17 ++++++++--------- src/main/java/gregtech/api/fluid/GT_FluidFactory.java | 18 +++++++++--------- 2 files changed, 17 insertions(+), 18 deletions(-) (limited to 'src/main/java/gregtech/api/fluid') diff --git a/src/main/java/gregtech/api/fluid/FluidTankGT.java b/src/main/java/gregtech/api/fluid/FluidTankGT.java index 0d21d7dd49..801354ac86 100644 --- a/src/main/java/gregtech/api/fluid/FluidTankGT.java +++ b/src/main/java/gregtech/api/fluid/FluidTankGT.java @@ -194,16 +194,15 @@ public class FluidTankGT implements IFluidTank { return mVoidExcess ? aFluid.amount : (int) tFilled; } return saturatedCast( - isEmpty() ? mVoidExcess ? aFluid.amount : Math.min(capacity(aFluid), aFluid.amount) - : contains(aFluid) - ? mVoidExcess ? aFluid.amount : Math.min(capacity(aFluid) - mAmount, aFluid.amount) - : 0); + isEmpty() ? mVoidExcess ? aFluid.amount : Math.min(capacity(aFluid), aFluid.amount) + : contains(aFluid) ? mVoidExcess ? aFluid.amount : Math.min(capacity(aFluid) - mAmount, aFluid.amount) + : 0); } public boolean canFillAll(FluidStack aFluid) { return aFluid == null || aFluid.amount <= 0 - || (isEmpty() ? mVoidExcess || aFluid.amount <= capacity(aFluid) - : contains(aFluid) && (mVoidExcess || mAmount + aFluid.amount <= capacity(aFluid))); + || (isEmpty() ? mVoidExcess || aFluid.amount <= capacity(aFluid) + : contains(aFluid) && (mVoidExcess || mAmount + aFluid.amount <= capacity(aFluid))); } public boolean canFillAll(long aAmount) { @@ -366,7 +365,7 @@ public class FluidTankGT implements IFluidTank { final Long tSize = mAdjustableCapacity.get(aFluid); return tSize == null ? Math.max(mAmount, mCapacity) - : Math.max(tSize * mAdjustableMultiplier, Math.max(mAmount, mCapacity)); + : Math.max(tSize * mAdjustableMultiplier, Math.max(mAmount, mCapacity)); } public boolean isHalf() { @@ -419,8 +418,8 @@ public class FluidTankGT implements IFluidTank { public String name() { return mFluid == null ? null - : mFluid.getFluid() - .getName(); + : mFluid.getFluid() + .getName(); } public FluidStack get() { diff --git a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java b/src/main/java/gregtech/api/fluid/GT_FluidFactory.java index ae57f47430..7ffc824a79 100644 --- a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java +++ b/src/main/java/gregtech/api/fluid/GT_FluidFactory.java @@ -53,12 +53,12 @@ public class GT_FluidFactory { * @return the registered {@link Fluid} */ public static Fluid of(final String fluidName, final String localizedName, final Materials material, - final FluidState state, final int temperature) { + final FluidState state, final int temperature) { return builder(fluidName).withLocalizedName(localizedName) - .withStateAndTemperature(state, temperature) - .buildAndRegister() - .configureMaterials(material) - .asFluid(); + .withStateAndTemperature(state, temperature) + .buildAndRegister() + .configureMaterials(material) + .asFluid(); } /** @@ -71,11 +71,11 @@ public class GT_FluidFactory { * @return the registered {@link Fluid} */ public static Fluid of(final String fluidName, final String localizedName, final FluidState state, - final int temperature) { + final int temperature) { return builder(fluidName).withLocalizedName(localizedName) - .withStateAndTemperature(state, temperature) - .buildAndRegister() - .asFluid(); + .withStateAndTemperature(state, temperature) + .buildAndRegister() + .asFluid(); } /** -- cgit