From 5171cd30e87f01ab2cd2fed8d78a040ccfbedf00 Mon Sep 17 00:00:00 2001 From: Justin Vitale <4002351+justinvvitale@users.noreply.github.com> Date: Thu, 18 Jun 2020 23:29:52 +1000 Subject: [PATCH] Fix in/out position and translation for percent on storage/tank unit --- .../java/techreborn/client/gui/GuiStorageUnit.java | 11 +++++++---- src/main/java/techreborn/client/gui/GuiTankUnit.java | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiStorageUnit.java b/src/main/java/techreborn/client/gui/GuiStorageUnit.java index 8b18fe394..ae5cf6a14 100644 --- a/src/main/java/techreborn/client/gui/GuiStorageUnit.java +++ b/src/main/java/techreborn/client/gui/GuiStorageUnit.java @@ -47,10 +47,8 @@ public class GuiStorageUnit extends GuiBase { super.drawBackground(matrixStack, f, mouseX, mouseY); final Layer layer = Layer.BACKGROUND; - client.textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.in"), 100, 43, 4210752); + // Draw slots drawSlot(matrixStack, 100, 53, layer); - - client.textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.out"), 140, 43, 4210752); drawSlot(matrixStack, 140, 53, layer); } @@ -58,6 +56,11 @@ public class GuiStorageUnit extends GuiBase { protected void drawForeground(MatrixStack matrixStack, final int mouseX, final int mouseY) { super.drawForeground(matrixStack, mouseX, mouseY); + + // Draw in/out labels + drawTextWithShadow(matrixStack, textRenderer, new TranslatableText("gui.techreborn.unit.in"), 100, 43, 4210752); + drawTextWithShadow(matrixStack,textRenderer, new TranslatableText("gui.techreborn.unit.out"), 140, 43, 4210752); + if (storageEntity.isEmpty() && !storageEntity.isLocked()) { textRenderer.draw(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752); } else { @@ -69,7 +72,7 @@ public class GuiStorageUnit extends GuiBase { String percentFilled = String.valueOf((int) ((double) storageEntity.getCurrentCapacity() / (double) storageEntity.getMaxCapacity() * 100)); - textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used") + percentFilled + "%", 10, 70, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752); textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680); } diff --git a/src/main/java/techreborn/client/gui/GuiTankUnit.java b/src/main/java/techreborn/client/gui/GuiTankUnit.java index 52169c211..7ba9c4911 100644 --- a/src/main/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/main/java/techreborn/client/gui/GuiTankUnit.java @@ -47,10 +47,8 @@ public class GuiTankUnit extends GuiBase { super.drawBackground(matrixStack, f, mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; - drawTextWithShadow(matrixStack, client.textRenderer, new TranslatableText("gui.techreborn.unit.in"), 100, 43, 4210752); + // Draw slots drawSlot(matrixStack, 100, 53, layer); - - drawTextWithShadow(matrixStack, client.textRenderer, new TranslatableText("gui.techreborn.unit.out"), 140, 43, 4210752); drawSlot(matrixStack, 140, 53, layer); } @@ -58,6 +56,11 @@ public class GuiTankUnit extends GuiBase { protected void drawForeground(MatrixStack matrixStack, final int mouseX, final int mouseY) { super.drawForeground(matrixStack, mouseX, mouseY); + // Draw input/out + drawTextWithShadow(matrixStack, textRenderer, new TranslatableText("gui.techreborn.unit.in"), 100, 43, 4210752); + drawTextWithShadow(matrixStack, textRenderer, new TranslatableText("gui.techreborn.unit.out"), 140, 43, 4210752); + + FluidInstance fluid = tankEntity.getTank().getFluidInstance(); if (fluid.isEmpty()) { @@ -72,7 +75,7 @@ public class GuiTankUnit extends GuiBase { String percentFilled = String.valueOf((int) ((double) fluid.getAmount().getRawValue() / (double) tankEntity.getTank().getCapacity().getRawValue() * 100)); - textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used") + percentFilled + "%", 10, 70, 4210752); + textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752); textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680); }