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

hdd capacity info in tooltip only in advanced tooltips

Browse Source
This commit is contained in:
Florian Nücke 2013-10-07 19:53:22 +02:00
parent e4ef181704
commit 67792fc992
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
li/cil/oc/Blocks.scala
View File

@ -5,11 +5,14 @@ import li.cil.oc.common.block._
object Blocks { object Blocks {
var blockSimple: Delegator = null var blockSimple: Delegator = null
var blockSpecial: Delegator = null var blockSpecial: Delegator = null
var computer: Computer = null var computer: Computer = null
var screen: Screen = null var screen: Screen = null
var keyboard: Keyboard = null var keyboard: Keyboard = null
var powersupply: PowerSupply = null
var powerdistributor: PowerDistributor = null var powerSupply: PowerSupply = null
var powerDistributor: PowerDistributor = null
def init() { def init() {
// IMPORTANT: the multi block must come first, since the sub blocks will // IMPORTANT: the multi block must come first, since the sub blocks will
// try to register with it. Also, the order the sub blocks are created in // try to register with it. Also, the order the sub blocks are created in
@ -20,7 +23,8 @@ object Blocks {
computer = new Computer(blockSimple) computer = new Computer(blockSimple)
screen = new Screen(blockSimple) screen = new Screen(blockSimple)
keyboard = new Keyboard(blockSpecial) keyboard = new Keyboard(blockSpecial)
powersupply = new PowerSupply(blockSimple)
powerdistributor = new PowerDistributor(blockSimple) powerSupply = new PowerSupply(blockSimple)
powerDistributor = new PowerDistributor(blockSimple)
} }
} }

2
li/cil/oc/common/item/Hdd.scala
View File

@ -18,7 +18,7 @@ class Hdd(val parent: Delegator, val megaBytes: Int) extends Delegate {
val nodeNbt = nbt.getCompoundTag("oc.node") val nodeNbt = nbt.getCompoundTag("oc.node")
if (nodeNbt.hasKey("address")) if (nodeNbt.hasKey("address"))
tooltip.add(nodeNbt.getString("address")) tooltip.add(nodeNbt.getString("address"))
if (nodeNbt.hasKey("fs")) { if (advanced && nodeNbt.hasKey("fs")) {
val fsNbt = nodeNbt.getCompoundTag("fs") val fsNbt = nodeNbt.getCompoundTag("fs")
if (fsNbt.hasKey("used")) { if (fsNbt.hasKey("used")) {
val used = fsNbt.getLong("used") val used = fsNbt.getLong("used")