AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made MFU respect sided environments.

Browse Source
This commit is contained in:
Vexatos 2016-05-07 22:53:16 +02:00
parent 4c665723dc
commit 60f403131b
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/scala/li/cil/oc/server/component/UpgradeMF.scala
View File

@ -1,13 +1,15 @@
package li.cil.oc.server.component package li.cil.oc.server.component
import li.cil.oc.api.network._ import li.cil.oc.api.network._
import li.cil.oc.api.{Network, prefab} import li.cil.oc.api.prefab
import li.cil.oc.common.event.BlockChangeHandler import li.cil.oc.common.event.BlockChangeHandler
import li.cil.oc.common.event.BlockChangeHandler.ChangeListener 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.BlockPosition
import li.cil.oc.util.ExtendedWorld._ import li.cil.oc.util.ExtendedWorld._
import li.cil.oc.{Settings, api} import li.cil.oc.{Settings, api}
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
import net.minecraft.util.Vec3 import net.minecraft.util.Vec3
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
@ -17,7 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection
* @author Sangar, Vexatos * @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 {
override val node = Network.newNode(this, Visibility.None). override val node = api.Network.newNode(this, Visibility.None).
withConnector(). withConnector().
create() create()
@ -27,11 +29,24 @@ class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: Fo
override val canUpdate = true override val canUpdate = true
private def otherNode(tile: TileEntity, f: (Node) => Unit) {
network.Network.getNetworkNode(tile, dir) match {
case Some(otherNode) => f(otherNode)
case _ => // Nothing to do here
}
}
private def updateBoundState() { private def updateBoundState() {
if (node != null && node.network != null && coord.world.exists(_.provider.dimensionId == host.world.provider.dimensionId) if (node != null && node.network != null && coord.world.exists(_.provider.dimensionId == host.world.provider.dimensionId)
&& coord.toVec3.distanceTo(Vec3.createVectorHelper(host.xPosition, host.yPosition, host.zPosition)) <= Settings.get.mfuRange) { && coord.toVec3.distanceTo(Vec3.createVectorHelper(host.xPosition, host.yPosition, host.zPosition)) <= Settings.get.mfuRange) {
host.world.getTileEntity(coord) match { host.world.getTileEntity(coord) match {
case env: api.network.Environment => case env: TileEntity with api.network.Environment =>
otherEnv match {
case Some(environment: TileEntity) =>
otherNode(environment, node.disconnect)
otherEnv = None
case _ => // Nothing to do here.
}
otherEnv = Some(env) otherEnv = Some(env)
// Remove any driver that might be there. // Remove any driver that might be there.
otherDrv match { otherDrv match {
@ -42,12 +57,12 @@ class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: Fo
otherDrv = None otherDrv = None
case _ => // Nothing to do here. case _ => // Nothing to do here.
} }
node.connect(env.node) otherNode(env, node.connect)
case _ => case _ =>
// Remove any environment that might have been there. // Remove any environment that might have been there.
otherEnv match { otherEnv match {
case Some(environment) => case Some(environment: TileEntity) =>
node.disconnect(environment.node) otherNode(environment, node.disconnect)
otherEnv = None otherEnv = None
case _ => // Nothing to do here. case _ => // Nothing to do here.
} }
@ -100,8 +115,8 @@ class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: Fo
private def disconnect() { private def disconnect() {
otherEnv match { otherEnv match {
case Some(environment) => case Some(environment: TileEntity) =>
node.disconnect(environment.node) otherNode(environment, node.disconnect)
otherEnv = None otherEnv = None
case _ => // Nothing to do here. case _ => // Nothing to do here.
} }
@ -144,7 +159,7 @@ class UpgradeMF(val host: EnvironmentHost, val coord: BlockPosition, val dir: Fo
override def onDisconnect(node: Node) { override def onDisconnect(node: Node) {
super.onDisconnect(node) super.onDisconnect(node)
otherEnv match { otherEnv match {
case Some(env) if node == env.node => otherEnv = None case Some(env: TileEntity) => otherNode(env, (otherNode) => if (node == otherNode) otherEnv = None)
case _ => // No environment case _ => // No environment
} }
otherDrv match { otherDrv match {