Changed a few things to make the Soft Hammer more noticeable from the Hard Hammer.

Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407

# Conflicts:
#	src/main/java/gregtech/api/enums/OrePrefixes.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java

1 files changed, 46 insertions, 3 deletions

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
index 6e98629fdc..34a9cc0345 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
@@ -1,11 +1,54 @@
 package gregtech.common.items;

 

 import gregtech.api.GregTech_API;

-import gregtech.api.enums.*;

+import gregtech.api.enums.ConfigCategories;

+import gregtech.api.enums.Materials;

+import gregtech.api.enums.OrePrefixes;

+import gregtech.api.enums.TC_Aspects;

+import gregtech.api.enums.ToolDictNames;

 import gregtech.api.items.GT_MetaGenerated_Tool;

 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_OreDictUnificator;

-import gregtech.common.tools.*;

+import gregtech.common.tools.GT_Tool_Axe;

+import gregtech.common.tools.GT_Tool_BranchCutter;

+import gregtech.common.tools.GT_Tool_ButcheryKnife;

+import gregtech.common.tools.GT_Tool_BuzzSaw;

+import gregtech.common.tools.GT_Tool_Chainsaw_HV;

+import gregtech.common.tools.GT_Tool_Chainsaw_LV;

+import gregtech.common.tools.GT_Tool_Chainsaw_MV;

+import gregtech.common.tools.GT_Tool_Crowbar;

+import gregtech.common.tools.GT_Tool_Drill_HV;

+import gregtech.common.tools.GT_Tool_Drill_LV;

+import gregtech.common.tools.GT_Tool_Drill_MV;

+import gregtech.common.tools.GT_Tool_File;

+import gregtech.common.tools.GT_Tool_HardHammer;

+import gregtech.common.tools.GT_Tool_Hoe;

+import gregtech.common.tools.GT_Tool_JackHammer;

+import gregtech.common.tools.GT_Tool_Knife;

+import gregtech.common.tools.GT_Tool_Mortar;

+import gregtech.common.tools.GT_Tool_Pickaxe;

+import gregtech.common.tools.GT_Tool_Plow;

+import gregtech.common.tools.GT_Tool_Plunger;

+import gregtech.common.tools.GT_Tool_RollingPin;

+import gregtech.common.tools.GT_Tool_Saw;

+import gregtech.common.tools.GT_Tool_Scoop;

+import gregtech.common.tools.GT_Tool_Screwdriver;

+import gregtech.common.tools.GT_Tool_Screwdriver_LV;

+import gregtech.common.tools.GT_Tool_Sense;

+import gregtech.common.tools.GT_Tool_Shovel;

+import gregtech.common.tools.GT_Tool_SoftHammer;

+import gregtech.common.tools.GT_Tool_Soldering_Iron;

+import gregtech.common.tools.GT_Tool_Sword;

+import gregtech.common.tools.GT_Tool_Turbine_Huge;

+import gregtech.common.tools.GT_Tool_Turbine_Large;

+import gregtech.common.tools.GT_Tool_Turbine_Normal;

+import gregtech.common.tools.GT_Tool_Turbine_Small;

+import gregtech.common.tools.GT_Tool_UniversalSpade;

+import gregtech.common.tools.GT_Tool_WireCutter;

+import gregtech.common.tools.GT_Tool_Wrench;

+import gregtech.common.tools.GT_Tool_Wrench_HV;

+import gregtech.common.tools.GT_Tool_Wrench_LV;

+import gregtech.common.tools.GT_Tool_Wrench_MV;

 import net.minecraft.init.Blocks;

 import net.minecraft.init.Items;

 import net.minecraft.item.ItemStack;

@@ -66,7 +109,7 @@ public class GT_MetaGenerated_Tool_01
         addTool(8, "Hoe", "", new GT_Tool_Hoe(), new Object[]{ToolDictNames.craftingToolHoe, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 4L)});

         addTool(10, "Saw", "Can also harvest Ice", new GT_Tool_Saw(), new Object[]{ToolDictNames.craftingToolSaw, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)});

         GregTech_API.registerTool(addTool(12, "Hammer", "Crushes Ores instead of harvesting them", new GT_Tool_HardHammer(), new Object[]{ToolDictNames.craftingToolHardHammer, 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)}), GregTech_API.sHardHammerList);

-        GregTech_API.registerTool(addTool(14, "Soft Hammer", "", new GT_Tool_SoftHammer(), new Object[]{ToolDictNames.craftingToolSoftHammer, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 4L)}), GregTech_API.sSoftHammerList);

+        GregTech_API.registerTool(addTool(14, "Soft Mallet", "", new GT_Tool_SoftHammer(), new Object[]{ToolDictNames.craftingToolSoftMallet, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 4L)}), GregTech_API.sSoftHammerList);

         GregTech_API.registerTool(addTool(WRENCH, "Wrench", "Hold Leftclick to dismantle Machines", new GT_Tool_Wrench(), new Object[]{ToolDictNames.craftingToolWrench, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)}), GregTech_API.sWrenchList);

         addTool(18, "File", "", new GT_Tool_File(), new Object[]{ToolDictNames.craftingToolFile, 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)});

         GregTech_API.registerTool(addTool(20, "Crowbar", "Dismounts Covers and Rotates Rails", new GT_Tool_Crowbar(), new Object[]{ToolDictNames.craftingToolCrowbar, 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.TELUM, 2L)}), GregTech_API.sCrowbarList);