Merge pull request #71 from aerospark/devel

Linenumber strip
Well, let's try this, but i'm not going trough all classes to make sure there is nothing broken.

37 files changed, 3857 insertions, 3857 deletions

diff --git a/main/java/gregtech/common/tools/GT_Tool.java b/main/java/gregtech/common/tools/GT_Tool.java
index 7af4bc3837..3bd87a4b5f 100644
--- a/main/java/gregtech/common/tools/GT_Tool.java
+++ b/main/java/gregtech/common/tools/GT_Tool.java
@@ -1,173 +1,173 @@
-/*   1:    */ package gregtech.common.tools;

-/*   2:    */ 

-/*   3:    */ import gregtech.api.GregTech_API;

-/*   4:    */ import gregtech.api.damagesources.GT_DamageSources;

-/*   5:    */ import gregtech.api.interfaces.IToolStats;

-/*   6:    */ import gregtech.api.items.GT_MetaGenerated_Tool;

+package gregtech.common.tools;

 

-/*   7:    */ import java.util.List;

-/*   8:    */ import java.util.Map;

+import gregtech.api.GregTech_API;

+import gregtech.api.damagesources.GT_DamageSources;

+import gregtech.api.interfaces.IToolStats;

+import gregtech.api.items.GT_MetaGenerated_Tool;

 

-/*   9:    */ import net.minecraft.block.Block;

-/*  10:    */ import net.minecraft.enchantment.Enchantment;

-/*  11:    */ import net.minecraft.entity.Entity;

-/*  12:    */ import net.minecraft.entity.EntityLivingBase;

-/*  13:    */ import net.minecraft.entity.player.EntityPlayer;

-/*  14:    */ import net.minecraft.item.ItemStack;

-/*  15:    */ import net.minecraft.stats.AchievementList;

-/*  16:    */ import net.minecraft.util.DamageSource;

-/*  17:    */ import net.minecraft.util.EntityDamageSource;

-/*  18:    */ import net.minecraft.util.IChatComponent;

+import java.util.List;

+import java.util.Map;

+

+import net.minecraft.block.Block;

+import net.minecraft.enchantment.Enchantment;

+import net.minecraft.entity.Entity;

+import net.minecraft.entity.EntityLivingBase;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.item.ItemStack;

+import net.minecraft.stats.AchievementList;

+import net.minecraft.util.DamageSource;

+import net.minecraft.util.EntityDamageSource;

+import net.minecraft.util.IChatComponent;

 import net.minecraftforge.event.world.BlockEvent;

-/*  19:    */ import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent;

-/*  20:    */ 

-/*  21:    */ public abstract class GT_Tool

-/*  22:    */   implements IToolStats

-/*  23:    */ {

-/*  24: 23 */   public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune };

-/*  25: 24 */   public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting };

-/*  26: 25 */   public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0];

-/*  27: 26 */   public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0];

-/*  28:    */   

-/*  29:    */   public int getToolDamagePerBlockBreak()

-/*  30:    */   {

-/*  31: 30 */     return 100;

-/*  32:    */   }

-/*  33:    */   

-/*  34:    */   public int getToolDamagePerDropConversion()

-/*  35:    */   {

-/*  36: 35 */     return 100;

-/*  37:    */   }

-/*  38:    */   

-/*  39:    */   public int getToolDamagePerContainerCraft()

-/*  40:    */   {

-/*  41: 40 */     return 800;

-/*  42:    */   }

-/*  43:    */   

-/*  44:    */   public int getToolDamagePerEntityAttack()

-/*  45:    */   {

-/*  46: 45 */     return 200;

-/*  47:    */   }

-/*  48:    */   

-/*  49:    */   public float getSpeedMultiplier()

-/*  50:    */   {

-/*  51: 50 */     return 1.0F;

-/*  52:    */   }

-/*  53:    */   

-/*  54:    */   public float getMaxDurabilityMultiplier()

-/*  55:    */   {

-/*  56: 55 */     return 1.0F;

-/*  57:    */   }

-/*  58:    */   

-/*  59:    */   public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity)

-/*  60:    */   {

-/*  61: 60 */     return aOriginalHurtResistance;

-/*  62:    */   }

-/*  63:    */   

-/*  64:    */   public String getMiningSound()

-/*  65:    */   {

-/*  66: 65 */     return null;

-/*  67:    */   }

-/*  68:    */   

-/*  69:    */   public String getCraftingSound()

-/*  70:    */   {

-/*  71: 70 */     return null;

-/*  72:    */   }

-/*  73:    */   

-/*  74:    */   public String getEntityHitSound()

-/*  75:    */   {

-/*  76: 75 */     return null;

-/*  77:    */   }

-/*  78:    */   

-/*  79:    */   public String getBreakingSound()

-/*  80:    */   {

-/*  81: 80 */     return (String)GregTech_API.sSoundList.get(Integer.valueOf(0));

-/*  82:    */   }

-/*  83:    */   

-/*  84:    */   public int getBaseQuality()

-/*  85:    */   {

-/*  86: 85 */     return 0;

-/*  87:    */   }

-/*  88:    */   

-/*  89:    */   public boolean canBlock()

-/*  90:    */   {

-/*  91: 90 */     return false;

-/*  92:    */   }

-/*  93:    */   

-/*  94:    */   public boolean isCrowbar()

-/*  95:    */   {

-/*  96: 95 */     return false;

-/*  97:    */   }

-/*  98:    */   

-/*  99:    */   public boolean isGrafter()

-/* 100:    */   {

-/* 101:100 */     return false;

-/* 102:    */   }

-/* 103:    */   

-/* 104:    */   public boolean isWeapon()

-/* 105:    */   {

-/* 106:105 */     return false;

-/* 107:    */   }

-/* 108:    */   

-/* 109:    */   public boolean isRangedWeapon()

-/* 110:    */   {

-/* 111:110 */     return false;

-/* 112:    */   }

-/* 113:    */   

-/* 114:    */   public boolean isMiningTool()

-/* 115:    */   {

-/* 116:115 */     return true;

-/* 117:    */   }

-/* 118:    */   

-/* 119:    */   public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity)

-/* 120:    */   {

-/* 121:120 */     return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase)aEntity) : null);

-/* 122:    */   }

-/* 123:    */   

-/* 124:    */   public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity)

-/* 125:    */   {

-/* 126:124 */     return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(aEntity);

-/* 127:    */   }

-/* 128:    */   

-/* 129:    */   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)

-/* 130:    */   {

-/* 131:129 */     return 0;

-/* 132:    */   }

-/* 133:    */   

-/* 134:    */   public ItemStack getBrokenItem(ItemStack aStack)

-/* 135:    */   {

-/* 136:134 */     return null;

-/* 137:    */   }

-/* 138:    */   

-/* 139:    */   public Enchantment[] getEnchantments(ItemStack aStack)

-/* 140:    */   {

-/* 141:139 */     return ZERO_ENCHANTMENTS;

-/* 142:    */   }

-/* 143:    */   

-/* 144:    */   public int[] getEnchantmentLevels(ItemStack aStack)

-/* 145:    */   {

-/* 146:144 */     return ZERO_ENCHANTMENT_LEVELS;

-/* 147:    */   }

-/* 148:    */   

-/* 149:    */   public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer)

-/* 150:    */   {

-/* 151:149 */     aPlayer.triggerAchievement(AchievementList.openInventory);

-/* 152:150 */     aPlayer.triggerAchievement(AchievementList.mineWood);

-/* 153:151 */     aPlayer.triggerAchievement(AchievementList.buildWorkBench);

-/* 154:    */   }

-/* 155:    */   

-/* 156:    */   public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}

-/* 157:    */   

-/* 158:    */   public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer)

-/* 159:    */   {

-/* 160:161 */     return aOriginalDamage;

-/* 161:    */   }

-/* 162:    */   

-/* 163:    */   public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer)

-/* 164:    */   {

-/* 165:166 */     return aOriginalDamage;

-/* 166:    */   }

-/* 167:    */ }

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

+

+public abstract class GT_Tool

+  implements IToolStats

+{

+  public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune };

+  public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting };

+  public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0];

+  public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0];

+  

+  public int getToolDamagePerBlockBreak()

+  {

+    return 100;

+  }

+  

+  public int getToolDamagePerDropConversion()

+  {

+    return 100;

+  }

+  

+  public int getToolDamagePerContainerCraft()

+  {

+    return 800;

+  }

+  

+  public int getToolDamagePerEntityAttack()

+  {

+    return 200;

+  }

+  

+  public float getSpeedMultiplier()

+  {

+    return 1.0F;

+  }

+  

+  public float getMaxDurabilityMultiplier()

+  {

+    return 1.0F;

+  }

+  

+  public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity)

+  {

+    return aOriginalHurtResistance;

+  }

+  

+  public String getMiningSound()

+  {

+    return null;

+  }

+  

+  public String getCraftingSound()

+  {

+    return null;

+  }

+  

+  public String getEntityHitSound()

+  {

+    return null;

+  }

+  

+  public String getBreakingSound()

+  {

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

+  }

+  

+  public int getBaseQuality()

+  {

+    return 0;

+  }

+  

+  public boolean canBlock()

+  {

+    return false;

+  }

+  

+  public boolean isCrowbar()

+  {

+    return false;

+  }

+  

+  public boolean isGrafter()

+  {

+    return false;

+  }

+  

+  public boolean isWeapon()

+  {

+    return false;

+  }

+  

+  public boolean isRangedWeapon()

+  {

+    return false;

+  }

+  

+  public boolean isMiningTool()

+  {

+    return true;

+  }

+  

+  public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity)

+  {

+    return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase)aEntity) : null);

+  }

+  

+  public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity)

+  {

+    return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(aEntity);

+  }

+  

+  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)

+  {

+    return 0;

+  }

+  

+  public ItemStack getBrokenItem(ItemStack aStack)

+  {

+    return null;

+  }

+  

+  public Enchantment[] getEnchantments(ItemStack aStack)

+  {

+    return ZERO_ENCHANTMENTS;

+  }

+  

+  public int[] getEnchantmentLevels(ItemStack aStack)

+  {

+    return ZERO_ENCHANTMENT_LEVELS;

+  }

+  

+  public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer)

+  {

+    aPlayer.triggerAchievement(AchievementList.openInventory);

+    aPlayer.triggerAchievement(AchievementList.mineWood);

+    aPlayer.triggerAchievement(AchievementList.buildWorkBench);

+  }

+  

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

+  

+  public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer)

+  {

+    return aOriginalDamage;

+  }

+  

+  public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer)

+  {

+    return aOriginalDamage;

+  }

+}

 

 


 /* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


diff --git a/main/java/gregtech/common/tools/GT_Tool_Axe.java b/main/java/gregtech/common/tools/GT_Tool_Axe.java
index 5f07ded782..72c60f1578 100644
--- a/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -1,149 +1,149 @@
-/*   1:    */ package gregtech.common.tools;

-/*   2:    */ 

-/*   3:    */ import gregtech.api.GregTech_API;

-/*   4:    */ import gregtech.api.enums.Materials;

-/*   5:    */ import gregtech.api.enums.OrePrefixes;

-/*   6:    */ import gregtech.api.interfaces.IIconContainer;

-/*   7:    */ import gregtech.api.items.GT_MetaGenerated_Tool;

+package gregtech.common.tools;

 

-/*   8:    */ import java.util.List;

-/*   9:    */ import java.util.Map;

+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;

 

-/*  10:    */ import net.minecraft.block.Block;

-/*  11:    */ import net.minecraft.block.material.Material;

-/*  12:    */ import net.minecraft.entity.EntityLivingBase;

-/*  13:    */ import net.minecraft.entity.player.EntityPlayer;

-/*  14:    */ import net.minecraft.item.ItemStack;

-/*  15:    */ import net.minecraft.util.ChatComponentText;

-/*  16:    */ import net.minecraft.util.EnumChatFormatting;

-/*  17:    */ import net.minecraft.util.IChatComponent;

-/*  18:    */ import net.minecraft.world.World;

+import java.util.List;

+import java.util.Map;

+

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.entity.EntityLivingBase;

+import net.minecraft.entity.player.EntityPlayer;

+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;

-/*  19:    */ import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent;

-/*  20:    */ 

-/*  21:    */ public class GT_Tool_Axe

-/*  22:    */   extends GT_Tool

-/*  23:    */ {

-/*  24:    */   public int getToolDamagePerBlockBreak()

-/*  25:    */   {

-/*  26: 23 */     return 50;

-/*  27:    */   }

-/*  28:    */   

-/*  29:    */   public int getToolDamagePerDropConversion()

-/*  30:    */   {

-/*  31: 28 */     return 100;

-/*  32:    */   }

-/*  33:    */   

-/*  34:    */   public int getToolDamagePerContainerCraft()

-/*  35:    */   {

-/*  36: 33 */     return 100;

-/*  37:    */   }

-/*  38:    */   

-/*  39:    */   public int getToolDamagePerEntityAttack()

-/*  40:    */   {

-/*  41: 38 */     return 200;

-/*  42:    */   }

-/*  43:    */   

-/*  44:    */   public int getBaseQuality()

-/*  45:    */   {

-/*  46: 43 */     return 0;

-/*  47:    */   }

-/*  48:    */   

-/*  49:    */   public float getBaseDamage()

-/*  50:    */   {

-/*  51: 48 */     return 3.0F;

-/*  52:    */   }

-/*  53:    */   

-/*  54:    */   public float getSpeedMultiplier()

-/*  55:    */   {

-/*  56: 53 */     return 2.0F;

-/*  57:    */   }

-/*  58:    */   

-/*  59:    */   public float getMaxDurabilityMultiplier()

-/*  60:    */   {

-/*  61: 58 */     return 1.0F;

-/*  62:    */   }

-/*  63:    */   

-/*  64:    */   public String getCraftingSound()

-/*  65:    */   {

-/*  66: 63 */     return null;

-/*  67:    */   }

-/*  68:    */   

-/*  69:    */   public String getEntityHitSound()

-/*  70:    */   {

-/*  71: 68 */     return null;

-/*  72:    */   }

-/*  73:    */   

-/*  74:    */   public String getBreakingSound()

-/*  75:    */   {

-/*  76: 73 */     return (String)GregTech_API.sSoundList.get(Integer.valueOf(0));

-/*  77:    */   }

-/*  78:    */   

-/*  79:    */   public String getMiningSound()

-/*  80:    */   {

-/*  81: 78 */     return null;

-/*  82:    */   }

-/*  83:    */   

-/*  84:    */   public boolean canBlock()

-/*  85:    */   {

-/*  86: 83 */     return false;

-/*  87:    */   }

-/*  88:    */   

-/*  89:    */   public boolean isCrowbar()

-/*  90:    */   {

-/*  91: 88 */     return false;

-/*  92:    */   }

-/*  93:    */   

-/*  94:    */   public boolean isWeapon()

-/*  95:    */   {

-/*  96: 93 */     return true;

-/*  97:    */   }

-/*  98:    */   

-/*  99:    */   public boolean isMinableBlock(Block aBlock, byte aMetaData)

-/* 100:    */   {

-/* 101: 98 */     String tTool = aBlock.getHarvestTool(aMetaData);

-/* 102: 99 */     return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);

-/* 103:    */   }

-/* 104:    */   

-/* 105:    */   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)

-/* 106:    */   {

-/* 107:104 */     int rAmount = 0;

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

-/* 109:    */     {

-/* 110:106 */       int tY = aY + 1;

-/* 111:106 */       for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++)

-/* 112:    */       {

-/* 113:107 */         if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock) || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {

-/* 114:    */           break;

-/* 115:    */         }

-/* 116:107 */         rAmount++;

-/* 117:    */       }

-/* 118:    */     }

-/* 119:110 */     return rAmount;

-/* 120:    */   }

-/* 121:    */   

-/* 122:    */   public ItemStack getBrokenItem(ItemStack aStack)

-/* 123:    */   {

-/* 124:115 */     return null;

-/* 125:    */   }

-/* 126:    */   

-/* 127:    */   public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack)

-/* 128:    */   {

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

-/* 130:    */   }

-/* 131:    */   

-/* 132:    */   public short[] getRGBa(boolean aIsToolHead, ItemStack aStack)

-/* 133:    */   {

-/* 134:125 */     return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-/* 135:    */   }

-/* 136:    */   

-/* 137:    */   public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}

-/* 138:    */   

-/* 139:    */   public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity)

-/* 140:    */   {

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

-/* 142:    */   }

-/* 143:    */ }

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

+

+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;

+        }

+        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);

+  }

+}

 

 


 /* Location:           F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar


diff --git a/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
index 2a26e934f6..0757a5117c 100644
--- a/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
@@ -1,103 +1,103 @@
-/*  1:   */ package gregtech.common.tools;

-/*  2:   */ 

-/*  3:   */ import gregtech.api.enums.Materials;

+package gregtech.common.tools;

+

+import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

-/*  4:   */ import gregtech.api.enums.Textures.ItemIcons;

-/*  5:   */ import gregtech.api.interfaces.IIconContainer;

-/*  6:   */ import gregtech.api.items.GT_MetaGenerated_Tool;

-/*  7:   */ import gregtech.api.util.GT_ModHandler;

-/*  8:   */ import gregtech.api.util.GT_Utility;

+import gregtech.api.enums.Textures.ItemIcons;

+import gregtech.api.interfaces.IIconContainer;

+import gregtech.api.items.GT_MetaGenerated_Tool;

+import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_Utility;

 

-/*  9:   */ import java.util.List;

-/* 10:   */ import java.util.Random;

+import java.util.List;

+import java.util.Random;

 

-/* 11:   */ import net.minecraft.block.Block;

-/* 12:   */ import net.minecraft.block.material.Material;

-/* 13:   */ import net.minecraft.entity.EntityLivingBase;

-/* 14:   */ import net.minecraft.entity.player.EntityPlayer;

-/* 15:   */ import net.minecraft.init.Blocks;

-/* 16:   */ import net.minecraft.init.Items;

-/* 17:   */ import net.minecraft.item.Item;

-/* 18:   */ import net.minecraft.item.ItemStack;

-/* 19:   */ import net.minecraft.util.ChatComponentText;

-/* 20:   */ import net.minecraft.util.EnumChatFormatting;

-/* 21:   */ import net.minecraft.util.IChatComponent;

-/* 22:   */ import net.minecraft.world.World;

+import net.minecraft.block.Block;