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

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
This commit is contained in:
Florian Nücke 2015-09-13 13:30:24 +02:00
commit 9c27e85800
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/common/item/Tablet.scala
View File

@ -20,6 +20,7 @@ import li.cil.oc.api.driver.item.Chargeable
import li.cil.oc.api.driver.item.Container import li.cil.oc.api.driver.item.Container
import li.cil.oc.api.internal import li.cil.oc.api.internal
import li.cil.oc.api.machine.MachineHost import li.cil.oc.api.machine.MachineHost
import li.cil.oc.api.network.Connector
import li.cil.oc.api.network.Message import li.cil.oc.api.network.Message
import li.cil.oc.api.network.Node import li.cil.oc.api.network.Node
import li.cil.oc.client.KeyBindings import li.cil.oc.client.KeyBindings
@ -237,6 +238,8 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp
private var lastRunning = false private var lastRunning = false
def isCreative = data.tier == Tier.Four
def items = data.items def items = data.items
override def facing = RotationHelper.fromYaw(player.rotationYaw) override def facing = RotationHelper.fromYaw(player.rotationYaw)
@ -401,6 +404,9 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp
} }
} }
if (!world.isRemote) { if (!world.isRemote) {
if (isCreative && world.getTotalWorldTime % Settings.get.tickFrequency == 0) {
machine.node.asInstanceOf[Connector].changeBuffer(Double.PositiveInfinity)
}
machine.update() machine.update()
updateComponents() updateComponents()
data.isRunning = machine.isRunning data.isRunning = machine.isRunning

4
src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
View File

@ -52,6 +52,8 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
override def canConnect(side: EnumFacing) = side != facing override def canConnect(side: EnumFacing) = side != facing
override def sidedNode(side: EnumFacing): Node = if (side != facing) super.sidedNode(side) else null
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
override protected def hasConnector(side: EnumFacing) = side != facing override protected def hasConnector(side: EnumFacing) = side != facing
@ -171,7 +173,7 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
override def onMessage(message: Message): Unit = { override def onMessage(message: Message): Unit = {
if (message.source.network == snooperNode.network) { if (message.source.network == snooperNode.network) {
for (side <- EnumFacing.values if outputSides(side.ordinal)) { for (side <- EnumFacing.values if outputSides(side.ordinal) && side != facing) {
sidedNode(side).sendToReachable(message.name, message.data: _*) sidedNode(side).sendToReachable(message.name, message.data: _*)
} }
} }

4
src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
View File

@ -69,6 +69,8 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
override def canConnect(side: EnumFacing) = side != facing override def canConnect(side: EnumFacing) = side != facing
override def sidedNode(side: EnumFacing): Node = if (side != facing) super.sidedNode(side) else null
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
def isRunning(number: Int) = def isRunning(number: Int) =
@ -107,7 +109,7 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
sides(number) match { sides(number) match {
case Some(serverSide) => case Some(serverSide) =>
val serverNode = server.machine.node val serverNode = server.machine.node
for (side <- EnumFacing.values) { for (side <- EnumFacing.values if side != facing) {
if (toLocal(side) == serverSide) sidedNode(side).connect(serverNode) if (toLocal(side) == serverSide) sidedNode(side).connect(serverNode)
else sidedNode(side).disconnect(serverNode) else sidedNode(side).disconnect(serverNode)
} }

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

@ -62,6 +62,6 @@ trait PowerBalancer extends PowerInformation with SidedEnvironment {
private def isPrimary(connector: Connector) = { private def isPrimary(connector: Connector) = {
val nodes = connectors val nodes = connectors
connector != null && nodes(nodes.indexWhere(_.network == connector.network)) == connector connector != null && nodes(nodes.indexWhere(node => node != null && node.network == connector.network)) == connector
} }
} }