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

Fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-02 20:51:57 +02:00
parent 0abd9cf779
commit 949af208cb
3 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/refinedstorage/api/storage/IGroupedStorage.java
View File

@@ -16,11 +16,6 @@ public interface IGroupedStorage {
*/
void rebuild();
/**
* @return If this storage is currently rebuilding
*/
boolean isRebuilding();
/**
* Adds an item to the network. Will merge it with another item if it already exists.
*

10
src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
View File

@@ -20,7 +20,6 @@ public class GroupedStorage implements IGroupedStorage {
private INetworkMaster network;
private List<IStorage> storages = new ArrayList<IStorage>();
private Multimap<Item, ItemStack> stacks = ArrayListMultimap.create();
private boolean rebuilding;
public GroupedStorage(INetworkMaster network) {
this.network = network;
@@ -28,8 +27,6 @@ public class GroupedStorage implements IGroupedStorage {
@Override
public void rebuild() {
this.rebuilding = true;
storages.clear();
for (INetworkSlave slave : network.getSlaves()) {
@@ -54,16 +51,9 @@ public class GroupedStorage implements IGroupedStorage {
}
}
this.rebuilding = false;
network.sendStorageToClient();
}
@Override
public boolean isRebuilding() {
return rebuilding;
}
@Override
public void add(ItemStack stack) {
for (ItemStack otherStack : stacks.get(stack.getItem())) {

64
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -56,9 +56,33 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
private GridHandler gridHandler = new GridHandler(this);
private WirelessGridHandler wirelessGridHandler = new WirelessGridHandler(this);
private List<IStorage> storages = new ArrayList<IStorage>();
private IGroupedStorage storage = new GroupedStorage(this);
private Comparator<IStorage> sizeComparator = new Comparator<IStorage>() {
@Override
public int compare(IStorage left, IStorage right) {
int leftStored = left.getStored();
int rightStored = right.getStored();
if (leftStored == rightStored) {
return 0;
}
return (leftStored > rightStored) ? -1 : 1;
}
};
private Comparator<IStorage> priorityComparator = new Comparator<IStorage>() {
@Override
public int compare(IStorage left, IStorage right) {
if (left.getPriority() == right.getPriority()) {
return 0;
}
return (left.getPriority() > right.getPriority()) ? -1 : 1;
}
};
private List<INetworkSlave> slaves = new ArrayList<INetworkSlave>();
private List<INetworkSlave> slavesToAdd = new ArrayList<INetworkSlave>();
private List<INetworkSlave> slavesToRemove = new ArrayList<INetworkSlave>();
@@ -123,32 +147,8 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
slavesToRemove.clear();
if (canRun()) {
if (ticks % 20 == 0) {
Collections.sort(storages, new Comparator<IStorage>() {
@Override
public int compare(IStorage left, IStorage right) {
int leftStored = left.getStored();
int rightStored = right.getStored();
if (leftStored == rightStored) {
return 0;
}
return (leftStored > rightStored) ? -1 : 1;
}
});
Collections.sort(storages, new Comparator<IStorage>() {
@Override
public int compare(IStorage left, IStorage right) {
if (left.getPriority() == right.getPriority()) {
return 0;
}
return (left.getPriority() > right.getPriority()) ? -1 : 1;
}
});
}
Collections.sort(storage.getStorages(), sizeComparator);
Collections.sort(storage.getStorages(), priorityComparator);
for (ICraftingTask taskToCancel : craftingTasksToCancel) {
taskToCancel.onCancelled(this);
@@ -380,21 +380,17 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
@Override
public void sendStorageToClient() {
if (!storage.isRebuilding()) {
for (EntityPlayer player : worldObj.playerEntities) {
if (isWatchingGrid(player)) {
sendStorageToClient((EntityPlayerMP) player);
}
}
}
}
@Override
public void sendStorageToClient(EntityPlayerMP player) {
if (!storage.isRebuilding()) {
RefinedStorage.NETWORK.sendTo(new MessageGridItems(this), player);
}
}
private boolean isWatchingGrid(EntityPlayer player) {
return player.openContainer.getClass() == ContainerGrid.class && pos.equals(((ContainerGrid) player.openContainer).getGrid().getNetworkPosition());
@@ -402,7 +398,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
@Override
public ItemStack push(ItemStack stack, int size, boolean simulate) {
if (stack == null || stack.getItem() == null || storages.isEmpty()) {
if (stack == null || stack.getItem() == null || storage.getStorages().isEmpty()) {
return ItemHandlerHelper.copyStackWithSize(stack, size);
}
@@ -410,7 +406,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
ItemStack remainder = stack;
for (IStorage storage : storages) {
for (IStorage storage : this.storage.getStorages()) {
remainder = storage.push(remainder, size, simulate);
if (remainder == null) {
@@ -446,7 +442,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
ItemStack newStack = null;
for (IStorage storage : storages) {
for (IStorage storage : this.storage.getStorages()) {
ItemStack took = storage.take(stack, requested - received, flags);
if (took != null) {