From 1743968924e7bf0d9105b290cdbaecf8c4a62887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 1 Jun 2014 20:30:20 +0200 Subject: [PATCH 1/2] Fixed Waila support for screens. --- src/main/scala/li/cil/oc/common/block/Screen.scala | 2 +- src/main/scala/li/cil/oc/util/mods/Waila.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/block/Screen.scala b/src/main/scala/li/cil/oc/common/block/Screen.scala index ae1c363ae..a7b2d88b3 100644 --- a/src/main/scala/li/cil/oc/common/block/Screen.scala +++ b/src/main/scala/li/cil/oc/common/block/Screen.scala @@ -38,7 +38,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"))) diff --git a/src/main/scala/li/cil/oc/util/mods/Waila.scala b/src/main/scala/li/cil/oc/util/mods/Waila.scala index a2584825d..665456934 100644 --- a/src/main/scala/li/cil/oc/util/mods/Waila.scala +++ b/src/main/scala/li/cil/oc/util/mods/Waila.scala @@ -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]) } From 6f3f9cc260f10fb58792753d90a4985d9d107336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 1 Jun 2014 20:50:53 +0200 Subject: [PATCH 2/2] Fixes small creatures (e.g. chickens) taking damage standing on hologram projectors. Because the size was evil. Or something. I don't even. #lolwatminecraft --- src/main/scala/li/cil/oc/common/block/Hologram.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/block/Hologram.scala b/src/main/scala/li/cil/oc/common/block/Hologram.scala index d13722fba..8e6665807 100644 --- a/src/main/scala/li/cil/oc/common/block/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/block/Hologram.scala @@ -48,10 +48,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: IconRegister) = {