diff --git a/li/cil/oc/common/tileentity/BundledRedstone.scala b/li/cil/oc/common/tileentity/BundledRedstone.scala index 737d8df8b..779b60cf9 100644 --- a/li/cil/oc/common/tileentity/BundledRedstone.scala +++ b/li/cil/oc/common/tileentity/BundledRedstone.scala @@ -1,14 +1,20 @@ package li.cil.oc.common.tileentity +import cpw.mods.fml.common.Optional.Interface import cpw.mods.fml.common.{Optional, Loader} import li.cil.oc.Settings import li.cil.oc.util.ExtendedNBT._ import mods.immibis.redlogic.api.wiring.{IInsulatedRedstoneWire, IBundledUpdatable, IBundledEmitter} +import net.minecraft.block.Block import net.minecraft.nbt.{NBTTagIntArray, NBTTagCompound} import net.minecraftforge.common.ForgeDirection -import net.minecraft.block.Block import powercrystals.minefactoryreloaded.api.rednet.IRedNetNetworkContainer +import scala.Array +@Optional.InterfaceList(Array( + new Interface(iface = "mods.immibis.redlogic.api.wiring.IBundledEmitter", modid = "RedLogic"), + new Interface(iface = "mods.immibis.redlogic.api.wiring.IBundledUpdatable", modid = "RedLogic") +)) trait BundledRedstone extends Redstone with IBundledEmitter with IBundledUpdatable { private val _bundledInput = Array.fill(6)(Array.fill(16)(-1)) diff --git a/li/cil/oc/common/tileentity/Redstone.scala b/li/cil/oc/common/tileentity/Redstone.scala index adc45dc8f..ef7105fcb 100644 --- a/li/cil/oc/common/tileentity/Redstone.scala +++ b/li/cil/oc/common/tileentity/Redstone.scala @@ -13,8 +13,6 @@ import net.minecraftforge.common.ForgeDirection @Optional.InterfaceList(Array( new Interface(iface = "mods.immibis.redlogic.api.wiring.IConnectable", modid = "RedLogic"), - new Interface(iface = "mods.immibis.redlogic.api.wiring.IBundledEmitter", modid = "RedLogic"), - new Interface(iface = "mods.immibis.redlogic.api.wiring.IBundledUpdatable", modid = "RedLogic"), new Interface(iface = "mods.immibis.redlogic.api.wiring.IRedstoneEmitter", modid = "RedLogic"), new Interface(iface = "mods.immibis.redlogic.api.wiring.IRedstoneUpdatable", modid = "RedLogic") ))