Skip to content

Commit f0a06c8

Browse files
committed
Send raw error message to client and add extra method to resolve error message.
Avoids powered-off computers showing "bus incomplete" after load.
1 parent cb4117a commit f0a06c8

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected void renderFg(final PoseStack stack, final float partialTicks, final i
185185
Sprites.ENERGY_BAR.drawFillY(stack, x, y, menu.getEnergy() / (float) menu.getEnergyCapacity());
186186
}
187187

188-
terminalWidget.render(stack, mouseX, mouseY, menu.getVirtualMachine().getBootError());
188+
terminalWidget.render(stack, mouseX, mouseY, menu.getVirtualMachine().getError());
189189
}
190190

191191
@Override

src/main/java/li/cil/oc2/client/renderer/blockentity/ComputerRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private void renderStatusText(final ComputerBlockEntity computer, final PoseStac
183183
return;
184184
}
185185

186-
final Component bootError = computer.getVirtualMachine().getBootError();
186+
final Component bootError = computer.getVirtualMachine().getError();
187187
if (bootError == null) {
188188
return;
189189
}

src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ public void setRunStateClient(final VMRunState value) {
126126
@Override
127127
@Nullable
128128
public Component getBootError() {
129+
return bootError;
130+
}
131+
132+
@Override
133+
@OnlyIn(Dist.CLIENT)
134+
public void setBootErrorClient(@Nullable final Component value) {
135+
bootError = value;
136+
}
137+
138+
@Override
139+
@Nullable
140+
public Component getError() {
129141
switch (busState) {
130142
case SCAN_PENDING:
131143
case INCOMPLETE:
@@ -145,12 +157,6 @@ public Component getBootError() {
145157
return null;
146158
}
147159

148-
@Override
149-
@OnlyIn(Dist.CLIENT)
150-
public void setBootErrorClient(@Nullable final Component value) {
151-
bootError = value;
152-
}
153-
154160
@Override
155161
public void start() {
156162
if (runState == VMRunState.RUNNING) {

src/main/java/li/cil/oc2/common/vm/VirtualMachine.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public interface VirtualMachine {
2626
@OnlyIn(Dist.CLIENT)
2727
void setBootErrorClient(@Nullable Component value);
2828

29+
@Nullable
30+
Component getError();
31+
2932
boolean isRunning();
3033

3134
void start();

0 commit comments

Comments
 (0)