Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x

Browse source
This commit is contained in:
asiekierka 2014-12-21 21:22:17 +01:00
commit 73eaf3e039
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/transport/render/FacadeItemRenderer.java
View file

@ -146,13 +146,6 @@ public class FacadeItemRenderer implements IItemRenderer {
Block block = activeState != null ? activeState.block : null;
int decodedMeta = activeState != null ? activeState.metadata : 0;
boolean hollow = activeState != null ? activeState.hollow : false;
ItemStack decodedStack = new ItemStack(block, 1, decodedMeta);
try {
int color = decodedStack.getItem().getColorFromItemStack(decodedStack, 0);
RenderUtils.setGLColorFromInt(color);
} catch (Throwable error) {
}
Tessellator tessellator = Tessellator.instance;
@ -170,6 +163,7 @@ public class FacadeItemRenderer implements IItemRenderer {
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
}
RenderUtils.setGLColorFromInt(block.getRenderColor(decodedMeta));
if (hollow) {
GL11.glTranslatef(translateX, translateY, translateZ);
drawHollowCube(tessellator, render, block, decodedMeta);

7
common/buildcraft/transport/render/FacadeRenderHelper.java
View file

@ -130,11 +130,6 @@ public final class FacadeRenderHelper {
}
}
try {
BlockGenericPipe.facadeRenderColor = Item.getItemFromBlock(pluggable.getRenderingBlock()).getColorFromItemStack(new ItemStack(renderBlock, 1, renderMeta), 0);
} catch (Throwable error) {
}
if (renderBlock.getRenderType() == 31) {
if ((renderMeta & 12) == 4) {
renderblocks.uvRotateEast = 1;
@ -147,6 +142,7 @@ public final class FacadeRenderHelper {
}
}
BlockGenericPipe.facadeRenderColor = renderBlock.getRenderColor(renderMeta);
// Hollow facade
if (pluggable.isHollow()) {
renderblocks.field_152631_f = true;
@ -187,6 +183,7 @@ public final class FacadeRenderHelper {
setRenderBounds(renderblocks, rotated, direction);
renderblocks.renderStandardBlock(blockStateMachine.getBlock(), x, y, z);
}
BlockGenericPipe.facadeRenderColor = -1;
if (renderBlock.getRenderType() == 31) {
renderblocks.uvRotateSouth = 0;