Reformat code

1 files changed, 99 insertions, 127 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
index 28cd415aed..f74aeca505 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -1,14 +1,9 @@
 package gregtech.common.tools;

 

 import gregtech.api.GregTech_API;

-import gregtech.api.enums.Materials;

 import gregtech.api.enums.OrePrefixes;

 import gregtech.api.interfaces.IIconContainer;

 import gregtech.api.items.GT_MetaGenerated_Tool;

-

-import java.util.List;

-import java.util.Map;

-

 import net.minecraft.block.Block;

 import net.minecraft.block.material.Material;

 import net.minecraft.entity.EntityLivingBase;

@@ -17,130 +12,107 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;

 import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.util.IChatComponent;

-import net.minecraft.world.World;

 import net.minecraftforge.event.world.BlockEvent;

-import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent;

+

+import java.util.List;

 

 public class GT_Tool_Axe

-  extends GT_Tool

-{

-  public int getToolDamagePerBlockBreak()

-  {

-    return 50;

-  }

-  

-  public int getToolDamagePerDropConversion()

-  {

-    return 100;

-  }

-  

-  public int getToolDamagePerContainerCraft()

-  {

-    return 100;

-  }

-  

-  public int getToolDamagePerEntityAttack()

-  {

-    return 200;

-  }

-  

-  public int getBaseQuality()

-  {

-    return 0;

-  }

-  

-  public float getBaseDamage()

-  {

-    return 3.0F;

-  }

-  

-  public float getSpeedMultiplier()

-  {

-    return 2.0F;

-  }

-  

-  public float getMaxDurabilityMultiplier()

-  {

-    return 1.0F;

-  }

-  

-  public String getCraftingSound()

-  {

-    return null;

-  }

-  

-  public String getEntityHitSound()

-  {

-    return null;

-  }

-  

-  public String getBreakingSound()

-  {

-    return (String)GregTech_API.sSoundList.get(Integer.valueOf(0));

-  }

-  

-  public String getMiningSound()

-  {

-    return null;

-  }

-  

-  public boolean canBlock()

-  {

-    return false;

-  }

-  

-  public boolean isCrowbar()

-  {

-    return false;

-  }

-  

-  public boolean isWeapon()

-  {

-    return true;

-  }

-  

-  public boolean isMinableBlock(Block aBlock, byte aMetaData)

-  {

-    String tTool = aBlock.getHarvestTool(aMetaData);

-    return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);

-  }

-  

-  public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent)

-  {

-    int rAmount = 0;

-    if ((GregTech_API.sTimber) && (!aPlayer.isSneaking()) && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))))

-    {

-      int tY = aY + 1;

-      for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++)

-      {

-        if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock) || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {

-          break;

+        extends GT_Tool {

+    public int getToolDamagePerBlockBreak() {

+        return 50;

+    }

+

+    public int getToolDamagePerDropConversion() {

+        return 100;

+    }

+

+    public int getToolDamagePerContainerCraft() {

+        return 100;

+    }

+

+    public int getToolDamagePerEntityAttack() {

+        return 200;

+    }

+

+    public int getBaseQuality() {

+        return 0;

+    }

+

+    public float getBaseDamage() {

+        return 3.0F;

+    }

+

+    public float getSpeedMultiplier() {

+        return 2.0F;

+    }

+

+    public float getMaxDurabilityMultiplier() {

+        return 1.0F;

+    }

+

+    public String getCraftingSound() {

+        return null;

+    }

+

+    public String getEntityHitSound() {

+        return null;

+    }

+

+    public String getBreakingSound() {

+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

+    }

+

+    public String getMiningSound() {

+        return null;

+    }

+

+    public boolean canBlock() {

+        return false;

+    }

+

+    public boolean isCrowbar() {

+        return false;

+    }

+

+    public boolean isWeapon() {

+        return true;

+    }

+

+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

+        String tTool = aBlock.getHarvestTool(aMetaData);

+        return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);

+    }

+

+    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

+        int rAmount = 0;

+        if ((GregTech_API.sTimber) && (!aPlayer.isSneaking()) && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {

+            int tY = aY + 1;

+            for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {

+                if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock) || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {

+                    break;

+                }

+                rAmount++;

+            }

         }

-        rAmount++;

-      }

-    }

-    return rAmount;

-  }

-  

-  public ItemStack getBrokenItem(ItemStack aStack)

-  {

-    return null;

-  }

-  

-  public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack)

-  {

-    return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];

-  }

-  

-  public short[] getRGBa(boolean aIsToolHead, ItemStack aStack)

-  {

-    return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-  }

-  

-  public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}

-  

-  public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity)

-  {

-    return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been chopped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-  }

+        return rAmount;

+    }

+

+    public ItemStack getBrokenItem(ItemStack aStack) {

+        return null;

+    }

+

+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];

+    }

+

+    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

+    }

+

+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

+    }

+

+    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been chopped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

+    }

 }