From a43004760ff4f8107cdae3ad140d1d72a2c985c9 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Mon, 2 Jun 2025 17:18:25 +0200 Subject: [PATCH] different fix for #3764 --- .../resources/assets/opencomputers/lang/en_US.lang | 1 + src/main/scala/li/cil/oc/Localization.scala | 2 ++ src/main/scala/li/cil/oc/client/gui/Rack.scala | 11 +++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 30da048b9..c56f78f4c 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -231,6 +231,7 @@ oc:gui.Rack.Right=Right oc:gui.Rack.Enabled=Enabled oc:gui.Rack.Disabled=Disabled oc:gui.Rack.RelayModeTooltip=Relay Mode +oc:gui.Rack.OrientationTooltip=Note: If facing the front[nl]of the Rack, the right[nl]side of the Rack is to[nl]your left. oc:gui.Rack.Top=Top oc:gui.Switch.PacketsPerCycle=Packets / cycle oc:gui.Switch.QueueSize=Queue size diff --git a/src/main/scala/li/cil/oc/Localization.scala b/src/main/scala/li/cil/oc/Localization.scala index 29b8ca04b..23349438d 100644 --- a/src/main/scala/li/cil/oc/Localization.scala +++ b/src/main/scala/li/cil/oc/Localization.scala @@ -147,6 +147,8 @@ object Localization { def RelayDisabled = localizeImmediately("gui.Rack.Disabled") def RelayModeTooltip: String = localizeImmediately("gui.Rack.RelayModeTooltip") + + def OrientationTooltip: String = localizeImmediately("gui.Rack.OrientationTooltip") } object Switch { diff --git a/src/main/scala/li/cil/oc/client/gui/Rack.scala b/src/main/scala/li/cil/oc/client/gui/Rack.scala index 878010623..4aa50de90 100644 --- a/src/main/scala/li/cil/oc/client/gui/Rack.scala +++ b/src/main/scala/li/cil/oc/client/gui/Rack.scala @@ -81,8 +81,8 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends def sideName(side: ForgeDirection) = side match { case ForgeDirection.UP => Localization.Rack.Top case ForgeDirection.DOWN => Localization.Rack.Bottom - case ForgeDirection.WEST => Localization.Rack.Left - case ForgeDirection.EAST => Localization.Rack.Right + case ForgeDirection.WEST => Localization.Rack.Right + case ForgeDirection.EAST => Localization.Rack.Left case ForgeDirection.NORTH => Localization.Rack.Back case _ => Localization.Rack.None } @@ -250,6 +250,13 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends x, y, 0x404040) } + if (mouseX >= guiLeft + 122 && mouseY >= guiTop + 20 && mouseX < guiLeft + 158 && mouseY < guiTop + 20 + 5 * 11) { + val tooltip = new java.util.ArrayList[String] + tooltip.addAll(asJavaCollection(Localization.Rack.OrientationTooltip.lines.toIterable)) + copiedDrawHoveringText(tooltip, mouseX - guiLeft, mouseY - guiTop, fontRendererObj) + + } + if (relayButton.func_146115_a) { val tooltip = new java.util.ArrayList[String] tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable))