Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatible

Heating coils moved to separated block.

7 files changed, 110 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..4084a15da6 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
@@ -28,9 +28,9 @@ 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() + ".12.name", "Cupronickel Coil Block (Overheated)");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Overheated)");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Overheated)");

         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));

@@ -44,9 +44,9 @@ 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_Cupronickel_Overheated.set(new ItemStack(this, 1, 12));

+        ItemList.Casing_Coil_Kanthal_Overheated.set(new ItemStack(this, 1, 13));

+        ItemList.Casing_Coil_Nichrome_Overheated.set(new ItemStack(this, 1, 14));

         ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));

     }

 

@@ -58,11 +58,11 @@ public class GT_Block_Casings1
                 case 11:

                     return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();

                 case 12:

-                    return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();

+                    return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL_OVERHEATED.getIcon();

                 case 13:

-                    return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();

+                    return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon();

                 case 14:

-                    return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();

+                    return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon();

                 case 15:

                     return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();

             }

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
index 8b1e4a4aa9..3c3535e4da 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -37,8 +37,6 @@ public class GT_Block_Casings4
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Tungstensteel Coil Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Naquadah Alloy Coil Block");
 
         ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
@@ -52,8 +50,6 @@ public class GT_Block_Casings4
         ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11));
         ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12));
         ItemList.Casing_EngineIntake.set(new ItemStack(this, 1, 13));
-        ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 14));
-        ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 15));
     }
 
     public IIcon getIcon(int aSide, int aMeta) {
@@ -87,9 +83,9 @@ public class GT_Block_Casings4
             case 13:
                 return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon();
             case 14:
-                return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
             case 15:
-                return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
         }
         return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.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
new file mode 100644
index 0000000000..b94346f2cf
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -0,0 +1,48 @@
+package gregtech.common.blocks;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class GT_Block_Casings5
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings5() {
+        super(GT_Item_Casings5.class, "gt.blockcasings5", GT_Material_Casings.INSTANCE);
+        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");
+
+        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));
+    }
+    @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_NAQUADAHALLOY.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..81b865d4fe 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,27 @@
 package gregtech.common.blocks;

 

+import java.util.List;

+

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import net.minecraft.block.Block;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

-

-import java.util.List;

+import net.minecraft.util.EnumChatFormatting;

 

 public class GT_Item_Casings1

         extends GT_Item_Casings_Abstract {

     public GT_Item_Casings1(Block par1) {

         super(par1);

     }

-

+    @Override

+    @SideOnly(Side.CLIENT)

     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);

+        int tMeta = getDamage(aStack);

+        if (tMeta >= 12 && tMeta <= 14) {

+            aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated1Tooltip);

+            aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated2Tooltip);

         }

     }

 }

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
index 3dcfbf3c09..33447673cb 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
@@ -1,25 +1,10 @@
 package gregtech.common.blocks;

 

-import java.util.List;

-

 import net.minecraft.block.Block;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

 

 public class GT_Item_Casings4

         extends GT_Item_Casings_Abstract {

     public GT_Item_Casings4(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 14:

-                aList.add(this.mCoil04Tooltip);

-                break;

-            case 15:

-                aList.add(this.mCoil05Tooltip);

-                break;

-        }

-    }

 }

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
new file mode 100644
index 0000000000..7b5f281006
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -0,0 +1,38 @@
+package gregtech.common.blocks;
+
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class GT_Item_Casings5
+        extends GT_Item_Casings_Abstract {
+    public GT_Item_Casings5(Block par1) {
+        super(par1);
+    }
+    @Override
+    @SideOnly(Side.CLIENT)
+    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:
+                aList.add(this.mCoil04Tooltip);
+                break;
+            case 4:
+                aList.add(this.mCoil05Tooltip);
+                break;
+        }
+    }
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
index 77fb8aacb2..8b34167c91 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
@@ -18,6 +18,8 @@ public abstract class GT_Item_Casings_Abstract
     protected final String mCoil03Tooltip = GT_LanguageManager.addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin");

     protected final String mCoil04Tooltip = GT_LanguageManager.addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 4500 Kelvin");

     protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 9001 Kelvin");

+    protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are overheated");

+    protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to repair");

     protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");

     public GT_Item_Casings_Abstract(Block par1) {

         super(par1);