Skip to content

Commit 8ca336f

Browse files
committed
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2 parents 61e1ccd + a430047 commit 8ca336f

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-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
@@ -230,6 +230,7 @@ oc:gui.Rack.Right=Right
230230
oc:gui.Rack.Enabled=Enabled
231231
oc:gui.Rack.Disabled=Disabled
232232
oc:gui.Rack.RelayModeTooltip=Relay Mode
233+
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.
233234
oc:gui.Rack.Top=Top
234235
oc:gui.Switch.PacketsPerCycle=Packets / cycle
235236
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
@@ -148,6 +148,8 @@ object Localization {
148148
def RelayDisabled: String = localizeImmediately("gui.Rack.Disabled")
149149

150150
def RelayModeTooltip: String = localizeImmediately("gui.Rack.RelayModeTooltip")
151+
152+
def OrientationTooltip: String = localizeImmediately("gui.Rack.OrientationTooltip")
151153
}
152154

153155
object Switch {

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
8484
def sideName(side: EnumFacing) = side match {
8585
case EnumFacing.UP => Localization.Rack.Top
8686
case EnumFacing.DOWN => Localization.Rack.Bottom
87-
case EnumFacing.WEST => Localization.Rack.Left
88-
case EnumFacing.EAST => Localization.Rack.Right
87+
case EnumFacing.WEST => Localization.Rack.Right
88+
case EnumFacing.EAST => Localization.Rack.Left
8989
case EnumFacing.NORTH => Localization.Rack.Back
9090
case _ => Localization.Rack.None
9191
}
@@ -253,6 +253,12 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
253253
x, y, 0x404040)
254254
}
255255

256+
if (mouseX >= guiLeft + 122 && mouseY >= guiTop + 20 && mouseX < guiLeft + 158 && mouseY < guiTop + 20 + 5 * 11) {
257+
val tooltip = new java.util.ArrayList[String]
258+
tooltip.addAll(asJavaCollection(Localization.Rack.OrientationTooltip.lines.toIterable))
259+
copiedDrawHoveringText(tooltip, mouseX - guiLeft, mouseY - guiTop, fontRenderer)
260+
}
261+
256262
if (relayButton.isMouseOver) {
257263
val tooltip = new java.util.ArrayList[String]
258264
tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable))

0 commit comments

Comments
 (0)