From f0a06c8929ec34588c16c77368df43fdc51fee07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sun, 13 Feb 2022 19:11:45 +0100
Subject: [PATCH] Send raw error message to client and add extra method to
 resolve error message. Avoids powered-off computers showing "bus incomplete"
 after load.

---
 .../gui/AbstractMachineTerminalScreen.java     |  2 +-
 .../renderer/blockentity/ComputerRenderer.java |  2 +-
 .../oc2/common/vm/AbstractVirtualMachine.java  | 18 ++++++++++++------
 .../li/cil/oc2/common/vm/VirtualMachine.java   |  3 +++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
index dbec0454..4e10e9c3 100644
--- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
+++ b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
@@ -185,7 +185,7 @@ public abstract class AbstractMachineTerminalScreen<T extends AbstractMachineTer
             Sprites.ENERGY_BAR.drawFillY(stack, x, y, menu.getEnergy() / (float) menu.getEnergyCapacity());
         }
 
-        terminalWidget.render(stack, mouseX, mouseY, menu.getVirtualMachine().getBootError());
+        terminalWidget.render(stack, mouseX, mouseY, menu.getVirtualMachine().getError());
     }
 
     @Override
diff --git a/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java b/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java
index 8627997f..914681a0 100644
--- a/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java
+++ b/src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java
@@ -183,7 +183,7 @@ public final class ComputerRenderer implements BlockEntityRenderer<ComputerBlock
             return;
         }
 
-        final Component bootError = computer.getVirtualMachine().getBootError();
+        final Component bootError = computer.getVirtualMachine().getError();
         if (bootError == null) {
             return;
         }
diff --git a/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java b/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
index 11b52b45..fc649a81 100644
--- a/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
+++ b/src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
@@ -126,6 +126,18 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
     @Override
     @Nullable
     public Component getBootError() {
+        return bootError;
+    }
+
+    @Override
+    @OnlyIn(Dist.CLIENT)
+    public void setBootErrorClient(@Nullable final Component value) {
+        bootError = value;
+    }
+
+    @Override
+    @Nullable
+    public Component getError() {
         switch (busState) {
             case SCAN_PENDING:
             case INCOMPLETE:
@@ -145,12 +157,6 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
         return null;
     }
 
-    @Override
-    @OnlyIn(Dist.CLIENT)
-    public void setBootErrorClient(@Nullable final Component value) {
-        bootError = value;
-    }
-
     @Override
     public void start() {
         if (runState == VMRunState.RUNNING) {
diff --git a/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java b/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java
index 4682a6ae..3076fa84 100644
--- a/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java
+++ b/src/main/java/li/cil/oc2/common/vm/VirtualMachine.java
@@ -26,6 +26,9 @@ public interface VirtualMachine {
     @OnlyIn(Dist.CLIENT)
     void setBootErrorClient(@Nullable Component value);
 
+    @Nullable
+    Component getError();
+
     boolean isRunning();
 
     void start();