tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed wires not connecting at all

Browse source
This commit is contained in:
Calclavia 2014-11-02 22:53:45 +08:00
parent 3de3e3aed1
commit 04d37537cc
4 changed files with 58 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/resonantinduction/core/prefab/part/connector/TNodePartConnector.scala
View file

@ -52,7 +52,7 @@ trait TNodePartConnector extends PartAbstract with INodeProvider
override def getNode[N <: INode](nodeType: Class[_ <: N], from: ForgeDirection): N =
{
if (nodeType.isAssignableFrom(node.getClass) || node.getClass == nodeType)
if (node.getClass.isAssignableFrom(nodeType))
return node.asInstanceOf[N]
return null.asInstanceOf[N]

6
src/main/scala/resonantinduction/core/util/MultipartUtil.scala
View file

@ -19,7 +19,11 @@ object MultipartUtil
def getMultipartTile(access: IBlockAccess, pos: Vector3): TileMultipart =
{
val te = pos.getTileEntity(access)
return if (te.isInstanceOf[TileMultipart]) te.asInstanceOf[TileMultipart] else null
if (te.isInstanceOf[TileMultipart])
return te.asInstanceOf[TileMultipart]
else
return null
}
def getMultipart(world: World, vector: Vector3, partMap: Int): TMultiPart =

18
src/main/scala/resonantinduction/electrical/battery/TileBattery.scala
View file

@ -98,26 +98,30 @@ class TileBattery extends TileAdvanced(Material.iron) with TElectric with IPacke
override def toggleIO(side: Int, entityPlayer: EntityPlayer): Boolean =
{
val res = super.toggleIO(side, entityPlayer)
dcNode.connectionMask = ForgeDirection.VALID_DIRECTIONS.filter(getIO(_) > 0).map(d => 1 << d.ordinal()).foldLeft(0)(_ | _)
dcNode.positiveTerminals.clear()
dcNode.positiveTerminals.addAll(getOutputDirections())
notifyChange()
return res
}
override def getDescPacket: AbstractPacket =
{
return new PacketTile(this, Array[Any](renderEnergyAmount, ioMap))
return new PacketTile(this) <<< renderEnergyAmount <<< ioMap
}
def read(data: ByteBuf, player: EntityPlayer, `type`: PacketType)
override def read(buf: ByteBuf, player: EntityPlayer, packet: PacketType)
{
this.energy.setEnergy(data.readLong)
this.ioMap_$eq(data.readShort)
energy.setEnergy(buf.readLong)
ioMap == buf.readShort
}
override def setIO(dir: ForgeDirection, `type`: Int)
override def setIO(dir: ForgeDirection, packet: Int)
{
super.setIO(dir, `type`)
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord)
super.setIO(dir, packet)
markUpdate()
}
override def onPlaced(entityliving: EntityLivingBase, itemStack: ItemStack)

77
src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala
View file

@ -277,10 +277,7 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
/**
* Multipart Methods
*/
override def getStrength(hit: MovingObjectPosition, player: EntityPlayer): Float =
{
return 4
}
override def getStrength(hit: MovingObjectPosition, player: EntityPlayer): Float = 4
def getSlotMask: Int = 1 << side
@ -347,8 +344,11 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
{
override def reconstruct()
{
super.reconstruct()
if (!world.isRemote)
{
directionMap.clear()
updateOpenConnections()
/**
@ -368,7 +368,7 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
val absDir = Rotation.rotateSide(side, r)
if (setExternalConnection(r, absDir) || setCornerConnection(r, absDir))
calculatedMask = calculatedMask | (1 << absDir)
calculatedMask |= 1 << absDir
if ((calculatedMask & (1 << absDir)) == 0)
disconnect(absDir)
@ -416,14 +416,13 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
val pos = new BlockCoord(tile).offset(absDir)
val tilePart = MultipartUtil.getMultipartTile(world, pos)
val forgeDir = ForgeDirection.getOrientation(absDir)
val toDir = ForgeDirection.getOrientation(absDir)
val fromDir = ForgeDirection.getOrientation(absDir).getOpposite
if (tilePart != null && r != -1)
{
val part = tilePart.partMap(side)
if (canConnectTo(part, ForgeDirection.getOrientation(absDir)))
{
val otherR = (r + 2) % 4
@ -439,13 +438,13 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
if (wire.canConnectTo(PartFlatWire.this, fromDir) && wire.maskOpen(otherR))
{
connect(dcNode, forgeDir)
connect(dcNode, toDir)
return true
}
}
else if (canConnectTo(part))
{
connect(dcNode, forgeDir)
connect(dcNode, toDir)
return true
}
}
@ -458,12 +457,12 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
/**
* Can't find another wire. Try TileEntity.
*/
val tileEntity = world.getTileEntity(pos.x, pos.y, pos.z)
val tileEntity = pos.getTileEntity(world)
val tileComponent = getComponent(tileEntity, fromDir)
if (canConnectTo(tileEntity, forgeDir))
if (canConnectTo(tileEntity, fromDir))
{
connect(tileComponent, forgeDir)
connect(tileComponent, toDir)
return true
}
@ -485,12 +484,13 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
if (tpCorner != null)
{
val part = tpCorner.partMap(absDir ^ 1)
val absForgeDir = ForgeDirection.getOrientation(absDir)
val absToDir = ForgeDirection.getOrientation(absDir)
val absFromDir = ForgeDirection.getOrientation(absDir).getOpposite
if (canConnectTo(part, absForgeDir))
if (canConnectTo(part, absFromDir))
{
//TODO: Check dir
connect(part.asInstanceOf[INodeProvider].getNode(classOf[DCNode], absForgeDir.getOpposite).asInstanceOf[DCNode], absForgeDir)
connect(part.asInstanceOf[INodeProvider].getNode(classOf[DCNode], absFromDir), absToDir)
return true
}
}
@ -551,10 +551,10 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
}
}
if (newConn != (connectionMask & 0xF000FF))
if (newConn != (PartFlatWire.this.connectionMask & 0xF000FF))
{
val diff: Int = connectionMask ^ newConn
connectionMask = connectionMask & ~0xF000FF | newConn
val diff: Int = PartFlatWire.this.connectionMask ^ newConn
PartFlatWire.this.connectionMask = PartFlatWire.this.connectionMask & ~0xF000FF | newConn
for (r <- 0 until 4)
{
@ -590,9 +590,9 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
{
newConn |= 0x10000
}
if (newConn != (connectionMask & 0x10F00))
if (newConn != (PartFlatWire.this.connectionMask & 0x10F00))
{
connectionMask = connectionMask & ~0x10F00 | newConn
PartFlatWire.this.connectionMask = PartFlatWire.this.connectionMask & ~0x10F00 | newConn
return true
}
return false
@ -615,9 +615,9 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
}
}
if (newConn != (connectionMask & 0xF000))
if (newConn != (PartFlatWire.this.connectionMask & 0xF000))
{
connectionMask = connectionMask & ~0xF000 | newConn
PartFlatWire.this.connectionMask = PartFlatWire.this.connectionMask & ~0xF000 | newConn
return true
}
@ -626,9 +626,11 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
def connectionOpen(r: Int): Boolean =
{
val absDir: Int = Rotation.rotateSide(side, r)
val facePart: TMultiPart = tile.partMap(absDir)
if (facePart != null && (!(facePart.isInstanceOf[PartFlatWire]) || !canConnectTo(facePart, ForgeDirection.getOrientation(absDir))))
val absDir = Rotation.rotateSide(side, r)
val facePart = tile.partMap(absDir)
val toDir = ForgeDirection.getOrientation(absDir)
if (facePart != null && (!facePart.isInstanceOf[PartFlatWire] || !canConnectTo(facePart, toDir.getOpposite)))
{
return false
}
@ -636,6 +638,7 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
{
return false
}
return true
}
@ -648,10 +651,12 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
val absDir: Int = Rotation.rotateSide(side, r)
val pos: BlockCoord = new BlockCoord(tile)
pos.offset(absDir)
if (!canConnectThroughCorner(pos, absDir ^ 1, side))
{
return 0
}
pos.offset(side)
val t: TileMultipart = MultipartUtil.getMultipartTile(world, pos)
@ -761,13 +766,13 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
val absDir: Int = Rotation.rotateSide(side, r)
if (canConnectTo(wire, ForgeDirection.getOrientation(absDir)) && maskOpen(r))
{
val oldConn: Int = connectionMask
connectionMask |= 0x1 << r
val oldConn: Int = PartFlatWire.this.connectionMask
PartFlatWire.this.connectionMask |= 0x1 << r
if (renderThisCorner(wire))
{
connectionMask |= 0x100000 << r
PartFlatWire.this.connectionMask |= 0x100000 << r
}
if (oldConn != connectionMask)
if (oldConn != PartFlatWire.this.connectionMask)
{
sendConnUpdate
}
@ -781,9 +786,9 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
val absDir: Int = Rotation.rotateSide(side, r)
if (canConnectTo(wire, ForgeDirection.getOrientation(absDir)) && maskOpen(r))
{
val oldConn: Int = connectionMask
connectionMask |= 0x10 << r
if (oldConn != connectionMask)
val oldConn: Int = PartFlatWire.this.connectionMask
PartFlatWire.this.connectionMask |= 0x10 << r
if (oldConn != PartFlatWire.this.connectionMask)
{
sendConnUpdate()
}
@ -797,9 +802,9 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
val absDir: Int = Rotation.rotateSide(side, r)
if (canConnectTo(wire, ForgeDirection.getOrientation(absDir)))
{
val oldConn: Int = connectionMask
connectionMask |= 0x100 << r
if (oldConn != connectionMask)
val oldConn: Int = PartFlatWire.this.connectionMask
PartFlatWire.this.connectionMask |= 0x100 << r
if (oldConn != PartFlatWire.this.connectionMask)
{
sendConnUpdate()
}
@ -814,7 +819,7 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
private def getComponent(obj: AnyRef, from: ForgeDirection): DCNode =
{
if (obj.isInstanceOf[INodeProvider])
return obj.asInstanceOf[INodeProvider].getNode(classOf[DCNode], from).asInstanceOf[DCNode]
return obj.asInstanceOf[INodeProvider].getNode(classOf[DCNode], from)
return null
}