Complete fix for #11

Author: Michael Hillcox

src/main/java/com/fgtXray/client/ClientTick.java

@@ -85,8 +85,7 @@ static boolean blockFinder(boolean ForceAdd) {
 				{
 					for (int z = pz - radius; z < pz + radius; z++) // z axis.
 					{
-						BlockPos xyz = new BlockPos(x, y, z);
-						IBlockState state = mc.theWorld.getBlockState( xyz );
+						IBlockState state = mc.theWorld.getBlockState(  new BlockPos(x, y, z) );
 
 						int id = Block.getIdFromBlock( state.getBlock() );
 						int meta = state.getBlock().getMetaFromState(state);

src/main/java/com/fgtXray/client/OresSearch.java

@@ -3,6 +3,7 @@
 import java.util.*;
 
 import com.fgtXray.config.ConfigHandler;
+import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -30,50 +31,39 @@ private static boolean checkList( List<OreInfo> temp, OreInfo value, ItemStack s
 		return false;
 	}
 
-	public static void add( String oreIdent, String name, int[] color ) // Takes a string of id:meta or oreName to add to our search list.
+	public static void add( String oreIdent, String oreMeta, String name, int[] color ) // Takes a string of id:meta or oreName to add to our search list.
 	{
 		oreIdent = oreIdent.replaceAll( "\\p{C}",  "?" );
 		int id, meta = 0;
 
-		if( oreIdent.contains( ":" ) ) // Hopefully a proper id:meta string.
-		{
-			String[] splitArray = oreIdent.split( ":" );
-
-			if( splitArray.length != 2 )
-			{
-				//System.out.println( String.format( "Can't add %s to searchList. Invalid format.", oreIdent ) );
-				String notify = String.format( "[XRay] %s is not a valid identifier. Try id:meta (example 1:0 for stone) or oreName (example oreDiamond or mossyStone)", oreIdent );
-				mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify));
-				return;
-			}
+		if( oreIdent.equals("") || oreMeta.equals("") || name.equals("") ) {
+			mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString( "[XRay] You need to have all the inputs filled" ));
+			return;
+		}
 
-			try
-			{
-				id = Integer.parseInt( splitArray[0] );
-				meta = Integer.parseInt( splitArray[1] );
-			}
-			catch( NumberFormatException e )
-			{ // TODO: Some oredict ores are mod:block for some reason...
-				//System.out.println( String.format( "%s is not a valid id:meta format.", oreIdent ) );
-				String notify = String.format( "[XRay] %s contains data other than numbers and the colon. Failed to add.", oreIdent );
-				mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify) );
-				return;
-			}
+		if( oreIdent.contains( ":" ) ) {
+
+			Block tmpBlock = Block.getBlockFromName( oreIdent );
+			if( tmpBlock != null ) {
+				id = Block.getIdFromBlock( tmpBlock );
+				try {
+					meta = Integer.parseInt( oreMeta );
+				} catch( NumberFormatException e ) {
+					String notify = String.format( "[XRay] %s contains data other than numbers. Failed to add.", oreIdent );
+					mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify) );
+					return;
+				}
 
-		}
-		else
-		{
-			try
-			{
-				id = Integer.parseInt( oreIdent );
-				meta = 0;
-			}
-			catch( NumberFormatException e )
-			{
-				mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString("[XRay] Doesn't support in-game additions to the ore dictionary yet.. Failed to add.") );
+			} else {
+				String notify = String.format( "[XRay] %s is not a valid block name", oreIdent );
+				mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify));
 				return;
 			}
 
+		} else {
+			String notify = String.format( "[XRay] %s is not a valid identifier. Try modname:blockname (example minecraft:stone for stone)", oreIdent );
+			mc.ingameGUI.getChatGUI().printChatMessage( new TextComponentString(notify));
+			return;
 		}
 
 		//System.out.println( String.format( "Adding ore: %s", oreIdent ) );
@@ -88,7 +78,7 @@ public static void add( String oreIdent, String name, int[] color ) // Takes a s
 		String notify = String.format( "[XRay] successfully added %s.", oreIdent );
 		mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(notify));
 
-		ConfigHandler.add(name, oreIdent, color);
+		ConfigHandler.add(name, id, meta, color);
 	}
 
 	public static List<OreInfo> get() // Return the searchList, create it if needed.

src/main/java/com/fgtXray/client/gui/GuiNewOre.java

@@ -2,6 +2,7 @@
 
 import com.fgtXray.client.OresSearch;
 import com.fgtXray.reference.Ref;
+import net.minecraft.block.Block;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -11,12 +12,14 @@
 import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import java.io.IOException;
 import java.util.Objects;
 
 public class GuiNewOre extends GuiScreen {
 	private GuiTextField oreName;
+	private GuiTextField oreMeta;
 	private GuiTextField oreIdent;
 	private GuiSlider redSlider;
 	private GuiSlider greenSlider;
@@ -25,6 +28,7 @@ public class GuiNewOre extends GuiScreen {
 
 	private boolean oreNameCleared  = false;
 	private boolean oreIdentCleared = false;
+	private boolean oreMetaCleared = false;
 
 	@Override
 	public void initGui()
@@ -62,9 +66,11 @@ public void initGui()
 		blueSlider.sliderValue  = 0.0F;
 
 		oreName = new GuiTextField( 1, this.fontRendererObj, width / 2 - 108, height / 2 + 8, 220, 20 );
-		oreIdent = new GuiTextField( 0, this.fontRendererObj, width / 2 - 108, height / 2 + 32, 220, 20 );
-		oreName.setText( "Block Name");
-		oreIdent.setText( "ID:META" ); // TODO: oreName
+		oreIdent = new GuiTextField( 0, this.fontRendererObj, width / 2 - 108, height / 2 + 32, 185, 20 );
+		oreMeta = new GuiTextField( 3, this.fontRendererObj, width / 2 + 82, height / 2 + 32, 30, 20 );
+		oreName.setText( "Gui Name");
+		oreIdent.setText( "minecraft:grass" );
+		oreMeta.setText( "Meta" );
 	}
 
 	@Override
@@ -75,7 +81,7 @@ public void actionPerformed( GuiButton button ) // Called on left click of GuiBu
 			case 98: // Add
 				int[] rgb = {(int)(redSlider.sliderValue * 255), (int)(greenSlider.sliderValue * 255), (int)(blueSlider.sliderValue * 255)};
 
-				OresSearch.add(oreIdent.getText(), oreName.getText(), rgb);
+				OresSearch.add(oreIdent.getText(), oreMeta.getText(), oreName.getText(), rgb);
 
 				mc.thePlayer.closeScreen();
 				mc.displayGuiScreen( new GuiSettings() );
@@ -115,6 +121,17 @@ protected void keyTyped( char par1, int par2 ) // par1 is char typed, par2 is as
 		else if( oreIdent.isFocused() )
 		{
 			oreIdent.textboxKeyTyped( par1, par2 );
+			if( par2 == 15 )
+			{
+				oreIdent.setFocused( false );
+				if( !oreMetaCleared )
+					oreMeta.setText("");
+				oreMeta.setFocused( true );
+			}
+		}
+		else if( oreMeta.isFocused() )
+		{
+			oreMeta.textboxKeyTyped( par1, par2 );
 			if( par2 == 28 )
 				this.actionPerformed( addButton );
 		}
@@ -147,6 +164,7 @@ public void updateScreen()
 	{
 		oreName.updateCursorCounter();
 		oreIdent.updateCursorCounter();
+		oreMeta.updateCursorCounter();
 	}
 
 	@Override
@@ -161,6 +179,7 @@ public void drawScreen( int x, int y, float f )
 
 		oreName.drawTextBox();
 		oreIdent.drawTextBox();
+		oreMeta.drawTextBox();
 
 		Tessellator tessellator = Tessellator.getInstance();
 		VertexBuffer vertexbuffer = tessellator.getBuffer();
@@ -194,8 +213,10 @@ public void mouseClicked( int x, int y, int mouse )
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+
 		oreName.mouseClicked( x, y, mouse );
 		oreIdent.mouseClicked( x, y, mouse );
+		oreMeta.mouseClicked( x, y, mouse );
 
 		if( oreName.isFocused() && !oreNameCleared )
 		{
@@ -207,18 +228,28 @@ public void mouseClicked( int x, int y, int mouse )
 			oreIdent.setText( "" );
 			oreIdentCleared = true;
 		}
+		if( oreMeta.isFocused() && !oreMetaCleared )
+		{
+			oreMeta.setText( "" );
+			oreMetaCleared = true;
+		}
 
-		// TODO: fix bug where if you type then remove it the text will not be put back.
 		if( !oreName.isFocused() && oreNameCleared && Objects.equals(oreName.getText(), ""))
 		{
 			oreNameCleared = false;
-			oreName.setText( "Name of block");
+			oreName.setText( "Gui Name");
 		}
 
 		if( !oreIdent.isFocused() && oreIdentCleared && Objects.equals(oreIdent.getText(), ""))
 		{
 			oreIdentCleared = false;
-			oreIdent.setText( "ID:META");
+			oreIdent.setText( "minecraft:grass");
+		}
+
+		if( !oreMeta.isFocused() && oreMetaCleared && Objects.equals(oreMeta.getText(), ""))
+		{
+			oreMetaCleared = false;
+			oreMeta.setText( "Meta");
 		}
 //
 //		if( mouse == 1 ) // Right clicked

src/main/java/com/fgtXray/config/ConfigHandler.java

@@ -50,7 +50,7 @@ else if( category.startsWith("customores.") )
 		config.save();
 	}
 
-	public static void add( String oreName, String ore, int[] color )
+	public static void add( String oreName, Integer id, Integer meta, int[] color )
 	{
 		config.load();
 		String formattedname = oreName.replace("\\s+", "").toLowerCase();
@@ -69,10 +69,6 @@ public static void add( String oreName, String ore, int[] color )
 			}
 		}
 
-		int oreId = Integer.parseInt(ore.split( ":" )[0]);
-		// Don't do this if it does not exist... Stupid me
-		int oreMeta = ore.contains(":") ? Integer.parseInt(ore.split( ":" )[1]) : 0;
-
 		for( String category : config.getCategoryNames() )
 		{
 			if( category.startsWith("customores.") )
@@ -81,8 +77,8 @@ public static void add( String oreName, String ore, int[] color )
 				config.get("customores."+formattedname, "green", "").set( color[1] );
 				config.get("customores."+formattedname, "blue", "").set( color[2] );
 				config.get("customores."+formattedname, "enabled", "false").set( true );
-				config.get("customores."+formattedname, "id", "").set( oreId );
-				config.get("customores."+formattedname, "meta", "").set( oreMeta );
+				config.get("customores."+formattedname, "id", "").set( id );
+				config.get("customores."+formattedname, "meta", "").set( meta );
 				config.get("customores." + formattedname, "name", "").set(oreName);
 
 			}