This commit is contained in:
Modmuss50 2015-11-23 15:15:42 +00:00
parent abb9b5102f
commit 92ca6548c6
49 changed files with 405 additions and 332 deletions

View file

@ -22,7 +22,7 @@ public class LesuNetwork {
private void rebuild() {
master = null;
for (TileLesuStorage lesuStorage : storages) {
lesuStorage.findAndJoinNetwork(lesuStorage.getWorldObj(), lesuStorage.getPos().getX(), lesuStorage.getPos().getY(), lesuStorage.getPos().getZ());
lesuStorage.findAndJoinNetwork(lesuStorage.getWorld(), lesuStorage.getPos().getX(), lesuStorage.getPos().getY(), lesuStorage.getPos().getZ());
}
}

View file

@ -35,9 +35,9 @@ public class TileLesu extends TilePowerAcceptor {//TODO wrench
countedNetworks.clear();
connectedBlocks = 0;
for (EnumFacing dir : EnumFacing.VALID_DIRECTIONS) {
if (worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ) instanceof TileLesuStorage) {
if (((TileLesuStorage) worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ)).network != null) {
LesuNetwork network = ((TileLesuStorage) worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ)).network;
if (worldObj.getTileEntity(getPos().getX() + dir.offsetX, getPos().getY() + dir.offsetY, getPos().getZ() + dir.offsetZ) instanceof TileLesuStorage) {
if (((TileLesuStorage) worldObj.getTileEntity(getPos().getX() + dir.offsetX, getPos().getY() + dir.offsetY, getPos().getZ() + dir.offsetZ)).network != null) {
LesuNetwork network = ((TileLesuStorage) worldObj.getTileEntity(getPos().getX() + dir.offsetX, getPos().getY() + dir.offsetY, getPos().getZ() + dir.offsetZ)).network;
if (!countedNetworks.contains(network)) {
if (network.master == null || network.master == this) {
connectedBlocks += network.storages.size();

View file

@ -12,9 +12,9 @@ public class TileLesuStorage extends TileMachineBase {
public void updateEntity() {
super.updateEntity();
if (network == null) {
findAndJoinNetwork(worldObj, xCoord, yCoord, zCoord);
findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ());
} else {
if (network.master != null && network.master.getWorldObj().getTileEntity(network.master.getPos().getX(), network.master.getPos().getY(), network.master.getPos().getZ()) != network.master) {
if (network.master != null && network.master.getWorld().getTileEntity(network.master.getPos().getX(), network.master.getPos().getY(), network.master.getPos().getZ()) != network.master) {
network.master = null;
}
}
@ -54,6 +54,6 @@ public class TileLesuStorage extends TileMachineBase {
public final void rebuildNetwork() {
this.removeFromNetwork();
this.resetNetwork();
this.findAndJoinNetwork(worldObj, xCoord, yCoord, zCoord);
this.findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ());
}
}