Added new crop.

Added Wireless Charger locking.
Fixed Cyclotron leaving bad input stacks.
Improve Block localization.

1 files changed, 49 insertions, 13 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 396689ef63..af6f036942 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,30 +1,35 @@
 package gtPlusPlus.core.item.base.itemblock;
 
+import java.util.HashMap;
 import java.util.List;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BlockBaseModular;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
 
 public class ItemBlockGtBlock extends ItemBlock {
 
+	public static HashMap<String, String> sNameCache = new HashMap<String, String>();
+	
 	protected final int blockColour;
 	private int sRadiation;
 
 	private Material mMaterial;
+	protected BlockTypes thisBlockType;
 
 	private final Block thisBlock;
 	private boolean isOre = false;
@@ -50,15 +55,46 @@ public class ItemBlockGtBlock extends ItemBlock {
 		if (block instanceof BlockBaseModular){
 			BlockBaseModular g = (BlockBaseModular) block;
 			this.mMaterial = g.getMaterialEx();
+			this.thisBlockType = g.thisBlock;
 		}
 		else {
 			this.mMaterial = null;
+			this.thisBlockType = BlockTypes.STANDARD;
 		}
 		
-		// GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block",
-		// "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block",
-		// "").replace("-", "").replace("_", "").replace(" ", ""),
-		// ItemUtils.getSimpleStack(this));
+	}
+	
+	public int getBlockTypeMeta() {
+		if (this.thisBlockType.equals(BlockTypes.STANDARD)) {
+			return 0;
+		}
+		else if (this.thisBlockType.equals(BlockTypes.FRAME)) {
+			return 1;
+		}
+		else if (this.thisBlockType.equals(BlockTypes.ORE)) {
+			return 2;
+		}
+		return 0;
+	}
+	
+	public String getUnlocalizedBlockName() {
+		return "block."+mMaterial.getUnlocalizedName()+"."+this.thisBlockType.name().toLowerCase();
+	}
+	
+	public String GetProperName() {
+		String tempIngot = sNameCache.get(getUnlocalizedBlockName());
+		if (tempIngot == null) {
+			tempIngot = "BAD.UNLOCAL.NAME";
+		}
+		return tempIngot;
+	}
+	
+	@Override
+	public String getItemStackDisplayName(ItemStack stack) {
+		return this.thisBlock.getLocalizedName();
+		//Logger.INFO("Unlocal Name: "+this.getUnlocalizedName());
+		//String aFormattedLangName = GetProperName();
+		//return GT_LanguageManager.addStringLocalization("block."+mMaterial.getUnlocalizedName()+"."+this.thisBlockType.name().toLowerCase()+".name", aFormattedLangName);
 	}
 
 	public int getRenderColor(final int aMeta) {