aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-10-07 17:11:52 +1000
committerAlkalus <draknyte1@hotmail.com>2017-10-07 17:11:52 +1000
commit89d0c5a37a6b982d30a24350492fe8d7acb0d63c (patch)
tree5448f202d640f9d0619a0949167bf1053d24e149 /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities
parented7ce97e350bbc6fc794a4b0a76902a293026373 (diff)
downloadGT5-Unofficial-89d0c5a37a6b982d30a24350492fe8d7acb0d63c.tar.gz
GT5-Unofficial-89d0c5a37a6b982d30a24350492fe8d7acb0d63c.tar.bz2
GT5-Unofficial-89d0c5a37a6b982d30a24350492fe8d7acb0d63c.zip
$ Fixed Textures further on the Industrial Centrifuge.
$ Fixed the issue where two textures would become Fusion Reactor casings. Fixed thanks to @Technus
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java
index 460965de05..ac288eb3ab 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -76,7 +76,12 @@ extends GregtechMeta_MultiBlockBase {
@Override
public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[TAE.GTPP_INDEX(0)][aColorIndex + 1], aFacing == aSide ? aActive ? frontFaceActive : frontFace : Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(0)]};
+ try {
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[TAE.GTPP_INDEX(0)][aColorIndex + 1], aFacing == aSide ? aActive ? frontFaceActive : frontFace : Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(0)]};
+ }
+ catch (Throwable t){
+ return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[0][aColorIndex + 1], aFacing == aSide ? aActive ? frontFaceActive : frontFace : Textures.BlockIcons.CASING_BLOCKS[0]};
+ }
}
@@ -164,9 +169,9 @@ extends GregtechMeta_MultiBlockBase {
this.mEUt = (-this.mEUt);
}
this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
-
+
ItemStack mNewOutputs[] = new ItemStack[tRecipe.mOutputs.length];
-
+
for (int i = 0; i < tRecipe.mOutputs.length; i++){
if (this.getBaseMetaTileEntity().getRandomNumber(7500) < tRecipe.getOutputChance(i)){
//Utils.LOG_INFO("Adding a bonus output | "+tRecipe.getOutputChance(i));
@@ -177,7 +182,7 @@ extends GregtechMeta_MultiBlockBase {
mNewOutputs[i] = null;
}
}
-
+
this.mOutputItems = mNewOutputs;
this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
updateSlots();