Moved all coils to another block.

4 files changed, 34 insertions, 42 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
index 6e4231f5dc..a9c07358be 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/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();

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 bcbc9af660..c76354d9a2 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/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() + ".5.name", "Naquadah Alloy Coil Block");
+        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() + ".5.name", "Superconducting Coil Block");
 
-        ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 4));
-        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 5));
+        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_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();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
index a02124706e..c253cca548 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
+++ b/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);

-        }

-    }

 }

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 8e828d1220..7b5f281006 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/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;
         }