aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Xizhi <60341015+GlodBlock@users.noreply.github.com>2021-12-24 22:05:25 +0800
committerGitHub <noreply@github.com>2021-12-24 15:05:25 +0100
commit9b7d225b93fb15efc958786fb90c923b20d8752f (patch)
tree831c5d31af8d3ac9446ea006a8578dcf02972b92
parentb4068fcfbaae154a1f55b84b19a2c474bb7796ef (diff)
downloadGT5-Unofficial-9b7d225b93fb15efc958786fb90c923b20d8752f.tar.gz
GT5-Unofficial-9b7d225b93fb15efc958786fb90c923b20d8752f.tar.bz2
GT5-Unofficial-9b7d225b93fb15efc958786fb90c923b20d8752f.zip
add more turbine texture (#835)
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java86
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java26
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java10
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY1.pngbin0 -> 380 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY2.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY3.pngbin0 -> 467 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY4.pngbin0 -> 338 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY5.pngbin0 -> 90 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY6.pngbin0 -> 341 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY7.pngbin0 -> 430 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY8.pngbin0 -> 338 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY9.pngbin0 -> 395 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY1.pngbin0 -> 411 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY2.pngbin0 -> 335 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY3.pngbin0 -> 484 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY4.pngbin0 -> 346 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY5.pngbin0 -> 90 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY6.pngbin0 -> 338 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY7.pngbin0 -> 477 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY8.pngbin0 -> 343 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY9.pngbin0 -> 432 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY1.pngbin0 -> 428 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY2.pngbin0 -> 353 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY3.pngbin0 -> 488 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY4.pngbin0 -> 360 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY5.pngbin0 -> 90 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY6.pngbin0 -> 360 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY7.pngbin0 -> 473 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY8.pngbin0 -> 349 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY9.pngbin0 -> 432 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY1.pngbin0 -> 412 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY2.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY3.pngbin0 -> 457 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY4.pngbin0 -> 359 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY5.pngbin0 -> 90 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY6.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY7.pngbin0 -> 450 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY8.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY9.pngbin0 -> 402 bytes
43 files changed, 130 insertions, 26 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 28bbe6b8c9..fc47ee459a 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -1145,7 +1145,47 @@ public class Textures {
PIPE_RESTRICTOR_DR,
PIPE_RESTRICTOR_LR,
- OVERLAY_ME_HATCH;
+ OVERLAY_ME_HATCH,
+
+ LARGETURBINE_ST_EMPTY1,
+ LARGETURBINE_ST_EMPTY2,
+ LARGETURBINE_ST_EMPTY3,
+ LARGETURBINE_ST_EMPTY4,
+ LARGETURBINE_ST_EMPTY5,
+ LARGETURBINE_ST_EMPTY6,
+ LARGETURBINE_ST_EMPTY7,
+ LARGETURBINE_ST_EMPTY8,
+ LARGETURBINE_ST_EMPTY9,
+
+ LARGETURBINE_SS_EMPTY1,
+ LARGETURBINE_SS_EMPTY2,
+ LARGETURBINE_SS_EMPTY3,
+ LARGETURBINE_SS_EMPTY4,
+ LARGETURBINE_SS_EMPTY5,
+ LARGETURBINE_SS_EMPTY6,
+ LARGETURBINE_SS_EMPTY7,
+ LARGETURBINE_SS_EMPTY8,
+ LARGETURBINE_SS_EMPTY9,
+
+ LARGETURBINE_TI_EMPTY1,
+ LARGETURBINE_TI_EMPTY2,
+ LARGETURBINE_TI_EMPTY3,
+ LARGETURBINE_TI_EMPTY4,
+ LARGETURBINE_TI_EMPTY5,
+ LARGETURBINE_TI_EMPTY6,
+ LARGETURBINE_TI_EMPTY7,
+ LARGETURBINE_TI_EMPTY8,
+ LARGETURBINE_TI_EMPTY9,
+
+ LARGETURBINE_TU_EMPTY1,
+ LARGETURBINE_TU_EMPTY2,
+ LARGETURBINE_TU_EMPTY3,
+ LARGETURBINE_TU_EMPTY4,
+ LARGETURBINE_TU_EMPTY5,
+ LARGETURBINE_TU_EMPTY6,
+ LARGETURBINE_TU_EMPTY7,
+ LARGETURBINE_TU_EMPTY8,
+ LARGETURBINE_TU_EMPTY9;
/**
* Icon for Fresh CFoam
@@ -1310,6 +1350,17 @@ public class Textures {
LARGETURBINE_ST_ACTIVE8,
LARGETURBINE_ST_ACTIVE9
},
+ TURBINE_EMPTY = {
+ LARGETURBINE_ST_EMPTY1,
+ LARGETURBINE_ST_EMPTY2,
+ LARGETURBINE_ST_EMPTY3,
+ LARGETURBINE_ST_EMPTY4,
+ LARGETURBINE_ST_EMPTY5,
+ LARGETURBINE_ST_EMPTY6,
+ LARGETURBINE_ST_EMPTY7,
+ LARGETURBINE_ST_EMPTY8,
+ LARGETURBINE_ST_EMPTY9
+ },
TURBINE1 = {
LARGETURBINE_SS1,
LARGETURBINE_SS2,
@@ -1332,6 +1383,17 @@ public class Textures {
LARGETURBINE_SS_ACTIVE8,
LARGETURBINE_SS_ACTIVE9
},
+ TURBINE_EMPTY1 = {
+ LARGETURBINE_SS_EMPTY1,
+ LARGETURBINE_SS_EMPTY2,
+ LARGETURBINE_SS_EMPTY3,
+ LARGETURBINE_SS_EMPTY4,
+ LARGETURBINE_SS_EMPTY5,
+ LARGETURBINE_SS_EMPTY6,
+ LARGETURBINE_SS_EMPTY7,
+ LARGETURBINE_SS_EMPTY8,
+ LARGETURBINE_SS_EMPTY9
+ },
TURBINE2 = {
LARGETURBINE_TI1,
LARGETURBINE_TI2,
@@ -1354,6 +1416,17 @@ public class Textures {
LARGETURBINE_TI_ACTIVE8,
LARGETURBINE_TI_ACTIVE9
},
+ TURBINE_EMPTY2 = {
+ LARGETURBINE_TI_EMPTY1,
+ LARGETURBINE_TI_EMPTY2,
+ LARGETURBINE_TI_EMPTY3,
+ LARGETURBINE_TI_EMPTY4,
+ LARGETURBINE_TI_EMPTY5,
+ LARGETURBINE_TI_EMPTY6,
+ LARGETURBINE_TI_EMPTY7,
+ LARGETURBINE_TI_EMPTY8,
+ LARGETURBINE_TI_EMPTY9
+ },
TURBINE3 = {
LARGETURBINE_TU1,
LARGETURBINE_TU2,
@@ -1376,6 +1449,17 @@ public class Textures {
LARGETURBINE_TU_ACTIVE8,
LARGETURBINE_TU_ACTIVE9
},
+ TURBINE_EMPTY3 = {
+ LARGETURBINE_TU_EMPTY1,
+ LARGETURBINE_TU_EMPTY2,
+ LARGETURBINE_TU_EMPTY3,
+ LARGETURBINE_TU_EMPTY4,
+ LARGETURBINE_TU_EMPTY5,
+ LARGETURBINE_TU_EMPTY6,
+ LARGETURBINE_TU_EMPTY7,
+ LARGETURBINE_TU_EMPTY8,
+ LARGETURBINE_TU_EMPTY9
+ },
CONNECTED_HULLS = {
CONCRETE_DARK_STONE,
FUSIONI_1,
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 d217064d30..2bd94c6ccb 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -107,6 +107,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
}
+ @Deprecated
public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) {
switch (meta) {
case 10:
@@ -120,12 +121,27 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
}
}
+ public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) {
+ switch (meta) {
+ case 10:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() : hasTurbine ? Textures.BlockIcons.TURBINE1[iconIndex].getIcon() : Textures.BlockIcons.TURBINE_EMPTY1[iconIndex].getIcon();
+ case 11:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() : hasTurbine ? Textures.BlockIcons.TURBINE2[iconIndex].getIcon() : Textures.BlockIcons.TURBINE_EMPTY2[iconIndex].getIcon();
+ case 12:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() : hasTurbine ? Textures.BlockIcons.TURBINE3[iconIndex].getIcon() : Textures.BlockIcons.TURBINE_EMPTY3[iconIndex].getIcon();
+ default:
+ return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon();
+ }
+ }
+
private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
- if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine && tTile.getFrontFacing() == aSide)
- return tTile.isActive() ? 1 : 2;
+ if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine && tTile.getFrontFacing() == aSide) {
+ if (tTile.isActive()) return 1;
+ return ((GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3;
+ }
return 0;
}
@@ -146,7 +162,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
continue;
int tState;
if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) != 0) {
- return getTurbineCasing(tMeta, 4 - i * 3 - j, tState == 1);
+ return getTurbineCasing(tMeta, 4 - i * 3 - j, tState == 1, tState == 2);
}
}
}
@@ -158,7 +174,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
continue;
int tState;
if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) != 0) {
- return getTurbineCasing(tMeta, 4 + i * 3 - j * tInvertLeftRightMod, tState == 1);
+ return getTurbineCasing(tMeta, 4 + i * 3 - j * tInvertLeftRightMod, tState == 1, tState == 2);
}
}
}
@@ -170,7 +186,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract {
continue;
int tState;
if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) != 0) {
- return getTurbineCasing(tMeta, 4 + i * 3 + j * tInvertLeftRightMod, tState == 1);
+ return getTurbineCasing(tMeta, 4 + i * 3 + j * tInvertLeftRightMod, tState == 1, tState == 2);
}
}
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
index 8966838f3f..2678c3ac72 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
@@ -238,6 +238,10 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_E
}
+ public boolean hasTurbine() {
+ return this.getMaxEfficiency(mInventory[1]) > 0;
+ }
+
@Override
public boolean isGivingInformation() {
return true;
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 ca2ecbbbc1..6cd1cd567c 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
@@ -16,10 +16,7 @@ import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS5;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5;
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
+import static gregtech.api.enums.Textures.BlockIcons.*;
public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeTurbine {
@@ -33,7 +30,10 @@ 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[]{MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? TextureFactory.builder().addIcon(LARGETURBINE_SS_ACTIVE5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_SS5).extFacing().build() : casingTexturePages[0][58]};
+ return new ITexture[]{MACHINE_CASINGS[1][aColorIndex + 1],
+ aFacing == aSide ?
+ (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_SS_ACTIVE5).extFacing().build() : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_SS5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_SS_EMPTY5).extFacing().build())
+ : casingTexturePages[0][58]};
}
@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 b34662e619..c434c2e886 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
@@ -17,10 +17,7 @@ import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5;
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
+import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_LargeTurbine {
@@ -38,7 +35,10 @@ 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[]{MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? TextureFactory.builder().addIcon(LARGETURBINE_TI_ACTIVE5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_TI5).extFacing().build() : casingTexturePages[0][59]};
+ return new ITexture[]{MACHINE_CASINGS[1][aColorIndex + 1],
+ aFacing == aSide ?
+ (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_TI_ACTIVE5).extFacing().build() : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_TI5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_TI_EMPTY5).extFacing().build())
+ : casingTexturePages[0][59]};
}
@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 b32385c1be..8a5616dafd 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
@@ -1,7 +1,6 @@
package gregtech.common.tileentities.machines.multi;
import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -23,9 +22,7 @@ import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5;
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
+import static gregtech.api.enums.Textures.BlockIcons.*;
public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_LargeTurbine {
@@ -39,7 +36,10 @@ 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[]{MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? TextureFactory.builder().addIcon(LARGETURBINE_TU_ACTIVE5).extFacing().build() : TextureFactory.builder().addIcon(Textures.BlockIcons.LARGETURBINE_TU5).extFacing().build() : casingTexturePages[0][60]};
+ return new ITexture[]{MACHINE_CASINGS[1][aColorIndex + 1],
+ aFacing == aSide ?
+ (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_TU_ACTIVE5).extFacing().build() : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_TU5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_TU_EMPTY5).extFacing().build())
+ : casingTexturePages[0][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 651d9c9d09..9513b6f5dc 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
@@ -18,10 +18,7 @@ import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
import static gregtech.api.enums.GT_Values.STEAM_PER_WATER;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5;
-import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5;
-import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
-import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
+import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_LargeTurbine {
@@ -41,7 +38,10 @@ 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[]{MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? TextureFactory.builder().addIcon(LARGETURBINE_ST_ACTIVE5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_ST5).extFacing().build() : casingTexturePages[0][57]};
+ return new ITexture[]{MACHINE_CASINGS[1][aColorIndex + 1],
+ aFacing == aSide ?
+ (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_ST_ACTIVE5).extFacing().build() : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_ST5).extFacing().build() : TextureFactory.builder().addIcon(LARGETURBINE_ST_EMPTY5).extFacing().build())
+ : casingTexturePages[0][57]};
}
@Override
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY1.png
new file mode 100644
index 0000000000..6a41c86dd5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY1.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY2.png
new file mode 100644
index 0000000000..456508c648
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY2.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY3.png
new file mode 100644
index 0000000000..ac5b52d993
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY3.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY4.png
new file mode 100644
index 0000000000..01ad310c88
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY4.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY5.png
new file mode 100644
index 0000000000..ede77ea0da
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY5.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY6.png
new file mode 100644
index 0000000000..586749c881
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY6.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY7.png
new file mode 100644
index 0000000000..81221ee177
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY7.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY8.png
new file mode 100644
index 0000000000..260eaac7a4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY8.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY9.png
new file mode 100644
index 0000000000..8c8a4c5dc1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_EMPTY9.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY1.png
new file mode 100644
index 0000000000..ce43879133
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY1.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY2.png
new file mode 100644
index 0000000000..39c9b02910
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY2.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY3.png
new file mode 100644
index 0000000000..98438d85bb
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY3.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY4.png
new file mode 100644
index 0000000000..1ed1956f7a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY4.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY5.png
new file mode 100644
index 0000000000..ede77ea0da
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY5.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY6.png
new file mode 100644
index 0000000000..14536949ca
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY6.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY7.png
new file mode 100644
index 0000000000..b075a42926
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY7.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY8.png
new file mode 100644
index 0000000000..77310f0ab7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY8.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY9.png
new file mode 100644
index 0000000000..b26134bf26
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_EMPTY9.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY1.png
new file mode 100644
index 0000000000..679c823b7f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY1.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY2.png
new file mode 100644
index 0000000000..32b8d8c647
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY2.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY3.png
new file mode 100644
index 0000000000..daf3368139
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY3.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY4.png
new file mode 100644
index 0000000000..68158b3a7c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY4.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY5.png
new file mode 100644
index 0000000000..ede77ea0da
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY5.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY6.png
new file mode 100644
index 0000000000..c32a8588c3
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY6.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY7.png
new file mode 100644
index 0000000000..fa6ea151b7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY7.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY8.png
new file mode 100644
index 0000000000..0eb77d7fcc
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY8.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY9.png
new file mode 100644
index 0000000000..c67487b604
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_EMPTY9.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY1.png
new file mode 100644
index 0000000000..56d6e6bc07
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY1.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY2.png
new file mode 100644
index 0000000000..c20c728690
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY2.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY3.png
new file mode 100644
index 0000000000..fe22003fc4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY3.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY4.png
new file mode 100644
index 0000000000..77ded45ca2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY4.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY5.png
new file mode 100644
index 0000000000..ede77ea0da
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY5.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY6.png
new file mode 100644
index 0000000000..24cf02fab0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY6.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY7.png
new file mode 100644
index 0000000000..fe683aa60f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY7.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY8.png
new file mode 100644
index 0000000000..552ff6c5c2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY8.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY9.png
new file mode 100644
index 0000000000..27d14c04cd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_EMPTY9.png
Binary files differ