aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-06-21 19:56:20 +0200
committerGitHub <noreply@github.com>2016-06-21 19:56:20 +0200
commit5728c8d93fc7f9ff7e8a62a13b1b1c62effc8efe (patch)
tree00e8092994c9974a8446f7d221ed164c62f94386 /src/main/java/gregtech/common/blocks
parent75d71e546ba9631cc339795ce59025bab006d41a (diff)
parent434450107b4c5e8bad513e7462638a9753b59f37 (diff)
downloadGT5-Unofficial-5728c8d93fc7f9ff7e8a62a13b1b1c62effc8efe.tar.gz
GT5-Unofficial-5728c8d93fc7f9ff7e8a62a13b1b1c62effc8efe.tar.bz2
GT5-Unofficial-5728c8d93fc7f9ff7e8a62a13b1b1c62effc8efe.zip
Merge pull request #534 from Muramasa-/DieselGenerator
Bug Fixes
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java32
1 files changed, 0 insertions, 32 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 cd9eff1f77..a1b9571436 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -119,66 +119,50 @@ public class GT_Block_Casings4
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 0, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
}
return getTurbineCasing(tMeta, 0, false);
- //return Textures.BlockIcons.TURBINE[0].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 3, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
}
return getTurbineCasing(tMeta, 3, false);
- //return Textures.BlockIcons.TURBINE[3].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 6, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
}
return getTurbineCasing(tMeta, 6, false);
- //return Textures.BlockIcons.TURBINE[6].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 1, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
}
return getTurbineCasing(tMeta, 1, false);
- //return Textures.BlockIcons.TURBINE[1].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 7, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
}
return getTurbineCasing(tMeta, 7, false);
- //return Textures.BlockIcons.TURBINE[7].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 8, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
}
return getTurbineCasing(tMeta, 8, false);
- //return Textures.BlockIcons.TURBINE[8].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 5, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
}
return getTurbineCasing(tMeta, 5, false);
- //return Textures.BlockIcons.TURBINE[5].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 2, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
}
return getTurbineCasing(tMeta, 2, false);
- //return Textures.BlockIcons.TURBINE[2].getIcon();
}
} else if ((aSide == 4) || (aSide == 5)) {
TileEntity tTileEntity;
@@ -186,66 +170,50 @@ public class GT_Block_Casings4
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 0, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
}
return getTurbineCasing(tMeta, 0, false);
- //return Textures.BlockIcons.TURBINE[0].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 3, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
}
return getTurbineCasing(tMeta, 3, false);
- //return Textures.BlockIcons.TURBINE[3].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 6, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
}
return getTurbineCasing(tMeta, 6, false);
- //return Textures.BlockIcons.TURBINE[6].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 1, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
}
return getTurbineCasing(tMeta, 1, false);
- //return Textures.BlockIcons.TURBINE[1].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 7, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
}
return getTurbineCasing(tMeta, 7, false);
- //return Textures.BlockIcons.TURBINE[7].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 8, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
}
return getTurbineCasing(tMeta, 8, false);
- //return Textures.BlockIcons.TURBINE[8].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 5, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
}
return getTurbineCasing(tMeta, 5, false);
- //return Textures.BlockIcons.TURBINE[5].getIcon();
}
if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine))) {
if (((IGregTechTileEntity) tTileEntity).isActive()) {
return getTurbineCasing(tMeta, 2, true);
- //return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
}
return getTurbineCasing(tMeta, 2, false);
- //return Textures.BlockIcons.TURBINE[2].getIcon();
}
}
switch (tMeta) {