From df8bc51437bf0023dc1b8fe31a50daeb653ad2fb Mon Sep 17 00:00:00 2001
From: Philip Cass <frymaster@127001.org>
Date: Thu, 26 Feb 2015 16:44:46 +0000
Subject: [PATCH] Use custom names in block lookups

Currently will search only using block type ie searching for prismarine_brick
will search for all prismarine blocks

Also removed pluralisation of prismarine_brick
---
 .../java/de/diddiz/LogBlock/QueryParams.java  |  5 ++--
 .../java/de/diddiz/util/MaterialName.java     | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/QueryParams.java b/src/main/java/de/diddiz/LogBlock/QueryParams.java
index e19cc4e..0c2cb29 100644
--- a/src/main/java/de/diddiz/LogBlock/QueryParams.java
+++ b/src/main/java/de/diddiz/LogBlock/QueryParams.java
@@ -20,6 +20,7 @@ import static de.diddiz.LogBlock.config.Config.*;
 import static de.diddiz.util.BukkitUtils.friendlyWorldname;
 import static de.diddiz.util.BukkitUtils.getBlockEquivalents;
 import static de.diddiz.util.MaterialName.materialName;
+import static de.diddiz.util.MaterialName.typeFromName;
 import static de.diddiz.util.Utils.*;
 
 public final class QueryParams implements Cloneable
@@ -579,9 +580,7 @@ public final class QueryParams implements Cloneable
 						types.add(new Block(mat.getId(), data));
 					} else {
 						final Material mat = Material.matchMaterial(blockName);
-						if (mat == null)
-							throw new IllegalArgumentException("No material matching: '" + blockName + "'");
-						types.add(new Block(mat.getId(), -1));
+						types.add(new Block(typeFromName(blockName), -1));
 					}
 				}
 			} else if (param.equals("area")) {
diff --git a/src/main/java/de/diddiz/util/MaterialName.java b/src/main/java/de/diddiz/util/MaterialName.java
index 4213c38..2be9310 100644
--- a/src/main/java/de/diddiz/util/MaterialName.java
+++ b/src/main/java/de/diddiz/util/MaterialName.java
@@ -18,6 +18,7 @@ public class MaterialName
 	private static final String[] COLORS = {"white","orange","magenta","light blue","yellow","lime","pink","gray","silver","cyan","purple","blue","brown","green","red","black"};
 	private static final Map<Integer, String> materialNames = new HashMap<Integer, String>();
 	private static final Map<Integer, Map<Short, String>> materialDataNames = new HashMap<Integer, Map<Short, String>>();
+	private static final Map<String, Integer> nameTypes = new HashMap<String, Integer>();
 
 	static {
 		// Add all known materials
@@ -141,7 +142,7 @@ public class MaterialName
 			cfg.set("162.9", "dark oak log");
 			cfg.set("162.12", "acacia log");
 			cfg.set("162.13", "dark oak log");
-			cfg.set("168.1", "prismarine bricks");
+			cfg.set("168.1", "prismarine brick");
 			cfg.set("168.2", "dark prismarine");
 			cfg.set("181.0", "red sandstone double step");
 			cfg.set("181.8", "smooth red sandstone double step");
@@ -197,16 +198,20 @@ public class MaterialName
 		}
 		for (final String entry : cfg.getKeys(false))
 			if (isInt(entry)) {
-				if (cfg.isString(entry))
+				if (cfg.isString(entry)) {
 					materialNames.put(Integer.valueOf(entry), cfg.getString(entry));
+					nameTypes.put(cfg.getString(entry), Integer.valueOf(entry));
+				}
 				else if (cfg.isConfigurationSection(entry)) {
 					final Map<Short, String> dataNames = new HashMap<Short, String>();
 					materialDataNames.put(Integer.valueOf(entry), dataNames);
 					final ConfigurationSection sec = cfg.getConfigurationSection(entry);
 					for (final String data : sec.getKeys(false))
 						if (isShort(data)) {
-							if (sec.isString(data))
+							if (sec.isString(data)) {
 								dataNames.put(Short.valueOf(data), sec.getString(data));
+								nameTypes.put(sec.getString(data), Integer.valueOf(entry));
+							}
 							else
 								getLogger().warning("Parsing materials.yml: '" + data + "' is not a string.");
 						} else
@@ -234,8 +239,20 @@ public class MaterialName
 				return dataNames.get(data);
 		return materialName(type);
 	}
+	
+	public static Integer typeFromName(String name) {
+	    Integer answer = nameTypes.get(toReadable(name));
+	    if (answer != null) return answer;
+	    final Material mat = Material.matchMaterial(name);
+	    if (mat == null) throw new IllegalArgumentException("No material matching: '" + name + "'");
+	    return mat.getId();
+	}
 
 	private static String toReadable(MaterialData matData) {
 		return matData.toString().toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");
 	}
+
+	private static String toReadable(String matData) {
+		return matData.toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");
+	}
 }