Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three

Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala

src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala

@@ -20,7 +20,7 @@ class ClassTransformer extends IClassTransformer {
   override def transform(name: String, transformedName: String, basicClass: Array[Byte]): Array[Byte] = {
     var transformedClass = basicClass
     try {
-      if (name == "li.cil.oc.common.tileentity.Computer" || name == "li.cil.oc.common.tileentity.Rack") {
+      if (name == "li.cil.oc.common.tileentity.traits.Computer" || name == "li.cil.oc.common.tileentity.Rack") {
         transformedClass = ensureStargateTechCompatibility(transformedClass)
       }
       if (transformedClass != null
@@ -52,15 +52,17 @@ class ClassTransformer extends IClassTransformer {
           classNode.methods.removeAll(incompleteMethods)
           transformedClass = writeClass(classNode)
         }
-        val classNode = newClassNode(transformedClass)
-        if (classNode.interfaces.contains("li/cil/oc/api/network/SimpleComponent")) {
-          try {
-            transformedClass = injectEnvironmentImplementation(classNode, transformedClass)
-            log.info(s"Successfully injected component logic into class $name.")
-          }
-          catch {
-            case e: Throwable =>
-              log.log(Level.WARNING, s"Failed injecting component logic into class $name.", e)
+        {
+          val classNode = newClassNode(transformedClass)
+          if (classNode.interfaces.contains("li/cil/oc/api/network/SimpleComponent")) {
+            try {
+              transformedClass = injectEnvironmentImplementation(classNode)
+              log.info(s"Successfully injected component logic into class $name.")
+            }
+            catch {
+              case e: Throwable =>
+                log.log(Level.WARNING, s"Failed injecting component logic into class $name.", e)
+            }
           }
         }
       }
@@ -95,7 +97,7 @@ class ClassTransformer extends IClassTransformer {
     else basicClass
   }
 
-  def injectEnvironmentImplementation(classNode: ClassNode, basicClass: Array[Byte]): Array[Byte] = {
+  def injectEnvironmentImplementation(classNode: ClassNode): Array[Byte] = {
     log.fine(s"Injecting methods from Environment interface into ${classNode.name}.")
     if (!isTileEntity(classNode)) {
       throw new InjectionFailedException("Found SimpleComponent on something that isn't a tile entity, ignoring.")

src/main/scala/li/cil/oc/common/component/TextBuffer.scala

@@ -72,15 +72,24 @@ class TextBuffer(val owner: component.Container) extends ManagedComponent with a
         // origin.
         val w = getWidth
         val h = getHeight
-        relativeLitArea = data.buffer.foldLeft(0) {
-          (acc, line) => acc + line.count(' ' !=)
+        relativeLitArea = (data.buffer, data.color).zipped.foldLeft(0) {
+          case (acc, (line, colors)) => acc + (line, colors).zipped.foldLeft(0) {
+            case (acc2, (char, color)) =>
+              val bg = PackedColor.unpackBackground(color, data.format)
+              val fg = PackedColor.unpackForeground(color, data.format)
+              acc2 + (if (char == ' ') if (bg == 0) 0 else 1
+              else if (char == 0x2588) if (fg == 0) 0 else 1
+              else if (fg == 0 && bg == 0) 0 else 1)
+          }
         } / (w * h).toDouble
       }
-      val hadPower = hasPower
-      val neededPower = relativeLitArea * fullyLitCost * Settings.get.tickFrequency
-      hasPower = node.tryChangeBuffer(-neededPower)
-      if (hasPower != hadPower) {
-        ServerPacketSender.sendTextBufferPowerChange(node.address, isDisplaying && hasPower, owner)
+      if (node != null) {
+        val hadPower = hasPower
+        val neededPower = relativeLitArea * fullyLitCost * Settings.get.tickFrequency
+        hasPower = node.tryChangeBuffer(-neededPower)
+        if (hasPower != hadPower) {
+          ServerPacketSender.sendTextBufferPowerChange(node.address, isDisplaying && hasPower, owner)
+        }
       }
     }
   }
@@ -263,7 +272,11 @@ class TextBuffer(val owner: component.Container) extends ManagedComponent with a
   }
 
   @SideOnly(Side.CLIENT)
-  override def renderText() = proxy.render()
+  override def renderText() = {
+    if (relativeLitArea != 0) {
+      proxy.render()
+    }
+  }
 
   @SideOnly(Side.CLIENT)
   override def renderWidth = MonospaceFontRenderer.fontWidth * data.width

src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala

@@ -27,10 +27,9 @@ class Keyboard(isRemote: Boolean) extends traits.Environment with traits.Rotatab
   // ----------------------------------------------------------------------- //
 
   @SideOnly(Side.CLIENT)
-  override def canConnect(side: ForgeDirection) = side == facing.getOpposite
+  override def canConnect(side: ForgeDirection) = hasNodeOnSide(side)
 
-  override def sidedNode(side: ForgeDirection) =
-    if (hasNodeOnSide(side)) node else null
+  override def sidedNode(side: ForgeDirection) = if (hasNodeOnSide(side)) node else null
 
   // Override automatic analyzer implementation for sided environments.
   override def onAnalyze(player: EntityPlayer, side: Int, hitX: Float, hitY: Float, hitZ: Float) = Array(node)

src/main/scala/li/cil/oc/common/tileentity/traits/TextBuffer.scala

@@ -20,9 +20,7 @@ trait TextBuffer extends Environment {
 
   override def updateEntity() {
     super.updateEntity()
-    if (isServer) {
-      buffer.update()
-    }
+    buffer.update()
   }
 
   // ----------------------------------------------------------------------- //