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

Monkeypatch

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-18 22:29:27 +02:00
parent a9c3c27053
commit a18faba114
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
private List<WirelessGridConsumer> wirelessGridConsumers = new ArrayList<WirelessGridConsumer>(); private List<WirelessGridConsumer> wirelessGridConsumers = new ArrayList<WirelessGridConsumer>();
private List<WirelessGridConsumer> wirelessGridConsumersToRemove = new ArrayList<WirelessGridConsumer>(); private List<WirelessGridConsumer> wirelessGridConsumersToRemove = new ArrayList<WirelessGridConsumer>();
private List<ItemGroup> combinedGroups = new ArrayList<ItemGroup>(); private List<Integer> combinedGroups = new ArrayList<Integer>();
private RedstoneMode redstoneMode = RedstoneMode.IGNORE; private RedstoneMode redstoneMode = RedstoneMode.IGNORE;
@@ -333,31 +333,35 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
for (int i = 0; i < itemGroups.size(); ++i) { for (int i = 0; i < itemGroups.size(); ++i) {
ItemGroup group = itemGroups.get(i); ItemGroup group = itemGroups.get(i);
if (combinedGroups.contains(group)) { if (combinedGroups.contains(i)) {
continue; continue;
} }
// If the item doesn't exist anymore, remove it from storage to avoid crashes // If the item doesn't exist anymore, remove it from storage to avoid crashes
if (group.getType() == null) { if (group.getType() == null) {
combinedGroups.add(group); combinedGroups.add(i);
} else { } else {
for (int j = i + 1; j < itemGroups.size(); ++j) { for (int j = i + 1; j < itemGroups.size(); ++j) {
ItemGroup otherGroup = itemGroups.get(j); ItemGroup otherGroup = itemGroups.get(j);
if (combinedGroups.contains(otherGroup)) { if (combinedGroups.contains(j)) {
continue; continue;
} }
if (group.compareNoQuantity(otherGroup)) { if (group.compareNoQuantity(otherGroup)) {
group.setQuantity(group.getQuantity() + otherGroup.getQuantity()); group.setQuantity(group.getQuantity() + otherGroup.getQuantity());
combinedGroups.add(otherGroup); combinedGroups.add(j);
} }
} }
} }
} }
itemGroups.removeAll(combinedGroups); Collections.sort(combinedGroups, Collections.reverseOrder());
for (int i : combinedGroups) {
itemGroups.remove(i);
}
} }
public boolean push(ItemStack stack) { public boolean push(ItemStack stack) {