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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
This commit is contained in:
Florian Nücke 2014-03-07 10:50:38 +01:00
commit cfd8fb4fff
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,13 +130,14 @@ object Cable {
tileEntity match {
/* TODO FMP
case host: TileMultipart =>
!host.partList.exists {
host.partList.forall {
case part: JNormalOcclusion if !part.isInstanceOf[CablePart] =>
import scala.collection.convert.WrapAsScala._
val ownBounds = Iterable(new Cuboid6(cachedBounds(side.flag)))
val otherBounds = part.getOcclusionBoxes
!NormalOcclusionTest(ownBounds, otherBounds)
case _ => false
NormalOcclusionTest(ownBounds, otherBounds)
case part: TFacePart => !part.solid(side.ordinal) || (part.getSlotMask & codechicken.multipart.PartMap.face(side.ordinal).mask) == 0
case _ => true
}
*/
case _ => true

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

@ -9,7 +9,7 @@ import li.cil.oc.server.network.{Node => MutableNode}
import li.cil.oc.{Settings, api}
import net.minecraft.tileentity.TileEntity
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.event.world.{ChunkEvent, WorldEvent}
import net.minecraftforge.event.world.WorldEvent
import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
@ -414,13 +414,14 @@ object Network extends api.detail.NetworkAPI {
tileEntity match {
/* TODO FMP
case host: TileMultipart =>
!host.partList.exists {
host.partList.forall {
case part: JNormalOcclusion if !part.isInstanceOf[CablePart] =>
import scala.collection.convert.WrapAsScala._
val ownBounds = Iterable(new Cuboid6(Cable.cachedBounds(side.flag)))
val otherBounds = part.getOcclusionBoxes
!NormalOcclusionTest(ownBounds, otherBounds)
case _ => false
NormalOcclusionTest(ownBounds, otherBounds)
case part: TFacePart => !part.solid(side.ordinal) || (part.getSlotMask & codechicken.multipart.PartMap.face(side.ordinal).mask) == 0
case _ => true
}
*/
case _ => true