aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorMauveCloud <MauveCloud@users.noreply.github.com>2016-04-28 11:30:29 -0700
committerMauveCloud <MauveCloud@users.noreply.github.com>2016-04-28 11:30:29 -0700
commitb69385d29b99497ba68e878a8333315439ef854c (patch)
treecfdbe19adfcd6cf8d0b5370e4232a1f3e61c2ce8 /src/main/java/gregtech/common
parenta88988770b9810c37331380b430fdae068a5d2b8 (diff)
parent5c8eec846d0a452b9f524e7ffe5351222fbc55ec (diff)
downloadGT5-Unofficial-b69385d29b99497ba68e878a8333315439ef854c.tar.gz
GT5-Unofficial-b69385d29b99497ba68e878a8333315439ef854c.tar.bz2
GT5-Unofficial-b69385d29b99497ba68e878a8333315439ef854c.zip
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java138
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java2
5 files changed, 114 insertions, 50 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 3705ce2204..f19219323c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -33,6 +33,9 @@ public class GT_Block_Casings4
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Casing MK II");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
@@ -42,6 +45,9 @@ public class GT_Block_Casings4
ItemList.Casing_Fusion_Coil.set(new ItemStack(this, 1, 7));
ItemList.Casing_Fusion2.set(new ItemStack(this, 1, 8));
ItemList.Casing_Turbine.set(new ItemStack(this, 1, 9));
+ ItemList.Casing_Turbine1.set(new ItemStack(this, 1, 10));
+ ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11));
+ ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12));
}
public IIcon getIcon(int aSide, int aMeta) {
@@ -67,9 +73,9 @@ public class GT_Block_Casings4
case 9:
return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
case 10:
- return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+ return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
case 11:
- return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+ return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
case 12:
return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
case 13:
@@ -82,118 +88,176 @@ public class GT_Block_Casings4
return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
}
+ public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) {
+ switch (meta) {
+ case 9:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() : Textures.BlockIcons.TURBINE[iconIndex].getIcon();
+ case 10:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() : Textures.BlockIcons.TURBINE1[iconIndex].getIcon();
+ case 11:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() : Textures.BlockIcons.TURBINE2[iconIndex].getIcon();
+ case 12:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() : Textures.BlockIcons.TURBINE3[iconIndex].getIcon();
+ default:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() : Textures.BlockIcons.TURBINE[iconIndex].getIcon();
+ }
+ }
+
@SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) {
int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
- if (((tMeta != 6) && (tMeta != 8) && (tMeta != 9)) || (!mConnectedMachineTextures)) {
+ if ((tMeta != 6) && (tMeta != 8) && (tMeta != 9) && (tMeta != 10) && (tMeta != 11) && (tMeta != 12) || (!mConnectedMachineTextures)) {
return getIcon(aSide, tMeta);
}
int tStartIndex = tMeta == 6 ? 1 : 13;
- if (tMeta == 9) {
+ if ((tMeta == 9) || (tMeta == 10) || (tMeta == 11) || (tMeta == 12)) {
if ((aSide == 2) || (aSide == 3)) {
TileEntity tTileEntity;
IMetaTileEntity tMetaTileEntity;
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 Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
+ return getTurbineCasing(tMeta, 0, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
+ return getTurbineCasing(tMeta, 3, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
+ return getTurbineCasing(tMeta, 6, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
+ return getTurbineCasing(tMeta, 1, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
+ return getTurbineCasing(tMeta, 7, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
+ return getTurbineCasing(tMeta, 8, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
+ return getTurbineCasing(tMeta, 5, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
+ return getTurbineCasing(tMeta, 2, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
}
- return Textures.BlockIcons.TURBINE[2].getIcon();
+ return getTurbineCasing(tMeta, 2, false);
+ //return Textures.BlockIcons.TURBINE[2].getIcon();
}
} else if ((aSide == 4) || (aSide == 5)) {
TileEntity tTileEntity;
Object tMetaTileEntity;
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 Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
+ return getTurbineCasing(tMeta, 0, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
+ return getTurbineCasing(tMeta, 3, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
+ return getTurbineCasing(tMeta, 6, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
+ return getTurbineCasing(tMeta, 1, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
+ return getTurbineCasing(tMeta, 7, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
+ return getTurbineCasing(tMeta, 8, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
+ return getTurbineCasing(tMeta, 5, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
}
- return Textures.BlockIcons.TURBINE[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 Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
+ return getTurbineCasing(tMeta, 2, true);
+ //return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
}
- return Textures.BlockIcons.TURBINE[2].getIcon();
+ return getTurbineCasing(tMeta, 2, false);
+ //return Textures.BlockIcons.TURBINE[2].getIcon();
}
}
- return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+ switch (tMeta) {
+ case 9:
+ return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+ case 10:
+ return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
+ case 11:
+ return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+ case 12:
+ return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+ default:
+ return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+ }
}
boolean[] tConnectedSides = {(aWorld.getBlock(xCoord, yCoord - 1, zCoord) == this) && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == this) && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta), (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == this) && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == this) && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta), (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == this) && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == this) && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta)};
switch (aSide) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
index 419b885d47..a914ab3a12 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
@@ -28,7 +28,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
- return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS5) : Textures.BlockIcons.CASING_BLOCKS[59]};
}
@@ -40,7 +40,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
"1x Dynamo Hatch (back centered)",
"1x Maintenance Hatch (side centered)",
"1x Muffler Hatch (side centered)",
- "Turbine Casings for the rest (24 at least!)",
+ "Stainless Steel Turbine Casings for the rest (24 at least!)",
"Needs a Turbine Item (inside controller GUI)"};
}
@@ -66,12 +66,12 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
@Override
public byte getCasingMeta() {
- return 9;
+ return 11;
}
@Override
public byte getCasingTextureIndex() {
- return 46;
+ return 59;
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index b9b4b7b2b4..7befab0088 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -28,7 +28,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
- return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_SS5) : Textures.BlockIcons.CASING_BLOCKS[58]};
}
public String[] getDescription() {
@@ -38,7 +38,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
"1x Input Hatch (side centered)", "1x Output Hatch(side centered)",
"1x Dynamo Hatch (back centered)",
"1x Maintenance Hatch (side centered)",
- "Turbine Casings for the rest (24 at least!)",
+ "Stainless Steel Turbine Casings for the rest (24 at least!)",
"Needs a Turbine Item (inside controller GUI)"};
}
@@ -54,12 +54,12 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
@Override
public byte getCasingMeta() {
- return 9;
+ return 10;
}
@Override
public byte getCasingTextureIndex() {
- return 46;
+ return 58;
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index 7cb84129c4..c72e880783 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -28,7 +28,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
- return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_TU5) : Textures.BlockIcons.CASING_BLOCKS[60]};
}
@@ -39,7 +39,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
"1x Input Hatch (side centered)",
"1x Dynamo Hatch (back centered)",
"1x Maintenance Hatch (side centered)",
- "Turbine Casings for the rest (24 at least!)",
+ "Tungstensteel Turbine Casings for the rest (24 at least!)",
"Needs a Turbine Item (inside controller GUI)"};
}
@@ -65,12 +65,12 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
@Override
public byte getCasingMeta() {
- return 9;
+ return 12;
}
@Override
public byte getCasingTextureIndex() {
- return 46;
+ return 60;
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 34e23196a7..534f53c36b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -30,7 +30,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
- return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ST5) : Textures.BlockIcons.CASING_BLOCKS[57]};
}
public String[] getDescription() {