AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 03:36:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

more stable signal pushing for carriage component; bump version for incoming first release

Browse Source
This commit is contained in:
Florian Nücke 2013-12-13 12:43:58 +01:00
parent 8d7d7ad93c
commit 966b2e7f6e
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li/cil/oc/OpenComputers.scala
View File

@ -13,8 +13,8 @@ import li.cil.oc.client.{PacketHandler => ClientPacketHandler}
import li.cil.oc.common.Proxy import li.cil.oc.common.Proxy
import li.cil.oc.server.{PacketHandler => ServerPacketHandler} import li.cil.oc.server.{PacketHandler => ServerPacketHandler}
@Mod(modid = "OpenComputers", name = "OpenComputers", version = "0.0.0", @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", dependencies = "required-after:Forge@[9.11.1.940,);after:BuildCraft|Energy;after:ComputerCraft;after:IC2;after:MineFactoryReloaded;after:RedLogic;after:ThermalExpansion",
modLanguage = "scala") modLanguage = "scala")
@NetworkMod(clientSideRequired = true, serverSideRequired = false, @NetworkMod(clientSideRequired = true, serverSideRequired = false,
clientPacketHandlerSpec = new SidedPacketHandler( clientPacketHandlerSpec = new SidedPacketHandler(

14
li/cil/oc/server/component/Carriage.scala
View File

@ -78,6 +78,10 @@ class Carriage(controller: AnyRef) extends ManagedComponent {
override val canUpdate = true override val canUpdate = true
override def update() { override def update() {
if (node != null && node.network != null && moving) {
moving = false
node.sendToReachable("computer.signal", "carriage_moved", Boolean.box(true))
}
super.update() super.update()
if (shouldMove) { if (shouldMove) {
shouldMove = false 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) = { override def save(nbt: NBTTagCompound) = {
super.save(nbt) super.save(nbt)
nbt.setBoolean("moving", moving) nbt.setBoolean("moving", moving)

4
mcmod.info
View File

@ -2,8 +2,8 @@
{ {
"modid": "OpenComputers", "modid": "OpenComputers",
"name": "OpenComputers", "name": "OpenComputers",
"version": "0.0.0", "version": "1.0.0",
"credits" : "Inspired by ComputerCraft", "credits" : "Inspired by a couple of other mods, most notably ComputerCraft.",
"authors": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer"], "authors": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer"],
"description": "This mod adds modular computers and robots that can be programmed in Lua.", "description": "This mod adds modular computers and robots that can be programmed in Lua.",
"logoFile" : "assets/opencomputers/textures/gui/logo.png", "logoFile" : "assets/opencomputers/textures/gui/logo.png",