diff --git a/src/main/scala/li/cil/oc/OpenComputers.scala b/src/main/scala/li/cil/oc/OpenComputers.scala index a71bb7bde..3e7a45d2b 100644 --- a/src/main/scala/li/cil/oc/OpenComputers.scala +++ b/src/main/scala/li/cil/oc/OpenComputers.scala @@ -37,8 +37,8 @@ object OpenComputers { @EventHandler def preInit(e: FMLPreInitializationEvent) { - proxy.preInit(e) log = e.getModLog + proxy.preInit(e) } @EventHandler diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala index 79290b6ba..0b46e53f8 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala @@ -521,7 +521,7 @@ class Robot extends traits.Computer with traits.PowerInformation with api.machin case _ => false }) - def isUpgradeSlot(slot: Int) = false // slot == 3 TODO upgrade synching for rendering + def isUpgradeSlot(slot: Int) = containerSlotType(slot) == Slot.Upgrade // ----------------------------------------------------------------------- // diff --git a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala index f0afef3bb..b65fd2162 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala @@ -312,6 +312,7 @@ class Robot(val robot: tileentity.Robot) extends ManagedComponent { (broke, "block") } + var reason: Option[String] = None for (side <- sides) { val player = robot.player(facing, side) player.setSneaking(sneaky) @@ -341,9 +342,10 @@ class Robot(val robot: tileentity.Robot) extends ManagedComponent { if (success) { return result(true, what) } + reason = reason.orElse(Option(what)) } - result(false) + result(false, reason.orNull) } @Callback