+ Added more tools.

7 files changed, 565 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index 944a345b7e..ee104eaca3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -13,8 +13,10 @@ import gtPlusPlus.core.lib.CORE;
 public final class TexturesGtTools {
 
 	public final static CustomIcon SKOOKUM_CHOOCHER = new CustomIcon("iconsets/SKOOKUMCHOOCHER");
-	public final static CustomIcon ANGEL_GRINDER = new CustomIcon("iconsets/ANGEL_GRINDER");
+	public final static CustomIcon ANGLE_GRINDER = new CustomIcon("iconsets/ANGLE_GRINDER");
 	public final static CustomIcon ELECTRIC_SNIPS = new CustomIcon("iconsets/ELECTRIC_SNIPS");
+	public final static CustomIcon ELECTRIC_LIGHTER = new CustomIcon("iconsets/ELECTRIC_LIGHTER");
+	public final static CustomIcon ELECTRIC_BUTCHER_KNIFE = new CustomIcon("iconsets/ELECTRIC_BUTCHER_KNIFE");
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 4a3430502c..dbae4fe194 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -7,10 +7,14 @@ import gregtech.api.items.GT_MetaGenerated_Tool;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngelGrinder;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips;
 
 public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
+	public static final short ELECTRIC_LIGHTER = 7534;
+	public static final short ELECTRIC_BUTCHER_KNIFE = 7634;
 	public static final short SKOOKUM_CHOOCHER = 7734;
 	public static final short ANGLE_GRINDER = 7834;
 	public static final short ELECTRIC_SNIPS = 7934;
@@ -43,6 +47,22 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
 						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
 						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
+
+		// Electric Lighter
+		this.addTool(ELECTRIC_LIGHTER, "Pyromatic 9k", "Electric Fire!",
+				new TOOL_Gregtech_ElectricLighter(),
+				new Object[] { GregtechToolDictNames.craftingToolElectricLighter,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
+
+		// Electric Butcher Knife
+		this.addTool(ELECTRIC_BUTCHER_KNIFE, "Meat-o-matic", "Electric butcher knife",
+				new TOOL_Gregtech_ElectricButcherKnife(),
+				new Object[] { GregtechToolDictNames.craftingToolElectricButcherKnife, ToolDictNames.craftingToolKnife,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
new file mode 100644
index 0000000000..278b556733
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -0,0 +1,143 @@
+package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+
+import java.util.List;
+
+import codechicken.lib.math.MathHelper;
+import gregtech.api.GregTech_API;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GT_Utility.ItemNBT;
+import gregtech.common.items.behaviors.Behaviour_None;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
+import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
+import ic2.api.item.IElectricItemManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class Behaviour_Electric_Lighter extends Behaviour_None {
+
+	private final ItemStack mLighter;
+
+	private final long mFuelAmount;
+
+	private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.tooltip",
+			"Can light things on Fire");
+	private final String mTooltipUses = GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.uses",
+			"Remaining Uses:");
+	private final String mTooltipUnstackable = GT_LanguageManager.addStringLocalization("gt.behaviour.unstackable",
+			"Not usable when stacked!");
+
+	public Behaviour_Electric_Lighter(ItemStack aFullLighter, long aFuelAmount) {
+		this.mLighter = aFullLighter;
+		this.mFuelAmount = aFuelAmount;
+	}
+
+	public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
+		if (!aPlayer.worldObj.isRemote && aStack.stackSize == 1) {
+			boolean rOutput = false;
+			if (aEntity instanceof EntityCreeper) {
+				if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
+					GT_Utility.sendSoundToPlayers(aPlayer.worldObj, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F,
+							MathHelper.floor_double(aEntity.posX), MathHelper.floor_double(aEntity.posY),
+							MathHelper.floor_double(aEntity.posZ));
+					((EntityCreeper) aEntity).func_146079_cb();
+					rOutput = true;
+				}
+			}
+			return rOutput;
+		} else {
+			return false;
+		}
+	}
+
+	public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+			int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+		return false;
+	}
+
+	public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+			int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+		if (!aWorld.isRemote && aStack.stackSize == 1) {
+			Logger.WARNING("Preparing Lighter a");
+			boolean rOutput = false;
+			ForgeDirection tDirection = ForgeDirection.getOrientation(aSide);
+			aX += tDirection.offsetX;
+			aY += tDirection.offsetY;
+			aZ += tDirection.offsetZ;
+			if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack)) {
+				Logger.WARNING("Preparing Lighter b");
+				if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
+					Logger.WARNING("Preparing Lighter c");
+					GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F, aX, aY,
+							aZ);
+					aWorld.setBlock(aX, aY, aZ, Blocks.fire);
+					rOutput = true;
+					// ItemNBT.setLighterFuel(aStack, tFuelAmount);
+					return rOutput;
+				}
+			}
+		}
+		Logger.WARNING("Preparing Lighter z");
+		return false;
+	}
+
+	private boolean prepare(ItemStack aStack) {
+		if (aStack != null) {
+			Logger.WARNING("Preparing Lighter 1");
+			if (aStack.getItem() instanceof MetaGeneratedGregtechTools) {
+				Logger.WARNING("Preparing Lighter 2");
+				if (ChargingHelper.isItemValid(aStack)) {
+					Logger.WARNING("Preparing Lighter 3");
+					if (aStack.getItem() instanceof IElectricItemManager) {
+						Logger.WARNING("Preparing Lighter 4");
+						IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem();
+						double aCharge = aItemElec.getCharge(aStack);
+						long aEuCost = 4096 * 2;
+						if (aCharge >= aEuCost) {
+							Logger.WARNING("Preparing Lighter 5");
+							aItemElec.discharge(aStack, aEuCost, 3, true, true, false);
+							return true;
+						}
+					}
+				}
+			}
+		}
+		Logger.WARNING("Preparing Lighter 0");
+		return false;
+	}
+
+	private void useUp(ItemStack aStack) {
+
+	}
+
+	public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+		aList.add(this.mTooltip);
+		int aUses = 0;
+
+		if (aStack != null) {
+			if (aStack.getItem() instanceof MetaGeneratedGregtechTools) {
+				if (ChargingHelper.isItemValid(aStack)) {
+					if (aStack.getItem() instanceof IElectricItemManager) {
+						IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem();
+						double aCharge = aItemElec.getCharge(aStack);
+						long aEuCost = 4096 * 2;
+						aUses = (int) (aCharge / aEuCost);
+					}
+				}
+			}
+		}
+
+		NBTTagCompound tNBT = aStack.getTagCompound();
+		aList.add(this.mTooltipUses + " " + aUses);
+		aList.add(this.mTooltipUnstackable);
+		return aList;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java
index 53dbf58cf2..905164802c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java
@@ -157,14 +157,14 @@ extends GT_Tool {
 	
 	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
 		return (IIconContainer) (aIsToolHead
-				? TexturesGtTools.ANGEL_GRINDER
+				? TexturesGtTools.ANGLE_GRINDER
 				: ItemIcons.POWER_UNIT_HV);
 	}
 
 	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
 		return !aIsToolHead
 				? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-				: Materials.Diamond.mRGBa;
+				: Materials.TungstenSteel.mRGBa;
 	}
 	
 	
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
new file mode 100644
index 0000000000..ff4be9dd93
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
@@ -0,0 +1,197 @@
+package gtPlusPlus.xmod.gregtech.common.tools;
+
+import java.util.Arrays;
+import java.util.List;
+
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+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 net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+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_ElectricButcherKnife
+extends GT_Tool {
+
+	public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+
+
+	@Override
+	public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+		String tName = aEntity.getClass().getName();
+		tName = tName.substring(tName.lastIndexOf(".") + 1);
+		return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
+	}
+
+	@Override
+	public int getToolDamagePerBlockBreak() {
+		return 50;
+	}
+
+	@Override
+	public int getToolDamagePerDropConversion() {
+		return 100;
+	}
+
+	@Override
+	public int getToolDamagePerContainerCraft() {
+		return 400;
+	}
+
+	@Override
+	public int getToolDamagePerEntityAttack() {
+		return 100;
+	}
+
+	@Override
+	public int getBaseQuality() {
+		return 0;
+	}
+
+	@Override
+	public float getBaseDamage() {
+		return 8.0F;
+	}
+
+	@Override
+	public float getSpeedMultiplier() {
+		return 2F;
+	}
+
+	@Override
+	public float getMaxDurabilityMultiplier() {
+		return 1.8F;
+	}
+
+	@Override
+	public String getCraftingSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(1));
+	}
+
+	@Override
+	public String getEntityHitSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(2));
+	}
+
+	@Override
+	public String getBreakingSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(0));
+	}
+
+	@Override
+	public String getMiningSound() {
+		return null;
+	}
+
+	@Override
+	public boolean canBlock() {
+		return false;
+	}
+
+	public boolean isWrench(){
+		return false;
+	}
+
+	@Override
+	public boolean isCrowbar() {
+		return false;
+	}
+
+	@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;
+	}
+
+	@Override
+	public ItemStack getBrokenItem(final ItemStack aStack) {
+		return null;
+	}
+	
+	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+		return (IIconContainer) (aIsToolHead
+				? TexturesGtTools.ELECTRIC_BUTCHER_KNIFE
+				: ItemIcons.POWER_UNIT_HV);
+	}
+
+	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+		return aIsToolHead
+				? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
+				: Materials.RedSteel.mRGBa;
+	}
+	
+	
+	
+
+	@Override
+	public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) {
+		super.onToolCrafted(aStack, aPlayer);
+		aPlayer.triggerAchievement(AchievementList.buildSword);
+		try {
+			GT_Mod.achievements.issueAchievement(aPlayer, "tools");
+			GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+		} catch (final Exception e) {
+		}
+	}
+
+	@Override
+	public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
+		return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been Sliced 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_None());
+	}
+
+	@Override
+	public boolean isGrafter() {
+		return false;
+	}
+	
+}
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
new file mode 100644
index 0000000000..cf6f33cc36
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
@@ -0,0 +1,198 @@
+package gtPlusPlus.xmod.gregtech.common.tools;
+
+import java.util.Arrays;
+import java.util.List;
+
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+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;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+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 {
+
+	public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+
+
+	@Override
+	public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+		String tName = aEntity.getClass().getName();
+		tName = tName.substring(tName.lastIndexOf(".") + 1);
+		return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
+	}
+
+	@Override
+	public int getToolDamagePerBlockBreak() {
+		return 50;
+	}
+
+	@Override
+	public int getToolDamagePerDropConversion() {
+		return 100;
+	}
+
+	@Override
+	public int getToolDamagePerContainerCraft() {
+		return 400;
+	}
+
+	@Override
+	public int getToolDamagePerEntityAttack() {
+		return 100;
+	}
+
+	@Override
+	public int getBaseQuality() {
+		return 0;
+	}
+
+	@Override
+	public float getBaseDamage() {
+		return 8.0F;
+	}
+
+	@Override
+	public float getSpeedMultiplier() {
+		return 2F;
+	}
+
+	@Override
+	public float getMaxDurabilityMultiplier() {
+		return 1.8F;
+	}
+
+	@Override
+	public String getCraftingSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(1));
+	}
+
+	@Override
+	public String getEntityHitSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(2));
+	}
+
+	@Override
+	public String getBreakingSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(0));
+	}
+
+	@Override
+	public String getMiningSound() {
+		return null;
+	}
+
+	@Override
+	public boolean canBlock() {
+		return false;
+	}
+
+	public boolean isWrench(){
+		return false;
+	}
+
+	@Override
+	public boolean isCrowbar() {
+		return false;
+	}
+
+	@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;
+	}
+
+	@Override
+	public ItemStack getBrokenItem(final ItemStack aStack) {
+		return null;
+	}
+	
+	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+		return (IIconContainer) (aIsToolHead
+				? TexturesGtTools.ELECTRIC_LIGHTER
+				: ItemIcons.POWER_UNIT_HV);
+	}
+
+	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+		return !aIsToolHead
+				? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
+				: Materials.Silver.mRGBa;
+	}
+	
+	
+	
+
+	@Override
+	public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) {
+		super.onToolCrafted(aStack, aPlayer);
+		aPlayer.triggerAchievement(AchievementList.buildSword);
+		try {
+			GT_Mod.achievements.issueAchievement(aPlayer, "tools");
+			GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
+		} catch (final Exception e) {
+		}
+	}
+
+	@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);
+	}
+
+	@Override
+	public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) {
+		aItem.addItemBehavior(aID, new Behaviour_Electric_Lighter(null, 32000));
+	}
+
+	@Override
+	public boolean isGrafter() {
+		return false;
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
index 9974519c71..bc0c821478 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
@@ -156,13 +156,13 @@ extends GT_Tool {
 	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
 		return (IIconContainer) (aIsToolHead
 				? TexturesGtTools.ELECTRIC_SNIPS
-				: ItemIcons.POWER_UNIT_HV);
+				: ItemIcons.POWER_UNIT_MV);
 	}
 
 	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
 		return !aIsToolHead
 				? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
-				: GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+				: GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
 	}