Skip to content

Commit a430047

Browse files
committed
different fix for #3764
1 parent d1ca1ce commit a430047

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

src/main/resources/assets/opencomputers/lang/en_US.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ oc:gui.Rack.Right=Right
231231
oc:gui.Rack.Enabled=Enabled
232232
oc:gui.Rack.Disabled=Disabled
233233
oc:gui.Rack.RelayModeTooltip=Relay Mode
234+
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.
234235
oc:gui.Rack.Top=Top
235236
oc:gui.Switch.PacketsPerCycle=Packets / cycle
236237
oc:gui.Switch.QueueSize=Queue size

src/main/scala/li/cil/oc/Localization.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ object Localization {
147147
def RelayDisabled = localizeImmediately("gui.Rack.Disabled")
148148

149149
def RelayModeTooltip: String = localizeImmediately("gui.Rack.RelayModeTooltip")
150+
151+
def OrientationTooltip: String = localizeImmediately("gui.Rack.OrientationTooltip")
150152
}
151153

152154
object Switch {

src/main/scala/li/cil/oc/client/gui/Rack.scala

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
8181
def sideName(side: ForgeDirection) = side match {
8282
case ForgeDirection.UP => Localization.Rack.Top
8383
case ForgeDirection.DOWN => Localization.Rack.Bottom
84-
case ForgeDirection.WEST => Localization.Rack.Left
85-
case ForgeDirection.EAST => Localization.Rack.Right
84+
case ForgeDirection.WEST => Localization.Rack.Right
85+
case ForgeDirection.EAST => Localization.Rack.Left
8686
case ForgeDirection.NORTH => Localization.Rack.Back
8787
case _ => Localization.Rack.None
8888
}
@@ -250,6 +250,13 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
250250
x, y, 0x404040)
251251
}
252252

253+
if (mouseX >= guiLeft + 122 && mouseY >= guiTop + 20 && mouseX < guiLeft + 158 && mouseY < guiTop + 20 + 5 * 11) {
254+
val tooltip = new java.util.ArrayList[String]
255+
tooltip.addAll(asJavaCollection(Localization.Rack.OrientationTooltip.lines.toIterable))
256+
copiedDrawHoveringText(tooltip, mouseX - guiLeft, mouseY - guiTop, fontRendererObj)
257+
258+
}
259+
253260
if (relayButton.func_146115_a) {
254261
val tooltip = new java.util.ArrayList[String]
255262
tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable))

0 commit comments

Comments
 (0)