Update changelog

CHANGELOG.md

@@ -6,6 +6,8 @@
 - Fixed solderer not supporting ore dictionary
 - Fixed recipes not supporting ore dictionary
 - Fixed destructor not being able to destroy some blocks
+- Fixed not being able to place or destroy sugar cane
+- New items now go to the first available storage that has items in it already
 - Performance improvements
 
 **Features**

src/main/java/refinedstorage/storage/NBTStorage.java

@@ -47,9 +47,11 @@ public abstract class NBTStorage implements IStorage {
 
             stack.setTagCompound(tag.hasKey(NBT_ITEM_NBT) ? ((NBTTagCompound) tag.getTag(NBT_ITEM_NBT)) : null);
 
+            if (stack.getItem() != null) {
                 stacks.add(stack);
             }
         }
+    }
 
     public void writeToNBT(NBTTagCompound tag) {
         NBTTagList list = new NBTTagList();

src/main/java/refinedstorage/tile/TileExternalStorage.java

@@ -46,7 +46,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
         IDeepStorageUnit storageUnit = getStorageUnit();
 
         if (storageUnit != null) {
-            if (storageUnit.getStoredItemType() != null) {
+            if (storageUnit.getStoredItemType() != null && storageUnit.getStoredItemType().getItem() != null) {
                 items.add(storageUnit.getStoredItemType().copy());
             }
         } else {
@@ -54,7 +54,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
 
             if (handler != null) {
                 for (int i = 0; i < handler.getSlots(); ++i) {
-                    if (handler.getStackInSlot(i) != null) {
+                    if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getItem() != null) {
                         items.add(handler.getStackInSlot(i).copy());
                     }
                 }

src/main/java/refinedstorage/tile/controller/TileController.java

@@ -335,11 +335,6 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
             ItemStack stack = items.get(i);
 
-            // If the item doesn't exist anymore, remove it from storage to avoid crashes
-            if (stack.getItem() == null) {
-                combinedItems.add(stack);
-                combinedItemsIndices.add(i);
-            } else {
             for (int j = i + 1; j < items.size(); ++j) {
                 if (combinedItemsIndices.contains(j)) {
                     continue;
@@ -357,7 +352,6 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
                 }
             }
         }
-        }
 
         items.removeAll(combinedItems);
     }