diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/storagecraft/tile/TileCable.java index 3b05ad6c7..e709226c1 100644 --- a/src/main/java/storagecraft/tile/TileCable.java +++ b/src/main/java/storagecraft/tile/TileCable.java @@ -4,23 +4,12 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import storagecraft.block.BlockCable; public class TileCable extends TileSC { - class VisitedCable { - public int x; - public int y; - public int z; - - public VisitedCable(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } - } - public static boolean isCable(World world, int x, int y, int z, ForgeDirection dir) { Block block = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); @@ -41,16 +30,16 @@ public class TileCable extends TileSC { return findMachines(new ArrayList(), true); } - private List findMachines(List visited, boolean ignoreController) { + private List findMachines(List visited, boolean ignoreController) { List machines = new ArrayList(); - for (VisitedCable visitedCable : visited) { - if (visitedCable.x == xCoord && visitedCable.y == yCoord && visitedCable.z == zCoord) { + for (Vec3 visitedCable : visited) { + if (visitedCable.xCoord == xCoord && visitedCable.yCoord == yCoord && visitedCable.zCoord == zCoord) { return machines; } } - visited.add(new VisitedCable(xCoord, yCoord, zCoord)); + visited.add(Vec3.createVectorHelper(xCoord, yCoord, zCoord)); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ);