From a394aaa1f064e93f12e75b535bad17ae0987e9b8 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 30 Mar 2015 05:18:08 -0400 Subject: [PATCH] Fix some remaining render issues with conduits and breaking animations --- .../enderio/conduit/item/ItemConduitRenderer.java | 2 +- .../enderio/conduit/render/ConduitBundleRenderer.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java index 151105cb..f31d35f3 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java @@ -50,7 +50,7 @@ public class ItemConduitRenderer extends DefaultConduitRenderer { render = false; } - if(render) { + if(render && !rb.hasOverrideBlockTexture()) { Offset offset = te.getOffset(IItemConduit.class, dir); ConnectionModeGeometry.renderModeConnector(dir, offset, pc.getTextureForInOutBackground(), true); diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index 2c0f1102..6cd5869e 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -256,8 +256,10 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); // External connection terminations - for (ForgeDirection dir : externals) { - renderExternalConnection(dir); + if(rb.overrideBlockTexture == null) { + for (ForgeDirection dir : externals) { + renderExternalConnection(dir); + } } tessellator.addTranslation(-(float) x, -(float) y, -(float) z);