Fix #899 Machine's exterior tank levels don't update until GUI is opened

This commit is contained in:
mezz committed 2015-10-25 00:46:43 -07:00
1 parent dffa89709b
commit 85c05d8985
21 files changed
+236 -83

No files matched your search

@@ -51,6 +51,11 @@ public class FakeTankManager implements ITankManager {
return FakeTank.INSTANCE;
}
@Override
public void processTankUpdate(int tankIndex, FluidStack contents) {
}
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
return FakeTank.INSTANCE.fill(resource, doFill);
@@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
@@ -27,5 +28,9 @@ public interface ITankManager extends IFluidHandler {
void processGuiUpdate(int messageId, int data);
IFluidTank getTank(int tankIndex);
}
/**
* For updating tanks on the client
*/
void processTankUpdate(int tankIndex, FluidStack contents);
}
@@ -10,9 +10,8 @@
******************************************************************************/
package forestry.core.fluids;
import com.google.common.collect.ForwardingList;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -26,55 +25,64 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
import forestry.core.fluids.tanks.FakeTank;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.network.PacketProgressBarUpdate;
import forestry.core.network.PacketTankLevelUpdate;
import forestry.core.proxy.Proxies;
import forestry.core.render.EnumTankLevel;
import forestry.core.tiles.ILiquidTankTile;
import forestry.core.utils.NBTUtil;
import forestry.core.utils.NBTUtil.NBTList;
/**
* @author CovertJaguar <http://www.railcraft.info>
*/
public class TankManager extends ForwardingList<StandardTank> implements ITankManager, List<StandardTank> {
public class TankManager implements ITankManager {
private static final byte NETWORK_DATA = 3;
private final List<StandardTank> tanks = new ArrayList<>();
private final List<EnumTankLevel> tankLevels = new ArrayList<>();
private final List<FluidStack> prevFluidStacks = new ArrayList<>();
private final List<Integer> prevColor = new ArrayList<>();
// tank updates
@Nullable
private final ILiquidTankTile tile;
public TankManager() {
this.tile = null;
}
public TankManager(StandardTank... tanks) {
this(null, tanks);
}
public TankManager(@Nullable ILiquidTankTile tile, StandardTank... tanks) {
this.tile = tile;
addAll(Arrays.asList(tanks));
}
@Override
protected List<StandardTank> delegate() {
return tanks;
}
@Override
public final boolean addAll(@Nonnull Collection<? extends StandardTank> collection) {
return standardAddAll(collection);
boolean addedAll = true;
for (StandardTank tank : collection) {
addedAll &= add(tank);
}
return addedAll;
}
@Override
public boolean add(@Nonnull StandardTank tank) {
boolean added = tanks.add(tank);
int index = tanks.indexOf(tank);
tank.setTankIndex(index);
tankLevels.add(EnumTankLevel.rateTankLevel(tank));
prevFluidStacks.add(tank.getFluid() == null ? null : tank.getFluid().copy());
prevColor.add(tank.getColor());
return added;
@@ -103,7 +111,9 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
for (NBTTagCompound tag : tagList) {
int slot = tag.getByte("tank");
if (slot >= 0 && slot < tanks.size()) {
tanks.get(slot).readFromNBT(tag);
StandardTank tank = tanks.get(slot);
tank.readFromNBT(tag);
updateTankLevels(tank, false);
}
}
}
@@ -252,9 +262,18 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
}
}
@Override
public void processTankUpdate(int tankIndex, FluidStack contents) {
if (tankIndex < 0 || tankIndex > tanks.size()) {
return;
}
StandardTank tank = tanks.get(tankIndex);
tank.setFluid(contents);
}
@Override
public IFluidTank getTank(int tankIndex) {
return get(tankIndex);
return tanks.get(tankIndex);
}
@Override
@@ -278,36 +297,68 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
return 0;
}
return tank.fill(resource, doFill);
int fill = tank.fill(resource, doFill);
if (doFill) {
updateTankLevels(tank, true);
}
return fill;
}
private void updateTankLevels(StandardTank tank, boolean sendUpdate) {
if (tile == null) {
return;
}
int tankIndex = tank.getTankIndex();
EnumTankLevel tankLevel = EnumTankLevel.rateTankLevel(tank);
if (tankLevel != tankLevels.get(tankIndex)) {
tankLevels.set(tankIndex, tankLevel);
if (sendUpdate) {
PacketTankLevelUpdate tankLevelUpdate = new PacketTankLevelUpdate(tile, tankIndex, tank.getFluid());
Proxies.net.sendNetworkPacket(tankLevelUpdate, tile.getWorld());
}
}
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
for (StandardTank tank : tanks) {
if (tankCanDrain(tank)) {
return drain(tank.getTankIndex(), maxDrain, doDrain);
if (tankCanDrain(tank, true)) {
return drain(tank.getTankIndex(), maxDrain, true, doDrain);
}
}
return FakeTank.INSTANCE.drain(maxDrain, doDrain);
}
public FluidStack drain(int tankIndex, int maxDrain, boolean doDrain) {
public FluidStack drain(int tankIndex, int maxDrain, boolean external, boolean doDrain) {
if (tankIndex < 0 || tankIndex >= tanks.size()) {
return null;
}
StandardTank tank = tanks.get(tankIndex);
if (!tank.canBeDrainedExternally()) {
if (external && !tank.canBeDrainedExternally()) {
return null;
}
return tank.drain(maxDrain, doDrain);
FluidStack drained = tank.drain(maxDrain, doDrain);
if (doDrain) {
updateTankLevels(tank, true);
}
return drained;
}
public FluidStack drain(FluidStack resource, boolean doDrain) {
return drain(resource, false, doDrain);
}
public FluidStack drain(FluidStack resource, boolean external, boolean doDrain) {
for (StandardTank tank : tanks) {
if (tankCanDrainFluid(tank, resource)) {
return tank.drain(resource.amount, doDrain);
if (tankCanDrainFluid(tank, resource, external)) {
return drain(tank.getTankIndex(), resource.amount, external, doDrain);
}
}
return null;
@@ -315,7 +366,7 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
return drain(resource, doDrain);
return drain(resource, true, doDrain);
}
@Override
@@ -330,9 +381,9 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection direction) {
FluidTankInfo[] info = new FluidTankInfo[size()];
for (int i = 0; i < size(); i++) {
info[i] = get(i).getInfo();
FluidTankInfo[] info = new FluidTankInfo[tanks.size()];
for (int i = 0; i < tanks.size(); i++) {
info[i] = tanks.get(i).getInfo();
}
return info;
}
@@ -342,33 +393,15 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
}
public FluidTankInfo getTankInfo(int tankIndex) {
return get(tankIndex).getInfo();
return tanks.get(tankIndex).getInfo();
}
public FluidStack getFluid(int tankIndex) {
return get(tankIndex).getFluid();
return tanks.get(tankIndex).getFluid();
}
@Override
public StandardTank get(int tankIndex) {
return tanks.get(tankIndex);
}
public void setCapacity(int tankIndex, int capacity) {
StandardTank tank = get(tankIndex);
tank.setCapacity(capacity);
FluidStack fluidStack = tank.getFluid();
if (fluidStack != null && fluidStack.amount > capacity) {
fluidStack.amount = capacity;
}
}
public static IFluidHandler getTankFromTile(TileEntity tile) {
IFluidHandler tank = null;
if (tile instanceof IFluidHandler) {
tank = (IFluidHandler) tile;
}
return tank;
public int getFluidAmount(int tankIndex) {
return tanks.get(tankIndex).getFluidAmount();
}
public boolean accepts(Fluid fluid) {
@@ -395,21 +428,21 @@ public class TankManager extends ForwardingList<StandardTank> implements ITankMa
return tank.fill(fluidStack, false) > 0;
}
private static boolean tankCanDrain(StandardTank tank) {
if (!tank.canBeDrainedExternally()) {
private static boolean tankCanDrain(StandardTank tank, boolean external) {
if (external && !tank.canBeDrainedExternally()) {
return false;
}
FluidStack drained = tank.drain(1, false);
return drained != null && drained.amount > 0;
}
private static boolean tankCanDrainFluid(StandardTank tank, FluidStack fluidStack) {
private static boolean tankCanDrainFluid(StandardTank tank, FluidStack fluidStack, boolean external) {
if (fluidStack == null) {
return false;
}
if (!Fluids.areEqual(tank.getFluidType(), fluidStack)) {
return false;
}
return tankCanDrain(tank);
return tankCanDrain(tank, external);
}
}
@@ -13,6 +13,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.registry.GameData;
import forestry.core.utils.Log;
@@ -118,4 +122,15 @@ public class DataInputStreamForestry extends DataInputStream {
return CompressedStreamTools.readCompressed(new ByteArrayInputStream(compressed));
}
}
public FluidStack readFluidStack() throws IOException {
int fluidId = readVarInt();
Fluid fluid = FluidRegistry.getFluid(fluidId);
if (fluid == null) {
return null;
}
int amount = readVarInt();
return new FluidStack(fluid, amount);
}
}
@@ -10,6 +10,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.registry.GameData;
public class DataOutputStreamForestry extends DataOutputStream {
@@ -93,4 +95,13 @@ public class DataOutputStreamForestry extends DataOutputStream {
write(compressed);
}
}
public void writeFluidStack(FluidStack fluidStack) throws IOException {
if (fluidStack == null) {
writeVarInt(-1);
} else {
writeVarInt(fluidStack.getFluidID());
writeVarInt(fluidStack.amount);
}
}
}
@@ -27,6 +27,7 @@ public enum PacketIdClient implements IPacketId {
TILE_FORESTRY_UPDATE(new PacketTileStream()),
ITEMSTACK_DISPLAY(new PacketItemStackDisplay()),
FX_SIGNAL(new PacketFXSignal()),
TANK_LEVEL_UPDATE(new PacketTankLevelUpdate()),
// Core Genome
GENOME_TRACKER_UPDATE(new PacketGenomeTrackerUpdate()),
@@ -0,0 +1,60 @@
/*******************************************************************************
* Copyright (c) 2011-2014 SirSengir.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser Public License v3
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/lgpl-3.0.txt
*
* Various Contributors including, but not limited to:
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
******************************************************************************/
package forestry.core.network;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import forestry.core.fluids.ITankManager;
import forestry.core.proxy.Proxies;
import forestry.core.tiles.ILiquidTankTile;
public class PacketTankLevelUpdate extends PacketCoordinates implements IForestryPacketClient {
private int tankIndex;
private FluidStack contents;
public PacketTankLevelUpdate() {
}
public PacketTankLevelUpdate(ILiquidTankTile tileEntity, int tankIndex, FluidStack contents) {
super(PacketIdClient.TANK_LEVEL_UPDATE, tileEntity.getCoordinates());
this.tankIndex = tankIndex;
this.contents = contents;
}
@Override
protected void writeData(DataOutputStreamForestry data) throws IOException {
super.writeData(data);
data.writeVarInt(tankIndex);
data.writeFluidStack(contents);
}
@Override
public void readData(DataInputStreamForestry data) throws IOException {
super.readData(data);
tankIndex = data.readVarInt();
contents = data.readFluidStack();
}
@Override
public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException {
TileEntity tileEntity = getTarget(Proxies.common.getRenderWorld());
if (tileEntity instanceof ILiquidTankTile) {
ITankManager tankManager = ((ILiquidTankTile) tileEntity).getTankManager();
tankManager.processTankUpdate(tankIndex, contents);
}
}
}
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.core.render;
import net.minecraftforge.fluids.IFluidTank;
public enum EnumTankLevel {
EMPTY(0),
@@ -28,6 +30,10 @@ public enum EnumTankLevel {
return level * scale / 100;
}
public static EnumTankLevel rateTankLevel(IFluidTank tank) {
return rateTankLevel(100 * tank.getFluidAmount() / tank.getCapacity());
}
public static EnumTankLevel rateTankLevel(int scaled) {
if (scaled < 5) {
@@ -25,8 +25,8 @@ public class TankRenderInfo {
@Nonnull
private final EnumTankLevel level;
public TankRenderInfo(@Nonnull IFluidTank fluidTank, int resourceScaled) {
this(Fluids.getFluidColor(fluidTank.getFluid()), EnumTankLevel.rateTankLevel(resourceScaled));
public TankRenderInfo(@Nonnull IFluidTank fluidTank) {
this(Fluids.getFluidColor(fluidTank.getFluid()), EnumTankLevel.rateTankLevel(fluidTank));
}
public TankRenderInfo(@Nonnull Color fluidColor, @Nonnull EnumTankLevel level) {
@@ -12,6 +12,8 @@ package forestry.core.tiles;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import net.minecraftforge.fluids.IFluidHandler;
@@ -25,4 +27,7 @@ public interface ILiquidTankTile extends IFluidHandler {
void sendGUINetworkData(Container container, ICrafting iCrafting);
ChunkCoordinates getCoordinates();
World getWorld();
}
@@ -23,6 +23,7 @@ import net.minecraft.network.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@@ -184,6 +185,10 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE
public void onRemoval() {
}
public World getWorld() {
return worldObj;
}
/* ITriggerProvider */
@Optional.Method(modid = "BuildCraftAPI|statements")
@Override
@@ -67,7 +67,7 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT
setInternalInventory(new GeneratorInventoryAdapter(this));
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FuelManager.generatorFuel.keySet());
tankManager = new TankManager(resourceTank);
tankManager = new TankManager(this, resourceTank);
if (PluginIC2.instance.isAvailable()) {
ic2EnergySource = new BasicSource(this, maxEnergy, 1);
@@ -161,7 +161,7 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT
if (tickCount >= fuel.rate) {
tickCount = 0;
resourceTank.drain(fuel.fuelConsumed.amount, true);
tankManager.drain(fuel.fuelConsumed, true);
}
}
@@ -189,7 +189,7 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT
@Override
public TankRenderInfo getResourceTankInfo() {
return new TankRenderInfo(resourceTank, getResourceScaled(100));
return new TankRenderInfo(resourceTank);
}
@Override
@@ -153,7 +153,7 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
setHints(Config.hints.get("bottler"));
resourceTank = new StandardTank(Constants.PROCESSOR_TANK_CAPACITY);
tankManager = new TankManager(resourceTank);
tankManager = new TankManager(this, resourceTank);
}
@Override
@@ -298,7 +298,7 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
@Override
public TankRenderInfo getResourceTankInfo() {
return new TankRenderInfo(resourceTank, getResourceScaled(100));
return new TankRenderInfo(resourceTank);
}
/* SMP GUI */
@@ -88,7 +88,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
craftPreviewInventory = new InventoryCraftResult();
setInternalInventory(new CarpenterInventoryAdapter(this));
tankManager = new TankManager(resourceTank);
tankManager = new TankManager(this, resourceTank);
}
@Override
@@ -280,9 +280,9 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
// Remove resources
FluidStack fluid = recipe.getFluidResource();
if (fluid != null) {
FluidStack amountDrained = resourceTank.drain(fluid.amount, false);
FluidStack amountDrained = tankManager.drain(fluid, false);
if (amountDrained != null && amountDrained.amount == fluid.amount) {
resourceTank.drain(fluid.amount, true);
tankManager.drain(fluid, true);
} else {
return false;
}
@@ -347,7 +347,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
@Override
public TankRenderInfo getResourceTankInfo() {
return new TankRenderInfo(resourceTank, getResourceScaled(100));
return new TankRenderInfo(resourceTank);
}
/* SMP GUI */
@@ -154,7 +154,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank
// Remove smelt if we have gone below melting point
IFabricatorSmeltingRecipe smelt = FabricatorSmeltingRecipeManager.findMatchingSmelting(moltenTank.getFluid());
if (smelt != null && heat < smelt.getMeltingPoint()) {
moltenTank.drain(5, true);
tankManager.drain(new FluidStack(moltenTank.getFluidType(), 5), true);
}
}
@@ -266,13 +266,13 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank
return;
}
FluidStack canDrain = moltenTank.drain(liquid.amount, false);
FluidStack canDrain = tankManager.drain(liquid, false);
if (canDrain == null || !canDrain.isFluidStackIdentical(liquid)) {
return;
}
removeFromInventory(crafting, player, true);
moltenTank.drain(liquid.amount, true);
tankManager.drain(liquid, true);
// Damage plan
if (inventory.getStackInSlot(SLOT_PLAN) != null) {
@@ -84,7 +84,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
resourceTank.tankMode = StandardTank.TankMode.INPUT;
productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FermenterRecipeManager.recipeFluidOutputs);
productTank.tankMode = StandardTank.TankMode.OUTPUT;
tankManager = new TankManager(resourceTank, productTank);
tankManager = new TankManager(this, resourceTank, productTank);
}
@Override
@@ -201,7 +201,8 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
}
fuelBurnTime--;
resourceTank.drain(fuelCurrentFerment, true);
FluidStack drainResource = new FluidStack(resourceTank.getFluidType(), fuelCurrentFerment);
tankManager.drain(drainResource, true);
fermentationTime -= this.fuelCurrentFerment;
// Not done yet
@@ -360,12 +361,12 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
@Override
public TankRenderInfo getResourceTankInfo() {
return new TankRenderInfo(resourceTank, getResourceScaled(100));
return new TankRenderInfo(resourceTank);
}
@Override
public TankRenderInfo getProductTankInfo() {
return new TankRenderInfo(productTank, getProductScaled(100));
return new TankRenderInfo(productTank);
}
private ItemStack getFermentationStack() {
@@ -415,7 +416,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
@Override
public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) {
return productTank.drain(quantityMax, doEmpty);
return tankManager.drain(new FluidStack(productTank.getFluidType(), quantityMax), doEmpty);
}
@Override
@@ -77,7 +77,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
setInternalInventory(new MoistenerInventoryAdapter(this));
setHints(Config.hints.get("moistener"));
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER);
tankManager = new TankManager(resourceTank);
tankManager = new TankManager(this, resourceTank);
}
@Override
@@ -190,7 +190,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
return;
}
resourceTank.drain(1, true);
tankManager.drain(new FluidStack(resourceTank.getFluidType(), 1), true);
burnTime -= speed;
productionTime -= speed;
@@ -487,7 +487,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
@Override
public TankRenderInfo getResourceTankInfo() {
return new TankRenderInfo(resourceTank, getResourceScaled(100));
return new TankRenderInfo(resourceTank);
}
@Override
@@ -73,7 +73,7 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
setHints(Config.hints.get("squeezer"));
this.productTank = new StandardTank(Constants.PROCESSOR_TANK_CAPACITY);
this.productTank.tankMode = StandardTank.TankMode.OUTPUT;
this.tankManager = new TankManager(productTank);
this.tankManager = new TankManager(this, productTank);
}
@Override
@@ -217,7 +217,7 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
@Override
public TankRenderInfo getProductTankInfo() {
return new TankRenderInfo(productTank, getProductScaled(100));
return new TankRenderInfo(productTank);
}
/* ILIQUIDCONTAINER IMPLEMENTATION */
@@ -69,7 +69,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
resourceTank.tankMode = StandardTank.TankMode.INPUT;
productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, StillRecipeManager.recipeFluidOutputs);
productTank.tankMode = StandardTank.TankMode.OUTPUT;
tankManager = new TankManager(resourceTank, productTank);
tankManager = new TankManager(this, resourceTank, productTank);
}
@Override
@@ -164,8 +164,8 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
if (!errorLogic.hasErrors()) {
// Start next cycle if enough bio mass is available
distillationTime = distillationTotalTime = resourceRequired;
resourceTank.drain(resourceRequired, true);
bufferedLiquid = new FluidStack(currentRecipe.getInput(), resourceRequired);
tankManager.drain(bufferedLiquid, true);
return true;
}
@@ -217,12 +217,12 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
@Override
public TankRenderInfo getResourceTankInfo() {
return new TankRenderInfo(resourceTank, getResourceScaled(100));
return new TankRenderInfo(resourceTank);
}
@Override
public TankRenderInfo getProductTankInfo() {
return new TankRenderInfo(productTank, getProductScaled(100));
return new TankRenderInfo(productTank);
}
/* SMP GUI */
@@ -794,7 +794,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
@Override
public boolean hasLiquid(FluidStack liquid) {
return tankManager.get(0).getFluidAmount() >= liquid.amount;
return tankManager.getFluidAmount(0) >= liquid.amount;
}
@Override
@@ -12,6 +12,7 @@ package forestry.farming.tiles;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
@@ -66,4 +67,9 @@ public class TileValve extends TileFarm implements ILiquidTankTile {
@Override
public void sendGUINetworkData(Container container, ICrafting iCrafting) {
}
@Override
public World getWorld() {
return worldObj;
}
}