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

Small performance changes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-15 22:11:52 +02:00
parent d2875b869f
commit f1c4e81385
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,12 +106,21 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
} }
int range = 0; int range = 0;
int usage = 0;
storages.clear();
for (TileMachine machine : newMachines) { for (TileMachine machine : newMachines) {
if (machine instanceof TileWirelessTransmitter) { if (machine instanceof TileWirelessTransmitter) {
range += ((TileWirelessTransmitter) machine).getRange(); range += ((TileWirelessTransmitter) machine).getRange();
} }
if (machine instanceof IStorageProvider) {
((IStorageProvider) machine).provide(storages);
}
usage += machine.getEnergyUsage();
if (!machinesHavePosition(machines, machine.getPos())) { if (!machinesHavePosition(machines, machine.getPos())) {
machine.onConnected(this); machine.onConnected(this);
} else { } else {
@@ -126,17 +135,9 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
} }
wirelessGridRange = range; wirelessGridRange = range;
energyUsage = usage;
machines = newMachines; machines = newMachines;
storages.clear();
for (TileMachine machine : machines) {
if (machine instanceof IStorageProvider) {
((IStorageProvider) machine).provide(storages);
}
}
Collections.sort(storages, new Comparator<IStorage>() { Collections.sort(storages, new Comparator<IStorage>() {
@Override @Override
public int compare(IStorage s1, IStorage s2) { public int compare(IStorage s1, IStorage s2) {
@@ -145,12 +146,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
}); });
syncItems(); syncItems();
energyUsage = 10;
for (TileMachine machine : machines) {
energyUsage += machine.getEnergyUsage();
}
} }
craftingTasks.addAll(craftingTasksToAdd); craftingTasks.addAll(craftingTasksToAdd);
@@ -193,7 +188,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
if (!InventoryUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) { if (!InventoryUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) {
consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list
} else { } else {
if (isActive()) { if (isActive() && ticks % 4 == 0) {
RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(this), (EntityPlayerMP) consumer.getPlayer()); RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(this), (EntityPlayerMP) consumer.getPlayer());
} }
} }