Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

1 files changed, 52 insertions, 33 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index 5a5c923d10..a9c8a1e9bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -2,21 +2,24 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import java.util.List;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
 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.TexturesGtBlock;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 
 
 public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbstract {
-
-
-	public static class SpecialCasingItemBlock extends GregtechMetaCasingItems {
+	
+	public static class SpecialCasingItemBlock extends GregtechMetaCasingItems {		
 
 		public SpecialCasingItemBlock(Block par1) {
 			super(par1);
@@ -49,9 +52,9 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Thermally Insulated Casing");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", ""); // Unused
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", ""); // Unused
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", ""); // Unused
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", ""); // Unused
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", ""); // Unused
 
@@ -66,37 +69,53 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
 		GregtechItemList.Casing_SolarTower_HeatContainment.set(new ItemStack(this, 1, 8));
 		GregtechItemList.Casing_Flotation_Cell.set(new ItemStack(this, 1, 9));
 		GregtechItemList.Casing_Reinforced_Engine_Casing.set(new ItemStack(this, 1, 10));
+		GregtechItemList.Casing_Molecular_Transformer_1.set(new ItemStack(this, 1, 11));
+		GregtechItemList.Casing_Molecular_Transformer_2.set(new ItemStack(this, 1, 12));
+		GregtechItemList.Casing_Molecular_Transformer_3.set(new ItemStack(this, 1, 13));
 	}	
-
-	public IIcon getIcon(int aSide, int aMeta) {
-
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
+		return LargeTurbineTextureHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, this);
+	}
+	@Override
+	public IIcon getIcon(final int aSide, final int aMeta) {
+		return getStaticIcon((byte) aSide, (byte) aMeta);
+	}
+	
+	public static IIcon getStaticIcon(final byte aSide, final byte aMeta) {
 		switch (aMeta) {
+			case 0:
+				return TexturesGtBlock.Casing_Redox_1.getIcon();
+			case 1:
+				return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
+			case 2:
+				return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+			case 3:
+				return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
+			case 4:
+				return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+			case 5:
+				return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
+			case 6:
+				return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();	
+			case 7:
+				return TexturesGtBlock.Casing_Material_Stellite.getIcon();
+			case 8:
+				return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+			case 9:
+				return TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon();
+			case 10:
+				return TexturesGtBlock.Casing_Material_Talonite.getIcon();
+			case 11:
+				return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+			case 12:
+				return TexturesGtBlock.Casing_Redox_5.getIcon();
+			case 13:
+				return TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon();
 
-		case 0:
-			return TexturesGtBlock.Casing_Redox_1.getIcon();
-		case 1:
-			return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
-		case 2:
-			return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
-		case 3:
-			return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
-		case 4:
-			return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
-		case 5:
-			return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
-		case 6:
-			return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();	
-		case 7:
-			return TexturesGtBlock.Casing_Material_Stellite.getIcon();
-		case 8:
-			return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
-		case 9:
-			return TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon();
-		case 10:
-			return TexturesGtBlock.Casing_Material_Talonite.getIcon();
-			
 		}
-
 		return Textures.BlockIcons.RENDERING_ERROR.getIcon();
 	}