tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Got rid of multi tank code for prefab

Browse source 
Both this time and the last time i tried this it caused more issues than
it was worth. I'll deal with it later in its own special class as the
main tiles will not need more than one tank.
This commit is contained in:
DarkGuardsman 2013-10-31 04:26:00 -04:00
parent d98a1d6d69
commit 7d19ddb767
3 changed files with 60 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java
View file

@ -5,6 +5,7 @@ import java.util.Iterator;
import java.util.Set; import java.util.Set;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTank;
@ -58,21 +59,21 @@ public class NetworkFluidTiles extends NetworkTileEntities
return this.sharedTankInfo; return this.sharedTankInfo;
} }
public int fillNetworkTank(FluidStack stack, boolean doFill) public int fillNetworkTank(World world, FluidStack stack, boolean doFill)
{ {
if (!this.loadedLiquids) if (!this.loadedLiquids)
{ {
this.readDataFromTiles(); this.readDataFromTiles();
this.loadedLiquids = true; this.loadedLiquids = true;
} }
if (this.getNetworkTank() != null) if (!world.isRemote && this.getNetworkTank() != null && stack != null)
{ {
int p = this.getNetworkTank().getFluidAmount(); int p = this.getNetworkTank().getFluidAmount();
int r = this.getNetworkTank().fill(stack, doFill); int r = this.getNetworkTank().fill(stack, doFill);
System.out.println((world.isRemote ? "Client" : "Server") + " Network Fill: B:" + p + " A:" + this.getNetworkTank().getFluidAmount());
if (doFill) if (doFill)
{ {
if (p != r) if (p != this.getNetworkTank().getFluidAmount())
{ {
this.sharedTankInfo = this.getNetworkTank().getInfo(); this.sharedTankInfo = this.getNetworkTank().getInfo();
this.writeDataToTiles(); this.writeDataToTiles();
@ -83,7 +84,7 @@ public class NetworkFluidTiles extends NetworkTileEntities
return 0; return 0;
} }
public FluidStack drainNetworkTank(int volume, boolean doDrain) public FluidStack drainNetworkTank(World world, int volume, boolean doDrain)
{ {
if (!this.loadedLiquids) if (!this.loadedLiquids)
@ -91,18 +92,22 @@ public class NetworkFluidTiles extends NetworkTileEntities
this.readDataFromTiles(); this.readDataFromTiles();
this.loadedLiquids = true; this.loadedLiquids = true;
} }
if (this.getNetworkTank() != null) if (!world.isRemote && this.getNetworkTank() != null)
{ {
FluidStack p = this.getNetworkTank().getFluid(); FluidStack p = this.getNetworkTank().getFluid();
FluidStack r = this.getNetworkTank().drain(volume, doDrain); FluidStack r = this.getNetworkTank().drain(volume, doDrain);
FluidStack n = this.getNetworkTank().getFluid();
System.out.println((world.isRemote ? "Client" : "Server") + " Network Drain: B:" + (p != null ? p.amount : 0) + " A:" + (n != null ? n.amount : 0));
if (doDrain) if (doDrain)
{ {
//Has the tank changed any. If yes then update all info and do a client update //Has the tank changed any. If yes then update all info and do a client update
if (!p.isFluidEqual(r) || (p != null && r != null && p.amount != r.amount)) if (!p.isFluidEqual(n) || (p != null && n != null && p.amount != n.amount))
{ {
this.sharedTankInfo = this.getNetworkTank().getInfo(); this.sharedTankInfo = this.getNetworkTank().getInfo();
this.writeDataToTiles(); this.writeDataToTiles();
//TODO do a client update from the network rather than each pipe updating itself. //TODO do a client update from the network rather than each pipe updating itself.
//This will save on packet size but will increase the CPU load of the client since it
//will need to do network calculations
} }
} }
return r; return r;

6
src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java
View file

@ -156,7 +156,7 @@ public class NetworkPipes extends NetworkFluidTiles
} }
else if (allowStore) else if (allowStore)
{ {
used = this.fillNetworkTank(stack, doFill); used = this.fillNetworkTank(source.worldObj, stack, doFill);
// System.out.println("Network Target filled for " + used + doFill); // System.out.println("Network Target filled for " + used + doFill);
filledMain = true; filledMain = true;
} }
@ -168,14 +168,14 @@ public class NetworkPipes extends NetworkFluidTiles
FluidStack drainStack = new FluidStack(0, 0); FluidStack drainStack = new FluidStack(0, 0);
if (this.getNetworkTank().getFluid().amount >= used) if (this.getNetworkTank().getFluid().amount >= used)
{ {
drainStack = this.drainNetworkTank(used, doFill); drainStack = this.drainNetworkTank(source.worldObj, used, doFill);
used = 0; used = 0;
} }
else else
{ {
int pUsed = used; int pUsed = used;
used = Math.min(used, Math.max(used - this.getNetworkTank().getFluid().amount, 0)); used = Math.min(used, Math.max(used - this.getNetworkTank().getFluid().amount, 0));
drainStack = this.drainNetworkTank(pUsed - used, doFill); drainStack = this.drainNetworkTank(source.worldObj, pUsed - used, doFill);
} }
// System.out.println("Pulling " + (drainStack != null ? drainStack.amount : 0) + // System.out.println("Pulling " + (drainStack != null ? drainStack.amount : 0) +
// " from combined leaving " + (this.combinedStorage.getLiquid() != null ? // " from combined leaving " + (this.combinedStorage.getLiquid() != null ?

167
src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java
View file

@ -37,19 +37,16 @@ import dark.core.prefab.tilenetwork.NetworkTileEntities;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles; import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
import dark.fluid.common.FluidPartsMaterial; import dark.fluid.common.FluidPartsMaterial;
public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
{ {
private int updateTick = 1; private int updateTick = 1;
protected static final byte NO_CONENCTION = 0, PIPE_CONENCTION = 1, NETWORK_CONNECTION = 2; protected FluidTank tank;
protected FluidTank[] internalTanks = new FluidTank[1];;
protected FluidTankInfo[] internalTanksInfo = new FluidTankInfo[1]; protected FluidTankInfo[] internalTanksInfo = new FluidTankInfo[1];
protected List<TileEntity> connectedBlocks = new ArrayList<TileEntity>(); protected List<TileEntity> connectedBlocks = new ArrayList<TileEntity>();
public boolean[] renderConnection = new boolean[6]; public boolean[] renderConnection = new boolean[6];
public boolean[] canConnectSide = new boolean[] { true, true, true, true, true, true, true }; public boolean[] canConnectSide = new boolean[] { true, true, true, true, true, true, true };
protected int heat = 0; protected int heat = 0, maxHeat = 20000;
protected int maxHeat = 20000; protected int damage = 0, maxDamage = 1000;
protected int damage = 0;
protected int maxDamage = 1000;
protected int subID = 0; protected int subID = 0;
protected int tankCap; protected int tankCap;
@ -57,7 +54,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
public TileEntityFluidNetworkTile() public TileEntityFluidNetworkTile()
{ {
this(2); this(1);
} }
public TileEntityFluidNetworkTile(int tankCap) public TileEntityFluidNetworkTile(int tankCap)
@ -67,8 +64,18 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
tankCap = 1; tankCap = 1;
} }
this.tankCap = tankCap; this.tankCap = tankCap;
this.internalTanks[0] = new FluidTank(this.tankCap * FluidContainerRegistry.BUCKET_VOLUME); this.tank = new FluidTank(this.tankCap * FluidContainerRegistry.BUCKET_VOLUME);
this.internalTanksInfo[0] = this.internalTanks[0].getInfo(); this.internalTanksInfo[0] = this.tank.getInfo();
}
public FluidTank getTank()
{
if (tank == null)
{
this.tank = new FluidTank(this.tankCap * FluidContainerRegistry.BUCKET_VOLUME);
this.internalTanksInfo[0] = this.tank.getInfo();
}
return tank;
} }
@Override @Override
@ -97,7 +104,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
{ {
if (this.getTileNetwork() != null && this.canConnectSide[from.ordinal()] && resource != null) if (this.getTileNetwork() != null && this.canConnectSide[from.ordinal()] && resource != null)
{ {
return this.getTileNetwork().fillNetworkTank(resource, doFill); return this.getTileNetwork().fillNetworkTank(this.worldObj, resource, doFill);
} }
return 0; return 0;
} }
@ -109,7 +116,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
{ {
if (this.getTileNetwork().getNetworkTank() != null && this.getTileNetwork().getNetworkTank().getFluid() != null && this.getTileNetwork().getNetworkTank().getFluid().isFluidEqual(resource)) if (this.getTileNetwork().getNetworkTank() != null && this.getTileNetwork().getNetworkTank().getFluid() != null && this.getTileNetwork().getNetworkTank().getFluid().isFluidEqual(resource))
{ {
this.getTileNetwork().drainNetworkTank(resource.amount, doDrain); this.getTileNetwork().drainNetworkTank(this.worldObj, resource.amount, doDrain);
} }
} }
@ -121,7 +128,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
{ {
if (this.getTileNetwork() != null && this.canConnectSide[from.ordinal()]) if (this.getTileNetwork() != null && this.canConnectSide[from.ordinal()])
{ {
this.getTileNetwork().drainNetworkTank(maxDrain, doDrain); this.getTileNetwork().drainNetworkTank(this.worldObj, maxDrain, doDrain);
} }
return null; return null;
} }
@ -223,14 +230,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
{ {
if (this.internalTanksInfo == null) if (this.internalTanksInfo == null)
{ {
this.internalTanksInfo = new FluidTankInfo[this.internalTanks.length]; this.internalTanksInfo = new FluidTankInfo[] { this.getTank().getInfo() };
for (int i = 0; i < this.internalTanks.length; i++)
{
if (this.internalTanks[i] != null)
{
this.internalTanksInfo[i] = this.internalTanks[i].getInfo();
}
}
} }
return this.internalTanksInfo; return this.internalTanksInfo;
} }
@ -238,20 +238,15 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
@Override @Override
public int fillTankContent(int index, FluidStack stack, boolean doFill) public int fillTankContent(int index, FluidStack stack, boolean doFill)
{ {
if (index < this.internalTanks.length) if (index == 0)
{ {
if (this.internalTanks[index] == null) int p = this.getTank().getFluid() != null ? this.getTank().getFluid().amount : 0;
{ int fill = this.getTank().fill(stack, doFill);
this.internalTanks[index] = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * this.tankCap);
this.internalTanksInfo[index] = this.internalTanks[index].getInfo();
}
int p = this.internalTanks[index].getFluid() != null ? this.internalTanks[index].getFluid().amount : 0;
int fill = this.internalTanks[index].fill(stack, doFill);
if (p != fill) if (p != fill)
{ {
//TODO add a catch to this so we don't send a dozen packets for one updates //TODO add a catch to this so we don't send a dozen packets for one updates
this.sendTankUpdate(index); this.sendTankUpdate(index);
this.internalTanksInfo[index] = this.internalTanks[index].getInfo(); this.internalTanksInfo[index] = this.getTank().getInfo();
} }
return fill; return fill;
} }
@ -261,19 +256,14 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
@Override @Override
public FluidStack drainTankContent(int index, int volume, boolean doDrain) public FluidStack drainTankContent(int index, int volume, boolean doDrain)
{ {
if (index < this.internalTanks.length) if (index == 0)
{ {
if (this.internalTanks[index] == null) FluidStack prev = this.getTank().getFluid();
{ FluidStack stack = this.getTank().drain(volume, doDrain);
this.internalTanks[index] = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * this.tankCap);
this.internalTanksInfo[index] = this.internalTanks[index].getInfo();
}
FluidStack prev = this.internalTanks[index].getFluid();
FluidStack stack = this.internalTanks[index].drain(volume, doDrain);
if (prev != null && (stack == null || prev.amount != stack.amount)) if (prev != null && (stack == null || prev.amount != stack.amount))
{ {
this.sendTankUpdate(index); this.sendTankUpdate(index);
this.internalTanksInfo[index] = this.internalTanks[index].getInfo(); this.internalTanksInfo[index] = this.getTank().getInfo();
} }
return stack; return stack;
} }
@ -348,40 +338,14 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
if (fluid != null) if (fluid != null)
{ {
FluidStack liquid = new FluidStack(fluid, amount); FluidStack liquid = new FluidStack(fluid, amount);
internalTanks[0].setFluid(liquid); this.getTank().setFluid(liquid);
internalTanksInfo[0] = internalTanks[0].getInfo(); internalTanksInfo[0] = this.getTank().getInfo();
} }
} }
else if (nbt.hasKey("FluidTank"))
{
internalTanks[0].readFromNBT(nbt.getCompoundTag("FluidTank"));
internalTanksInfo[0] = internalTanks[0].getInfo();
}
else else
{ {
int tankCount = nbt.getByte("InternalTanks"); this.getTank().readFromNBT(nbt.getCompoundTag("FluidTank"));
internalTanksInfo[0] = this.getTank().getInfo();
if (tankCount > 0)
{
this.internalTanks = new FluidTank[tankCount];
for (int i = 0; i < this.internalTanks.length; i++)
{
FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
if (this.internalTanksInfo != null && i < this.internalTanksInfo.length && this.internalTanksInfo[i] != null)
{
tank = new FluidTank(this.internalTanksInfo[i].capacity);
}
tank.readFromNBT(nbt.getCompoundTag("FluidTank" + i));
}
this.internalTanksInfo = new FluidTankInfo[tankCount];
for (int i = 0; i < this.internalTanksInfo.length; i++)
{
if (this.internalTanks[i] != null)
{
this.internalTanksInfo[i] = this.internalTanks[i].getInfo();
}
}
}
} }
} }
@ -392,17 +356,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
nbt.setInteger("damage", this.damage); nbt.setInteger("damage", this.damage);
nbt.setInteger("heat", this.heat); nbt.setInteger("heat", this.heat);
nbt.setInteger("subID", this.subID); nbt.setInteger("subID", this.subID);
if (this.internalTanks != null) nbt.setCompoundTag("FluidTank", this.getTank().writeToNBT(new NBTTagCompound()));
{
nbt.setByte("InternalTanks", (byte) this.internalTanks.length);
for (byte i = 0; i < this.internalTanks.length; i++)
{
if (this.internalTanks[i] != null)
{
nbt.setCompoundTag("FluidTank" + i, this.internalTanks[i].writeToNBT(new NBTTagCompound()));
}
}
}
} }
@Override @Override
@ -421,13 +375,9 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
this.renderConnection[3] = data.readBoolean(); this.renderConnection[3] = data.readBoolean();
this.renderConnection[4] = data.readBoolean(); this.renderConnection[4] = data.readBoolean();
this.renderConnection[5] = data.readBoolean(); this.renderConnection[5] = data.readBoolean();
int tanks = data.readInt(); this.tank = new FluidTank(data.readInt());
this.internalTanks = new FluidTank[tanks]; this.getTank().readFromNBT(PacketHandler.instance().readNBTTagCompound(data));
for (int i = 0; i < tanks; i++) this.internalTanksInfo[0] = this.getTank().getInfo();
{
this.internalTanks[i] = new FluidTank(data.readInt());
this.internalTanks[i].readFromNBT(PacketHandler.instance().readNBTTagCompound(data));
}
return true; return true;
} }
else if (id.equalsIgnoreCase("RenderPacket")) else if (id.equalsIgnoreCase("RenderPacket"))
@ -441,24 +391,11 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
this.renderConnection[5] = data.readBoolean(); this.renderConnection[5] = data.readBoolean();
return true; return true;
} }
else if (id.equalsIgnoreCase("TankPacket"))
{
int tanks = data.readInt();
this.internalTanks = new FluidTank[tanks];
for (int i = 0; i < tanks; i++)
{
this.internalTanks[i] = new FluidTank(data.readInt());
this.internalTanks[i].readFromNBT(PacketHandler.instance().readNBTTagCompound(data));
this.internalTanksInfo[i] = this.internalTanks[i].getInfo();
}
return true;
}
else if (id.equalsIgnoreCase("SingleTank")) else if (id.equalsIgnoreCase("SingleTank"))
{ {
int index = data.readInt(); this.tank = new FluidTank(data.readInt());
this.internalTanks[index] = new FluidTank(data.readInt()); this.getTank().readFromNBT(PacketHandler.instance().readNBTTagCompound(data));
this.internalTanks[index].readFromNBT(PacketHandler.instance().readNBTTagCompound(data)); this.internalTanksInfo[0] = this.getTank().getInfo();
this.internalTanksInfo[index] = this.internalTanks[index].getInfo();
return true; return true;
} }
} }
@ -475,7 +412,7 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
@Override @Override
public Packet getDescriptionPacket() public Packet getDescriptionPacket()
{ {
Object[] data = new Object[(this.internalTanks != null ? (this.internalTanks.length * 2) : 2) + 9]; Object[] data = new Object[10];
data[0] = "DescriptionPacket"; data[0] = "DescriptionPacket";
data[1] = this.subID; data[1] = this.subID;
data[2] = this.renderConnection[0]; data[2] = this.renderConnection[0];
@ -484,18 +421,8 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
data[5] = this.renderConnection[3]; data[5] = this.renderConnection[3];
data[6] = this.renderConnection[4]; data[6] = this.renderConnection[4];
data[7] = this.renderConnection[5]; data[7] = this.renderConnection[5];
data[8] = (this.internalTanks != null ? (this.internalTanks.length) : 1); data[8] = this.getTank().getCapacity();
int place = 9; data[9] = this.getTank().writeToNBT(new NBTTagCompound());
for (int i = 0; i < this.internalTanks.length; i++)
{
if (this.internalTanks[i] == null)
{
this.internalTanks[i] = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * this.tankCap);
}
data[place] = this.internalTanks[i].getCapacity();
data[place + 1] = this.internalTanks[i].writeToNBT(new NBTTagCompound());
place += 2;
}
return PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, data); return PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, data);
} }
@ -515,13 +442,9 @@ public class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements
public void sendTankUpdate(int index) public void sendTankUpdate(int index)
{ {
if (this.internalTanks != null && index < this.internalTanks.length) if (this.getTank() != null && index == 0)
{ {
if (this.internalTanks[index] == null) PacketHandler.instance().sendPacketToClients(PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())));
{
this.internalTanks[index] = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * this.tankCap);
}
PacketHandler.instance().sendPacketToClients(PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, "SingleTank", index, this.internalTanks[index].getCapacity(), this.internalTanks[index].writeToNBT(new NBTTagCompound())));
} }
} }