$ Fixed Textures further on the Industrial Centrifuge.

$ Fixed the issue where two textures would become Fusion Reactor casings. Fixed thanks to @Technus

5 files changed, 16 insertions, 13 deletions

diff --git a/src/Java/gregtech/api/enums/TAE.java b/src/Java/gregtech/api/enums/TAE.java
index 04a8d16ee8..c6fc8c7790 100644
--- a/src/Java/gregtech/api/enums/TAE.java
+++ b/src/Java/gregtech/api/enums/TAE.java
@@ -35,14 +35,15 @@ public class TAE {
 		return true;
 	}
 
-	public static boolean registerTextures(GT_RenderedTexture textureToRegister) {
-		Textures.BlockIcons.CASING_BLOCKS[gtPPLastUsedIndex++] = textureToRegister;
+	/*public static boolean registerTextures(GT_RenderedTexture textureToRegister) {
+		Textures.BlockIcons.CASING_BLOCKS[gtPPLastUsedIndex] = textureToRegister;
 		//Just so I know registration is done.
 		return true;
-	}
+	}*/
 
 	public static boolean registerTextures(GT_CopiedBlockTexture gt_CopiedBlockTexture) {
-		Textures.BlockIcons.CASING_BLOCKS[gtPPLastUsedIndex++] = gt_CopiedBlockTexture;
+		Textures.BlockIcons.CASING_BLOCKS[gtPPLastUsedIndex] = gt_CopiedBlockTexture;
+		gtPPLastUsedIndex++;
 		//Just so I know registration is done.
 		return true;
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index c05df6ade3..852fd6c72b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -8,7 +8,6 @@ import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -62,8 +61,6 @@ extends GregtechMetaCasingBlocksAbstract {
 		return CasingTextureHandler.getIcon(aSide, aMeta);
 	}
 
-
-
 	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index 3becc6b1ec..1ddf68bf94 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -34,7 +34,7 @@ public class CasingTextureHandler {
 				return TexturesGtBlock.Casing_Material_Potin.getIcon();
 				//Broken Blue Fusion Casings
 			case 6:
-				return Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon();
+				return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
 				//Maceration Stack Casings
 			case 7:
 				return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index 356bc2f9e0..fe31836899 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -81,7 +81,7 @@ public class TexturesCentrifugeMultiblock {
 
 	public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks thisBlock) {
 		final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
-		if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) {
+		if (tMeta != 0) {
 			return CasingTextureHandler.getIcon(aSide, tMeta);
 		}
 		final int tStartIndex = tMeta == 6 ? 1 : 13;
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();