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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-06-01 20:51:16 +02:00
commit b1291d2607
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/block/Hologram.scala
View File

@ -49,10 +49,10 @@ abstract class Hologram(val parent: SpecialDelegator) extends SpecialDelegate {
}
override def bounds(world: IBlockAccess, x: Int, y: Int, z: Int) =
AxisAlignedBB.getAABBPool.getAABB(0, 0, 0, 1, 7 / 16f, 1)
AxisAlignedBB.getAABBPool.getAABB(0, 0, 0, 1, 0.5f, 1)
override def itemBounds() {
parent.setBlockBounds(AxisAlignedBB.getAABBPool.getAABB(0, 0, 0, 1, 7 / 16f, 1))
parent.setBlockBounds(AxisAlignedBB.getAABBPool.getAABB(0, 0, 0, 1, 0.5f, 1))
}
override def registerIcons(iconRegister: IIconRegister) = {

2
src/main/scala/li/cil/oc/common/block/Screen.scala
View File

@ -39,7 +39,7 @@ abstract class Screen(val parent: SimpleDelegator) extends RedstoneAware with Si
@Optional.Method(modid = "Waila")
override def wailaBody(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler) {
val node = accessor.getNBTData.getCompoundTag(Settings.namespace + "node")
val node = accessor.getNBTData.getCompoundTag("node")
if (node.hasKey("address")) {
tooltip.add(StatCollector.translateToLocalFormatted(
Settings.namespace + "gui.Analyzer.Address", node.getString("address")))

2
src/main/scala/li/cil/oc/util/mods/Waila.scala
View File

@ -16,7 +16,7 @@ object Waila {
registrar.registerSyncedNBTKey(Settings.namespace + "items", classOf[tileentity.DiskDrive])
registrar.registerSyncedNBTKey(Settings.namespace + "node", classOf[tileentity.Hologram])
registrar.registerSyncedNBTKey(Settings.namespace + "keyboard", classOf[tileentity.Keyboard])
registrar.registerSyncedNBTKey(Settings.namespace + "node", classOf[tileentity.Screen])
registrar.registerSyncedNBTKey("node", classOf[tileentity.Screen])
registrar.registerSyncedNBTKey(Settings.namespace + "componentNodes", classOf[tileentity.WirelessRouter])
registrar.registerSyncedNBTKey(Settings.namespace + "strength", classOf[tileentity.WirelessRouter])
}