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

Fixes for differences in merged branches.

Browse Source
This commit is contained in:
Florian Nücke 2014-12-22 20:53:13 +01:00
parent a8dbb15745
commit 7aff4cec3c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
View File

@ -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 _ =>
}

6
src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
View File

@ -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

2
src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
View File

@ -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] = {

6
src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala
View File

@ -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