diff options
Diffstat (limited to 'src/main/java/gregtech/api/objects/GT_FluidStack.java')
-rw-r--r-- | src/main/java/gregtech/api/objects/GT_FluidStack.java | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java index 8771b504cf..8f796430e5 100644 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java @@ -3,27 +3,29 @@ package gregtech.api.objects; import gregtech.api.GregTech_API; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; -import net.minecraftforge.common.ForgeVersion; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.WeakHashMap; +import net.minecraftforge.common.ForgeVersion; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; /** * Because Forge fucked this one up royally. */ public class GT_FluidStack extends FluidStack { - private static final Collection<GT_FluidStack> sAllFluidStacks = Collections.newSetFromMap(new WeakHashMap<>(10000)); + private static final Collection<GT_FluidStack> sAllFluidStacks = + Collections.newSetFromMap(new WeakHashMap<>(10000)); private static volatile boolean lock = false; private Fluid mFluid; public GT_FluidStack(Fluid aFluid, int aAmount) { super(aFluid, aAmount); mFluid = aFluid; - if(!GregTech_API.mServerStarted){sAllFluidStacks.add(this);} + if (!GregTech_API.mServerStarted) { + sAllFluidStacks.add(this); + } } public GT_FluidStack(FluidStack aFluid) { @@ -35,13 +37,16 @@ public class GT_FluidStack extends FluidStack { try { while (lock) { Thread.sleep(1); - }} catch (InterruptedException e) {} + } + } catch (InterruptedException e) { + } lock = true; for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); try { - for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) - GT_Utility.reMap(tMap); - } catch (Throwable e) {e.printStackTrace(GT_Log.err);} + for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) GT_Utility.reMap(tMap); + } catch (Throwable e) { + e.printStackTrace(GT_Log.err); + } lock = false; } } @@ -72,6 +77,7 @@ public class GT_FluidStack extends FluidStack { @Override public String toString() { - return String.format("GT_FluidStack: %s x %s, ID:%s", this.amount, this.getFluid().getName(), this.getFluidID()); + return String.format( + "GT_FluidStack: %s x %s, ID:%s", this.amount, this.getFluid().getName(), this.getFluidID()); } } |