diff options
| author | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-20 10:27:47 +0300 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-25 22:53:13 +0200 |
| commit | d0396c268c8c4a7ee550a9ce2e9ecadcb2e91b80 (patch) | |
| tree | 907c33532570b69b793e3ba6e9608aa88d93d117 /src/main/java/gregtech/common/blocks | |
| parent | aca07ff36e3398d8c25f31c492aade42a8850864 (diff) | |
| download | GT5-Unofficial-d0396c268c8c4a7ee550a9ce2e9ecadcb2e91b80.tar.gz GT5-Unofficial-d0396c268c8c4a7ee550a9ce2e9ecadcb2e91b80.tar.bz2 GT5-Unofficial-d0396c268c8c4a7ee550a9ce2e9ecadcb2e91b80.zip | |
f98e51a82f646fa34172ce079a4b432ef3affffd
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
3 files changed, 18 insertions, 4 deletions
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 b94346f2cf..f19f82a0d1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -20,13 +20,17 @@ public class GT_Block_Casings5 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() + ".4.name", "Naquadah Alloy Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.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)); + //ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4)); + ItemList.Casing_Coil_Naquadah.set(new ItemStack(this, 1, 5)); + ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 6)); } @Override @SideOnly(Side.CLIENT) @@ -40,7 +44,9 @@ public class GT_Block_Casings5 return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon(); case 3: return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); - case 4: + case 5: + return Textures.BlockIcons.MACHINE_COIL_NAQUADAH.getIcon(); + case 6: 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_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java index 7b5f281006..36e7fea047 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -33,6 +33,12 @@ public class GT_Item_Casings5 case 4: aList.add(this.mCoil05Tooltip); break; + case 5: + aList.add(this.mCoil06Tooltip); + break; + case 6: + aList.add(this.mCoil07Tooltip); + 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 b79efe4ae8..b4cc465476 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 @@ -17,7 +17,9 @@ public abstract class GT_Item_Casings_Abstract protected final String mCoil02Tooltip = GT_LanguageManager.addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin"); 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 mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin"); + protected final String mCoil06Tooltip = GT_LanguageManager.addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin"); + protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization("gt.coil07tooltip", "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"); |
