Allow soldering to be inserted into toolbox and used for maintenance (#1002)

* Suppress warnings "unmappable character"

* Allow soldering to be inserted into toolbox and used for maintenance

* Clearfy tooltip

* Address reviews

3 files changed, 17 insertions, 14 deletions

diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
index 9f35b0c0d2..7cae9dffdd 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
@@ -7,6 +7,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.creativetab.CreativeTabs;
@@ -61,6 +62,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
                 }
                 if ((tPrefix == OrePrefixes.stick || tPrefix == OrePrefixes.wireFine || tPrefix == OrePrefixes.ingot) && (tMaterial == Materials.Lead || tMaterial == Materials.Tin || tMaterial == Materials.SolderingAlloy)) {
                     GregTech_API.sSolderingMetalList.add(tStack);
+                    GT_ModHandler.registerBoxableItemToToolBox(tStack);
                 }
             }
         }
@@ -87,7 +89,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
         // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false;
         return aPrefix != null && aMaterial != null && aPrefix.doGenerateItem(aMaterial);
     }
-	
+
 	/* ---------- OVERRIDEABLE FUNCTIONS ---------- */
 
     /**
@@ -128,7 +130,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
     public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) {
         return true;
     }
-	
+
 	/* ---------- INTERNAL OVERRIDES ---------- */
 
     @Override
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index 87593fdc5d..ea5ef281d3 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -80,12 +80,11 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
      */
     public GT_MetaGenerated_Tool(String aUnlocalized) {
         super(aUnlocalized);
-        GT_ModHandler.registerBoxableItemToToolBox(this);
         setCreativeTab(GregTech_API.TAB_GREGTECH);
         setMaxStackSize(1);
         sInstances.put(getUnlocalizedName(), this);
     }
-	
+
 	/* ---------- FOR ADDING CUSTOM ITEMS INTO THE REMAINING 766 RANGE ---------- */
 
     public static final Materials getPrimaryMaterial(ItemStack aStack) {
@@ -105,7 +104,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
         }
         return Materials._NULL;
     }
-	
+
 	/* ---------- INTERNAL OVERRIDES ---------- */
 
     public static final long getToolMaxDamage(ItemStack aStack) {
@@ -168,6 +167,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
             }
             if (GregTech_API.sThaumcraftCompat != null)
                 GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+            GT_ModHandler.registerBoxableItemToToolBox(rStack);
             return rStack;
         }
         return null;
@@ -217,14 +217,14 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
         if (isItemStackUsable(aStack) && getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)
             doDamage(aStack, tStats.convertBlockDrops(aDrops, aStack, aPlayer, aBlock, aX, aY, aZ, aMetaData, aFortune, aSilkTouch, aEvent) * tStats.getToolDamagePerDropConversion());
     }
-    
+
     @Mod.EventHandler
     public float onBlockBreakSpeedEvent(float aDefault, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, PlayerEvent.BreakSpeed aEvent)
     {
-      IToolStats tStats = getToolStats(aStack); 
+      IToolStats tStats = getToolStats(aStack);
       return tStats == null ? aDefault : tStats.getMiningSpeed(aBlock, aMetaData, aDefault, aPlayer, aPlayer.worldObj, aX, aY, aZ);
     }
-    
+
     @Override
     public boolean onBlockStartBreak(ItemStack aStack, int aX, int aY, int aZ, EntityPlayer aPlayer)
     {
@@ -393,7 +393,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
                     		aNBT.setLong("HeatTime", tWorldTime);
                     		if(tHeat>-10000)aNBT.setInteger("Heat", tHeat);
                     	}
-                    	
+
                     	 aList.add(tOffset + 3, EnumChatFormatting.RED + "Heat: " + aNBT.getInteger("Heat")+" K" + EnumChatFormatting.GRAY);
                     }
                 }
@@ -542,7 +542,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
         IToolStats tStats = getToolStats(aStack);
         if (tStats != null) doDamage(aStack, tStats.getToolDamagePerEntityAttack());
     }
-    
+
 	@Override
 	public boolean canWrench(EntityPlayer player, int x, int y, int z) {
 		if(player==null)return false;
@@ -559,7 +559,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
         IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
         if (tStats != null) doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack());
 	}
-	
+
 	@Override
 	public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z){
 		 return canWrench(player, x, y, z);
@@ -569,7 +569,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 	public void used(ItemStack stack, EntityPlayer player, int x, int y, int z){
 		wrenchUsed(player, x, y, z);
 	}
-	
+
 	@Override
 	public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) {
 		if(player==null)return false;
@@ -578,7 +578,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 		IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
 		return tStats.isWrench();
 	}
-	
+
 
     @Override
     public boolean canLink(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {
diff --git a/src/main/java/gregtech/api/items/GT_Tool_Item.java b/src/main/java/gregtech/api/items/GT_Tool_Item.java
index aa53ddaba1..736c7e4b13 100644
--- a/src/main/java/gregtech/api/items/GT_Tool_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Tool_Item.java
@@ -1,6 +1,7 @@
 package gregtech.api.items;
 
 import gregtech.api.util.GT_ModHandler;
+import net.minecraft.item.ItemStack;
 
 /**
  * This is just a basic Tool, which has normal durability and could break Blocks.
@@ -20,6 +21,6 @@ public class GT_Tool_Item extends GT_Generic_Item {
         setMaxStackSize(1);
         setNoRepair();
         setFull3D();
-        GT_ModHandler.registerBoxableItemToToolBox(this);
+        GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this));
     }
 }