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

added stuff

Browse Source 
- storage proxy block: reads an another inventory into system
- right clicking to push 1 item works
- when take() returns 0, don't give any item stack to the player
- tweaked energy usage
This commit is contained in:
Raoul Van den Berge
2015-12-15 21:58:21 +01:00
parent 62cca754a3
commit b47dc933c8
18 changed files with 326 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,15 +26,11 @@ public class TileCable extends TileSC {
return true;
}
public List<TileMachine> findMachines(TileController controller) {
List<TileMachine> machines = new ArrayList<TileMachine>();
findMachinesInternal(new ArrayList<Vec3>(), machines, controller);
return machines;
public void addMachines(List<TileMachine> machines, TileController controller) {
addMachines(new ArrayList<Vec3>(), machines, controller);
}
private void findMachinesInternal(List<Vec3> visited, List<TileMachine> machines, TileController controller) {
private void addMachines(List<Vec3> visited, List<TileMachine> machines, TileController controller) {
for (Vec3 visitedBlock : visited) {
if (visitedBlock.xCoord == xCoord && visitedBlock.yCoord == yCoord && visitedBlock.zCoord == zCoord) {
return;
@@ -67,7 +63,7 @@ public class TileCable extends TileSC {
visited.add(Vec3.createVectorHelper(x, y, z));
} else if (tile instanceof TileCable) {
((TileCable) tile).findMachinesInternal(visited, machines, controller);
((TileCable) tile).addMachines(visited, machines, controller);
} else if (tile instanceof TileController && (x != controller.xCoord || y != controller.yCoord || z != controller.zCoord)) {
worldObj.createExplosion(null, x, y, z, 4.5f, true);
}