dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use Vec3 instead of VisitedCable

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-08 20:27:42 +01:00
parent bd129418e7
commit 26ae82ead0
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/storagecraft/tile/TileCable.java
View File

@@ -4,23 +4,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import storagecraft.block.BlockCable; import storagecraft.block.BlockCable;
public class TileCable extends TileSC { 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) { 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); 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); return findMachines(new ArrayList(), true);
} }
private List<IMachine> findMachines(List<VisitedCable> visited, boolean ignoreController) { private List<IMachine> findMachines(List<Vec3> visited, boolean ignoreController) {
List<IMachine> machines = new ArrayList<IMachine>(); List<IMachine> machines = new ArrayList<IMachine>();
for (VisitedCable visitedCable : visited) { for (Vec3 visitedCable : visited) {
if (visitedCable.x == xCoord && visitedCable.y == yCoord && visitedCable.z == zCoord) { if (visitedCable.xCoord == xCoord && visitedCable.yCoord == yCoord && visitedCable.zCoord == zCoord) {
return machines; return machines;
} }
} }
visited.add(new VisitedCable(xCoord, yCoord, zCoord)); visited.add(Vec3.createVectorHelper(xCoord, yCoord, zCoord));
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ); TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ);