Fix rare crash if a storage block is corrupted.

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java

@@ -53,7 +53,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
     private int compare = IComparer.COMPARE_NBT;
     private int mode = IFilterable.BLACKLIST;
 
-    private UUID storageId;
+    private UUID storageId = UUID.randomUUID();
     private IStorageDisk<FluidStack> storage;
 
     public NetworkNodeFluidStorage(World world, BlockPos pos) {
@@ -79,6 +79,10 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
 
     @Override
     public void addFluidStorages(List<IStorage<FluidStack>> storages) {
+        if (storage == null) {
+            loadStorage();
+        }
+
         storages.add(storage);
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java

@@ -53,7 +53,7 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
     private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
     private int mode = IFilterable.BLACKLIST;
 
-    private UUID storageId;
+    private UUID storageId = UUID.randomUUID();
     private IStorageDisk<ItemStack> storage;
 
     public NetworkNodeStorage(World world, BlockPos pos) {
@@ -74,6 +74,10 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
 
     @Override
     public void addItemStorages(List<IStorage<ItemStack>> storages) {
+        if (storage == null) {
+            loadStorage();
+        }
+
         storages.add(storage);
     }
 

src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java

@@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import javax.annotation.Nullable;
-import java.util.UUID;
 
 public class BlockFluidStorage extends BlockNode {
     public static final PropertyEnum TYPE = PropertyEnum.create("type", FluidStorageType.class);
@@ -90,8 +89,6 @@ public class BlockFluidStorage extends BlockNode {
 
             if (stack.hasTagCompound() && stack.getTagCompound().hasUniqueId(NetworkNodeFluidStorage.NBT_ID)) {
                 storage.setStorageId(stack.getTagCompound().getUniqueId(NetworkNodeFluidStorage.NBT_ID));
-            } else {
-                storage.setStorageId(UUID.randomUUID());
             }
 
             storage.loadStorage();

src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java

@@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import javax.annotation.Nullable;
-import java.util.UUID;
 
 public class BlockStorage extends BlockNode {
     public static final PropertyEnum TYPE = PropertyEnum.create("type", ItemStorageType.class);
@@ -90,8 +89,6 @@ public class BlockStorage extends BlockNode {
 
             if (stack.hasTagCompound() && stack.getTagCompound().hasUniqueId(NetworkNodeStorage.NBT_ID)) {
                 storage.setStorageId(stack.getTagCompound().getUniqueId(NetworkNodeStorage.NBT_ID));
-            } else {
-                storage.setStorageId(UUID.randomUUID());
             }
 
             storage.loadStorage();

src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCover.java

@@ -124,6 +124,7 @@ public class BakedModelCover implements IBakedModel {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public ItemCameraTransforms getItemCameraTransforms() {
         return base.getItemCameraTransforms();
     }