From 4c3b7d03d8bc4ed1d07daade108514d27719e446 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Fri, 3 Feb 2017 22:06:36 +0100 Subject: [PATCH] Added device info to MFU. --- src/main/resources/application.conf | 2 +- src/main/scala/li/cil/oc/Constants.scala | 1 + .../oc/common/event/BlockChangeHandler.scala | 1 - .../cil/oc/server/component/UpgradeMF.scala | 22 +++++++++++++++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index e4a3d3510..9c834010e 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -809,7 +809,7 @@ opencomputers { nanomachinesReconfigure: 5000 # Energy consumed by a MFU per tick while connected. - # Similar to `wirelessCostPerRange`, this is multiplied with the distance to the bound block. + # Similarly to `wirelessCostPerRange`, this is multiplied with the distance to the bound block. mfuRelay: 1 } diff --git a/src/main/scala/li/cil/oc/Constants.scala b/src/main/scala/li/cil/oc/Constants.scala index bcaa4ce63..3eee3ce77 100644 --- a/src/main/scala/li/cil/oc/Constants.scala +++ b/src/main/scala/li/cil/oc/Constants.scala @@ -175,6 +175,7 @@ object Constants { object DeviceInfo { final val DefaultVendor = "MightyPirates GmbH & Co. KG" + final val Scummtech = "Scummtech, Inc." } diff --git a/src/main/scala/li/cil/oc/common/event/BlockChangeHandler.scala b/src/main/scala/li/cil/oc/common/event/BlockChangeHandler.scala index 6f6230bfd..3830de1e7 100644 --- a/src/main/scala/li/cil/oc/common/event/BlockChangeHandler.scala +++ b/src/main/scala/li/cil/oc/common/event/BlockChangeHandler.scala @@ -11,7 +11,6 @@ import net.minecraftforge.event.world.WorldEvent import scala.collection.mutable /** - * * @author Vexatos */ object BlockChangeHandler { diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeMF.scala b/src/main/scala/li/cil/oc/server/component/UpgradeMF.scala index 46498330b..a5870c618 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeMF.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeMF.scala @@ -1,5 +1,11 @@ package li.cil.oc.server.component +import java.util + +import li.cil.oc.Constants +import li.cil.oc.api.driver.DeviceInfo +import li.cil.oc.api.driver.DeviceInfo.DeviceAttribute +import li.cil.oc.api.driver.DeviceInfo.DeviceClass import li.cil.oc.api.network._ import li.cil.oc.api.prefab import li.cil.oc.common.event.BlockChangeHandler @@ -7,18 +13,21 @@ import li.cil.oc.common.event.BlockChangeHandler.ChangeListener import li.cil.oc.server.network import li.cil.oc.util.BlockPosition import li.cil.oc.util.ExtendedWorld._ -import li.cil.oc.{Settings, api} +import li.cil.oc.Settings +import li.cil.oc.api import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.util.Vec3 import net.minecraftforge.common.util.ForgeDirection +import scala.collection.convert.WrapAsJava._ + /** * Mostly stolen from li.cil.oc.common.tileentity.Adapter * * @author Sangar, Vexatos */ -class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: ForgeDirection) extends prefab.ManagedEnvironment with ChangeListener { +class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: ForgeDirection) extends prefab.ManagedEnvironment with ChangeListener with DeviceInfo { override val node = api.Network.newNode(this, Visibility.None). withConnector(). create() @@ -29,6 +38,15 @@ class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: Fo override val canUpdate = true + private final lazy val deviceInfo = Map( + DeviceAttribute.Class -> DeviceClass.Bus, + DeviceAttribute.Description -> "Remote Adapter", + DeviceAttribute.Vendor -> Constants.DeviceInfo.Scummtech, + DeviceAttribute.Product -> "ERR NAME NOT FOUND" + ) + + override def getDeviceInfo: util.Map[String, String] = deviceInfo + private def otherNode(tile: TileEntity, f: (Node) => Unit) { network.Network.getNetworkNode(tile, dir) match { case Some(otherNode) => f(otherNode)