--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/06/27 16:14:34	1530
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/06/27 19:43:33	1534
@@ -8,49 +8,66 @@
 import org.bukkit.block.Block;
 
 
-
 class Door {
+	final static int EAST = 0;
+	final static int WEST = 1;
+	final static int NORTH = 2;
+	final static int SOUTH = 3;
+	
 	Location leftUpper;
-	Location rightUpper;
-	Location leftLower;
-	Location rightLower;
+
+	
+	Location blocks[][]; // [width][height] - [0][0] == leftUpper
 
 	int material;
+	
+	int direction;
+	
+	int width;
+	int height;
+	
 
-	public Door(Block sign) {
+	public Door(Block sign, int width, int height, DoorStorage store) throws ConflictingDoorException{
 		leftUpper = sign.getLocation().clone();
-		rightUpper = sign.getLocation().clone();
+		
+		this.width = width;
+		this.height = height;
+		
+		blocks = new Location[width][height];		
 
+		direction = sign.getData() - 2;
+		
 		switch ( sign.getData() ) {
 		case 2: //facing east
 			leftUpper.setZ( leftUpper.getZ() + 1 ); 
-			rightUpper.setZ( rightUpper.getZ() + 1 ); 
-			rightUpper.setX( rightUpper.getX() - 1 );
 			break;	
 		case 3: //facing west
 			leftUpper.setZ( leftUpper.getZ() - 1 );
-			rightUpper.setZ( rightUpper.getZ() - 1 ); 
-			rightUpper.setX( rightUpper.getX() + 1 );				
 			break;
 		case 4: //facing north
 			leftUpper.setX( leftUpper.getX() + 1);
-			rightUpper.setX( rightUpper.getX() + 1);
-			rightUpper.setZ( rightUpper.getZ() + 1);
 			break;
 		case 5: //facing south
 			leftUpper.setX( leftUpper.getX() - 1);
-			rightUpper.setX( rightUpper.getX() - 1);
-			rightUpper.setZ( rightUpper.getZ() - 1);
 			break;
 		}
 
-		material = sign.getWorld().getBlockAt( leftUpper ).getTypeId();
-
-		leftLower = leftUpper.clone();
-		rightLower = rightUpper.clone();
+		
+		
+		material = leftUpper.getBlock().getTypeId();
+		
+		loadBlocks();
+		
+		
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {
+				Door d = store.findDoor( blocks[w][h] );
+				if (d != null) {
+					throw new ConflictingDoorException();
+				}
+			}
+		}
 
-		leftLower.setY( leftLower.getY() - 1);
-		rightLower.setY( rightLower.getY() - 1);
 	}
 
 	public Door(String input, Server server) {
@@ -59,10 +76,47 @@
 		World w = server.getWorld( parts[0] );
 
 		leftUpper  = new Location(w, Integer.parseInt(parts[1]),  Integer.parseInt(parts[2]),  Integer.parseInt(parts[3]) );
-		rightUpper = new Location(w, Integer.parseInt(parts[4]),  Integer.parseInt(parts[5]),  Integer.parseInt(parts[6]) );
-		leftLower  = new Location(w, Integer.parseInt(parts[7]),  Integer.parseInt(parts[8]),  Integer.parseInt(parts[9]) );
-		rightLower = new Location(w, Integer.parseInt(parts[10]), Integer.parseInt(parts[11]), Integer.parseInt(parts[12]) );
-		material = Integer.parseInt( parts[13] );
+		direction = Integer.parseInt( parts[4] );
+		material = Integer.parseInt( parts[5] );
+		
+		width = Integer.parseInt( parts[6] );
+		height = Integer.parseInt( parts[7] );
+		
+		loadBlocks();
+	}
+	
+	private void loadBlocks() {
+		
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {
+				int x = leftUpper.getBlockX();
+				int y = leftUpper.getBlockY();
+				int z = leftUpper.getBlockZ();
+				switch(direction) {
+				case EAST:
+					x -= w;
+					break;
+				case WEST:
+					x += w;
+					break;					
+				case NORTH:
+					z += w;
+					break;
+				case SOUTH:
+					z -= w;
+					break;
+				default:
+					System.out.println("[SecretDoor] this should never happen");				
+				}
+				y -= h;
+				
+				//System.out.println("Add block: " + x + ":" + y + ":" + z);
+				
+				blocks[w][h] = new Location( leftUpper.getWorld(), x, y, z);
+				
+			}
+		}
+		
 	}
 
 	public String toCsv() {
@@ -72,53 +126,50 @@
 		sb.append( ":" + leftUpper.getBlockX() );
 		sb.append( ":" + leftUpper.getBlockY() );
 		sb.append( ":" + leftUpper.getBlockZ() );
-
-		sb.append( ":" + rightUpper.getBlockX() );
-		sb.append( ":" + rightUpper.getBlockY() );
-		sb.append( ":" + rightUpper.getBlockZ() );
-
-
-		sb.append( ":" + leftLower.getBlockX() );
-		sb.append( ":" + leftLower.getBlockY() );
-		sb.append( ":" + leftLower.getBlockZ() );
-
-
-		sb.append( ":" + rightLower.getBlockX() );
-		sb.append( ":" + rightLower.getBlockY() );
-		sb.append( ":" + rightLower.getBlockZ() );
+		
+		sb.append( ":" + direction );
 
 		sb.append( ":" + material );
+		
+		sb.append( ":" + width );
+		sb.append( ":" + height );
 
 		return sb.toString();
 	}
 
 
 	public void registerMap(Map<Location,Door> map) {
-		map.put(leftUpper, this );
-		map.put(rightUpper, this );
-		map.put(leftLower, this );
-		map.put(rightLower, this );
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {
+				map.put(blocks[w][h], this);
+			}
+		}
 	}
 
 	public void unregisterMap(Map<Location,Door> map) {
-		map.remove(leftUpper);
-		map.remove(rightUpper);
-		map.remove(leftLower);
-		map.remove(rightLower);
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {
+				map.remove( blocks[w][h] );
+			}
+		}
+
 	}
 
 	public void open(World world) {
-		world.getBlockAt( leftUpper ).setTypeId( 0 );
-		world.getBlockAt( rightUpper ).setTypeId( 0 );
-		world.getBlockAt( leftLower ).setTypeId( 0 );
-		world.getBlockAt( rightLower ).setTypeId( 0 );
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {				
+				blocks[w][h].getBlock().setTypeId(0);
+			}
+		}
+
 	}
 
 	public void close(World world) {
-		world.getBlockAt( leftUpper ).setTypeId( material );
-		world.getBlockAt( rightUpper ).setTypeId( material );
-		world.getBlockAt( leftLower ).setTypeId( material );
-		world.getBlockAt( rightLower ).setTypeId( material );
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {				
+				blocks[w][h].getBlock().setTypeId( material );
+			}
+		}
 	}
 
 }
\ No newline at end of file