diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java index ac8f1c454..3d9d98deb 100755 --- a/src/main/java/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -14,6 +14,8 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.apiimpl.storage.NBTStorage; import refinedstorage.block.EnumStorageType; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public class ItemStorageDisk extends ItemBase { @@ -51,7 +53,36 @@ public class ItemStorageDisk extends ItemBase { @Override public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - if (!world.isRemote && player.isSneaking() && NBTStorage.getStoredFromNBT(stack.getTagCompound()) == 0 && stack.getMetadata() != TYPE_CREATIVE) { + if (!world.isRemote) { + ItemStack debugDisk = new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_CREATIVE); + + debugDisk.setTagCompound(NBTStorage.createNBT()); + + NBTStorage storage = new NBTStorage(debugDisk.getTagCompound(), -1, null) { + @Override + public int getPriority() { + return 0; + } + }; + + Iterator it = Item.REGISTRY.iterator(); + + while (it.hasNext()) { + Item item = it.next(); + + List stacks = new ArrayList(); + + item.getSubItems(item, CreativeTabs.BREWING, stacks); + + for (ItemStack itemStack : stacks) { + storage.push(itemStack, 1000, false); + } + } + + storage.writeToNBT(); + + return new ActionResult(EnumActionResult.SUCCESS, debugDisk); + } else if (!world.isRemote && player.isSneaking() && NBTStorage.getStoredFromNBT(stack.getTagCompound()) == 0 && stack.getMetadata() != TYPE_CREATIVE) { ItemStack storagePart = new ItemStack(RefinedStorageItems.STORAGE_PART, 1, stack.getMetadata()); if (!player.inventory.addItemStackToInventory(storagePart.copy())) { diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index e02fc3348..355866776 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -421,7 +421,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } } - combinedItems.clear(); + /*combinedItems.clear(); combinedItemsIndices.clear(); for (int i = 0; i < items.size(); ++i) { @@ -451,7 +451,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } } - items.removeAll(combinedItems); + items.removeAll(combinedItems);*/ } @Override