This commit is contained in:
Raoul Van den Berge
2016-06-29 15:55:44 +02:00
parent 0a76dd683a
commit 9789796781
3 changed files with 12 additions and 11 deletions

View File

@@ -55,16 +55,18 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
protected void onContentsChanged(int slot) { protected void onContentsChanged(int slot) {
super.onContentsChanged(slot); super.onContentsChanged(slot);
ItemStack disk = getStackInSlot(slot); if (!worldObj.isRemote) {
ItemStack disk = getStackInSlot(slot);
if (disk == null) { if (disk == null) {
storages[slot] = null; storages[slot] = null;
} else { } else {
storages[slot] = new Storage(disk); storages[slot] = new Storage(disk);
} }
if (isConnected()) { if (isConnected()) {
network.getItems().rebuild(network); network.getItems().rebuild(network);
}
} }
} }
@@ -115,7 +117,7 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
@Override @Override
public void addStorages(List<IStorage> storages) { public void addStorages(List<IStorage> storages) {
for (IStorage storage : storages) { for (IStorage storage : this.storages) {
if (storage != null) { if (storage != null) {
storages.add(storage); storages.add(storage);
} }

View File

@@ -89,7 +89,6 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage
} }
@Override @Override
public void addStorages(List<IStorage> storages) { public void addStorages(List<IStorage> storages) {
if (storage != null) { if (storage != null) {
storages.add(storage); storages.add(storage);

View File

@@ -132,6 +132,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
slavesToRemove.clear(); slavesToRemove.clear();
if (rebuildItemList) { if (rebuildItemList) {
System.out.println("Rebuilding item list");
items.rebuild(this); items.rebuild(this);
rebuildItemList = false; rebuildItemList = false;
@@ -430,7 +431,6 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
@Override @Override
public ItemStack push(ItemStack stack, int size, boolean simulate) { public ItemStack push(ItemStack stack, int size, boolean simulate) {
if (stack == null || stack.getItem() == null || items.getStorages().isEmpty()) { if (stack == null || stack.getItem() == null || items.getStorages().isEmpty()) {
System.out.println("Cannot push!");
return ItemHandlerHelper.copyStackWithSize(stack, size); return ItemHandlerHelper.copyStackWithSize(stack, size);
} }