Added new crop.

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

2 files changed, 73 insertions, 44 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index c0113e869b..035b13dfbf 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -6,28 +6,27 @@ import java.util.Map;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
 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.item.base.itemblock.ItemBlockGtBlock;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
 
 public class BlockBaseModular extends BasicBlock {
 
 	protected Material blockMaterial;
 
 	protected int blockColour;
-	protected BlockTypes thisBlock;
+	public BlockTypes thisBlock;
 	protected String thisBlockMaterial;
 	protected final String thisBlockType;
 
@@ -42,7 +41,7 @@ public class BlockBaseModular extends BasicBlock {
 		registerComponent();
 	}
 
-	protected BlockBaseModular(final String unlocalizedName, final String blockMaterial,
+	protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString,
 			final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour,
 			final int miningLevel) {
 		super(blockType, unlocalizedName, vanillaMaterial, miningLevel);	
@@ -50,33 +49,20 @@ public class BlockBaseModular extends BasicBlock {
 		this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture());
 		this.blockColour = colour;
 		this.thisBlock = blockType;
-		this.thisBlockMaterial = blockMaterial;
+		this.thisBlockMaterial = blockMaterialString;
 		this.thisBlockType = blockType.name().toUpperCase();
 		this.setBlockName(this.GetProperName());
 		int fx = getBlockTypeMeta();
+		//ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), GetProperName());
+		GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
 		if (fx == 0) {
-			GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
-					Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
-			GT_OreDictUnificator.registerOre(
-					"block" + getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "")
-							.replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""),
-					ItemUtils.getSimpleStack(this));
+			GT_OreDictUnificator.registerOre("block" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this));
 		}
 		else if (fx == 1) {
-			GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
-					Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
-			GT_OreDictUnificator.registerOre(
-					"frameGt" + getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "")
-							.replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""),
-					ItemUtils.getSimpleStack(this));
+			GT_OreDictUnificator.registerOre("frameGt" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this));
 		}
 		else if (fx == 2) {
-			GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
-					Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
-			GT_OreDictUnificator.registerOre(
-					"block" + getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "")
-							.replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""),
-					ItemUtils.getSimpleStack(this));
+			GT_OreDictUnificator.registerOre("frameGt" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this));
 		}
 	}
 	
@@ -135,7 +121,7 @@ public class BlockBaseModular extends BasicBlock {
 	}
 
 	public String GetProperName() {
-		String tempIngot;
+		String tempIngot = null;
 		if (this.thisBlock == BlockTypes.STANDARD) {
 			tempIngot = "Block of " + this.thisBlockMaterial;
 		}
@@ -145,14 +131,21 @@ public class BlockBaseModular extends BasicBlock {
 		else if (this.thisBlock == BlockTypes.ORE) {
 			tempIngot = this.thisBlockMaterial + " Ore [Old]";
 		}
-		else {
-
-			tempIngot = this.getUnlocalizedName().replace("tile.blockGt", "ingot");
-		}
 		return tempIngot;
 	}
 
 	@Override
+	public String getLocalizedName() {
+		String aFormattedLangName = GetProperName();
+		return GT_LanguageManager.addStringLocalization("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase()+".name", aFormattedLangName);
+	}
+
+	@Override
+	public String getUnlocalizedName() {
+		return "block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase();
+	}
+
+	@Override
 	public boolean isOpaqueCube() {
 		return false;
 	}
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) {