Moved all coils to another block.

src/main/java/gregtech/api/enums/ItemList.java

@@ -533,7 +533,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, Casing_Coil_Kanthal, Casing_Coil_Nichrome, 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_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,
@@ -629,7 +629,7 @@ public enum ItemList implements IItemContainer {
     Ingot_Heavy1, Ingot_Heavy2, Ingot_Heavy3,
     Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV, Pump_LuV, Pump_ZPM, Pump_UV,
     Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, Casing_EngineIntake,
-    Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy,
+    Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_NaquadahAlloy, Casing_Coil_Superconductor,
     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,

src/main/java/gregtech/common/blocks/GT_Block_Casings1.java

@@ -28,10 +28,7 @@ public class GT_Block_Casings1
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block");
+
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
         ItemList.Casing_ULV.set(new ItemStack(this, 1, 0));
         ItemList.Casing_LV.set(new ItemStack(this, 1, 1));
         ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
@@ -44,10 +41,6 @@ public class GT_Block_Casings1
         ItemList.Casing_MAX.set(new ItemStack(this, 1, 9));
         ItemList.Casing_BronzePlatedBricks.set(new ItemStack(this, 1, 10));
         ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11));
-        ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 12));
-        ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 13));
-        ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 14));
-        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));
     }
 
     public IIcon getIcon(int aSide, int aMeta) {
@@ -57,14 +50,6 @@ public class GT_Block_Casings1
                     return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
                 case 11:
                     return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
-                case 12:
-                    return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
-                case 13:
-                    return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
-                case 14:
-                    return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
-                case 15:
-                    return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
             }
             if (aSide == 0) {
                 return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon();

src/main/java/gregtech/common/blocks/GT_Block_Casings5.java

@@ -16,20 +16,36 @@ 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() + ".4.name", "Tungstensteel Coil Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Alloy 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() + ".5.name", "Superconducting Coil Block");
 
-        ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0));
-        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 5));
+        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_Superconductor.set(new ItemStack(this, 1, 5));
     }
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int aSide, int aMeta) {
         switch (aMeta) {
-            case 4:
+            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 5:
+            case 4:
                 return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
+            case 5:
+                return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
         }
         return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
     }

src/main/java/gregtech/common/blocks/GT_Item_Casings1.java

@@ -1,28 +1,10 @@
 package gregtech.common.blocks;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-import java.util.List;
 
 public class GT_Item_Casings1
         extends GT_Item_Casings_Abstract {
     public GT_Item_Casings1(Block par1) {
         super(par1);
     }
-
-    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-        super.addInformation(aStack, aPlayer, aList, aF3_H);
-        switch (getDamage(aStack)) {
-            case 12:
-                aList.add(this.mCoil01Tooltip);
-                break;
-            case 13:
-                aList.add(this.mCoil02Tooltip);
-                break;
-            case 14:
-                aList.add(this.mCoil03Tooltip);
-        }
-    }
 }

src/main/java/gregtech/common/blocks/GT_Item_Casings5.java

@@ -18,10 +18,19 @@ 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 4:
+            case 0:
+                aList.add(this.mCoil01Tooltip);
+                break;
+            case 1:
+                aList.add(this.mCoil02Tooltip);
+                break;
+            case 2:
+                aList.add(this.mCoil03Tooltip);
+                break;
+            case 3:
                 aList.add(this.mCoil04Tooltip);
                 break;
-            case 5:
+            case 4:
                 aList.add(this.mCoil05Tooltip);
                 break;
         }

src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java

@@ -144,41 +144,35 @@ 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;
+                break;
+            case 1:
+                this.mHeatingCapacity = 2700;
+                break;
+            case 2:
+                this.mHeatingCapacity = 3600;
+                break;
+            case 3:
+                this.mHeatingCapacity = 4500;
+                break;
             case 4:
-                this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0;
+                this.mHeatingCapacity = 9001;
-                break;
-            case 5:
-                this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0;
-                break;
-            case 12:
-                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800;
-                break;
-            case 13:
-                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700;
-                break;
-            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.sBlockCasings1 && !tUseAdvancedCoils ||
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5) {
-                        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.sBlockCasings1 && !tUseAdvancedCoils ||
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) {
-                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
                         return false;
                     }
                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {

src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java

@@ -39,12 +39,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC
 
     @Override
     public Block getFusionCoil() {
-        return GregTech_API.sBlockCasings1;
+        return GregTech_API.sBlockCasings5;
     }
 
     @Override
     public int getFusionCoilMeta() {
-        return 15;
+        return 5;
     }
 
     public String[] getDescription() {

src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java

@@ -106,34 +106,29 @@ 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;
+                break;
+            case 1:
+                this.mLevel = 2;
+                break;
+            case 2:
+                this.mLevel = 4;
+                break;
+            case 3:
+                this.mLevel = 8;
+                break;
             case 4:
-                this.mLevel = tUseAdvancedCoils ? 8 : 0;
+                this.mLevel = 16;
-                break;
-            case 5:
-                this.mLevel = tUseAdvancedCoils ? 16 : 0;
-                break;
-            case 12:
-                this.mLevel = tUseAdvancedCoils ? 0 : 1;
-                break;
-            case 13:
-                this.mLevel = tUseAdvancedCoils ? 0 : 2;
-                break;
-            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.sBlockCasings1 && !tUseAdvancedCoils ||
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) {
-                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) {
                         return false;
                     }
                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {

src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java

@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.machines.multi;
 
+import java.util.ArrayList;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -17,8 +19,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-
 public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBase {
 
     public GT_MetaTileEntity_OilCracker(int aID, String aName, String aNameRegional) {
@@ -120,10 +120,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa
                         if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) {
                             if (h == 1 || h == -1) {
                                 IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, j, h + zDir);
-                                if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings1) {
+                                if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings5) {
                                     return false;
                                 }
-                                if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 12) {
+                                if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 0) {
                                     return false;
                                 }
                             }
@@ -167,10 +167,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa
                         if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) {
                             if (h == 1 || h == -1) {
                                 IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + h, j, i + zDir);
-                                if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings1) {
+                                if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings5) {
                                     return false;
                                 }
-                                if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 12) {
+                                if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 0) {
                                     return false;
                                 }
                             }
@@ -246,4 +246,4 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa
         return new GT_MetaTileEntity_OilCracker(this.mName);
     }
 
-}
+}

src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java

@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.machines.multi;
 
+import java.util.ArrayList;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -15,8 +17,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-
 public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlockBase {
 
     public GT_MetaTileEntity_PyrolyseOven(int aID, String aName, String aNameRegional) {
@@ -105,10 +105,10 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock
                     IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
                     if ((i != -2 && i != 2) && (j != -2 && j != 2)) {// innerer 3x3 ohne h<EFBFBD>he
                         if (h == 0) {// innen boden (kantal coils)
-                            if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) {
+                            if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings5) {
                                 return false;
                             }
-                            if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) {
+                            if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) {
                                 return false;
                             }
                         } else if (h == 3) {// innen decke (ulv casings + input + muffler)
@@ -186,4 +186,4 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock
         return new GT_MetaTileEntity_PyrolyseOven(this.mName);
     }
 
-}
+}