--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/creative/GeneralContractorCommands.java	2016/10/20 07:37:19	3132
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/creative/GeneralContractorCommands.java	2016/11/18 13:14:07	3133
@@ -11,6 +11,8 @@
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 public class GeneralContractorCommands implements CommandExecutor{
 
@@ -24,13 +26,25 @@
 	}
 
 	final static int Y_MAX = 255;
-	final int valid_block_array[] = {1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 35, 41, 42, 43, 44, 45, 48, 49, 56, 57, 73, 74, 79, 80, 82} ;
+	final Material valid_block_array[] = {
+			Material.STONE, 
+			Material.GRASS,
+			Material.DIRT,
+			Material.COBBLESTONE
+	};
+//4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 35, 41, 42, 43, 44, 45, 48, 49, 56, 57, 73, 74, 79, 80, 82} ;
+
+	final Set<Material> valid_materials = new HashSet<Material>();
 
 	HashMap<String,StoredCommand> commands = new HashMap<String,StoredCommand>();
 
 
 	public GeneralContractorCommands() {
 		Arrays.sort(valid_block_array);
+
+		for (Material mat : valid_block_array) {
+			valid_materials.add( mat );
+		}
 	}
 	
 	//@Override
@@ -150,7 +164,7 @@
 	private void platform(Player player, Location loc, String[] split) {
 
 		if (split.length != 2) {
-			player.sendMessage("Usage /platform [radius] [blockID]");
+			player.sendMessage("Usage /platform [radius] [material]");
 			return;
 		}
 
@@ -167,10 +181,8 @@
 			return;
 		}
 
-		int blockid;
-		try {
-			blockid = Integer.parseInt(split[1]);
-		} catch (Exception e) {
+		Material material = Material.matchMaterial( split[1] );
+		if (material == null) {
 			player.sendMessage("platform: blockid must be an integer");
 			return;
 		}
@@ -199,7 +211,7 @@
 			for (int z=(playerZ-radius); z<=(playerZ+radius); z++) {
 				int y = playerY - 1;
 				
-				world.getBlockAt(x, y, z).setTypeId(blockid);
+				world.getBlockAt(x, y, z).setType( material );
 			}
 		}
 	}
@@ -224,18 +236,14 @@
 			return;
 		}
 
-		int blockid;
-		try {
-			blockid = Integer.parseInt(split[1]);
-		} catch (Exception e) {
-			player.sendMessage("setsurface: blockid must be an integer");
+		Material material = Material.matchMaterial( split[1] );
+		if (material == null) {
+			player.sendMessage("platform: blockid must be an integer");
 			return;
 		}
 
 		//check if the blockid is in the array of valid blocks
-		boolean validblock = ( Arrays.binarySearch(valid_block_array, blockid) >= 0);
-
-		if ( !validblock ) {
+		if ( ! valid_materials.contains(material) ) {
 			player.sendMessage("setsurface: block now allowed");
 			return;
 		}
@@ -244,7 +252,7 @@
 		int playerY = loc.getBlockY();
 		int playerZ = loc.getBlockZ();
 
-		if(playerY <= 2 && blockid != 7) {
+		if(playerY <= 2 && material != Material.BEDROCK ) {
 			player.sendMessage("setsurface: at this level you may only use bedrock(id=7)");
 			return;
 		}
@@ -256,7 +264,7 @@
 				//int y = getGroundLevel(x,z) - 1;
 				int y = world.getHighestBlockYAt(x, z) ;
 				
-				world.getBlockAt(x, y, z).setTypeId(blockid);
+				world.getBlockAt(x, y, z).setType(material);
 			}
 		}
 	}
@@ -301,10 +309,15 @@
 	private void fillArea(Player player, Location loc, String[] split) {
 		int radius = Integer.parseInt(split[0]);
 		
-		int material = Material.DIRT.getId();
+		Material material = Material.DIRT;
+
 		
 		if (split.length == 2) {
-			material = Integer.parseInt( split[1] );
+			material = Material.matchMaterial( split[1] );
+			if (material == null) {
+				player.sendMessage("Unknown material: " + split[1] );
+				return;
+			}
 		}
 
 		System.out.println("Player " + player.getName() + " used fillarea with radius=" + radius);
@@ -322,7 +335,7 @@
 				
 
 				for (int y=world.getHighestBlockYAt(x, z); y<playerY; y++) {					
-					world.getBlockAt(x, y, z).setTypeId(material);
+					world.getBlockAt(x, y, z).setType( material );
 				}
 
 			}
@@ -406,7 +419,12 @@
 			player.sendMessage("Usage: /cylinder [radius] [material] ");
 			return;
 		}
-		int material = Integer.parseInt( split[1] );
+
+		Material material = Material.matchMaterial( split[1] );
+		if ( material == null) {
+			player.sendMessage("/cylinder: unknown material: " + split[1]);
+			return;
+		}
 
 		int radius = Integer.parseInt(split[0]);
 		int diameter = (radius*2) + 1;
@@ -435,7 +453,7 @@
 		drawMap( loc, map, material );	
 	}
 
-	private void drawMap(Location loc, boolean[][] map, int material) {
+	private void drawMap(Location loc, boolean[][] map, Material material) {
 		int playerX = loc.getBlockX();
 		int playerY = loc.getBlockY();
 		int playerZ = loc.getBlockZ();
@@ -450,7 +468,7 @@
 
 				if (map[i][j] == true) {
 					for (int y=world.getHighestBlockYAt(x, z); y<playerY; y++) {					
-						world.getBlockAt(x, y, z).setTypeId(material);
+						world.getBlockAt(x, y, z).setType(material);
 					}
 				}