diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 4add29c69..f52eafa4d 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -5,6 +5,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; import refinedstorage.container.ContainerController; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileController; @@ -75,6 +76,8 @@ public class GuiController extends GuiBase { List machines = new ArrayList(controller.getMachines()); + TileMachine machineHovering = null; + for (int i = 0; i < 4; ++i) { if (slot < machines.size()) { TileMachine machine = machines.get(slot); @@ -91,6 +94,10 @@ public class GuiController extends GuiBase { drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 3, scale), machineStack.getDisplayName()); drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); GlStateManager.popMatrix(); + + if (inBounds(x, y, 16, 16, mouseX, mouseY)) { + machineHovering = machine; + } } if (i == 1) { @@ -103,6 +110,14 @@ public class GuiController extends GuiBase { slot++; } + if (machineHovering != null) { + String message = I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.x", machineHovering.getPos().getX()); + message += "\n" + I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.y", machineHovering.getPos().getY()); + message += "\n" + I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.z", machineHovering.getPos().getZ()); + + drawTooltip(mouseX, mouseY, message); + } + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 4ca573f22..4bbc86804 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -2,6 +2,9 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.machine_position.x=X: %d +gui.refinedstorage:controller.machine_position.y=Y: %d +gui.refinedstorage:controller.machine_position.z=Z: %d gui.refinedstorage:grid=Grid gui.refinedstorage:disk_drive=Drive gui.refinedstorage:external_storage=External Storage diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 261a9985b..28db69375 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -2,6 +2,9 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.machine_position.x=X: %d +gui.refinedstorage:controller.machine_position.y=Y: %d +gui.refinedstorage:controller.machine_position.z=Z: %d gui.refinedstorage:grid=Rooster gui.refinedstorage:disk_drive=Schijf gui.refinedstorage:external_storage=Externe Opslag