diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 67527659f..7c41080fe 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -230,6 +230,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 8bb6d8605..8b23f6b14 100644 --- a/src/main/scala/li/cil/oc/Localization.scala +++ b/src/main/scala/li/cil/oc/Localization.scala @@ -148,6 +148,8 @@ object Localization { def RelayDisabled: String = 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 2c4059871..886950541 100644 --- a/src/main/scala/li/cil/oc/client/gui/Rack.scala +++ b/src/main/scala/li/cil/oc/client/gui/Rack.scala @@ -84,8 +84,8 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends def sideName(side: EnumFacing) = side match { case EnumFacing.UP => Localization.Rack.Top case EnumFacing.DOWN => Localization.Rack.Bottom - case EnumFacing.WEST => Localization.Rack.Left - case EnumFacing.EAST => Localization.Rack.Right + case EnumFacing.WEST => Localization.Rack.Right + case EnumFacing.EAST => Localization.Rack.Left case EnumFacing.NORTH => Localization.Rack.Back case _ => Localization.Rack.None } @@ -253,6 +253,12 @@ 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, fontRenderer) + } + if (relayButton.isMouseOver) { val tooltip = new java.util.ArrayList[String] tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable))