Fix conduits rendering on the alpha pass

This commit is contained in:
tterrag1098 committed 2015-02-17 19:25:07 -05:00
1 parent 7982efd015
commit 452934ffdc
2 files changed
+3 -10

No files matched your search

@@ -4,7 +4,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.conduit.BlockConduitBundle;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.IConduitBundle;
@@ -29,10 +28,6 @@ public class ItemConduitRenderer extends DefaultConduitRenderer {
float worldLight, RenderBlocks rb) {
super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb);
if (BlockConduitBundle.theRenderPass == 1) {
return;
}
IItemConduit pc = (IItemConduit) conduit;
for (ForgeDirection dir : conduit.getExternalConnections()) {
DyeColor inChannel = null;
@@ -121,9 +121,9 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
boolean renderedFacade = renderFacade(x, y, z, rb, bundle, player);
boolean renderConduit = !renderedFacade;
boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player);
if(renderConduit) {
if(renderConduit && BlockConduitBundle.theRenderPass == 0) {
BlockCoord loc = bundle.getLocation();
float brightness;
if(!Config.updateLightingWhenHidingFacades && bundle.hasFacade() && ConduitUtil.isFacadeHidden(bundle, player)) {
@@ -141,7 +141,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
private boolean renderFacade(int x, int y, int z, RenderBlocks rb, IConduitBundle bundle, EntityClientPlayerMP player) {
boolean res = false;
if(bundle.hasFacade()) {
res = true;
Block facadeId = bundle.getFacadeId();
if(ConduitUtil.isFacadeHidden(bundle, player)) {
Tessellator.instance.setColorOpaque_F(1, 1, 1);
@@ -156,12 +156,10 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
rb.renderStandardBlock(facb, x, y, z);
}
facb.setBlockOverride(null);
bundle.setFacadeId(facadeId, false);
} else if(facadeId != null) {
bundle.setFacadeRenderAs(FacadeRenderState.FULL);
boolean isFacadeOpaque = facadeId.isOpaqueCube();
res = isFacadeOpaque;
if((isFacadeOpaque && BlockConduitBundle.theRenderPass == 0) ||
(rb.hasOverrideBlockTexture() || (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1))) {