From 0fb33291764c70f1ada01d3061431fac794b5d2a Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 10:05:44 +0300 Subject: 8bf5b61dea476ce950ed523293658780217b203f --- .../java/gregtech/common/blocks/GT_Block_Casings1.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Casings1.java') 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 67e37eba82..3faa9c30e6 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(); -- cgit From 718d28bd2379ea67c46a284eab7723abfa5bf410 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 14:56:21 +0300 Subject: ea5305f7dfbb06b7285ee50a7406e2d67b666147 --- .../java/gregtech/common/blocks/GT_Block_Casings1.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Casings1.java') 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 3faa9c30e6..cc6606357f 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -28,7 +28,10 @@ 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 (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)); ItemList.Casing_MV.set(new ItemStack(this, 1, 2)); @@ -41,6 +44,10 @@ 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_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)); } public IIcon getIcon(int aSide, int aMeta) { @@ -50,6 +57,14 @@ 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_OVERHEATED.getIcon(); + case 13: + return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon(); + case 14: + return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon(); + case 15: + return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } if (aSide == 0) { return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); -- cgit From 6121acb8434ce7298b4aacd068baf6a50c1aaa43 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 10:05:44 +0300 Subject: 8bf5b61dea476ce950ed523293658780217b203f --- .../java/gregtech/common/blocks/GT_Block_Casings1.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Casings1.java') 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 cc6606357f..315d8b8692 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 (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)); 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_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)); } 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_OVERHEATED.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon(); - case 14: - return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon(); - case 15: - return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } if (aSide == 0) { return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); @@ -80,5 +65,4 @@ public class GT_Block_Casings1 public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) { return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2]; } - } -- cgit From aca07ff36e3398d8c25f31c492aade42a8850864 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 14:56:21 +0300 Subject: ea5305f7dfbb06b7285ee50a7406e2d67b666147 --- .../java/gregtech/common/blocks/GT_Block_Casings1.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Casings1.java') 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 315d8b8692..38f591f185 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -28,7 +28,10 @@ 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 (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)); ItemList.Casing_MV.set(new ItemStack(this, 1, 2)); @@ -41,6 +44,10 @@ 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_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)); } public IIcon getIcon(int aSide, int aMeta) { @@ -50,6 +57,14 @@ 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_OVERHEATED.getIcon(); + case 13: + return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon(); + case 14: + return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon(); + case 15: + return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } if (aSide == 0) { return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); -- cgit From cda6044614431206536a905aef4ef307bf5a7763 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Tue, 26 Jul 2016 07:31:57 +0300 Subject: c4bd35d7cd38db6af45723a359b7de5ffafa68f6 --- .../java/gregtech/common/blocks/GT_Block_Casings1.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Casings1.java') 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 38f591f185..89f0446aa5 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 (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() + ".12.name", "Cupronickel Coil Block (Deprecated)"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Deprecated)"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Deprecated)"); 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_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_Cupronickel_Deprecated.set(new ItemStack(this, 1, 12)); + ItemList.Casing_Coil_Kanthal_Deprecated.set(new ItemStack(this, 1, 13)); + ItemList.Casing_Coil_Nichrome_Deprecated.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_OVERHEATED.getIcon(); + return Textures.BlockIcons.RENDERING_ERROR.getIcon(); case 13: - return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon(); + return Textures.BlockIcons.RENDERING_ERROR.getIcon(); case 14: - return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon(); + return Textures.BlockIcons.RENDERING_ERROR.getIcon(); case 15: return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } -- cgit