diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2023-01-31 02:23:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-30 19:23:25 +0100 |
| commit | 9285806d9e089b183caf9985718cee115ec75396 (patch) | |
| tree | 697cb793cfb08f26d07829d4ca2e350cdfe4564b /src/main/java/gregtech/common/blocks | |
| parent | df5f9d448647d5ccf9eb774a244319e54021ede0 (diff) | |
| download | GT5-Unofficial-9285806d9e089b183caf9985718cee115ec75396.tar.gz GT5-Unofficial-9285806d9e089b183caf9985718cee115ec75396.tar.bz2 GT5-Unofficial-9285806d9e089b183caf9985718cee115ec75396.zip | |
add back turbine wallsharing (#1699)
* add back turbine wallsharing
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* use new texture from @Jimbno
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* remove unnecessary structure checks
it turns out you cannot build 2 functional large turbine at these locations anyway, so why not?
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* spotless
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* update bs
* use the original grey for empty texture
these are slightly darker, and looks better
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---------
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
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; } |