diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgets.png index bc6abd54..6580271d 100644 Binary files a/resources/assets/enderio/textures/gui/widgets.png and b/resources/assets/enderio/textures/gui/widgets.png differ diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 62b5ab13..14dac3d5 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -20,21 +20,19 @@ public final class IconEIO { public static final IconEIO BUTTON_DOWN = new IconEIO(48, 116); public static final IconEIO BUTTON_DOWN_HIGHLIGHT = new IconEIO(64, 116); - public static final IconEIO WRENCH_OVERLAY_ALL_ON = new IconEIO(0, 148, 96, 64); - public static final IconEIO WRENCH_OVERLAY_ALL_OFF = new IconEIO(96, 148, 96, 64); + public static final IconEIO WRENCH_OVERLAY_ALL_ON = new IconEIO(0, 148, 64, 64); + public static final IconEIO WRENCH_OVERLAY_ALL_OFF = new IconEIO(96, 148, 64, 64); public static final IconEIO WRENCH_OVERLAY_POWER = new IconEIO(0, 148, 32, 32); public static final IconEIO WRENCH_OVERLAY_POWER_OFF = new IconEIO(96, 148, 32, 32); public static final IconEIO WRENCH_OVERLAY_REDSTONE = new IconEIO(32, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(64, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(64 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(32, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(32 + 96, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(16, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(112, 180, 32, 32); - - public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(48, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(0, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(96, 180, 32, 32); public static final IconEIO ACTIVE_TAB = new IconEIO(237, 0, 19, 24); public static final IconEIO INACTIVE_TAB = new IconEIO(237, 25, 19, 24); diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index 611181a6..4a67639e 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -47,20 +47,20 @@ public class YetaWrenchOverlayRenderer { if(mode == ConduitDisplayMode.ALL) { GL11.glColor4f(1, 1, 1, 0.75f); - IconEIO.WRENCH_OVERLAY_ALL_ON.renderIcon(offsetX, offsetY - 32, 48, 32, 0, true); + IconEIO.WRENCH_OVERLAY_ALL_ON.renderIcon(offsetX, offsetY - 32, 32, 32, 0, true); return; } float c = 0.6f; GL11.glColor4f(c, c, c, 0.33f); - IconEIO.WRENCH_OVERLAY_ALL_OFF.renderIcon(offsetX, offsetY - 32, 48, 32, 0, true); + IconEIO.WRENCH_OVERLAY_ALL_OFF.renderIcon(offsetX, offsetY - 32, 32, 32, 0, true); GL11.glColor4f(1, 1, 1, 0.75f); if(mode == ConduitDisplayMode.POWER) { IconEIO.WRENCH_OVERLAY_POWER.renderIcon(offsetX, offsetY - 32, 16, 16, 0, true); } else if(mode == ConduitDisplayMode.FLUID) { - IconEIO.WRENCH_OVERLAY_FLUID.renderIcon(offsetX + 8, offsetY - 16, 16, 16, 0, true); + IconEIO.WRENCH_OVERLAY_FLUID.renderIcon(offsetX , offsetY - 16, 16, 16, 0, true); } else if(mode == ConduitDisplayMode.ITEM) { - IconEIO.WRENCH_OVERLAY_ITEM.renderIcon(offsetX + 32, offsetY - 32, 16, 16, 0, true); + IconEIO.WRENCH_OVERLAY_ITEM.renderIcon(offsetX + 16, offsetY - 16, 16, 16, 0, true); } else if(mode == ConduitDisplayMode.REDSTONE) { IconEIO.WRENCH_OVERLAY_REDSTONE.renderIcon(offsetX + 16, offsetY - 32, 16, 16, 0, true); }