Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatible

Heating coils moved to separated block.

1 files changed, 11 insertions, 12 deletions

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

         }

     }

 }