diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index a9d51b79b..8fd32fa5c 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -128,7 +128,7 @@ public class Coord4D extends BlockPos TileEntity tile = world.getTileEntity(this); - return (tile != null && tile.hasWorldObj()) ? tile : null; + return (tile != null && tile.hasWorldObj() && !tile.isInvalid()) ? tile : null; } /** @@ -227,7 +227,7 @@ public class Coord4D extends BlockPos */ public Coord4D offset(EnumFacing facing, int n) { - return (facing == null || n == 0) ? this : new Coord4D(this.getX() + facing.getFrontOffsetX() * n, this.getY() + facing.getFrontOffsetY() * n, this.getZ() + facing.getFrontOffsetZ() * n); + return (facing == null || n == 0) ? this : new Coord4D(getX() + facing.getFrontOffsetX() * n, getY() + facing.getFrontOffsetY() * n, getZ() + facing.getFrontOffsetZ() * n, dimensionId); } public ItemStack getStack(IBlockAccess world) @@ -280,7 +280,7 @@ public class Coord4D extends BlockPos */ public Coord4D difference(Vec3i vec) { - return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); + return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(getX() - vec.getX(), getY() - vec.getY(), getZ() - vec.getZ(), dimensionId); } /** diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index fe9fc0e42..7d157515f 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -953,6 +953,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { ((IBoundingBlock)tileEntity).onBreak(); } + + System.out.println(world.getTileEntity(pos)); super.breakBlock(world, pos, state); diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 38e7fbb82..6251cf4f6 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; public abstract class UpdateProtocol> { /** The multiblock nodes that have already been iterated over. */ - public Set iteratedNodes = new HashSet(); + public Set iteratedNodes = new HashSet(); public Set innerNodes = new HashSet(); @@ -35,11 +35,11 @@ public abstract class UpdateProtocol> * Recursively loops through each node connected to the given TileEntity. * @param tile - the TileEntity to loop over */ - public void loopThrough(TileEntity tile) + public void loopThrough(Coord4D coord) { World worldObj = pointer.getWorld(); - int origX = tile.getPos().getX(), origY = tile.getPos().getY(), origZ = tile.getPos().getZ(); + int origX = coord.getX(), origY = coord.getY(), origZ = coord.getZ(); boolean isCorner = true; boolean isHollow = true; @@ -142,13 +142,13 @@ public abstract class UpdateProtocol> rightBlocks = false; break; } - else if(isFrame(Coord4D.get(tile).add(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z)) + else if(isFrame(coord.add(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z)) { rightFrame = false; break; } else { - locations.add(Coord4D.get(tile).add(x, y, z)); + locations.add(coord.add(x, y, z)); } } else { @@ -193,15 +193,15 @@ public abstract class UpdateProtocol> structure.volHeight = Math.abs(ymax-ymin)+1; structure.volWidth = Math.abs(zmax-zmin)+1; structure.volume = structure.volLength*structure.volHeight*structure.volWidth; - structure.renderLocation = Coord4D.get(tile).add(0, 1, 0); - structure.minLocation = Coord4D.get(tile).add(xmin, ymin, zmin); - structure.maxLocation = Coord4D.get(tile).add(xmax, ymax, zmax); + structure.renderLocation = coord.add(0, 1, 0); + structure.minLocation = coord.add(xmin, ymin, zmin); + structure.maxLocation = coord.add(xmax, ymax, zmax); if(structure.volLength >= 3 && structure.volHeight >= 3 && structure.volWidth >= 3) { onStructureCreated(structure, origX, origY, origZ, xmin, xmax, ymin, ymax, zmin, zmax); - if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin)) + if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(coord, origX+xmin, origY+ymin, origZ+zmin)) { if(canForm(structure)) { @@ -214,18 +214,17 @@ public abstract class UpdateProtocol> } innerNodes.clear(); - iteratedNodes.add(tile); + iteratedNodes.add(coord); for(EnumFacing side : EnumFacing.VALUES) { - Coord4D coord = Coord4D.get(tile).offset(side); - TileEntity tileEntity = coord.getTileEntity(pointer.getWorld()); + Coord4D sideCoord = coord.offset(side); - if(isViableNode(coord)) + if(isViableNode(sideCoord)) { - if(!iteratedNodes.contains(tileEntity)) + if(!iteratedNodes.contains(sideCoord)) { - loopThrough(tileEntity); + loopThrough(sideCoord); } } } @@ -319,7 +318,7 @@ public abstract class UpdateProtocol> { TileEntity tile = pointer.getWorld().getTileEntity(pos); - if(tile == null || !tile.hasWorldObj()) + if(tile == null || !tile.hasWorldObj() || tile.isInvalid()) { return false; } @@ -462,16 +461,21 @@ public abstract class UpdateProtocol> */ public void doUpdate() { - loopThrough(pointer); - + loopThrough(Coord4D.get(pointer)); + if(structureFound != null) { - for(TileEntity tileEntity : iteratedNodes) + for(Coord4D coord : iteratedNodes) { - if(!structureFound.locations.contains(Coord4D.get(tileEntity))) + if(!structureFound.locations.contains(coord)) { - for(TileEntity tile : iteratedNodes) + System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); + System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); + + for(Coord4D newCoord : iteratedNodes) { + TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); + if(tile instanceof TileEntityMultiblock) { ((TileEntityMultiblock)tile).structure = null; @@ -482,9 +486,9 @@ public abstract class UpdateProtocol> } } - for(Coord4D coord : innerNodes) + for(Coord4D newCoord : innerNodes) { - killInnerNode(coord); + killInnerNode(newCoord); } return; @@ -569,8 +573,10 @@ public abstract class UpdateProtocol> } } else { - for(TileEntity tile : iteratedNodes) + for(Coord4D coord : iteratedNodes) { + TileEntity tile = coord.getTileEntity(pointer.getWorld()); + if(tile instanceof TileEntityMultiblock) { TileEntityMultiblock tileEntity = (TileEntityMultiblock)tile; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 6d29ef7f6..12a33f9ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; @@ -208,7 +209,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock> extend { if(!prevStructure) { - Mekanism.proxy.doMultiblockSparkle(this); + //Mekanism.proxy.doMultiblockSparkle(this); } } @@ -134,6 +137,19 @@ public abstract class TileEntityMultiblock> extend } } + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newSate) + { + boolean b = super.shouldRefresh(world, pos, oldState, newSate); + + if(!world.isRemote) + { + System.out.println(b); + } + + return b; + } + @Override public void doUpdate() {