diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java index 1a5ad6a69c..ca1d872ed1 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.mechanics.enderStorage; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -10,8 +11,11 @@ import java.io.Serializable; public class EnderFluidContainer implements IFluidHandler, Serializable { private static final int CAPACITY = 64000; + @Deprecated() private int fluidID = -1; + @Deprecated() private int fluidQuantity = 0; + private NBTTagCompound fluid; public EnderFluidContainer() { } @@ -19,18 +23,21 @@ public class EnderFluidContainer implements IFluidHandler, Serializable { private FluidStack getFluidStack() { FluidStack fluidStack = null; if (fluidID >= 0) { - fluidStack = new FluidStack(fluidID, fluidQuantity); + fluid = new FluidStack(fluidID, fluidQuantity).writeToNBT(new NBTTagCompound()); + fluidID = -1; + fluidQuantity = 0; + } + if (fluid != null) { + fluidStack = FluidStack.loadFluidStackFromNBT(fluid); } return fluidStack; } private void setFluidStack(FluidStack fluidStack) { - if (fluidStack != null && fluidStack.amount != 0) { - fluidID = fluidStack.getFluidID(); - fluidQuantity = fluidStack.amount; + if (fluidStack != null) { + fluid = fluidStack.writeToNBT(new NBTTagCompound()); } else { - fluidID = -1; - fluidQuantity = 0; + fluid = null; } } |