AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-08-04 03:27:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12

Browse Source
This commit is contained in:
Adrian Siekierka 2025-06-02 17:19:33 +02:00
commit 8ca336fbeb
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/assets/opencomputers/lang/en_US.lang
View File

@ -230,6 +230,7 @@ oc:gui.Rack.Right=Right
oc:gui.Rack.Enabled=Enabled oc:gui.Rack.Enabled=Enabled
oc:gui.Rack.Disabled=Disabled oc:gui.Rack.Disabled=Disabled
oc:gui.Rack.RelayModeTooltip=Relay Mode 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.Rack.Top=Top
oc:gui.Switch.PacketsPerCycle=Packets / cycle oc:gui.Switch.PacketsPerCycle=Packets / cycle
oc:gui.Switch.QueueSize=Queue size oc:gui.Switch.QueueSize=Queue size

2
src/main/scala/li/cil/oc/Localization.scala
View File

@ -148,6 +148,8 @@ object Localization {
def RelayDisabled: String = localizeImmediately("gui.Rack.Disabled") def RelayDisabled: String = localizeImmediately("gui.Rack.Disabled")
def RelayModeTooltip: String = localizeImmediately("gui.Rack.RelayModeTooltip") def RelayModeTooltip: String = localizeImmediately("gui.Rack.RelayModeTooltip")
def OrientationTooltip: String = localizeImmediately("gui.Rack.OrientationTooltip")
} }
object Switch { object Switch {

10
src/main/scala/li/cil/oc/client/gui/Rack.scala
View File

@ -84,8 +84,8 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
def sideName(side: EnumFacing) = side match { def sideName(side: EnumFacing) = side match {
case EnumFacing.UP => Localization.Rack.Top case EnumFacing.UP => Localization.Rack.Top
case EnumFacing.DOWN => Localization.Rack.Bottom case EnumFacing.DOWN => Localization.Rack.Bottom
case EnumFacing.WEST => Localization.Rack.Left case EnumFacing.WEST => Localization.Rack.Right
case EnumFacing.EAST => Localization.Rack.Right case EnumFacing.EAST => Localization.Rack.Left
case EnumFacing.NORTH => Localization.Rack.Back case EnumFacing.NORTH => Localization.Rack.Back
case _ => Localization.Rack.None case _ => Localization.Rack.None
} }
@ -253,6 +253,12 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
x, y, 0x404040) 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) { if (relayButton.isMouseOver) {
val tooltip = new java.util.ArrayList[String] val tooltip = new java.util.ArrayList[String]
tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable)) tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable))