% Improved Mode handling on some tools, Electric lighter now has a projectile mode.

$ Fixed Bombs not having a renderer.
$ Fixed Mode changing on custom GT Tools. Fixes #80

2 files changed, 34 insertions, 71 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
index ff4be9dd93..7aa7529817 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
@@ -13,6 +13,7 @@ import gregtech.common.items.behaviors.Behaviour_None;
 import gregtech.common.tools.GT_Tool;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 import net.minecraft.block.Block;
+import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.monster.EntityIronGolem;
@@ -39,7 +40,7 @@ extends GT_Tool {
 
 	@Override
 	public int getToolDamagePerBlockBreak() {
-		return 50;
+		return 100;
 	}
 
 	@Override
@@ -49,12 +50,12 @@ extends GT_Tool {
 
 	@Override
 	public int getToolDamagePerContainerCraft() {
-		return 400;
+		return 100;
 	}
 
 	@Override
 	public int getToolDamagePerEntityAttack() {
-		return 100;
+		return 200;
 	}
 
 	@Override
@@ -112,40 +113,9 @@ extends GT_Tool {
 	}
 
 	@Override
-	public boolean isWeapon() {
-		return true;
-	}
-
-	@Override
 	public boolean isMinableBlock(final Block aBlock, final byte aMetaData) {
 		final String tTool = aBlock.getHarvestTool(aMetaData);
-		return (tTool != null) && (tTool.equals("sword") || tTool.equals("file")); 
-	}
-	
-
-	@Override
-	public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
-		int rConversions = 0;
-		/*GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{new ItemStack(aBlock, 1, aMetaData)});
-		if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
-			for (final ItemStack tDrop : aDrops) {
-				tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{tDrop})});
-				if (tRecipe != null) {
-					final ItemStack tHammeringOutput = tRecipe.getOutput(0);
-					if (tHammeringOutput != null) {
-						rConversions += tDrop.stackSize;
-						tDrop.stackSize *= tHammeringOutput.stackSize;
-						tHammeringOutput.stackSize = tDrop.stackSize;
-						GT_Utility.setStack(tDrop, tHammeringOutput);
-					}
-				}
-			}
-		} else {
-			aDrops.clear();
-			aDrops.add(tRecipe.getOutput(0));
-			rConversions++;
-		}*/
-		return rConversions;
+		return (tTool != null) && (tTool.equals("sword") || tTool.equals("knife")); 
 	}
 
 	@Override
@@ -193,5 +163,30 @@ extends GT_Tool {
 	public boolean isGrafter() {
 		return false;
 	}
+
+	@Override
+	public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {
+		return aOriginalHurtResistance * 2;
+	}
+
+	@Override
+	public boolean isWeapon() {
+		return true;
+	}
+
+	@Override
+	public boolean isMiningTool() {
+		return false;
+	}
+
+	@Override
+	public Enchantment[] getEnchantments(ItemStack aStack) {
+		return LOOTING_ENCHANTMENT;
+	}
+
+	@Override
+	public int[] getEnchantmentLevels(ItemStack aStack) {
+		return new int[]{(4 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2};
+	}
 	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
index cf6f33cc36..36e1161e83 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
@@ -9,7 +9,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures.ItemIcons;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_None;
 import gregtech.common.tools.GT_Tool;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Electric_Lighter;
@@ -23,7 +22,6 @@ import net.minecraft.stats.AchievementList;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
-import net.minecraftforge.event.world.BlockEvent;
 
 public class TOOL_Gregtech_ElectricLighter
 extends GT_Tool {
@@ -119,36 +117,9 @@ extends GT_Tool {
 
 	@Override
 	public boolean isMinableBlock(final Block aBlock, final byte aMetaData) {
-		final String tTool = aBlock.getHarvestTool(aMetaData);
-		return (tTool != null) && (tTool.equals("sword") || tTool.equals("file")); 
+		return false;
 	}
 	
-
-	@Override
-	public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
-		int rConversions = 0;
-		/*GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{new ItemStack(aBlock, 1, aMetaData)});
-		if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
-			for (final ItemStack tDrop : aDrops) {
-				tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{tDrop})});
-				if (tRecipe != null) {
-					final ItemStack tHammeringOutput = tRecipe.getOutput(0);
-					if (tHammeringOutput != null) {
-						rConversions += tDrop.stackSize;
-						tDrop.stackSize *= tHammeringOutput.stackSize;
-						tHammeringOutput.stackSize = tDrop.stackSize;
-						GT_Utility.setStack(tDrop, tHammeringOutput);
-					}
-				}
-			}
-		} else {
-			aDrops.clear();
-			aDrops.add(tRecipe.getOutput(0));
-			rConversions++;
-		}*/
-		return rConversions;
-	}
-
 	@Override
 	public ItemStack getBrokenItem(final ItemStack aStack) {
 		return null;
@@ -164,10 +135,7 @@ extends GT_Tool {
 		return !aIsToolHead
 				? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
 				: Materials.Silver.mRGBa;
-	}
-	
-	
-	
+	}	
 
 	@Override
 	public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) {
@@ -182,12 +150,12 @@ extends GT_Tool {
 
 	@Override
 	public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
-		return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been Ground out of existence by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+		return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been prodded out of existence by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
 	}
 
 	@Override
 	public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) {
-		aItem.addItemBehavior(aID, new Behaviour_Electric_Lighter(null, 32000));
+		aItem.addItemBehavior(aID, new Behaviour_Electric_Lighter());
 	}
 
 	@Override