dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show machine coords in controller

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-03-27 16:27:26 +02:00
parent 97d635a8cc
commit 2711a3d50c
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/refinedstorage/gui/GuiController.java
View File

@@ -5,6 +5,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.text.translation.I18n;
import refinedstorage.container.ContainerController; import refinedstorage.container.ContainerController;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
import refinedstorage.tile.TileController; import refinedstorage.tile.TileController;
@@ -75,6 +76,8 @@ public class GuiController extends GuiBase {
List<TileMachine> machines = new ArrayList<TileMachine>(controller.getMachines()); List<TileMachine> machines = new ArrayList<TileMachine>(controller.getMachines());
TileMachine machineHovering = null;
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
if (slot < machines.size()) { if (slot < machines.size()) {
TileMachine machine = machines.get(slot); 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 + 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())); drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage()));
GlStateManager.popMatrix(); GlStateManager.popMatrix();
if (inBounds(x, y, 16, 16, mouseX, mouseY)) {
machineHovering = machine;
}
} }
if (i == 1) { if (i == 1) {
@@ -103,6 +110,14 @@ public class GuiController extends GuiBase {
slot++; 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)) { 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))); drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
} }

3
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -2,6 +2,9 @@ itemGroup.refinedstorage=Refined Storage
gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.0=Controller
gui.refinedstorage:controller.1=Creative 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:grid=Grid
gui.refinedstorage:disk_drive=Drive gui.refinedstorage:disk_drive=Drive
gui.refinedstorage:external_storage=External Storage gui.refinedstorage:external_storage=External Storage

3
src/main/resources/assets/refinedstorage/lang/nl_NL.lang
View File

@@ -2,6 +2,9 @@ itemGroup.refinedstorage=Refined Storage
gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.0=Controller
gui.refinedstorage:controller.1=Creative 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:grid=Rooster
gui.refinedstorage:disk_drive=Schijf gui.refinedstorage:disk_drive=Schijf
gui.refinedstorage:external_storage=Externe Opslag gui.refinedstorage:external_storage=Externe Opslag