From 7aff4cec3ca4c8d6f967a991ed8e2bd0c3c5aa60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Mon, 22 Dec 2014 20:53:13 +0100
Subject: [PATCH] Fixes for differences in merged branches.

---
 .../li/cil/oc/integration/waila/BlockDataProvider.scala     | 2 +-
 .../oc/server/component/UpgradeInventoryController.scala    | 6 +++---
 .../scala/li/cil/oc/server/component/UpgradeLeash.scala     | 2 +-
 .../li/cil/oc/server/component/UpgradeTankController.scala  | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala b/src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
index e5c116f49..152a41528 100644
--- a/src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
+++ b/src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
@@ -95,7 +95,7 @@ object BlockDataProvider extends IWailaDataProvider {
       case te: tileentity.ServerRack =>
         tag.removeTag("nodes")
         tag.setNewTagList("servers", stringIterableToNbt(te.servers.map(_.fold("")(_.node.address))))
-        tag.setByteArray("sideIndexes", ForgeDirection.VALID_DIRECTIONS.map(te.sides.indexOf).map(_.toByte))
+        tag.setByteArray("sideIndexes", ForgeDirection.VALID_DIRECTIONS.map(side => te.sides.indexWhere(_.contains(side))).map(_.toByte))
       case _ =>
     }
 
diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala b/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
index 191534e52..52b15c3eb 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
@@ -23,7 +23,7 @@ object UpgradeInventoryController {
 
     // ----------------------------------------------------------------------- //
 
-    override protected def position = BlockPosition(host)
+    override def position = BlockPosition(host)
 
     override protected def checkSideForAction(args: Arguments, n: Int) = args.checkSide(n, ForgeDirection.VALID_DIRECTIONS: _*)
   }
@@ -35,7 +35,7 @@ object UpgradeInventoryController {
 
     // ----------------------------------------------------------------------- //
 
-    override protected def position = BlockPosition(host: Entity)
+    override def position = BlockPosition(host: Entity)
 
     override def inventory = host.inventory
 
@@ -53,7 +53,7 @@ object UpgradeInventoryController {
 
     // ----------------------------------------------------------------------- //
 
-    override protected def position = BlockPosition(host)
+    override def position = BlockPosition(host)
 
     override def inventory = host.dynamicInventory
 
diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
index c93e354cf..f9ef4a859 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
@@ -32,7 +32,7 @@ class UpgradeLeash(val host: Entity) extends prefab.ManagedEnvironment with trai
 
   val leashedEntities = mutable.Set.empty[UUID]
 
-  override protected def position = BlockPosition(host)
+  override def position = BlockPosition(host)
 
   @Callback(doc = """function(side:number):boolean -- Tries to put an entity on the specified side of the device onto a leash.""")
   def leash(context: Context, args: Arguments): Array[AnyRef] = {
diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala
index 7aa1a0ad2..e94669142 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala
@@ -21,7 +21,7 @@ object UpgradeTankController {
 
     // ----------------------------------------------------------------------- //
 
-    override protected def position = BlockPosition(host)
+    override def position = BlockPosition(host)
 
     override protected def checkSideForAction(args: Arguments, n: Int) = args.checkSide(n, ForgeDirection.VALID_DIRECTIONS: _*)
   }
@@ -31,7 +31,7 @@ object UpgradeTankController {
       withComponent("tank_controller", Visibility.Neighbors).
       create()
 
-    override protected def position = BlockPosition(host: Entity)
+    override def position = BlockPosition(host: Entity)
 
     override def inventory = host.inventory
 
@@ -53,7 +53,7 @@ object UpgradeTankController {
       withComponent("tank_controller", Visibility.Neighbors).
       create()
 
-    override protected def position = BlockPosition(host)
+    override def position = BlockPosition(host)
 
     override def inventory = host.dynamicInventory