From 63a89b368897ac42a098c682a57d005a3fc66bdb Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Wed, 6 Dec 2017 09:41:31 -0500 Subject: [PATCH] Implement issue #2654 (#2659) * Implement #2654 * Make the screen-turn-on-at-boot actually work. --- src/main/scala/li/cil/oc/client/GuiHandler.scala | 2 +- src/main/scala/li/cil/oc/common/item/Tablet.scala | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/client/GuiHandler.scala b/src/main/scala/li/cil/oc/client/GuiHandler.scala index 2afb8beef..d4aef3295 100644 --- a/src/main/scala/li/cil/oc/client/GuiHandler.scala +++ b/src/main/scala/li/cil/oc/client/GuiHandler.scala @@ -88,7 +88,7 @@ object GuiHandler extends CommonGuiHandler { item.Tablet.get(stack, player).components.collect { case Some(buffer: api.internal.TextBuffer) => buffer }.headOption match { - case Some(buffer: api.internal.TextBuffer) => new gui.Screen(buffer, true, () => true, () => true) + case Some(buffer: api.internal.TextBuffer) => new gui.Screen(buffer, true, () => true, () => buffer.isRenderingEnabled) case _ => null } } diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala index 250a6315f..34a9510a0 100644 --- a/src/main/scala/li/cil/oc/common/item/Tablet.scala +++ b/src/main/scala/li/cil/oc/common/item/Tablet.scala @@ -418,6 +418,13 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp if (lastRunning != machine.isRunning) { lastRunning = machine.isRunning markDirty() + + if (machine.isRunning) { + components collect { + case Some(buffer: api.internal.TextBuffer) => + buffer.setPowerState(true) + } + } } } }