Added some bees and shit.

Added Force.
Updated how GT++ material components get localized.

2 files changed, 37 insertions, 7 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index fca4c5d3c6..cf70c56f21 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -536,6 +536,7 @@ public final class ModItems {
 			MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
 			MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN);
 			MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.FORCE);
 			
 			//Custom Materials that are from Runescape
 			MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL);
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 9ad8ea3feb..1d435e1269 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -1,21 +1,19 @@
 package gtPlusPlus.core.item.base;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -64,6 +62,9 @@ public class BaseItemComponent extends Item{
 		//if (componentType != ComponentTypes.DUST)
 
 		GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
+		if (componentType == ComponentTypes.GEAR) {
+			GT_OreDictUnificator.registerOre("gear"+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
+		}
 		if (LoadedMods.Thaumcraft) {
 			//ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1);
 			if (componentMaterial.isRadioactive) {
@@ -161,6 +162,34 @@ public class BaseItemComponent extends Item{
 	public final String getMaterialName() {
 		return this.materialName;
 	}
+	
+	@Override
+	public String getItemStackDisplayName(ItemStack stack) {
+		if (componentMaterial == null) {
+			String aFormattedLangName = componentType.getName();
+			if (!aFormattedLangName.startsWith(" ")) {
+				if (aFormattedLangName.contains("@")) {
+					String[] aSplit = aFormattedLangName.split("@");
+					aFormattedLangName = aSplit[0] + " " + getMaterialName() + " " + aSplit[1];
+				}
+			}
+			if (aFormattedLangName.equals(componentType.getName())) {
+				aFormattedLangName = getMaterialName() + aFormattedLangName;
+			}		
+			return GT_LanguageManager.addStringLocalization(unlocalName, aFormattedLangName);
+		}
+		String aFormattedLangName = componentType.getName();
+		if (!aFormattedLangName.startsWith(" ")) {
+			if (aFormattedLangName.contains("@")) {
+				String[] aSplit = aFormattedLangName.split("@");
+				aFormattedLangName = aSplit[0] + " " + componentMaterial.getLocalizedName() + " " + aSplit[1];
+			}
+		}
+		if (aFormattedLangName.equals(componentType.getName())) {
+			aFormattedLangName = componentMaterial.getLocalizedName() + aFormattedLangName;
+		}		
+		return GT_LanguageManager.addStringLocalization(unlocalName, aFormattedLangName);
+	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
@@ -509,10 +538,10 @@ public class BaseItemComponent extends Item{
 
 	public static enum ComponentTypes {
 		DUST("Dust", " Dust", "dust", OrePrefixes.dust),
-		DUSTSMALL("DustSmall", " Dust", "dustSmall", OrePrefixes.dustSmall),
-		DUSTTINY("DustTiny", " Dust", "dustTiny", OrePrefixes.dustTiny),
+		DUSTSMALL("DustSmall", "Small Pile of@Dust", "dustSmall", OrePrefixes.dustSmall),
+		DUSTTINY("DustTiny", "Tiny Pile of@Dust", "dustTiny", OrePrefixes.dustTiny),
 		INGOT("Ingot", " Ingot", "ingot", OrePrefixes.ingot),
-		HOTINGOT("HotIngot", " Hot Ingot", "ingotHot", OrePrefixes.ingotHot),
+		HOTINGOT("HotIngot", " Hot@Ingot", "ingotHot", OrePrefixes.ingotHot),
 		PLATE("Plate", " Plate", "plate", OrePrefixes.plate),
 		PLATEDOUBLE("PlateDouble", " Double Plate", "plateDouble", OrePrefixes.plateDouble),
 		ROD("Rod", " Rod", "stick", OrePrefixes.stick),