From 4609d74a8e0b189f375ff8d67d779950d671f869 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sun, 25 Aug 2013 12:59:59 -0700 Subject: [PATCH] Fix Refinery Filters --- common/buildcraft/core/fluids/SingleUseTank.java | 10 ++++------ common/buildcraft/core/fluids/Tank.java | 12 ++++++++++-- common/buildcraft/factory/TileRefinery.java | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/common/buildcraft/core/fluids/SingleUseTank.java b/common/buildcraft/core/fluids/SingleUseTank.java index 9b2c4f0d..71f6d1ef 100644 --- a/common/buildcraft/core/fluids/SingleUseTank.java +++ b/common/buildcraft/core/fluids/SingleUseTank.java @@ -50,17 +50,15 @@ public class SingleUseTank extends Tank { } @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); + public void writeTankToNBT(NBTTagCompound nbt) { + super.writeTankToNBT(nbt); if (acceptedFluid != null) nbt.setString("acceptedFluid", acceptedFluid.getName()); - return nbt; } @Override - public FluidTank readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); + public void readTankFromNBT(NBTTagCompound nbt) { + super.readTankFromNBT(nbt); acceptedFluid = FluidRegistry.getFluid(nbt.getString("acceptedFluid")); - return this; } } diff --git a/common/buildcraft/core/fluids/Tank.java b/common/buildcraft/core/fluids/Tank.java index 9db95505..6ec56082 100644 --- a/common/buildcraft/core/fluids/Tank.java +++ b/common/buildcraft/core/fluids/Tank.java @@ -41,22 +41,30 @@ public class Tank extends FluidTank { } @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + public final NBTTagCompound writeToNBT(NBTTagCompound nbt) { NBTTagCompound tankData = new NBTTagCompound(); super.writeToNBT(tankData); + writeTankToNBT(tankData); nbt.setCompoundTag(name, tankData); return nbt; } @Override - public FluidTank readFromNBT(NBTTagCompound nbt) { + public final FluidTank readFromNBT(NBTTagCompound nbt) { if (nbt.hasKey(name)) { NBTTagCompound tankData = nbt.getCompoundTag(name); super.readFromNBT(tankData); + readTankFromNBT(tankData); } return this; } + public void writeTankToNBT(NBTTagCompound nbt) { + } + + public void readTankFromNBT(NBTTagCompound nbt) { + } + public ToolTip getToolTip() { return toolTip; } diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index b931a736..cd8408cb 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -62,7 +62,7 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IPowe } private void initPowerProvider() { - powerHandler.configure(25, 100, 25, 1000); + powerHandler.configure(50, 150, 25, 1000); powerHandler.configurePowerPerdition(1, 1); }