mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 12:09:39 +00:00
Fix #691 Tank GUIs are not synced for multiple players at the same time
This commit is contained in:
1 parent
bcb468b496
commit
4796ea24bb
23 files changed
+157
-263
No files matched your search
@@ -121,7 +121,7 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbttagcompound) {
|
||||
super.readFromNBT(nbttagcompound);
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
|
||||
transferTime = nbttagcompound.getInteger("TransferTime");
|
||||
|
||||
@@ -134,7 +134,7 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbttagcompound) {
|
||||
super.writeToNBT(nbttagcompound);
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
|
||||
nbttagcompound.setInteger("TransferTime", transferTime);
|
||||
if (currentRecipe != null) {
|
||||
|
||||
@@ -32,7 +32,7 @@ public class FakeTankManager implements ITankManager {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGuiData(Container container, ICrafting player) {
|
||||
public void containerAdded(Container container, ICrafting player) {
|
||||
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ public class FakeTankManager implements ITankManager {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processGuiUpdate(int messageId, int data) {
|
||||
public void containerRemoved(Container container) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -97,6 +97,14 @@ public final class FluidHelper {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean areFluidStacksEqual(FluidStack fluidStack1, FluidStack fluidStack2) {
|
||||
if (fluidStack1 == null) {
|
||||
return fluidStack2 == null;
|
||||
} else {
|
||||
return fluidStack1.isFluidStackIdentical(fluidStack2);
|
||||
}
|
||||
}
|
||||
|
||||
public enum FillStatus {
|
||||
SUCCESS, INVALID_INPUT, NO_FLUID, NO_SPACE
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@ import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.IFluidTank;
|
||||
|
||||
public interface ITankManager extends IFluidHandler {
|
||||
void initGuiData(Container container, ICrafting player);
|
||||
void containerAdded(Container container, ICrafting player);
|
||||
|
||||
void updateGuiData(Container container, List<EntityPlayerMP> crafters);
|
||||
|
||||
void processGuiUpdate(int messageId, int data);
|
||||
void containerRemoved(Container container);
|
||||
|
||||
IFluidTank getTank(int tankIndex);
|
||||
|
||||
|
||||
@@ -10,14 +10,16 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.fluids;
|
||||
|
||||
import com.google.common.collect.HashBasedTable;
|
||||
import com.google.common.collect.Table;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -28,14 +30,17 @@ import net.minecraft.nbt.NBTTagList;
|
||||
|
||||
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.IFluidTank;
|
||||
|
||||
import forestry.api.core.INBTTagable;
|
||||
import forestry.core.fluids.tanks.FakeTank;
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.core.network.PacketProgressBarUpdate;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.IForestryPacketClient;
|
||||
import forestry.core.network.IStreamable;
|
||||
import forestry.core.network.PacketTankLevelUpdate;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.render.EnumTankLevel;
|
||||
@@ -46,16 +51,18 @@ import forestry.core.utils.NBTUtil.NBTList;
|
||||
/**
|
||||
* @author CovertJaguar <http://www.railcraft.info>
|
||||
*/
|
||||
public class TankManager implements ITankManager {
|
||||
public class TankManager implements ITankManager, IStreamable, INBTTagable {
|
||||
|
||||
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
|
||||
|
||||
// for container updates, keeps track of the fluids known to each client (container)
|
||||
private final Table<Container, Integer, FluidStack> prevFluidStacks = HashBasedTable.create();
|
||||
|
||||
// tank tile updates, for blocks that show fluid levels on the outside
|
||||
@Nullable
|
||||
private final ILiquidTankTile tile;
|
||||
private final List<EnumTankLevel> tankLevels = new ArrayList<>();
|
||||
|
||||
public TankManager() {
|
||||
this.tile = null;
|
||||
@@ -83,8 +90,6 @@ public class TankManager implements ITankManager {
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -92,7 +97,8 @@ public class TankManager implements ITankManager {
|
||||
return NETWORK_DATA * tanks.size();
|
||||
}
|
||||
|
||||
public void writeTanksToNBT(NBTTagCompound data) {
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound data) {
|
||||
NBTTagList tagList = new NBTTagList();
|
||||
for (byte slot = 0; slot < tanks.size(); slot++) {
|
||||
StandardTank tank = tanks.get(slot);
|
||||
@@ -106,7 +112,8 @@ public class TankManager implements ITankManager {
|
||||
data.setTag("tanks", tagList);
|
||||
}
|
||||
|
||||
public void readTanksFromNBT(NBTTagCompound data) {
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound data) {
|
||||
NBTList<NBTTagCompound> tagList = NBTUtil.getNBTList(data, "tanks", NBTUtil.EnumNBTType.COMPOUND);
|
||||
for (NBTTagCompound tag : tagList) {
|
||||
int slot = tag.getByte("tank");
|
||||
@@ -118,72 +125,38 @@ public class TankManager implements ITankManager {
|
||||
}
|
||||
}
|
||||
|
||||
public void writePacketData(DataOutputStream data) throws IOException {
|
||||
for (int i = 0; i < tanks.size(); i++) {
|
||||
writePacketData(data, i);
|
||||
}
|
||||
}
|
||||
|
||||
public void writePacketData(DataOutputStream data, int tankIndex) throws IOException {
|
||||
if (tankIndex >= tanks.size()) {
|
||||
return;
|
||||
}
|
||||
StandardTank tank = tanks.get(tankIndex);
|
||||
FluidStack fluidStack = tank.getFluid();
|
||||
if (fluidStack != null) {
|
||||
data.writeShort(fluidStack.getFluid().getID());
|
||||
data.writeInt(fluidStack.amount);
|
||||
data.writeInt(fluidStack.getFluid().getColor(fluidStack));
|
||||
} else {
|
||||
data.writeShort(-1);
|
||||
}
|
||||
}
|
||||
|
||||
public void readPacketData(DataInputStream data) throws IOException {
|
||||
for (int i = 0; i < tanks.size(); i++) {
|
||||
readPacketData(data, i);
|
||||
}
|
||||
}
|
||||
|
||||
public void readPacketData(DataInputStream data, int tankIndex) throws IOException {
|
||||
if (tankIndex >= tanks.size()) {
|
||||
return;
|
||||
}
|
||||
StandardTank tank = tanks.get(tankIndex);
|
||||
int fluidId = data.readShort();
|
||||
Fluid fluid = FluidRegistry.getFluid(fluidId);
|
||||
if (fluid != null) {
|
||||
int amount = data.readInt();
|
||||
FluidStack fluidStack = new FluidStack(fluid, amount);
|
||||
tank.setFluid(fluidStack);
|
||||
tank.colorCache = data.readInt();
|
||||
} else {
|
||||
tank.setFluid(null);
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
for (StandardTank tank : tanks) {
|
||||
tank.writeData(data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGuiData(Container container, ICrafting player) {
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
for (StandardTank tank : tanks) {
|
||||
initGuiData(container, player, tank.getTankIndex());
|
||||
tank.readData(data);
|
||||
}
|
||||
}
|
||||
|
||||
private void initGuiData(Container container, ICrafting player, int tankIndex) {
|
||||
if (tankIndex >= tanks.size()) {
|
||||
@Override
|
||||
public void containerAdded(Container container, ICrafting player) {
|
||||
if (!(player instanceof EntityPlayerMP)) {
|
||||
return;
|
||||
}
|
||||
FluidStack fluidStack = tanks.get(tankIndex).getFluid();
|
||||
int fluidId = -1;
|
||||
int fluidAmount = 0;
|
||||
if (fluidStack != null && fluidStack.amount > 0) {
|
||||
fluidId = fluidStack.getFluid().getID();
|
||||
fluidAmount = fluidStack.amount;
|
||||
}
|
||||
|
||||
player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA, fluidId);
|
||||
PacketProgressBarUpdate packet = new PacketProgressBarUpdate(container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount);
|
||||
Proxies.net.sendToPlayer(packet, (EntityPlayerMP) player);
|
||||
List<EntityPlayerMP> crafters = Collections.singletonList((EntityPlayerMP) player);
|
||||
|
||||
for (StandardTank tank : tanks) {
|
||||
sendTankUpdate(container, tank, crafters);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void containerRemoved(Container container) {
|
||||
for (StandardTank tank : tanks) {
|
||||
prevFluidStacks.remove(container, tank.getTankIndex());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -195,70 +168,31 @@ public class TankManager implements ITankManager {
|
||||
|
||||
private void updateGuiData(Container container, List<EntityPlayerMP> crafters, int tankIndex) {
|
||||
StandardTank tank = tanks.get(tankIndex);
|
||||
FluidStack fluidStack = tank.getFluid();
|
||||
FluidStack prev = prevFluidStacks.get(tankIndex);
|
||||
int color = tank.getColor();
|
||||
int pColor = prevColor.get(tankIndex);
|
||||
|
||||
for (EntityPlayerMP player : crafters) {
|
||||
if (fluidStack == null ^ prev == null) {
|
||||
int fluidId = -1;
|
||||
int fluidAmount = 0;
|
||||
if (fluidStack != null) {
|
||||
fluidId = fluidStack.getFluid().getID();
|
||||
fluidAmount = fluidStack.amount;
|
||||
}
|
||||
player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA, fluidId);
|
||||
PacketProgressBarUpdate packet = new PacketProgressBarUpdate(container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount);
|
||||
Proxies.net.sendToPlayer(packet, player);
|
||||
} else if (fluidStack != null && prev != null) {
|
||||
if (fluidStack.getFluid() != prev.getFluid()) {
|
||||
player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA, fluidStack.getFluid().getID());
|
||||
}
|
||||
if (fluidStack.amount != prev.amount) {
|
||||
PacketProgressBarUpdate packet = new PacketProgressBarUpdate(container.windowId, tankIndex * NETWORK_DATA + 1, fluidStack.amount);
|
||||
Proxies.net.sendToPlayer(packet, player);
|
||||
}
|
||||
if (color != pColor) {
|
||||
PacketProgressBarUpdate packet = new PacketProgressBarUpdate(container.windowId, tankIndex * NETWORK_DATA + 2, color);
|
||||
Proxies.net.sendToPlayer(packet, player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
prevFluidStacks.set(tankIndex, tank.getFluid() == null ? null : tank.getFluid().copy());
|
||||
prevColor.set(tankIndex, color);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processGuiUpdate(int messageId, int data) {
|
||||
int tankIndex = messageId / NETWORK_DATA;
|
||||
|
||||
if (tankIndex >= tanks.size()) {
|
||||
if (tank == null) {
|
||||
return;
|
||||
}
|
||||
StandardTank tank = tanks.get(tankIndex);
|
||||
|
||||
switch (messageId % NETWORK_DATA) {
|
||||
case 0: {
|
||||
Fluid fluid = FluidRegistry.getFluid(data);
|
||||
if (fluid != null) {
|
||||
FluidStack fluidStack = new FluidStack(fluid, 0);
|
||||
tank.setFluid(fluidStack);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
FluidStack fluidStack = tank.getFluid();
|
||||
if (fluidStack != null) {
|
||||
fluidStack.amount = data;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
tank.colorCache = data;
|
||||
break;
|
||||
}
|
||||
FluidStack fluidStack = tank.getFluid();
|
||||
FluidStack prev = prevFluidStacks.get(container, tankIndex);
|
||||
if (FluidHelper.areFluidStacksEqual(fluidStack, prev)) {
|
||||
return;
|
||||
}
|
||||
|
||||
sendTankUpdate(container, tank, crafters);
|
||||
}
|
||||
|
||||
private void sendTankUpdate(Container container, StandardTank tank, Iterable<EntityPlayerMP> crafters) {
|
||||
int tankIndex = tank.getTankIndex();
|
||||
FluidStack fluid = tank.getFluid();
|
||||
IForestryPacketClient packet = new PacketTankLevelUpdate(tile, tankIndex, fluid);
|
||||
for (EntityPlayerMP player : crafters) {
|
||||
Proxies.net.sendToPlayer(packet, player);
|
||||
}
|
||||
|
||||
if (fluid == null) {
|
||||
prevFluidStacks.remove(container, tankIndex);
|
||||
} else {
|
||||
prevFluidStacks.put(container, tankIndex, fluid.copy());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.fluids.tanks;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.item.EnumRarity;
|
||||
@@ -21,12 +22,14 @@ import net.minecraftforge.fluids.FluidTank;
|
||||
|
||||
import forestry.core.gui.tooltips.ToolTip;
|
||||
import forestry.core.gui.tooltips.ToolTipLine;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.IStreamable;
|
||||
|
||||
/**
|
||||
* @author CovertJaguar <http://www.railcraft.info>
|
||||
*/
|
||||
public class StandardTank extends FluidTank {
|
||||
|
||||
public class StandardTank extends FluidTank implements IStreamable {
|
||||
// defines how the tank responds to IFluidHandler requests
|
||||
public enum TankMode {
|
||||
DEFAULT, OUTPUT, INPUT, INTERNAL
|
||||
@@ -34,7 +37,6 @@ public class StandardTank extends FluidTank {
|
||||
|
||||
public TankMode tankMode = TankMode.DEFAULT;
|
||||
private static final int DEFAULT_COLOR = 0xFFFFFF;
|
||||
public int colorCache = DEFAULT_COLOR;
|
||||
private int tankIndex;
|
||||
|
||||
public StandardTank(int capacity) {
|
||||
@@ -65,12 +67,6 @@ public class StandardTank extends FluidTank {
|
||||
return tankIndex;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFluid(FluidStack fluid) {
|
||||
super.setFluid(fluid);
|
||||
colorCache = StandardTank.DEFAULT_COLOR;
|
||||
}
|
||||
|
||||
public int getColor() {
|
||||
Fluid f = getFluidType();
|
||||
if (f == null) {
|
||||
@@ -181,4 +177,15 @@ public class StandardTank extends FluidTank {
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
data.writeFluidStack(fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
fluid = data.readFluidStack();
|
||||
}
|
||||
}
|
||||
@@ -43,7 +43,6 @@ public abstract class ContainerLiquidTanks<T extends TileEntity & ILiquidTankTil
|
||||
public void updateProgressBar(int messageId, int data) {
|
||||
super.updateProgressBar(messageId, data);
|
||||
|
||||
tile.getTankManager().processGuiUpdate(messageId, data);
|
||||
tile.getGUINetworkData(messageId, data);
|
||||
}
|
||||
|
||||
@@ -60,7 +59,13 @@ public abstract class ContainerLiquidTanks<T extends TileEntity & ILiquidTankTil
|
||||
@Override
|
||||
public void addCraftingToCrafters(ICrafting icrafting) {
|
||||
super.addCraftingToCrafters(icrafting);
|
||||
tile.getTankManager().initGuiData(this, icrafting);
|
||||
tile.getTankManager().containerAdded(this, icrafting);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onContainerClosed(EntityPlayer entityPlayer) {
|
||||
super.onContainerClosed(entityPlayer);
|
||||
tile.getTankManager().containerRemoved(this);
|
||||
}
|
||||
|
||||
public IFluidTank getTank(int slot) {
|
||||
|
||||
@@ -48,7 +48,6 @@ public abstract class ContainerLiquidTanksSocketed<T extends TileEntity & ILiqui
|
||||
public void updateProgressBar(int messageId, int data) {
|
||||
super.updateProgressBar(messageId, data);
|
||||
|
||||
tile.getTankManager().processGuiUpdate(messageId, data);
|
||||
tile.getGUINetworkData(messageId, data);
|
||||
}
|
||||
|
||||
@@ -65,7 +64,13 @@ public abstract class ContainerLiquidTanksSocketed<T extends TileEntity & ILiqui
|
||||
@Override
|
||||
public void addCraftingToCrafters(ICrafting icrafting) {
|
||||
super.addCraftingToCrafters(icrafting);
|
||||
tile.getTankManager().initGuiData(this, icrafting);
|
||||
tile.getTankManager().containerAdded(this, icrafting);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onContainerClosed(EntityPlayer entityPlayer) {
|
||||
super.onContainerClosed(entityPlayer);
|
||||
tile.getTankManager().containerRemoved(this);
|
||||
}
|
||||
|
||||
public IFluidTank getTank(int slot) {
|
||||
|
||||
@@ -19,7 +19,6 @@ public enum PacketIdClient implements IPacketId {
|
||||
ERROR_UPDATE(new PacketErrorUpdate()),
|
||||
GUI_UPDATE(new PacketGuiUpdate()),
|
||||
GUI_LAYOUT_SELECT(new PacketGuiLayoutSelect()),
|
||||
GUI_PROGRESS_BAR(new PacketProgressBarUpdate()),
|
||||
GUI_ENERGY(new PacketGuiEnergy()),
|
||||
SOCKET_UPDATE(new PacketSocketUpdate()),
|
||||
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
/*******************************************************************************
|
||||
* 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;
|
||||
|
||||
/**
|
||||
* @author CovertJaguar <http://www.railcraft.info>
|
||||
*/
|
||||
|
||||
public class PacketProgressBarUpdate extends ForestryPacket implements IForestryPacketClient {
|
||||
|
||||
private int windowId, dataId, value;
|
||||
|
||||
public PacketProgressBarUpdate() {
|
||||
}
|
||||
|
||||
public PacketProgressBarUpdate(int windowId, int dataId, int value) {
|
||||
super(PacketIdClient.GUI_PROGRESS_BAR);
|
||||
this.windowId = windowId;
|
||||
this.dataId = dataId;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
data.writeByte(windowId);
|
||||
data.writeByte(dataId);
|
||||
data.writeInt(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
windowId = data.readByte();
|
||||
dataId = data.readByte();
|
||||
value = data.readInt();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException {
|
||||
if (player.openContainer != null && player.openContainer.windowId == windowId) {
|
||||
player.openContainer.updateProgressBar(dataId, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -98,7 +98,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
|
||||
|
||||
nbttagcompound.setInteger("AnalyzeTime", analyzeTime);
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -107,7 +107,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
|
||||
|
||||
analyzeTime = nbttagcompound.getInteger("AnalyzeTime");
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -214,14 +214,14 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
|
||||
super.writeData(data);
|
||||
ItemStack displayStack = getIndividualOnDisplay();
|
||||
data.writeItemStack(displayStack);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
individualOnDisplayClient = data.readItemStack();
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -263,7 +263,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
|
||||
}
|
||||
}
|
||||
|
||||
tankManager.readTanksFromNBT(nbt);
|
||||
tankManager.readFromNBT(nbt);
|
||||
|
||||
}
|
||||
|
||||
@@ -279,7 +279,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
|
||||
nbt.setString("currentFluid", fluid.getName());
|
||||
}
|
||||
|
||||
tankManager.writeTanksToNBT(nbt);
|
||||
tankManager.writeToNBT(nbt);
|
||||
}
|
||||
|
||||
/* NETWORK */
|
||||
@@ -287,14 +287,14 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
data.writeBoolean(shutdown);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
shutdown = data.readBoolean();
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
/* GUI */
|
||||
|
||||
@@ -87,7 +87,7 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT
|
||||
ic2EnergySource.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -98,19 +98,19 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT
|
||||
ic2EnergySource.readFromNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -85,26 +85,26 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbttagcompound) {
|
||||
super.writeToNBT(nbttagcompound);
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbttagcompound) {
|
||||
super.readFromNBT(nbttagcompound);
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
checkRecipe();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -104,7 +104,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
nbttagcompound.setInteger("PackageTime", packageTime);
|
||||
nbttagcompound.setInteger("PackageTotalTime", totalTime);
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
|
||||
craftingInventory.writeToNBT(nbttagcompound);
|
||||
|
||||
@@ -123,7 +123,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
packageTime = nbttagcompound.getInteger("PackageTime");
|
||||
totalTime = nbttagcompound.getInteger("PackageTotalTime");
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
|
||||
craftingInventory.readFromNBT(nbttagcompound);
|
||||
|
||||
@@ -140,13 +140,13 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
public void resetRecipe() {
|
||||
|
||||
@@ -99,7 +99,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank
|
||||
nbttagcompound.setInteger("Heat", heat);
|
||||
|
||||
// Tank
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
|
||||
craftingInventory.writeToNBT(nbttagcompound);
|
||||
}
|
||||
@@ -111,7 +111,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank
|
||||
heat = nbttagcompound.getInteger("Heat");
|
||||
|
||||
// Tank
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
|
||||
craftingInventory.readFromNBT(nbttagcompound);
|
||||
|
||||
@@ -132,13 +132,13 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
/* UPDATING */
|
||||
|
||||
@@ -102,7 +102,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
nbttagcompound.setInteger("FuelTotalTime", fuelTotalTime);
|
||||
nbttagcompound.setInteger("FuelCurrentFerment", fuelCurrentFerment);
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
|
||||
}
|
||||
|
||||
@@ -116,19 +116,19 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
fuelTotalTime = nbttagcompound.getInteger("FuelTotalTime");
|
||||
fuelCurrentFerment = nbttagcompound.getInteger("FuelCurrentFerment");
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -94,7 +94,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
nbttagcompound.setInteger("TotalTime", totalTime);
|
||||
nbttagcompound.setInteger("ProductionTime", productionTime);
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
|
||||
// Write pending product
|
||||
if (pendingProduct != null) {
|
||||
@@ -117,7 +117,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
totalTime = nbttagcompound.getInteger("TotalTime");
|
||||
productionTime = nbttagcompound.getInteger("ProductionTime");
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
|
||||
// Load pending product
|
||||
if (nbttagcompound.hasKey("PendingProduct")) {
|
||||
@@ -135,13 +135,13 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -89,7 +89,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
|
||||
nbttagcompound.setBoolean("IsValidBiome", isValidBiome);
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -98,19 +98,19 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
|
||||
isValidBiome = nbttagcompound.getBoolean("IsValidBiome");
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -85,14 +85,14 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbttagcompound) {
|
||||
super.writeToNBT(nbttagcompound);
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
sockets.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbttagcompound) {
|
||||
super.readFromNBT(nbttagcompound);
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
sockets.readFromNBT(nbttagcompound);
|
||||
|
||||
ItemStack chip = sockets.getStackInSlot(0);
|
||||
@@ -107,13 +107,13 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -84,7 +84,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
nbttagcompound.setInteger("DistillationTime", distillationTime);
|
||||
nbttagcompound.setInteger("DistillationTotalTime", distillationTotalTime);
|
||||
|
||||
tankManager.writeTanksToNBT(nbttagcompound);
|
||||
tankManager.writeToNBT(nbttagcompound);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -94,7 +94,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
distillationTime = nbttagcompound.getInteger("DistillationTime");
|
||||
distillationTotalTime = nbttagcompound.getInteger("DistillationTotalTime");
|
||||
|
||||
tankManager.readTanksFromNBT(nbttagcompound);
|
||||
tankManager.readFromNBT(nbttagcompound);
|
||||
|
||||
checkRecipe();
|
||||
}
|
||||
@@ -102,13 +102,13 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
@Override
|
||||
public void writeData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readData(DataInputStreamForestry data) throws IOException {
|
||||
super.readData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,7 +14,6 @@ import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
||||
import net.minecraftforge.fluids.IFluidTank;
|
||||
|
||||
import forestry.core.fluids.ITankManager;
|
||||
import forestry.core.gui.ContainerSocketed;
|
||||
import forestry.core.gui.slots.SlotFiltered;
|
||||
import forestry.core.gui.slots.SlotOutput;
|
||||
@@ -61,14 +60,6 @@ public class ContainerFarm extends ContainerSocketed<TileFarm> {
|
||||
addSlotToContainer(new SlotFiltered(tile, FarmInventory.SLOT_CAN, 15, 95));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateProgressBar(int i, int j) {
|
||||
ITankManager tankManager = tile.getFarmController().getTankManager();
|
||||
if (tankManager != null) {
|
||||
tankManager.processGuiUpdate(i, j);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void detectAndSendChanges() {
|
||||
super.detectAndSendChanges();
|
||||
|
||||
@@ -318,7 +318,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
super.writeToNBT(data);
|
||||
sockets.writeToNBT(data);
|
||||
hydrationManager.writeToNBT(data);
|
||||
tankManager.writeTanksToNBT(data);
|
||||
tankManager.writeToNBT(data);
|
||||
fertilizerManager.writeToNBT(data);
|
||||
inventory.writeToNBT(data);
|
||||
}
|
||||
@@ -328,7 +328,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
super.readFromNBT(data);
|
||||
sockets.readFromNBT(data);
|
||||
hydrationManager.readFromNBT(data);
|
||||
tankManager.readTanksFromNBT(data);
|
||||
tankManager.readFromNBT(data);
|
||||
fertilizerManager.readFromNBT(data);
|
||||
inventory.readFromNBT(data);
|
||||
|
||||
@@ -339,7 +339,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
public void formatDescriptionPacket(NBTTagCompound data) {
|
||||
sockets.writeToNBT(data);
|
||||
hydrationManager.writeToNBT(data);
|
||||
tankManager.writeTanksToNBT(data);
|
||||
tankManager.writeToNBT(data);
|
||||
fertilizerManager.writeToNBT(data);
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
public void decodeDescriptionPacket(NBTTagCompound data) {
|
||||
sockets.readFromNBT(data);
|
||||
hydrationManager.readFromNBT(data);
|
||||
tankManager.readTanksFromNBT(data);
|
||||
tankManager.readFromNBT(data);
|
||||
fertilizerManager.readFromNBT(data);
|
||||
|
||||
refreshFarmLogics();
|
||||
@@ -379,7 +379,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
@Override
|
||||
public void writeGuiData(DataOutputStreamForestry data) throws IOException {
|
||||
super.writeGuiData(data);
|
||||
tankManager.writePacketData(data);
|
||||
tankManager.writeData(data);
|
||||
hydrationManager.writeData(data);
|
||||
fertilizerManager.writeData(data);
|
||||
}
|
||||
@@ -387,7 +387,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
@Override
|
||||
public void readGuiData(DataInputStreamForestry data) throws IOException {
|
||||
super.readGuiData(data);
|
||||
tankManager.readPacketData(data);
|
||||
tankManager.readData(data);
|
||||
hydrationManager.readData(data);
|
||||
fertilizerManager.readData(data);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user