ce1e6917e056c0a1300caefc175b10c68126832a

5 files changed, 44 insertions, 55 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 63d94e2e8c..3d08a74805 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -540,7 +540,7 @@ public enum ItemList implements IItemContainer {
 
     Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV,
 
-    Casing_ULV, Casing_LV, Casing_MV, Casing_HV, Casing_EV, Casing_IV, Casing_LuV, Casing_ZPM, Casing_UV, Casing_MAX, Casing_BronzePlatedBricks, Casing_HeatProof, Casing_Coil_Cupronickel_Overheated, Casing_Coil_Kanthal_Overheated, Casing_Coil_Nichrome_Overheated, Casing_Coil_Superconductor,
+    Casing_ULV, Casing_LV, Casing_MV, Casing_HV, Casing_EV, Casing_IV, Casing_LuV, Casing_ZPM, Casing_UV, Casing_MAX, Casing_BronzePlatedBricks, Casing_HeatProof, Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_Superconductor,
     Casing_SolidSteel, Casing_FrostProof, Casing_Gearbox_Bronze, Casing_Gearbox_Steel, Casing_Gearbox_Titanium, Casing_Gearbox_TungstenSteel, Casing_Processor, Casing_DataDrive, Casing_ContainmentField, Casing_Assembler, Casing_Pump, Casing_Motor, Casing_Pipe_Bronze, Casing_Pipe_Steel, Casing_Pipe_Titanium, Casing_Pipe_TungstenSteel,
     Casing_Stripes_A, Casing_Stripes_B, Casing_RadioactiveHazard, Casing_BioHazard, Casing_ExplosionHazard, Casing_FireHazard, Casing_AcidHazard, Casing_MagicHazard, Casing_FrostHazard, Casing_NoiseHazard, Casing_Grate, Casing_Vent, Casing_RadiationProof, Casing_Firebox_Bronze, Casing_Firebox_Steel, Casing_Firebox_TungstenSteel,
     Casing_RobustTungstenSteel, Casing_CleanStainlessSteel, Casing_StableTitanium, Casing_Firebox_Titanium,
@@ -636,7 +636,7 @@ public enum ItemList implements IItemContainer {
     Ingot_Heavy1, Ingot_Heavy2, Ingot_Heavy3,
     Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV,
     Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, Casing_EngineIntake,
-    Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy,
+    Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy,
     MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, MobRep_LuV, MobRep_ZPM, MobRep_UV, Cover_PlayerDetector, Machine_Multi_HeatExchanger,
     Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced,
     Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
index b94346f2cf..bcbc9af660 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -16,31 +16,19 @@ public class GT_Block_Casings5
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             Textures.BlockIcons.CASING_BLOCKS[(i + 64)] = new GT_CopiedBlockTexture(this, 6, i);
         }
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Naquadah Alloy Coil Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Tungstensteel Coil Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Alloy Coil Block");
 
-        ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
-        ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1));
-        ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 2));
-        ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 3));
-        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 5));
     }
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int aSide, int aMeta) {
         switch (aMeta) {
-            case 0:
-                return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
-            case 1:
-                return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
-            case 2:
-                return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
-            case 3:
-                return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
             case 4:
+                return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
+            case 5:
                 return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
         }
         return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
index 7b5f281006..8e828d1220 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -18,19 +18,10 @@ public class GT_Item_Casings5
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
         super.addInformation(aStack, aPlayer, aList, aF3_H);
         switch (getDamage(aStack)) {
-            case 0:
-                aList.add(this.mCoil01Tooltip);
-                break;
-            case 1:
-                aList.add(this.mCoil02Tooltip);
-                break;
-            case 2:
-                aList.add(this.mCoil03Tooltip);
-                break;
-            case 3:
+            case 4:
                 aList.add(this.mCoil04Tooltip);
                 break;
-            case 4:
+            case 5:
                 aList.add(this.mCoil05Tooltip);
                 break;
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index b98cef385e..6588a3126a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -144,35 +144,41 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
         addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11);
 
         byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir);
+        boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings5;
         switch (tUsedMeta) {
-            case 0:
-                this.mHeatingCapacity = 1800;
+            case 4:
+                this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0;
                 break;
-            case 1:
-                this.mHeatingCapacity = 2700;
+            case 5:
+                this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0;
                 break;
-            case 2:
-                this.mHeatingCapacity = 3600;
+            case 12:
+                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800;
                 break;
-            case 3:
-                this.mHeatingCapacity = 4500;
+            case 13:
+                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700;
                 break;
-            case 4:
-                this.mHeatingCapacity = 9001;
+            case 14:
+                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600;
                 break;
             default:
                 return false;
         }
+        if (this.mHeatingCapacity == 0) {
+            return false;
+        }
         for (int i = -1; i < 2; i++) {
             for (int j = -1; j < 2; j++) {
                 if ((i != 0) || (j != 0)) {
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||
+                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
                         return false;
                     }
                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j) != tUsedMeta) {
                         return false;
                     }
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||
+                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
                         return false;
                     }
                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index db68dc2bc7..615a0b7adc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -106,30 +106,34 @@ public class GT_MetaTileEntity_MultiFurnace
         addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 2, zDir), 11);
 
         byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 1, zDir);
+        boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings5;
         switch (tUsedMeta) {
-            case 0:
-                this.mLevel = 1;
+            case 4:
+                this.mLevel = tUseAdvancedCoils ? 8 : 0;
                 break;
-            case 1:
-                this.mLevel = 2;
+            case 5:
+                this.mLevel = tUseAdvancedCoils ? 16 : 0;
                 break;
-            case 2:
-                this.mLevel = 4;
+            case 12:
+                this.mLevel = tUseAdvancedCoils ? 0 : 1;
                 break;
-            case 3:
-                this.mLevel = 8;
+            case 13:
+                this.mLevel = tUseAdvancedCoils ? 0 : 2;
                 break;
-            case 4:
-                this.mLevel = 16;
+            case 14:
+                this.mLevel = tUseAdvancedCoils ? 0 : 4;
                 break;
             default:
                 return false;
-
+        }
+        if (this.mLevel == 0) {
+            return false;
         }
         for (int i = -1; i < 2; i++) {
             for (int j = -1; j < 2; j++) {
                 if ((i != 0) || (j != 0)) {
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||
+                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
                         return false;
                     }
                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {