Merge branch 'master' into 1.7

#447 Invisible rendering.
This commit is contained in:
cp committed 2014-03-19 15:55:50 +08:00
commit 15a723bcec
4 files changed
+583 -124

No files matched your search

@@ -22,33 +22,27 @@ public class CustomCubeRenderer {
if(rb == null) {
rb = new CustomRenderBlocks(ba);
}
try {
rb.blockAccess = ba;
rb.setOverrideTexture(getOverrideTexture());
rb.setFaceRenderers(null);
if(renderer != null) {
rb.addFaceRenderer(renderer);
}
rb.setRenderBoundsFromBlock(par1Block);
rb.renderStandardBlock(par1Block, par2, par3, par4);
} finally {
rb.setDefaultTesselatorEnabled(true);
rb.blockAccess = ba;
rb.setOverrideTexture(getOverrideTexture());
rb.setFaceRenderers(null);
if(renderer != null) {
rb.addFaceRenderer(renderer);
}
rb.setRenderBoundsFromBlock(par1Block);
rb.renderStandardBlock(par1Block, par2, par3, par4);
}
public void renderBlock(IBlockAccess ba, Block par1Block, int par2, int par3, int par4, Collection<IRenderFace> renderers) {
if(rb == null) {
rb = new CustomRenderBlocks(ba);
}
try {
rb.blockAccess = ba;
rb.setOverrideTexture(getOverrideTexture());
rb.setFaceRenderers(renderers);
rb.setRenderBoundsFromBlock(par1Block);
rb.renderStandardBlock(par1Block, par2, par3, par4);
} finally {
rb.setDefaultTesselatorEnabled(true);
}
rb.blockAccess = ba;
rb.setOverrideTexture(getOverrideTexture());
rb.setFaceRenderers(renderers);
rb.setRenderBoundsFromBlock(par1Block);
rb.renderStandardBlock(par1Block, par2, par3, par4);
}