rudimentary driver for computercraft peripherals: it emulates a computer that is the whole network and does not provide a lua context which may cause nullpointers. good enough to allow accessing cc disk drives and read/write floppies in them.

This commit is contained in:
Florian Nücke 2013-11-04 17:49:42 +01:00
parent 3c6d3f3b58
commit fcdb75e4bc
5 changed files with 110 additions and 3 deletions

View File

@ -28,6 +28,7 @@ class Proxy {
api.Driver.add(driver.RedstoneCard)
api.Driver.add(driver.CommandBlock)
api.Driver.add(driver.PowerSupply)
api.Driver.add(driver.Peripheral)
MinecraftForge.EVENT_BUS.register(Computer)
MinecraftForge.EVENT_BUS.register(network.Network)

View File

@ -10,8 +10,8 @@ import scala.Some
import scala.collection.mutable
class FileSystem(val fileSystem: api.fs.FileSystem, var label: String) extends ManagedComponent {
val node = api.Network.newNode(this, Visibility.Neighbors).
withComponent("filesystem").
val node = api.Network.newNode(this, Visibility.Network).
withComponent("filesystem", Visibility.Neighbors).
create()
private val owners = mutable.Map.empty[String, mutable.Set[Int]]

View File

@ -0,0 +1,86 @@
package li.cil.oc.server.component
import dan200.computer.api.{IMount, IWritableMount, IComputerAccess, IPeripheral}
import li.cil.oc.api
import li.cil.oc.api.network._
import scala.collection.convert.WrapAsScala._
import scala.collection.mutable
class Peripheral(peripheral: IPeripheral) extends ManagedComponent with IComputerAccess {
val node = api.Network.newNode(this, Visibility.Network).
withComponent("peripheral").
create()
private val mounts = mutable.Map.empty[String, ManagedEnvironment]
// ----------------------------------------------------------------------- //
@LuaCallback(value = "getType", asynchronous = true)
def getType(context: Context, args: Arguments): Array[Object] =
result(peripheral.getType)
@LuaCallback(value = "getMethodNames", asynchronous = true)
def getMethodNames(context: Context, args: Arguments): Array[Object] =
peripheral.getMethodNames.map(_.asInstanceOf[AnyRef])
@LuaCallback(value = "callMethod", asynchronous = true)
def callMethod(context: Context, args: Arguments): Array[Object] = {
val method = args.checkInteger(0)
peripheral.callMethod(this, null, method, args.drop(1).map {
case x: Array[Byte] => new String(x, "UTF-8")
case x => x
}.toArray)
}
// ----------------------------------------------------------------------- //
override def onConnect(node: Node) {
super.onConnect(node)
if (node == this.node) {
peripheral.attach(this)
}
}
override def onDisconnect(node: Node) {
super.onDisconnect(node)
if (node == this.node) {
peripheral.detach(this)
for ((_, env) <- mounts) {
env.node.remove()
}
}
}
// ----------------------------------------------------------------------- //
def getID = -1
def getAttachmentName = node.address
def queueEvent(event: String, arguments: Array[AnyRef]) {
node.sendToReachable("computer.signal", Seq(event) ++ arguments: _*)
}
def mount(desiredLocation: String, mount: IMount) =
mountFileSystem(desiredLocation, api.FileSystem.fromComputerCraft(mount))
def mountWritable(desiredLocation: String, mount: IWritableMount) =
mountFileSystem(desiredLocation, api.FileSystem.fromComputerCraft(mount))
private def mountFileSystem(desiredLocation: String, fs: api.fs.FileSystem) =
if (!mounts.contains(desiredLocation)) {
val env = api.FileSystem.asManagedEnvironment(fs, desiredLocation)
env.node.asInstanceOf[Component].setVisibility(Visibility.Network)
node.connect(env.node)
mounts += desiredLocation -> env
desiredLocation
}
else null
def unmount(location: String) {
mounts.remove(location) match {
case Some(env) => env.node.remove()
case _ =>
}
}
}

View File

@ -0,0 +1,20 @@
package li.cil.oc.server.driver
import dan200.computer.api.IPeripheral
import li.cil.oc.api.driver
import li.cil.oc.server.component
import net.minecraft.world.World
object Peripheral extends driver.Block {
def worksWith(world: World, x: Int, y: Int, z: Int) =
world.getBlockTileEntity(x, y, z) match {
case peripheral: IPeripheral => true
case _ => false
}
def createEnvironment(world: World, x: Int, y: Int, z: Int) =
world.getBlockTileEntity(x, y, z) match {
case peripheral: IPeripheral => new component.Peripheral(peripheral)
case _ => null
}
}

View File

@ -18,7 +18,7 @@ class ComputerCraftFileSystem(val mount: IMount) extends InputStreamFileSystem {
override def list(path: String) = {
val result = new java.util.ArrayList[String]
mount.list(path, result)
result.toArray.asInstanceOf[Array[String]]
result.toArray.map(_.asInstanceOf[String])
}
override def size(path: String) = mount.getSize(path)