diff options
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Casings4.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Casings8.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index f5618c23b4..62c7649dc2 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -158,6 +158,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { } } + @Deprecated public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) { switch (meta) { case 10: @@ -192,8 +193,10 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine && tTile.getFrontFacing() == aSide) { + GT_MetaTileEntity_LargeTurbine turbine = (GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity(); + if (turbine.isNewStyleRendering()) return 0; if (tTile.isActive()) return 1; - return ((GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; + return turbine.hasTurbine() ? 2 : 3; } return 0; } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java index ae67f52730..03f7262219 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java @@ -143,8 +143,10 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine && tTile.getFrontFacing() == aSide) { + GT_MetaTileEntity_LargeTurbine turbine = (GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity(); + if (turbine.isNewStyleRendering()) return 0; if (tTile.isActive()) return 1; - return ((GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; + return turbine.hasTurbine() ? 2 : 3; } return 0; } |
