From f3fe505df28ae395affd283329b67f644f5134bb Mon Sep 17 00:00:00 2001 From: Robert S Date: Fri, 16 May 2014 15:23:49 -0400 Subject: [PATCH] Clean up on tank code --- .../resonantinduction/archaic/fluid/tank/TileTank.java | 6 ++++-- .../resonantinduction/archaic/waila/WailaFluidTank.java | 6 ------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java index 7c1233847..8ae167ed6 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java +++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java @@ -42,6 +42,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class TileTank extends TileFluidDistribution implements IComparatorInputOverride, ISneakPickup { public static final int VOLUME = 16; + private int networkVolumeClient = 0; + private int networkCapClient = 0; public TileTank() { @@ -228,7 +230,7 @@ public class TileTank extends TileFluidDistribution implements IComparatorInputO { List drops = new ArrayList(); - ItemStack itemStack = new ItemStack(Archaic.blockTank); + ItemStack itemStack = new ItemStack(Archaic.blockTank, 1, 0); if (itemStack != null) { if (getInternalTank() != null && getInternalTank().getFluid() != null) @@ -241,7 +243,7 @@ public class TileTank extends TileFluidDistribution implements IComparatorInputO { itemStack.setTagCompound(new NBTTagCompound()); } - drain(ForgeDirection.UNKNOWN, stack.amount, true); + drain(ForgeDirection.UNKNOWN, stack.amount, false); itemStack.getTagCompound().setCompoundTag("fluid", stack.writeToNBT(new NBTTagCompound())); } } diff --git a/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java b/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java index 0b00bbbdb..816e0bebb 100644 --- a/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java +++ b/archaic/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java @@ -23,12 +23,6 @@ public class WailaFluidTank implements IWailaDataProvider if (tile instanceof TileTank) { FluidTank tank = ((TileTank) tile).getInternalTank(); - FluidTank tankNetwork = ((TileTank) tile).getNetwork().getTank(); - if (tankNetwork != null && tankNetwork.getFluid() != null) - { - currenttip.add(LanguageUtility.getLocal("info.waila.tank.fluid") + " " + tankNetwork.getFluid().getFluid().getLocalizedName()); - currenttip.add(LanguageUtility.getLocal("info.waila.tank.vol") + " " + tankNetwork.getFluidAmount() + " / " + tank.getCapacity()); - } if (tank != null && tank.getFluid() != null) { currenttip.add(LanguageUtility.getLocal("info.waila.tank.fluid") + " " + tank.getFluid().getFluid().getLocalizedName());