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

Very unstable improved machine searching part4

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-13 23:10:15 +02:00
parent bc72c25af9
commit d9be632072
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -59,7 +59,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
private List<TileMachine> machines = new ArrayList<TileMachine>(); private List<TileMachine> machines = new ArrayList<TileMachine>();
private List<TileMachine> machinesToAdd = new ArrayList<TileMachine>(); private List<TileMachine> machinesToAdd = new ArrayList<TileMachine>();
private List<BlockPos> machinesToRemove = new ArrayList<BlockPos>(); private List<TileMachine> machinesToRemove = new ArrayList<TileMachine>();
private List<ClientSideMachine> clientSideMachines = new ArrayList<ClientSideMachine>(); private List<ClientSideMachine> clientSideMachines = new ArrayList<ClientSideMachine>();
@@ -80,8 +80,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
} }
public void removeMachine(TileMachine machine) { public void removeMachine(TileMachine machine) {
System.out.println("Added for removal!"); machinesToRemove.add(machine);
machinesToRemove.add(machine.getPos());
} }
@Override @Override
@@ -92,18 +91,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
machines.addAll(machinesToAdd); machines.addAll(machinesToAdd);
machinesToAdd.clear(); machinesToAdd.clear();
for (BlockPos pos : machinesToRemove) { machines.removeAll(machinesToRemove);
System.out.println("ToRemove:" + pos.getX() + "," + pos.getY() + "," + pos.getZ());
for (TileMachine machine : machines) {
System.out.println("Machine:" + machine.getPos().getX() + "," + machine.getPos().getY() + "," + machine.getPos().getZ());
if (machine.getPos().equals(pos)) {
System.out.println("Found! Removing");
machines.remove(machine);
break;
}
}
}
machinesToRemove.clear(); machinesToRemove.clear();
int lastEnergy = energy.getEnergyStored(); int lastEnergy = energy.getEnergyStored();

8
src/main/java/refinedstorage/tile/TileMachine.java
View File

@@ -40,14 +40,14 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
} }
@Override @Override
public void onLoad() { public void update() {
super.onLoad(); if (!worldObj.isRemote && ticks == 0) {
if (!worldObj.isRemote) {
block = worldObj.getBlockState(pos).getBlock(); block = worldObj.getBlockState(pos).getBlock();
searchController(); searchController();
} }
super.update();
} }
public void onConnected() { public void onConnected() {