diff options
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
21 files changed, 84 insertions, 175 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index 49f15e328c..072259f2ee 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -20,7 +20,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) { @@ -84,16 +83,6 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); @@ -106,23 +95,13 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - - @Override - public int quantityDropped(Random par1Random) { - return 1; + public int damageDropped(int metadata) { + return metadata; } @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -132,7 +111,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index 851b84b5c3..24b8635c86 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -156,7 +156,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public boolean canConnectRedstone(IBlockAccess var1, int var2, int var3, int var4, int var5) { + public boolean canConnectRedstone(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { return true; } @@ -339,7 +339,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) { + public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity == null) { return false; @@ -361,7 +361,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo if ((!aWorld.isRemote) && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer)) { return true; } - return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, par1, par2, par3); + return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, aOffsetX, aOffsetY, aOffsetZ); } return false; } @@ -394,7 +394,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) { + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) { @@ -423,7 +423,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } } } - super.breakBlock(aWorld, aX, aY, aZ, par5, par6); + super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata); aWorld.removeTileEntity(aX, aY, aZ); } @@ -490,7 +490,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) { + public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) { if (!aWorld.isRemote) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity != null && (chance < 1.0F)) { @@ -500,7 +500,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo ((BaseMetaTileEntity) tTileEntity).doEnergyExplosion(); } } else { - super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7); + super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune); } } } @@ -568,7 +568,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @Override public float getExplosionResistance( - Entity par1Entity, World aWorld, int aX, int aY, int aZ, + Entity entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) { @@ -580,10 +580,10 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @SideOnly(Side.CLIENT) @Override @SuppressWarnings("unchecked") // Old API uses raw List type - public void getSubBlocks(Item par1Item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List outputSubBlocks) { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { if (GregTech_API.METATILEENTITIES[i] != null) { - par3List.add(new ItemStack(par1Item, 1, i)); + outputSubBlocks.add(new ItemStack(item, 1, i)); } } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 6c2ebed490..3a7f231761 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -138,7 +138,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) { + public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) { if (!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode) { return false; } @@ -181,7 +181,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) { return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F; } @@ -222,16 +222,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public TileEntity createNewTileEntity(World aWorld, int aMeta) { return createTileEntity(aWorld, aMeta); } @@ -277,12 +267,12 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) { + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity); } - super.breakBlock(aWorld, aX, aY, aZ, par5, par6); + super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata); aWorld.removeTileEntity(aX, aY, aZ); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index fc49ecc597..79087b8ae4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -31,7 +31,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; @@ -72,7 +71,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { ItemList.Block_BedrockiumCompressed.set(new ItemStack(this.setHardness(1500.0f).setResistance(5000.0f), 1, 12)); GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(Items.coal, 1, 1), new Object[]{ItemList.Block_BrittleCharcoal.get(1)}); GT_ModHandler.addCraftingRecipe(ItemList.Block_Powderbarrel.get(1L),GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WSW","GGG","WGW", 'W', OrePrefixes.plate.get(Materials.Wood), 'G', new ItemStack(Items.gunpowder,1),'S',new ItemStack(Items.string,1)}); - + } @Override @@ -166,7 +165,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { if (world == null) { return 0.0F; } @@ -202,7 +201,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { return 2500.0F; } - return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); + return super.getExplosionResistance(entity, world, x, y, z, explosionX, explosionY, explosionZ); } @Override @@ -226,49 +225,29 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return false; } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - - @Override - public int quantityDropped(Random par1Random) { - return 1; + public int damageDropped(int metadata) { + return metadata; } @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override - public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) { - if (par5 == 4) { + public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) { + if (aMetadata == 4) { this.dropBlockAsItem(aWorld, aX, aY, aZ, new ItemStack(Items.coal, XSTR_INSTANCE.nextInt(2) + 1, 1)); } else { - super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7); + super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune); } } - + @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { @@ -287,7 +266,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } return super.removedByPlayer(world, player, x, y, z); } - + @Override public void onBlockAdded(World world, int x, int y, int z) { @@ -296,7 +275,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { removedByPlayer(world, null, x, y, z); } } - + @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block neighbor) { @@ -304,7 +283,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { removedByPlayer(world, null, x, y, z); } } - + @Override public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { if (!world.isRemote && world.getBlockMetadata(x, y, z)==5){ @@ -314,17 +293,17 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } super.onBlockExploded(world, x, y, z, explosion); } - + @Override - public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) { - if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel)&&par1World.getBlockMetadata(x, y, z)==5) + if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel)&&world.getBlockMetadata(x, y, z)==5) { - removedByPlayer(par1World, player, x, y, z); - + removedByPlayer(world, player, x, y, z); + return true; } - return super.onBlockActivated(par1World, x, y, z, player, side, xOffset, yOffset, zOffset); + return super.onBlockActivated(world, x, y, z, player, side, xOffset, yOffset, zOffset); } @Override @@ -334,13 +313,13 @@ public class GT_Block_Reinforced extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); } } - + @Override public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { return !(entity instanceof EntityWither); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java index 2f816b93c0..b3c0a1811c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java @@ -22,7 +22,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRecipeRegistrator { public GT_Block_Stones_Abstract(Class<? extends ItemBlock> aItemClass, String aName) { @@ -100,14 +99,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe return true; } @Override - public boolean renderAsNormalBlock() { - return true; - } - @Override - public boolean isOpaqueCube() { - return true; - } - @Override public IIcon getIcon(int aSide, int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon(); @@ -120,21 +111,12 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe return world.getBlockMetadata(x, y, z) % 8 < 3; } @Override - public int damageDropped(int par1) { - return par1 % 8 == 0 ? par1 + 1 : par1; + public int damageDropped(int metadata) { + return metadata % 8 == 0 ? metadata + 1 : metadata; } @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - @Override - public int quantityDropped(Random par1Random) { - return 1; - } - - @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -144,7 +126,7 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java index 0a05ab300c..7c1fd49db1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java @@ -18,7 +18,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class GT_Block_Storage extends GT_Generic_Block { @@ -69,38 +68,18 @@ public class GT_Block_Storage extends GT_Generic_Block { } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return true; } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - - @Override - public int quantityDropped(Random par1Random) { - return 1; + public int damageDropped(int metadata) { + return metadata; } @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -110,7 +89,7 @@ public class GT_Block_Storage extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i)); } 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 98b0c24c61..f61f8360fa 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumChatFormatting; import java.util.List; public class GT_Item_Casings1 extends GT_Item_Casings_Abstract { - public GT_Item_Casings1(Block par1) { - super(par1); + public GT_Item_Casings1(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java index ed705d0c57..11a3aed3af 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack; import java.util.List; public class GT_Item_Casings2 extends GT_Item_Casings_Abstract { - public GT_Item_Casings2(Block par1) { - super(par1); + public GT_Item_Casings2(Block block) { + super(block); } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java index b9eac8252a..d80d88d2d1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings3 extends GT_Item_Casings_Abstract { - public GT_Item_Casings3(Block par1) { - super(par1); + public GT_Item_Casings3(Block block) { + super(block); } } 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 10b39e3ea8..7848398a0b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings4 extends GT_Item_Casings_Abstract { - public GT_Item_Casings4(Block par1) { - super(par1); + public GT_Item_Casings4(Block block) { + super(block); } } 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 c93f8bb38c..a0890ce154 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; import java.util.List; public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { - public GT_Item_Casings5(Block par1) { - super(par1); + public GT_Item_Casings5(Block block) { + super(block); } protected static final String mCoilHeatTooltip = GT_LanguageManager.addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = "); @@ -26,4 +26,4 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage()); aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip); } -}
\ No newline at end of file +} diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java index ebeab2f0aa..f4a8d38ba6 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings6 extends GT_Item_Casings_Abstract { - public GT_Item_Casings6(Block par1) { - super(par1); + public GT_Item_Casings6(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java index 19ca06d5ac..0d87b5d906 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings8 extends GT_Item_Casings_Abstract { - public GT_Item_Casings8(Block par1) { - super(par1); + public GT_Item_Casings8(Block block) { + super(block); } } 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 6a4b6e0695..33b428772d 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 @@ -23,8 +23,8 @@ public abstract class GT_Item_Casings_Abstract extends ItemBlock { protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin"); protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof"); - public GT_Item_Casings_Abstract(Block par1) { - super(par1); + public GT_Item_Casings_Abstract(Block block) { + super(block ); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java index bf8957afb4..1417aa4c39 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java @@ -10,8 +10,8 @@ import java.util.List; public class GT_Item_Concretes extends GT_Item_Stones_Abstract { private final String mRunFasterToolTip = GT_LanguageManager.addStringLocalization("gt.runfastertooltip", "You can walk faster on this Block"); - public GT_Item_Concretes(Block par1) { - super(par1); + public GT_Item_Concretes(Block block) { + super(block); } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java index d14474c17f..e0df50d07b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Granites extends GT_Item_Stones_Abstract { - public GT_Item_Granites(Block par1) { - super(par1); + public GT_Item_Granites(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java index e376933623..c63f10b8f4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java @@ -13,13 +13,13 @@ public class GT_Item_LongDistancePipe extends ItemBlock { protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); protected final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - public GT_Item_LongDistancePipe(Block par1) { - super(par1); + public GT_Item_LongDistancePipe(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); } - + @Override public int getMetadata(int aMeta) { return aMeta; diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index 18b1d073e5..2a108aca71 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -40,8 +40,8 @@ import java.util.List; import static gregtech.GT_Mod.GT_FML_LOGGER; public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { - public GT_Item_Machines(Block par1) { - super(par1); + public GT_Item_Machines(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH); @@ -59,7 +59,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { @Override @SuppressWarnings("unchecked") - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean par4) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { try { final int tDamage = getDamage(aStack); if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) { diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java index ab31233abc..63c3babfbb 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class GT_Item_Ores extends ItemBlock { - public GT_Item_Ores(Block par1) { - super(par1); + public GT_Item_Ores(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java index 5170b1cbeb..b75743e110 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java @@ -12,8 +12,8 @@ import java.util.List; public class GT_Item_Stones_Abstract extends ItemBlock { private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - public GT_Item_Stones_Abstract(Block par1) { - super(par1); + public GT_Item_Stones_Abstract(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java index 3696cd4fc2..10cc3ea1ac 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import java.util.List; public class GT_Item_Storage extends ItemBlock { - public GT_Item_Storage(Block par1) { - super(par1); + public GT_Item_Storage(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); |