Little clean and format change

This commit is contained in:
Gig 2015-05-17 22:58:53 +01:00
parent ce4312a578
commit 20a9cabf93
9 changed files with 126 additions and 263 deletions

View file

@ -28,8 +28,7 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
public static final int tier = ConfigTechReborn.AdvancedDrillTier;
public double transferLimit = 100;
public ItemAdvancedDrill()
{
public ItemAdvancedDrill(){
super(ToolMaterial.EMERALD);
efficiencyOnProperMaterial = 20F;
setCreativeTab(TechRebornCreativeTab.instance);
@ -40,8 +39,7 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister)
{
public void registerIcons(IIconRegister iconRegister){
this.itemIcon = iconRegister.registerIcon("techreborn:"
+ "tool/advancedDrill");
}
@ -49,111 +47,86 @@ public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem {
@SuppressWarnings(
{ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs,
List itemList)
{
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList){
ItemStack itemStack = new ItemStack(this, 1);
if (getChargedItem(itemStack) == this)
{
if (getChargedItem(itemStack) == this){
ItemStack charged = new ItemStack(this, 1);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true,
false);
ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false);
itemList.add(charged);
}
if (getEmptyItem(itemStack) == this)
{
if (getEmptyItem(itemStack) == this){
itemList.add(new ItemStack(this, 1, getMaxDamage()));
}
}
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block,
int par4, int par5, int par6, EntityLivingBase entityLiving)
{
int par4, int par5, int par6, EntityLivingBase entityLiving){
ElectricItem.manager.use(stack, cost, entityLiving);
return true;
}
@Override
public boolean canHarvestBlock(Block block, ItemStack stack)
{
return Items.diamond_pickaxe.canHarvestBlock(block, stack)
|| Items.diamond_shovel.canHarvestBlock(block, stack);
public boolean canHarvestBlock(Block block, ItemStack stack){
return Items.diamond_pickaxe.canHarvestBlock(block, stack)|| Items.diamond_shovel.canHarvestBlock(block, stack);
}
@Override
public float getDigSpeed(ItemStack stack, Block block, int meta)
{
if (!ElectricItem.manager.canUse(stack, cost))
{
public float getDigSpeed(ItemStack stack, Block block, int meta){
if (!ElectricItem.manager.canUse(stack, cost)){
return 4.0F;
}
if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F
|| Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F)
{
if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F){
return efficiencyOnProperMaterial;
} else
{
} else {
return super.getDigSpeed(stack, block, meta);
}
}
@Override
public boolean hitEntity(ItemStack itemstack,
EntityLivingBase entityliving, EntityLivingBase entityliving1)
{
public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1){
return true;
}
@Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world,
int x, int y, int z, int side, float xOffset, float yOffset,
float zOffset)
{
return TorchHelper.placeTorch(stack, player, world, x, y, z, side,
xOffset, yOffset, zOffset);
int x, int y, int z, int side, float xOffset, float yOffset, float zOffset){
return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
}
@Override
public boolean isRepairable()
{
public boolean isRepairable(){
return false;
}
@Override
public boolean canProvideEnergy(ItemStack itemStack)
{
public boolean canProvideEnergy(ItemStack itemStack){
return false;
}
@Override
public double getMaxCharge(ItemStack itemStack)
{
public double getMaxCharge(ItemStack itemStack){
return maxCharge;
}
@Override
public int getTier(ItemStack itemStack)
{
public int getTier(ItemStack itemStack){
return tier;
}
@Override
public double getTransferLimit(ItemStack itemStack)
{
public double getTransferLimit(ItemStack itemStack){
return transferLimit;
}
@Override
public Item getChargedItem(ItemStack itemStack)
{
public Item getChargedItem(ItemStack itemStack){
return this;
}
@Override
public Item getEmptyItem(ItemStack itemStack)
{
public Item getEmptyItem(ItemStack itemStack){
return this;
}
}