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

Controller sorts by energy usage in GUI

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-22 01:59:11 +02:00
parent 19b64ee84d
commit f8de0dfed0
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
View File

@@ -114,22 +114,22 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
node.getEnergyUsage()
);
if (clientNode.getStack().getItem() != null) {
if (nodes.contains(clientNode)) {
for (ClientNode other : nodes) {
if (other.equals(clientNode)) {
other.setAmount(other.getAmount() + 1);
if (clientNode.getStack().getItem() == null) {
continue;
}
break;
}
}
} else {
nodes.add(clientNode);
}
if (nodes.contains(clientNode)) {
ClientNode other = nodes.get(nodes.indexOf(clientNode));
other.setAmount(other.getAmount() + 1);
} else {
nodes.add(clientNode);
}
}
}
Collections.sort(nodes, CLIENT_NODE_COMPARATOR);
return nodes;
}
});
@@ -139,6 +139,14 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
private static final String NBT_CRAFTING_TASKS = "CraftingTasks";
private static final Comparator<ClientNode> CLIENT_NODE_COMPARATOR = (left, right) -> {
if (left.getEnergyUsage() == right.getEnergyUsage()) {
return 0;
}
return (left.getEnergyUsage() > right.getEnergyUsage()) ? -1 : 1;
};
private static final Comparator<IItemStorage> ITEM_SIZE_COMPARATOR = (left, right) -> {
if (left.getStored() == right.getStored()) {
return 0;