Merge pull request #482 from draknyte1/UpToDateGTPRBranch

Changes Soft Hammer -> Soft Mallet & Flips Icon. Makes them easier to differ now.

src/main/java/gregtech/api/enums/OrePrefixes.java

@@ -308,7 +308,10 @@ public enum OrePrefixes {
     liquid("Liquids", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
     bars("Bars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
     bar("Bars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1);
-
+	
+	toolHeadMallet("Mallet Heads", "", " Mallet Head", true, true, false, false, false, false, true, true, false, false, B[6], M * 6, 16, 127), // Reverse Head consisting out of 6 Ingots.
+	handleMallet("Mallet Handle", "", " Handle", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M / 2, 64, 126); // Reverse Stick made of half an Ingot. Introduced by Eloraam
+	
     public static volatile int VERSION = 509;
 
     static {

src/main/java/gregtech/api/enums/TextureSet.java

@@ -143,7 +143,7 @@ public class TextureSet {
         mTextures[123] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
         mTextures[124] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
         mTextures[125] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
-        mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void");
+        mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/handleMallet");
+        mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/toolHeadMallet");
     }
 }

src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java

@@ -66,7 +66,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.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(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);

src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java

@@ -1,109 +1,109 @@
-package gregtech.common.tools;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_SoftHammer;
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-
-public class GT_Tool_SoftHammer
-        extends GT_Tool {
-    public int getToolDamagePerBlockBreak() {
-        return 50;
-    }
-
-    public int getToolDamagePerDropConversion() {
-        return 100;
-    }
-
-    public int getToolDamagePerContainerCraft() {
-        return 800;
-    }
-
-    public int getToolDamagePerEntityAttack() {
-        return 200;
-    }
-
-    public int getBaseQuality() {
-        return 0;
-    }
-
-    public float getBaseDamage() {
-        return 3.0F;
-    }
-
-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {
-        return aOriginalHurtResistance * 2;
-    }
-
-    public float getSpeedMultiplier() {
-        return 0.1F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 8.0F;
-    }
-
-    public String getCraftingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
-    }
-
-    public String getEntityHitSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    public String getMiningSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
-    }
-
-    public boolean canBlock() {
-        return true;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    public boolean isMiningTool() {
-        return false;
-    }
-
-    public boolean isWeapon() {
-        return true;
-    }
-
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        String tTool = aBlock.getHarvestTool(aMetaData);
-        return (tTool != null) && (tTool.equals("softhammer"));
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHammer.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.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) {
-        aItem.addItemBehavior(aID, new Behaviour_SoftHammer(100));
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was hammered to death by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-}
+package gregtech.common.tools;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.behaviors.Behaviour_SoftHammer;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+public class GT_Tool_SoftHammer
+        extends GT_Tool {
+    public int getToolDamagePerBlockBreak() {
+        return 50;
+    }
+
+    public int getToolDamagePerDropConversion() {
+        return 100;
+    }
+
+    public int getToolDamagePerContainerCraft() {
+        return 800;
+    }
+
+    public int getToolDamagePerEntityAttack() {
+        return 200;
+    }
+
+    public int getBaseQuality() {
+        return 0;
+    }
+
+    public float getBaseDamage() {
+        return 3.0F;
+    }
+
+    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {
+        return aOriginalHurtResistance * 2;
+    }
+
+    public float getSpeedMultiplier() {
+        return 0.1F;
+    }
+
+    public float getMaxDurabilityMultiplier() {
+        return 8.0F;
+    }
+
+    public String getCraftingSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+    }
+
+    public String getEntityHitSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+    }
+
+    public String getBreakingSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+    }
+
+    public String getMiningSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+    }
+
+    public boolean canBlock() {
+        return true;
+    }
+
+    public boolean isCrowbar() {
+        return false;
+    }
+
+    public boolean isMiningTool() {
+        return false;
+    }
+
+    public boolean isWeapon() {
+        return true;
+    }
+
+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
+        String tTool = aBlock.getHarvestTool(aMetaData);
+        return (tTool != null) && (tTool.equals("softhammer"));
+    }
+
+    public ItemStack getBrokenItem(ItemStack aStack) {
+        return null;
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadMallet.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.handleMallet.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) {
+        aItem.addItemBehavior(aID, new Behaviour_SoftHammer(100));
+    }
+
+    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was hammered to death by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+    }
+}