From 9543ac8168840aea9bff22f2c703525f8f9d61c3 Mon Sep 17 00:00:00 2001 From: payonel Date: Sun, 18 Mar 2018 23:19:41 -0700 Subject: [PATCH] remove file accidentally added back by merge --- .../server/component/RedstoneWireless.scala | 163 ------------------ 1 file changed, 163 deletions(-) delete mode 100644 src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala diff --git a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala b/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala deleted file mode 100644 index 71d1f24cb..000000000 --- a/src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala +++ /dev/null @@ -1,163 +0,0 @@ -package li.cil.oc.server.component - -import codechicken.lib.vec.Vector3 -import codechicken.wirelessredstone.api.WirelessReceivingDevice -import codechicken.wirelessredstone.api.WirelessTransmittingDevice -import li.cil.oc.Constants -import li.cil.oc.api.driver.DeviceInfo.DeviceAttribute -import li.cil.oc.api.driver.DeviceInfo.DeviceClass -import li.cil.oc.Settings -import li.cil.oc.api.driver.DeviceInfo -import li.cil.oc.api.network.EnvironmentHost -import li.cil.oc.api.machine.Arguments -import li.cil.oc.api.machine.Callback -import li.cil.oc.api.machine.Context -import li.cil.oc.api.network._ -import li.cil.oc.common.EventHandler -import li.cil.oc.common.tileentity.traits.RedstoneChangedEventArgs -import li.cil.oc.integration.Mods -import li.cil.oc.integration.util -import net.minecraft.nbt.NBTTagCompound -import net.minecraftforge.fml.common.Optional - -import scala.collection.convert.WrapAsJava._ - -@Optional.InterfaceList(Array( - new Optional.Interface(iface = "codechicken.wirelessredstone.api.WirelessReceivingDevice", modid = Mods.IDs.WirelessRedstoneCBE), - new Optional.Interface(iface = "codechicken.wirelessredstone.api.WirelessTransmittingDevice", modid = Mods.IDs.WirelessRedstoneCBE) -)) -trait RedstoneWireless extends RedstoneSignaller with WirelessReceivingDevice with WirelessTransmittingDevice with DeviceInfo { - def redstone: EnvironmentHost - - var wirelessFrequency = 0 - - var wirelessInput = false - - var wirelessOutput = false - - // ----------------------------------------------------------------------- // - - private final lazy val deviceInfo = Map( - DeviceAttribute.Class -> DeviceClass.Communication, - DeviceAttribute.Description -> "Wireless redstone controller", - DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, - DeviceAttribute.Product -> "Rw400-M", - DeviceAttribute.Capacity -> "1", - DeviceAttribute.Width -> "1" - ) - - override def getDeviceInfo: java.util.Map[String, String] = deviceInfo - - // ----------------------------------------------------------------------- // - - @Callback(doc = """function():number -- Get the wireless redstone input.""") - def getWirelessInput(context: Context, args: Arguments): Array[AnyRef] = { - wirelessInput = util.WirelessRedstone.getInput(this) - result(wirelessInput) - } - - @Callback(direct = true, doc = """function():boolean -- Get the wireless redstone output.""") - def getWirelessOutput(context: Context, args: Arguments): Array[AnyRef] = result(wirelessOutput) - - @Callback(doc = """function(value:boolean):boolean -- Set the wireless redstone output.""") - def setWirelessOutput(context: Context, args: Arguments): Array[AnyRef] = { - val oldValue = wirelessOutput - val newValue = args.checkBoolean(0) - - if (oldValue != newValue) { - wirelessOutput = newValue - - util.WirelessRedstone.updateOutput(this) - - if (Settings.get.redstoneDelay > 0) - context.pause(Settings.get.redstoneDelay) - } - - result(oldValue) - } - - @Callback(direct = true, doc = """function():number -- Get the currently set wireless redstone frequency.""") - def getWirelessFrequency(context: Context, args: Arguments): Array[AnyRef] = result(wirelessFrequency) - - @Callback(doc = """function(frequency:number):number -- Set the wireless redstone frequency to use.""") - def setWirelessFrequency(context: Context, args: Arguments): Array[AnyRef] = { - val oldValue = wirelessFrequency - val newValue = args.checkInteger(0) - - if (oldValue != newValue) { - util.WirelessRedstone.removeReceiver(this) - util.WirelessRedstone.removeTransmitter(this) - - wirelessFrequency = newValue - wirelessInput = false - wirelessOutput = false - - util.WirelessRedstone.addReceiver(this) - - context.pause(0.5) - } - - result(oldValue) - } - - // ----------------------------------------------------------------------- // - - @Optional.Method(modid = Mods.IDs.WirelessRedstoneCBE) - override def updateDevice(frequency: Int, on: Boolean) { - if (frequency == wirelessFrequency && on != wirelessInput) { - wirelessInput = on - onRedstoneChanged(RedstoneChangedEventArgs(null, if (on) 0 else 1, if (on) 1 else 0)) - } - } - - @Optional.Method(modid = Mods.IDs.WirelessRedstoneCBE) - override def getTransmitPos = new Vector3(redstone.xPosition, redstone.yPosition, redstone.zPosition) - - @Optional.Method(modid = Mods.IDs.WirelessRedstoneCBE) - override def getDimension = redstone.world.provider.getDimension - - @Optional.Method(modid = Mods.IDs.WirelessRedstoneCBE) - override def getFreq = wirelessFrequency - - @Optional.Method(modid = Mods.IDs.WirelessRedstoneCBE) - override def getAttachedEntity = null - - // ----------------------------------------------------------------------- // - - override def onConnect(node: Node) { - super.onConnect(node) - if (node == this.node) { - EventHandler.scheduleWirelessRedstone(this) - } - } - - override def onDisconnect(node: Node) { - super.onDisconnect(node) - if (node == this.node) { - util.WirelessRedstone.removeReceiver(this) - util.WirelessRedstone.removeTransmitter(this) - wirelessOutput = false - wirelessFrequency = 0 - } - } - - // ----------------------------------------------------------------------- // - - private final val WirelessFrequencyTag = "wirelessFrequency" - private final val WirelessInputTag = "wirelessInput" - private final val WirelessOutputTag = "wirelessOutput" - - override def load(nbt: NBTTagCompound) { - super.load(nbt) - wirelessFrequency = nbt.getInteger(WirelessFrequencyTag) - wirelessInput = nbt.getBoolean(WirelessInputTag) - wirelessOutput = nbt.getBoolean(WirelessOutputTag) - } - - override def save(nbt: NBTTagCompound) { - super.save(nbt) - nbt.setInteger(WirelessFrequencyTag, wirelessFrequency) - nbt.setBoolean(WirelessInputTag, wirelessInput) - nbt.setBoolean(WirelessOutputTag, wirelessOutput) - } -}