From ec2e7d4aaf970d89212958e5f40fa24d373e4360 Mon Sep 17 00:00:00 2001 From: payonel Date: Sat, 23 May 2020 01:29:04 -0700 Subject: [PATCH] some tooltips and a fix for possible install code path (nil ref) --- src/main/resources/assets/opencomputers/lang/en_US.lang | 1 + .../opencomputers/loot/openos/lib/core/install_basics.lua | 2 +- src/main/scala/li/cil/oc/Localization.scala | 2 ++ src/main/scala/li/cil/oc/client/gui/Case.scala | 2 +- src/main/scala/li/cil/oc/client/gui/Rack.scala | 8 ++++++++ src/main/scala/li/cil/oc/server/component/DebugCard.scala | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 849ba858f..30da048b9 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.None=None oc:gui.Rack.Right=Right oc:gui.Rack.Enabled=Enabled oc:gui.Rack.Disabled=Disabled +oc:gui.Rack.RelayModeTooltip=Relay Mode oc:gui.Rack.Top=Top oc:gui.Switch.PacketsPerCycle=Packets / cycle oc:gui.Switch.QueueSize=Queue size diff --git a/src/main/resources/assets/opencomputers/loot/openos/lib/core/install_basics.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/core/install_basics.lua index 41b72d1cf..7fcb945b9 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/lib/core/install_basics.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/lib/core/install_basics.lua @@ -206,7 +206,7 @@ end local special_target = "" if #targets > 1 or target_filter or source_filter then - special_target = " to " .. transfer_args[1].args[2] + special_target = " to " .. transfer_args[1][1][2] end io.write("Install " .. source_display .. special_target .. "? [Y/n] ") diff --git a/src/main/scala/li/cil/oc/Localization.scala b/src/main/scala/li/cil/oc/Localization.scala index 90321bf5d..82197eadf 100644 --- a/src/main/scala/li/cil/oc/Localization.scala +++ b/src/main/scala/li/cil/oc/Localization.scala @@ -142,6 +142,8 @@ object Localization { def RelayEnabled = localizeImmediately("gui.Rack.Enabled") def RelayDisabled = localizeImmediately("gui.Rack.Disabled") + + def RelayModeTooltip: String = localizeImmediately("gui.Rack.RelayModeTooltip") } object Switch { diff --git a/src/main/scala/li/cil/oc/client/gui/Case.scala b/src/main/scala/li/cil/oc/client/gui/Case.scala index 244697cbb..0b5c25ca4 100644 --- a/src/main/scala/li/cil/oc/client/gui/Case.scala +++ b/src/main/scala/li/cil/oc/client/gui/Case.scala @@ -48,4 +48,4 @@ class Case(playerInventory: InventoryPlayer, val computer: tileentity.Case) exte mc.renderEngine.bindTexture(Textures.guiComputer) drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize) } -} \ No newline at end of file +} 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 9c6fc9b4d..ea60d4114 100644 --- a/src/main/scala/li/cil/oc/client/gui/Rack.scala +++ b/src/main/scala/li/cil/oc/client/gui/Rack.scala @@ -11,6 +11,8 @@ import net.minecraft.entity.player.InventoryPlayer import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 +import scala.collection.convert.WrapAsJava.asJavaCollection + class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends DynamicGuiContainer(new container.Rack(playerInventory, rack)) { ySize = 210 @@ -248,6 +250,12 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends x, y, 0x404040) } + if (relayButton.func_146115_a) { + val tooltip = new java.util.ArrayList[String] + tooltip.addAll(asJavaCollection(Localization.Rack.RelayModeTooltip.lines.toIterable)) + copiedDrawHoveringText(tooltip, mouseX - guiLeft, mouseY - guiTop, fontRendererObj) + } + GL11.glPopAttrib() } diff --git a/src/main/scala/li/cil/oc/server/component/DebugCard.scala b/src/main/scala/li/cil/oc/server/component/DebugCard.scala index e35d867d1..4ab26c9e7 100644 --- a/src/main/scala/li/cil/oc/server/component/DebugCard.scala +++ b/src/main/scala/li/cil/oc/server/component/DebugCard.scala @@ -622,7 +622,7 @@ object DebugCard { } val count = args.checkInteger(1) val damage = args.checkInteger(2) - val tagJson = args.checkString(3) + val tagJson = args.optString(3, "") val tag = if (Strings.isNullOrEmpty(tagJson)) null else JsonToNBT.func_150315_a(tagJson).asInstanceOf[NBTTagCompound] val position = BlockPosition(args.checkDouble(4), args.checkDouble(5), args.checkDouble(6), world) val side = args.checkSideAny(7)