From 966b2e7f6e8962058d9f085c9724dc16e2bf0328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Fri, 13 Dec 2013 12:43:58 +0100
Subject: [PATCH] more stable signal pushing for carriage component; bump
 version for incoming first release

---
 li/cil/oc/OpenComputers.scala             |  4 ++--
 li/cil/oc/server/component/Carriage.scala | 14 ++++----------
 mcmod.info                                |  4 ++--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/li/cil/oc/OpenComputers.scala b/li/cil/oc/OpenComputers.scala
index eb842a39a..59c68f05d 100644
--- a/li/cil/oc/OpenComputers.scala
+++ b/li/cil/oc/OpenComputers.scala
@@ -13,8 +13,8 @@ import li.cil.oc.client.{PacketHandler => ClientPacketHandler}
 import li.cil.oc.common.Proxy
 import li.cil.oc.server.{PacketHandler => ServerPacketHandler}
 
-@Mod(modid = "OpenComputers", name = "OpenComputers", version = "0.0.0",
-  dependencies = "required-after:Forge@[9.11.1.940,);after:BuildCraft|Energy;after:ComputerCraft;after:IC2;after:MineFactoryReloaded;after:RedLogic",
+@Mod(modid = "OpenComputers", name = "OpenComputers", version = "1.0.0",
+  dependencies = "required-after:Forge@[9.11.1.940,);after:BuildCraft|Energy;after:ComputerCraft;after:IC2;after:MineFactoryReloaded;after:RedLogic;after:ThermalExpansion",
   modLanguage = "scala")
 @NetworkMod(clientSideRequired = true, serverSideRequired = false,
   clientPacketHandlerSpec = new SidedPacketHandler(
diff --git a/li/cil/oc/server/component/Carriage.scala b/li/cil/oc/server/component/Carriage.scala
index a36949e2d..3192d1ae6 100644
--- a/li/cil/oc/server/component/Carriage.scala
+++ b/li/cil/oc/server/component/Carriage.scala
@@ -78,6 +78,10 @@ class Carriage(controller: AnyRef) extends ManagedComponent {
   override val canUpdate = true
 
   override def update() {
+    if (node != null && node.network != null && moving) {
+      moving = false
+      node.sendToReachable("computer.signal", "carriage_moved", Boolean.box(true))
+    }
     super.update()
     if (shouldMove) {
       shouldMove = false
@@ -101,16 +105,6 @@ class Carriage(controller: AnyRef) extends ManagedComponent {
 
   // ----------------------------------------------------------------------- //
 
-  override def onConnect(node: Node) {
-    super.onConnect(node)
-    if (moving) {
-      moving = false
-      node.sendToReachable("computer.signal", "carriage_moved", Boolean.box(true))
-    }
-  }
-
-  // ----------------------------------------------------------------------- //
-
   override def save(nbt: NBTTagCompound) = {
     super.save(nbt)
     nbt.setBoolean("moving", moving)
diff --git a/mcmod.info b/mcmod.info
index 4e3eab36d..b44d07e46 100644
--- a/mcmod.info
+++ b/mcmod.info
@@ -2,8 +2,8 @@
 {
   "modid": "OpenComputers",
   "name": "OpenComputers",
-  "version": "0.0.0",
-  "credits" : "Inspired by ComputerCraft",
+  "version": "1.0.0",
+  "credits" : "Inspired by a couple of other mods, most notably ComputerCraft.",
   "authors": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer"],
   "description": "This mod adds modular computers and robots that can be programmed in Lua.",
   "logoFile" : "assets/opencomputers/textures/gui/logo.png",