From 4cf30def99d3fbfd84ebc09dd90ec7967e2a4bf6 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 2 Apr 2015 13:32:15 -0400 Subject: [PATCH] Move overlays to bottom right corner, fix probe overlay rendering --- src/main/java/crazypants/enderio/gui/IconEIO.java | 8 +++++--- .../enderio/item/ConduitProbeOverlayRenderer.java | 15 +++++++++------ .../enderio/item/YetaWrenchOverlayRenderer.java | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index ccddb55d..822d9161 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -42,9 +42,11 @@ public final class IconEIO { public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(32, 128); public static final IconEIO WRENCH_OVERLAY_ME_OFF = new IconEIO(32 + 48, 128); - public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 192, 32, 16); - public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(144, 192, 32, 16); - + public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 192, 16, 16); + public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(128, 192, 16, 16); + public static final IconEIO PROBE_OVERLAY_PROBE_OFF = new IconEIO(144, 192, 16, 16); + public static final IconEIO PROBE_OVERLAY_COPY_OFF = new IconEIO(160, 192, 16, 16); + public static final IconEIO ACTIVE_TAB = new IconEIO(205, 0, 19, 24); public static final IconEIO INACTIVE_TAB = new IconEIO(237, 0, 19, 24); diff --git a/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java b/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java index 952a0e05..91e132cf 100644 --- a/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java @@ -37,19 +37,22 @@ public class ConduitProbeOverlayRenderer { return null; } - private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) { - IconEIO icon; + private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) { + IconEIO icon1, icon2; if(equippedProbe.getItemDamage() == 0) { - icon = IconEIO.PROBE_OVERLAY_PROBE; + icon1 = IconEIO.PROBE_OVERLAY_PROBE; + icon2 = IconEIO.PROBE_OVERLAY_COPY_OFF; } else { - icon = IconEIO.PROBE_OVERLAY_COPY; + icon1 = IconEIO.PROBE_OVERLAY_PROBE_OFF; + icon2 = IconEIO.PROBE_OVERLAY_COPY; } ScaledResolution res = event.resolution; - double offsetX = 16; + double offsetX = res.getScaledWidth() - 48; double offsetY = res.getScaledHeight() - 16; GL11.glColor4f(1, 1, 1, 0.75f); - icon.renderIcon(offsetX, offsetY - 32, 64, 32, 0, true); + icon1.renderIcon(offsetX - 32, offsetY - 32, 32, 32, 0, true); + icon2.renderIcon(offsetX, offsetY - 32, 32, 32, 0, true); } } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index d4edfaac..47efd2f0 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -55,7 +55,7 @@ public class YetaWrenchOverlayRenderer { ConduitDisplayMode mode = ConduitDisplayMode.getDisplayMode(equippedWrench); ScaledResolution res = event.resolution; - double offsetX = 16; + double offsetX = res.getScaledWidth() - (16 + ((onIcons.length / 2 + (onIcons.length % 2)) * 16)); double offsetY = res.getScaledHeight() - 16; if(mode == ConduitDisplayMode.ALL) { GL11.glColor4f(1, 1, 1, 0.75f);