From 799224e92b2879724e1bde86a43b6b688a05a308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Mon, 23 Mar 2015 01:58:35 +0100
Subject: [PATCH] Also calling doCustomInit on client side.

---
 .../cil/oc/common/block/Microcontroller.scala  |  6 ++++--
 .../scala/li/cil/oc/common/block/Raid.scala    | 18 ++++++++++--------
 .../oc/common/block/traits/CustomDrops.scala   | 10 ++++------
 .../li/cil/oc/common/item/data/ItemData.scala  |  4 ----
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/scala/li/cil/oc/common/block/Microcontroller.scala b/src/main/scala/li/cil/oc/common/block/Microcontroller.scala
index c4c475bcd..de1ede9e4 100644
--- a/src/main/scala/li/cil/oc/common/block/Microcontroller.scala
+++ b/src/main/scala/li/cil/oc/common/block/Microcontroller.scala
@@ -102,8 +102,10 @@ class Microcontroller(protected implicit val tileTag: ClassTag[tileentity.Microc
 
   override protected def doCustomInit(tileEntity: tileentity.Microcontroller, player: EntityLivingBase, stack: ItemStack): Unit = {
     super.doCustomInit(tileEntity, player, stack)
-    tileEntity.info.load(stack)
-    tileEntity.snooperNode.changeBuffer(tileEntity.info.storedEnergy - tileEntity.snooperNode.localBuffer)
+    if (!tileEntity.world.isRemote) {
+      tileEntity.info.load(stack)
+      tileEntity.snooperNode.changeBuffer(tileEntity.info.storedEnergy - tileEntity.snooperNode.localBuffer)
+    }
   }
 
   override protected def doCustomDrops(tileEntity: tileentity.Microcontroller, player: EntityPlayer, willHarvest: Boolean): Unit = {
diff --git a/src/main/scala/li/cil/oc/common/block/Raid.scala b/src/main/scala/li/cil/oc/common/block/Raid.scala
index e23b1a959..db0c17f6d 100644
--- a/src/main/scala/li/cil/oc/common/block/Raid.scala
+++ b/src/main/scala/li/cil/oc/common/block/Raid.scala
@@ -55,14 +55,16 @@ class Raid(protected implicit val tileTag: ClassTag[tileentity.Raid]) extends Si
 
   override protected def doCustomInit(tileEntity: tileentity.Raid, player: EntityLivingBase, stack: ItemStack): Unit = {
     super.doCustomInit(tileEntity, player, stack)
-    val data = new RaidData(stack)
-    for (i <- 0 until math.min(data.disks.length, tileEntity.getSizeInventory)) {
-      tileEntity.setInventorySlotContents(i, data.disks(i))
-    }
-    data.label.foreach(tileEntity.label.setLabel)
-    if (!data.filesystem.hasNoTags) {
-      tileEntity.tryCreateRaid(data.filesystem.getCompoundTag("node").getString("address"))
-      tileEntity.filesystem.foreach(_.load(data.filesystem))
+    if (!tileEntity.world.isRemote) {
+      val data = new RaidData(stack)
+      for (i <- 0 until math.min(data.disks.length, tileEntity.getSizeInventory)) {
+        tileEntity.setInventorySlotContents(i, data.disks(i))
+      }
+      data.label.foreach(tileEntity.label.setLabel)
+      if (!data.filesystem.hasNoTags) {
+        tileEntity.tryCreateRaid(data.filesystem.getCompoundTag("node").getString("address"))
+        tileEntity.filesystem.foreach(_.load(data.filesystem))
+      }
     }
   }
 
diff --git a/src/main/scala/li/cil/oc/common/block/traits/CustomDrops.scala b/src/main/scala/li/cil/oc/common/block/traits/CustomDrops.scala
index 8a74a8897..40aafff03 100644
--- a/src/main/scala/li/cil/oc/common/block/traits/CustomDrops.scala
+++ b/src/main/scala/li/cil/oc/common/block/traits/CustomDrops.scala
@@ -31,12 +31,10 @@ trait CustomDrops[Tile <: TileEntity] extends SimpleBlock {
 
   override def onBlockPlacedBy(world: World, x: Int, y: Int, z: Int, player: EntityLivingBase, stack: ItemStack): Unit = {
     super.onBlockPlacedBy(world, x, y, z, player, stack)
-    if (!world.isRemote) {
-      val matcher = tileTag
-      world.getTileEntity(x, y, z) match {
-        case matcher(tileEntity) => doCustomInit(tileEntity, player, stack)
-        case _ =>
-      }
+    val matcher = tileTag
+    world.getTileEntity(x, y, z) match {
+      case matcher(tileEntity) => doCustomInit(tileEntity, player, stack)
+      case _ =>
     }
   }
 
diff --git a/src/main/scala/li/cil/oc/common/item/data/ItemData.scala b/src/main/scala/li/cil/oc/common/item/data/ItemData.scala
index 1df64ade7..c721c78bb 100644
--- a/src/main/scala/li/cil/oc/common/item/data/ItemData.scala
+++ b/src/main/scala/li/cil/oc/common/item/data/ItemData.scala
@@ -4,10 +4,6 @@ import li.cil.oc.api.Persistable
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 
-object ItemData {
-
-}
-
 abstract class ItemData extends Persistable {
   def load(stack: ItemStack) {
     if (stack.hasTagCompound) {