diff options
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
3 files changed, 16 insertions, 25 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 2f8e248117..edbdacdfbd 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -1,5 +1,6 @@ package gregtech.common.blocks; +import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; import gregtech.api.render.TextureFactory; @@ -8,8 +9,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK; + public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { - + /** * Texture Index Information * Textures.BlockIcons.casingTexturePages[0][0-63] - Gregtech @@ -21,10 +24,10 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { * Textures.BlockIcons.casingTexturePages[5][0-127] - Free * Textures.BlockIcons.casingTexturePages[6][0-127] - Free * Textures.BlockIcons.casingTexturePages[7][0-127] - Free - * Textures.BlockIcons.casingTexturePages[8][0-127] - TecTech + * Textures.BlockIcons.casingTexturePages[8][0-127] - TecTech */ - - + + public GT_Block_Casings1() { super(GT_Item_Casings1.class, "gt.blockcasings", GT_Material_Casings.INSTANCE); for (int i = 0; i < 16; i++) { @@ -43,9 +46,9 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV 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 (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() + ".12.name", "Dimensionally Transcendent Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Dimensional Injection Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Dimensional Bridge"); 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)); @@ -59,9 +62,9 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { 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_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_Dim_Trans.set(new ItemStack(this, 1, 12)); + ItemList.Casing_Dim_Injector.set(new ItemStack(this, 1, 13)); + ItemList.Casing_Dim_Bridge.set(new ItemStack(this, 1, 14)); ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15)); } @@ -74,11 +77,11 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { case 11: return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); case 12: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return Textures.BlockIcons.MACHINE_DIM_TRANS_CASING.getIcon(); case 13: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return Textures.BlockIcons.MACHINE_DIM_INJECTOR.getIcon(); case 14: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return Textures.BlockIcons.MACHINE_DIM_BRIDGE.getIcon(); case 15: return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.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 bcb50b2176..98b0c24c61 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java @@ -13,14 +13,4 @@ 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); - 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_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java index 0468da20d8..6a4b6e0695 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 @@ -21,8 +21,6 @@ public abstract class GT_Item_Casings_Abstract extends ItemBlock { protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin"); protected final String mCoil08Tooltip = GT_LanguageManager.addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 9900 Kelvin"); protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin"); - protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are deprecated"); - protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to get regular coils"); protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof"); public GT_Item_Casings_Abstract(Block par1) { |