From 93f747fb545e276e9583c1e92593432bdf6f53d1 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Mon, 31 Oct 2022 20:08:50 +0000 Subject: [PATCH] Fix incorrect reboot tooltip This tooltip was a) using the wrong text and b) incorrect anyway! Rebooting an off computer does nothing, rather than turning it on. --- .../computercraft/client/gui/widgets/ComputerSidebar.java | 6 +++--- src/main/resources/assets/computercraft/lang/en_us.json | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java b/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java index 1ec68d08c..737d01792 100644 --- a/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java +++ b/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import java.util.Arrays; +import java.util.Collections; import java.util.function.BooleanSupplier; import java.util.function.Consumer; @@ -56,9 +57,8 @@ public final class ComputerSidebar () -> isOn.getAsBoolean() ? Arrays.asList( new TranslationTextComponent( "gui.computercraft.tooltip.turn_off" ), new TranslationTextComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( TextFormatting.GRAY ) - ) : Arrays.asList( - new TranslationTextComponent( "gui.computercraft.tooltip.turn_on" ), - new TranslationTextComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( TextFormatting.GRAY ) + ) : Collections.singletonList( + new TranslationTextComponent( "gui.computercraft.tooltip.turn_on" ) ) ) ); diff --git a/src/main/resources/assets/computercraft/lang/en_us.json b/src/main/resources/assets/computercraft/lang/en_us.json index 4f6f730e5..ed420e7a0 100644 --- a/src/main/resources/assets/computercraft/lang/en_us.json +++ b/src/main/resources/assets/computercraft/lang/en_us.json @@ -111,7 +111,6 @@ "gui.computercraft.tooltip.computer_id": "Computer ID: %s", "gui.computercraft.tooltip.disk_id": "Disk ID: %s", "gui.computercraft.tooltip.turn_on": "Turn this computer on", - "gui.computercraft.tooltip.turn_on.key": "Hold Ctrl+R", "gui.computercraft.tooltip.turn_off": "Turn this computer off", "gui.computercraft.tooltip.turn_off.key": "Hold Ctrl+S", "gui.computercraft.tooltip.terminate": "Stop the currently running code",