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

Added IM support for Keyboards, closes #247. Sorry, cba to fiddle in FMP support for these.

Browse Source
This commit is contained in:
Florian Nücke 2014-07-23 00:19:36 +02:00
parent 63bdcad60b
commit 6bf9423f35
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/block/Cable.scala
View File

@ -134,7 +134,7 @@ object Cable {
private def canConnectFromSideIM(tileEntity: TileEntity, side: ForgeDirection) = private def canConnectFromSideIM(tileEntity: TileEntity, side: ForgeDirection) =
tileEntity match { tileEntity match {
case cable: tileentity.Cable => cable.ImmibisMicroblocks_isSideOpen(side.ordinal) case im: tileentity.traits.ImmibisMicroblock => im.ImmibisMicroblocks_isSideOpen(side.ordinal)
case _ => true case _ => true
} }
} }

13
src/main/scala/li/cil/oc/common/tileentity/Cable.scala
View File

@ -3,21 +3,10 @@ package li.cil.oc.common.tileentity
import li.cil.oc.api.network.Visibility import li.cil.oc.api.network.Visibility
import li.cil.oc.{api, common} import li.cil.oc.{api, common}
class Cable extends traits.Environment with traits.NotAnalyzable { class Cable extends traits.Environment with traits.NotAnalyzable with traits.ImmibisMicroblock {
val node = api.Network.newNode(this, Visibility.None).create() val node = api.Network.newNode(this, Visibility.None).create()
override def canUpdate = false override def canUpdate = false
override def getRenderBoundingBox = common.block.Cable.bounds(world, x, y, z).offset(x, y, z) override def getRenderBoundingBox = common.block.Cable.bounds(world, x, y, z).offset(x, y, z)
// ----------------------------------------------------------------------- //
// Immibis Microblock support.
val ImmibisMicroblocks_TransformableTileEntityMarker = null
def ImmibisMicroblocks_isSideOpen(side: Int) = true
def ImmibisMicroblocks_onMicroblocksChanged() {
api.Network.joinOrCreateNetwork(this)
}
} }

2
src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
View File

@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.ForgeDirection import net.minecraftforge.common.ForgeDirection
class Keyboard extends traits.Environment with traits.Rotatable with SidedEnvironment with Analyzable { class Keyboard extends traits.Environment with traits.Rotatable with traits.ImmibisMicroblock with SidedEnvironment with Analyzable {
override def validFacings = ForgeDirection.VALID_DIRECTIONS override def validFacings = ForgeDirection.VALID_DIRECTIONS
val keyboard = { val keyboard = {

13
src/main/scala/li/cil/oc/common/tileentity/traits/ImmibisMicroblock.scala Normal file
View File

@ -0,0 +1,13 @@
package li.cil.oc.common.tileentity.traits
import li.cil.oc.api
trait ImmibisMicroblock extends TileEntity {
val ImmibisMicroblocks_TransformableTileEntityMarker = null
def ImmibisMicroblocks_isSideOpen(side: Int) = true
def ImmibisMicroblocks_onMicroblocksChanged() {
api.Network.joinOrCreateNetwork(this)
}
}

2
src/main/scala/li/cil/oc/server/network/Network.scala
View File

@ -440,7 +440,7 @@ object Network extends api.detail.NetworkAPI {
private def canConnectFromSideIM(tileEntity: TileEntity, side: ForgeDirection) = private def canConnectFromSideIM(tileEntity: TileEntity, side: ForgeDirection) =
tileEntity match { tileEntity match {
case cable: tileentity.Cable => cable.ImmibisMicroblocks_isSideOpen(side.ordinal) case im: tileentity.traits.ImmibisMicroblock => im.ImmibisMicroblocks_isSideOpen(side.ordinal)
case _ => true case _ => true
} }