Fixed a few tile network creation issues
This commit is contained in:
parent
127b145bf6
commit
15cfa7cf58
3 changed files with 36 additions and 14 deletions
|
@ -23,6 +23,11 @@ public class NetworkFluidContainers extends NetworkFluidTiles
|
||||||
NetworkUpdateHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class);
|
NetworkUpdateHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public NetworkFluidContainers()
|
||||||
|
{
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
public NetworkFluidContainers(INetworkPart... parts)
|
public NetworkFluidContainers(INetworkPart... parts)
|
||||||
{
|
{
|
||||||
super(parts);
|
super(parts);
|
||||||
|
|
|
@ -34,6 +34,11 @@ public class NetworkFluidTiles extends NetworkTileEntities
|
||||||
NetworkUpdateHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class);
|
NetworkUpdateHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public NetworkFluidTiles()
|
||||||
|
{
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
public NetworkFluidTiles(INetworkPart... parts)
|
public NetworkFluidTiles(INetworkPart... parts)
|
||||||
{
|
{
|
||||||
super(parts);
|
super(parts);
|
||||||
|
@ -223,6 +228,8 @@ public class NetworkFluidTiles extends NetworkTileEntities
|
||||||
protected void mergeDo(ITileNetwork network)
|
protected void mergeDo(ITileNetwork network)
|
||||||
{
|
{
|
||||||
ITileNetwork newNetwork = NetworkUpdateHandler.createNewNetwork(NetworkUpdateHandler.getID(this.getClass()));
|
ITileNetwork newNetwork = NetworkUpdateHandler.createNewNetwork(NetworkUpdateHandler.getID(this.getClass()));
|
||||||
|
if (newNetwork != null)
|
||||||
|
{
|
||||||
if (newNetwork instanceof NetworkFluidTiles)
|
if (newNetwork instanceof NetworkFluidTiles)
|
||||||
{
|
{
|
||||||
FluidStack one = this.getNetworkTank().getFluid();
|
FluidStack one = this.getNetworkTank().getFluid();
|
||||||
|
@ -238,6 +245,11 @@ public class NetworkFluidTiles extends NetworkTileEntities
|
||||||
newNetwork.getMembers().addAll(network.getMembers());
|
newNetwork.getMembers().addAll(network.getMembers());
|
||||||
newNetwork.onCreated();
|
newNetwork.onCreated();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
System.out.println("[NetworkFluidTiles] Failed to merge network due to the new network returned null");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void cleanUpMembers()
|
public void cleanUpMembers()
|
||||||
|
|
|
@ -26,6 +26,11 @@ public class NetworkPipes extends NetworkFluidTiles
|
||||||
NetworkUpdateHandler.registerNetworkClass("FluidPipes", NetworkPipes.class);
|
NetworkUpdateHandler.registerNetworkClass("FluidPipes", NetworkPipes.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public NetworkPipes()
|
||||||
|
{
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
public NetworkPipes(INetworkPart... parts)
|
public NetworkPipes(INetworkPart... parts)
|
||||||
{
|
{
|
||||||
super(parts);
|
super(parts);
|
||||||
|
|
Loading…
Reference in a new issue