aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/render
diff options
context:
space:
mode:
authorPrometheus0000 <prometheus0000000@gmail.com>2021-03-05 14:15:26 -0500
committerGitHub <noreply@github.com>2021-03-05 14:15:26 -0500
commit450d4c0df507f1927bd7a0929c736238d7d8e90e (patch)
tree003f7ea3c61e4471c44ad10af9e78f908a55da2b /src/main/java/gregtech/common/render
parent617f0c768c5bb7f2b16806e36ea80303dca261b2 (diff)
parent29db17e34d9a1b604771b41623c8e46f2716c9c6 (diff)
downloadGT5-Unofficial-450d4c0df507f1927bd7a0929c736238d7d8e90e.tar.gz
GT5-Unofficial-450d4c0df507f1927bd7a0929c736238d7d8e90e.tar.bz2
GT5-Unofficial-450d4c0df507f1927bd7a0929c736238d7d8e90e.zip
Merge pull request #25 from GTNewHorizons/experimental
update
Diffstat (limited to 'src/main/java/gregtech/common/render')
-rw-r--r--src/main/java/gregtech/common/render/GT_Renderer_Block.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GT_Renderer_Block.java
index 6cb161fcb8..5265be43e1 100644
--- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java
+++ b/src/main/java/gregtech/common/render/GT_Renderer_Block.java
@@ -558,13 +558,20 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
IMetaTileEntity metaTileEntity;
if ((metaTileEntity = ((IGregTechTileEntity) tileEntity).getMetaTileEntity()) != null &&
metaTileEntity.renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer)) {
+ aRenderer.enableAO = false;
return true;
}
}
- if ((tileEntity instanceof IPipeRenderedTileEntity)) {
- return renderPipeBlock(aWorld, aX, aY, aZ, aBlock, (IPipeRenderedTileEntity) tileEntity, aRenderer);
+ if (tileEntity instanceof IPipeRenderedTileEntity &&
+ renderPipeBlock(aWorld, aX, aY, aZ, aBlock, (IPipeRenderedTileEntity) tileEntity, aRenderer)) {
+ aRenderer.enableAO = false;
+ return true;
}
- return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer);
+ if (renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer)) {
+ aRenderer.enableAO = false;
+ return true;
+ }
+ return false;
}
public boolean shouldRender3DInInventory(int aModel) {