$ Tried fixing multi-tool names.

% Ended up making some not exist any more.

5 files changed, 63 insertions, 26 deletions

diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index bd0f7466b7..5c5ca9fa0b 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.item.tool.staballoy;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -34,6 +35,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 	protected ItemStack thisPickaxe = null;
 	protected final int colour;
 	protected final String materialName;
+	protected final String displayName;
 	public boolean isValid = true;
 
 	public MultiPickaxeBase(String unlocalizedName, ToolMaterial material, int materialDurability, int colour) {
@@ -45,12 +47,15 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 		this.setMaxStackSize(1);
 		this.setMaxDamage(materialDurability*3);
 		this.colour = colour;
-		this.materialName = material.name();		
+		this.materialName = material.name();
+		this.displayName = unlocalizedName;
 		this.setCreativeTab(AddToCreativeTab.tabTools);
 		miningLevel = material.getHarvestLevel();
 		try {isValid = addRecipe();} catch (Throwable e){}
-		if (colour != 0 && isValid){
-			GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName));			
+		if (colour != 0 && isValid && materialDurability > 10000){
+			if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null){
+				GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName));			
+			}	
 		}
 
 	}
@@ -67,6 +72,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 
 	private boolean addRecipe(){
 		String plateDense = "plateDense"+materialName;
+		String plateDouble = "plateDouble"+materialName;
 		String rodLong = "stickLong"+materialName;
 		String toolHammer = "craftingToolHardHammer";
 		String toolWrench = "craftingToolWrench";
@@ -77,6 +83,15 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 			return false;
 		}
 		if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){
+			if (null != ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDouble, 1)){
+				RecipeUtils.recipeBuilder(
+						plateDouble, plateDouble, plateDouble,
+						toolFile, rodLong, toolHammer,
+						toolWrench, rodLong, toolScrewDriver,
+						ItemUtils.getSimpleStack(this));
+
+				return true;
+			}
 			return false;
 		}
 
@@ -95,8 +110,8 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 
 	@Override
 	public String getItemStackDisplayName(ItemStack iStack) {
-
-		String name;
+		return displayName;
+		/*String name;
 		if (getUnlocalizedName().toLowerCase().contains("wood")){
 			name = "Wooden";
 		}
@@ -113,9 +128,8 @@ public class MultiPickaxeBase extends StaballoyPickaxe{
 			name = "Diamond";
 		}
 		else {
-			name = materialName;
 		}
-		return name+" Multipickaxe";
+		return name+" Multipickaxe";*/
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
index 659086fe92..08db58500a 100644
--- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
+++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.item.tool.staballoy;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -33,6 +34,7 @@ public class MultiSpadeBase extends StaballoySpade{
 	protected ItemStack thisPickaxe = null;
 	protected final int colour;
 	protected final String materialName;
+	protected final String displayName;
 	public boolean isValid = true;
 
 	public MultiSpadeBase(String unlocalizedName, ToolMaterial material, int materialDurability, int colour) {
@@ -45,52 +47,64 @@ public class MultiSpadeBase extends StaballoySpade{
 		this.setMaxDamage(materialDurability*3);
 		this.colour = colour;
 		this.materialName = material.name();
+		this.displayName = unlocalizedName;
 		this.setCreativeTab(AddToCreativeTab.tabTools);
 		try {isValid = addRecipe();} catch (Throwable e){}
 		if (colour != 0 && isValid){
-			GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName));			
+			if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null){
+				GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName));			
+			}
 		}
 	}
-	
+
 	private boolean addRecipe(){
 		String plateDense = "plateDense"+materialName;
+		String plateDouble = "plateDouble"+materialName;
 		String rodLong = "stickLong"+materialName;
 		String toolHammer = "craftingToolHardHammer";
 		String toolWrench = "craftingToolWrench";
 		String toolFile = "craftingToolFile";
 		String toolScrewDriver = "craftingToolScrewdriver";
-		
+
 		if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){
 			return false;
 		}
 		if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){
+			if (null != ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDouble, 1)){
+				RecipeUtils.recipeBuilder(
+						toolFile, plateDouble, toolHammer,
+						null, rodLong, null,
+						toolWrench, rodLong, toolScrewDriver,
+						ItemUtils.getSimpleStack(this));
+
+				return true;
+			}
 			return false;
 		}		
-		
+
 		RecipeUtils.recipeBuilder(
 				toolFile, plateDense, toolHammer,
 				null, rodLong, null,
 				toolWrench, rodLong, toolScrewDriver,
 				ItemUtils.getSimpleStack(this));
-		
+
 		return true;
 	}
-	
+
 	public final String getMaterialName() {
 		return materialName;
 	}
-	
+
 	@Override
 	public String getItemStackDisplayName(ItemStack iStack) {
-
-		String name;
+		return displayName;
+		/*String name;
 		if (getUnlocalizedName().toLowerCase().contains("wood")){
 			name = "Wooden";
 		}
 		else {
-			name = materialName;
 		}
-		return "Big "+name+" Spade";
+		return "Big "+name+" Spade";*/
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 4463c7f235..007029c86e 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -87,18 +87,27 @@ public class Material {
 		this.vMass = getMass();
 
 		//Sets tool Durability
-		if (durability != 0){			this.vDurability = durability;
-			
+		if (durability != 0){			
+			this.vDurability = durability;
 		}
 		else {
 			if (inputs != null){
 				long durabilityTemp = 0;
 				int counterTemp = 0;
 				for (MaterialStack m : inputs){
-					durabilityTemp =  (durabilityTemp+m.getStackMaterial().vDurability);
-					counterTemp++;
-				}			
+					if (m.getStackMaterial() != null){
+						if (m.getStackMaterial().vDurability != 0){
+							durabilityTemp =  (durabilityTemp+m.getStackMaterial().vDurability);
+							counterTemp++;
+						}
+					}					
+				}
+				if (durabilityTemp != 0 && counterTemp != 0){
 				this.vDurability = (durabilityTemp/counterTemp);
+				}
+				else {
+					this.vDurability = 8196;
+				}
 			}
 			else {
 				this.vDurability = 0;
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index cb30400fd7..c9041f8906 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -529,7 +529,7 @@ public class Utils {
 	}
 
 	public static ToolMaterial generateToolMaterialFromGT(Materials gtMaterial){
-		String name = gtMaterial.name();
+		String name = Utils.sanitizeString(gtMaterial.mDefaultLocalName);
 		int harvestLevel = gtMaterial.mToolQuality;
 		int durability = gtMaterial.mDurability;
 		float damage = gtMaterial.mToolQuality;
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 409e52a579..81357e66c8 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -304,7 +304,7 @@ public class ItemUtils {
 
 	public static MultiPickaxeBase generateMultiPick(boolean GT_Durability, Materials material){
 		ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
-		return generateMultiPick(GT_Durability, customMaterial, material.name(), material.mDurability, material.mRGBa);
+		return generateMultiPick(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa);
 	}
 
 	public static MultiPickaxeBase generateMultiPick(Material material){
@@ -349,7 +349,7 @@ public class ItemUtils {
 	
 	public static MultiSpadeBase generateMultiShovel(boolean GT_Durability, Materials material){
 		ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
-		return generateMultiShovel(GT_Durability, customMaterial, material.name(), material.mDurability, material.mRGBa);
+		return generateMultiShovel(GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa);
 	}
 	
 	public static MultiSpadeBase generateMultiShovel(Material material){