From 76f94b3ae1fc2d07882f5f39abc77cd7664f762a Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Thu, 19 May 2016 15:25:18 +0200
Subject: [PATCH] This makes more sense

---
 .../refinedstorage/block/BlockStorage.java    |  6 ++--
 .../java/refinedstorage/tile/TileStorage.java | 36 ++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java
index a8282a78b..baf8a7d72 100755
--- a/src/main/java/refinedstorage/block/BlockStorage.java
+++ b/src/main/java/refinedstorage/block/BlockStorage.java
@@ -76,9 +76,11 @@ public class BlockStorage extends BlockMachine {
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) {
         super.onBlockPlacedBy(world, pos, state, player, stack);
 
-        NBTTagCompound tag = stack.getTagCompound();
+        if (!world.isRemote) {
+            NBTTagCompound tag = stack.getTagCompound();
 
-        ((TileStorage) world.getTileEntity(pos)).onPlaced((tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) ? tag.getCompoundTag(TileStorage.NBT_STORAGE) : null);
+            ((TileStorage) world.getTileEntity(pos)).onPlaced((tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) ? tag.getCompoundTag(TileStorage.NBT_STORAGE) : null);
+        }
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index 138614618..4298594ef 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -27,7 +27,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
 
     private InventorySimple inventory = new InventorySimple("storage", 9, this);
 
-    private NBTTagCompound storageTag;
+    private NBTTagCompound storageTag = NBTStorage.createNBT();
 
     private StorageBlockStorage storage;
 
@@ -43,31 +43,26 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
 
     @Override
     public void updateMachine() {
-        if (getStorage().isDirty()) {
+        if (storage != null && storage.isDirty()) {
             markDirty();
 
-            getStorage().markClean();
+            storage.markClean();
         }
     }
 
     public void onPlaced(NBTTagCompound tag) {
-        if (tag == null) {
-            storageTag = NBTStorage.createNBT();
-        } else {
-            storageTag = tag;
+        if (tag != null) {
+            this.storageTag = tag;
         }
-    }
 
-    public NBTStorage getStorage() {
-        if (storage == null) {
-            storage = new StorageBlockStorage(this);
-        }
-        return storage;
+        this.storage = new StorageBlockStorage(this);
     }
 
     @Override
     public void provide(List<IStorage> storages) {
-        storages.add(getStorage());
+        if (storage != null) {
+            storages.add(storage);
+        }
     }
 
     @Override
@@ -82,10 +77,10 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
 
         if (nbt.hasKey(NBT_STORAGE)) {
             storageTag = nbt.getCompoundTag(NBT_STORAGE);
-        } else {
-            storageTag = NBTStorage.createNBT();
         }
 
+        storage = new StorageBlockStorage(this);
+
         if (nbt.hasKey(NBT_COMPARE)) {
             compare = nbt.getInteger(NBT_COMPARE);
         }
@@ -102,7 +97,10 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
         RefinedStorageUtils.saveInventory(inventory, 0, nbt);
 
         nbt.setInteger(NBT_PRIORITY, priority);
+
+        storage.writeToNBT(storageTag);
         nbt.setTag(NBT_STORAGE, storageTag);
+
         nbt.setInteger(NBT_COMPARE, compare);
         nbt.setInteger(NBT_MODE, mode);
     }
@@ -210,12 +208,6 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
         return storageTag;
     }
 
-    public void setStorageTag(NBTTagCompound tag) {
-        markDirty();
-
-        this.storageTag = tag;
-    }
-
     @Override
     public int getPriority() {
         return priority;