From a41b858395633ea1fcec4d2faac4d0fe701ab6ec Mon Sep 17 00:00:00 2001 From: Alexandre Tardif Date: Wed, 27 Jul 2022 23:26:57 -0400 Subject: Prevent internal ender tank to shift thier fluid by saving them by name instead of by ID --- .../mechanics/enderStorage/EnderFluidContainer.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/main/java') 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..7db66225ac 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,27 +11,18 @@ import java.io.Serializable; public class EnderFluidContainer implements IFluidHandler, Serializable { private static final int CAPACITY = 64000; - private int fluidID = -1; - private int fluidQuantity = 0; + private NBTTagCompound fluid; public EnderFluidContainer() { } private FluidStack getFluidStack() { - FluidStack fluidStack = null; - if (fluidID >= 0) { - fluidStack = new FluidStack(fluidID, fluidQuantity); - } - return fluidStack; + return FluidStack.loadFluidStackFromNBT(fluid); } private void setFluidStack(FluidStack fluidStack) { - if (fluidStack != null && fluidStack.amount != 0) { - fluidID = fluidStack.getFluidID(); - fluidQuantity = fluidStack.amount; - } else { - fluidID = -1; - fluidQuantity = 0; + if (fluidStack != null) { + fluid = fluidStack.writeToNBT(new NBTTagCompound()); } } -- cgit