--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/07/17 19:28:22	1580
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2015/03/09 13:24:52	2430
@@ -3,69 +3,77 @@
 import java.util.Map;
 
 import org.bukkit.Location;
-import org.bukkit.Server;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
 
 
 class Door {
-	final static int EAST = 0;
-	final static int WEST = 1;
-	final static int NORTH = 2;
-	final static int SOUTH = 3;
-	
+
 	private Location leftUpper;
 
 	
-	private Location blocks[][]; // [width][height] - [0][0] == leftUpper
-
-	private int material;
+	private Location blockLocations[][]; // [width][height] - [0][0] == leftUpper
+	private BlockState blockStates[][];
 	
-	private int direction;
+	private BlockFace direction;
 	
 	private int width;
 	private int height;
 
 	private String owner;
+
+	private boolean isPrivate;
+	
+	private String password;
 	
 
-	public Door(Block sign, int width, int height, DoorStorage store, String owner) throws ConflictingDoorException{
+	public Door(Block sign, int width, int height, DoorStorage store, String owner, boolean isPrivate, String password) throws ConflictingDoorException{
 		leftUpper = sign.getLocation().clone();
 		
 		this.width = width;
 		this.height = height;
 
 		this.owner = owner;
+
+		this.isPrivate = isPrivate;
+		this.password = password;
 		
-		blocks = new Location[width][height];		
+		BlockState signState = sign.getState();
+		org.bukkit.material.Sign signData = (org.bukkit.material.Sign) signState.getData();
 
-		direction = sign.getData() - 2;
+		direction = signData.getFacing();
 		
-		switch ( sign.getData() ) {
-		case 2: //facing east
+		switch ( direction ) {
+		case EAST: //facing east
 			leftUpper.setZ( leftUpper.getZ() + 1 ); 
 			break;	
-		case 3: //facing west
+		case WEST: //facing west
 			leftUpper.setZ( leftUpper.getZ() - 1 );
 			break;
-		case 4: //facing north
+		case NORTH: //facing north
 			leftUpper.setX( leftUpper.getX() + 1);
 			break;
-		case 5: //facing south
+		case SOUTH: //facing south
 			leftUpper.setX( leftUpper.getX() - 1);
 			break;
+		default:
+			//DoNothing
+			break;
 		}
 
 		
 		
-		material = leftUpper.getBlock().getTypeId();
+		//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] );
+				Door d = store.findDoor( blockLocations[w][h] );
 				if (d != null) {
 					throw new ConflictingDoorException();
 				}
@@ -74,6 +82,8 @@
 
 	}
 
+/*
+	@Deprecated
 	public Door(String input, Server server) {
 		String parts[] = input.split(":");
 
@@ -81,18 +91,30 @@
 
 		leftUpper  = new Location(w, Integer.parseInt(parts[1]),  Integer.parseInt(parts[2]),  Integer.parseInt(parts[3]) );
 		direction = Integer.parseInt( parts[4] );
-		material = Integer.parseInt( parts[5] );
+		//material = Integer.parseInt( parts[5] );
 		
 		width = Integer.parseInt( parts[6] );
 		height = Integer.parseInt( parts[7] );
 		owner = parts[8];
 
-
-		blocks = new Location[width][height];		
 		
 		loadBlocks();
+	}*/
+
+	public Door(Location loc, BlockFace direction, int width, int height, String owner, boolean isPrivate, String password) {
+		leftUpper = loc;
+		this.direction = direction;
+		this.width = width;
+		this.height = height;
+		this.owner = owner;
+		this.isPrivate = isPrivate;
+		this.password = password;
+
+		loadBlocks();
 	}
 
+	
+
 	public void powerChange(World world, int oldCurrent, int newCurrent ) {
 		if (isPowered() == true) {
 			open();
@@ -104,7 +126,7 @@
 	public boolean isPowered() {
 		for (int w=0; w<width; w++) {
                         for (int h=0; h<height; h++) {
-				Block b = blocks[w][h].getBlock();
+				Block b = blockLocations[w][h].getBlock();
 
 				if ( b.isBlockPowered() ||  b.isBlockIndirectlyPowered() )
 					return true;
@@ -115,6 +137,8 @@
 	}
 	
 	private void loadBlocks() {
+		blockLocations = new Location[width][height];		
+		blockStates = new BlockState[width][height];		
 		
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {
@@ -141,14 +165,16 @@
 				
 				//System.out.println("Add block: " + x + ":" + y + ":" + z);
 				
-				blocks[w][h] = new Location( leftUpper.getWorld(), x, y, z);
-				
+				blockLocations[w][h] = new Location( leftUpper.getWorld(), x, y, z);
+
+				blockStates[w][h] = blockLocations[w][h].getBlock().getState();
+	
 			}
 		}
 		
 	}
 
-	public String toCsv() {
+/*	public String toCsv() {
 		StringBuilder sb = new StringBuilder();
 		sb.append( leftUpper.getWorld().getName() );
 
@@ -158,20 +184,20 @@
 		
 		sb.append( ":" + direction );
 
-		sb.append( ":" + material );
+		sb.append( ":" + material[0][0] );
 		
 		sb.append( ":" + width );
 		sb.append( ":" + height );
 		sb.append( ":" + owner);
 
 		return sb.toString();
-	}
+	}*/
 
 
 	public void registerMap(Map<Location,Door> map) {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {
-				map.put(blocks[w][h], this);
+				map.put(blockLocations[w][h], this);
 			}
 		}
 	}
@@ -179,7 +205,7 @@
 	public void unregisterMap(Map<Location,Door> map) {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {
-				map.remove( blocks[w][h] );
+				map.remove( blockLocations[w][h] );
 			}
 		}
 
@@ -188,7 +214,8 @@
 	public void open() {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {				
-				blocks[w][h].getBlock().setTypeId(0, false);
+				//blocks[w][h].getBlock().setTypeId( 0, false);
+				blockLocations[w][h].getBlock().setType( Material.AIR );
 			}
 		}
 
@@ -197,7 +224,7 @@
 	public void close() {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {				
-				blocks[w][h].getBlock().setTypeId( material );
+				blockStates[w][h].update(true, true);
 			}
 		}
 	}
@@ -208,4 +235,28 @@
 		return owner;
 	}
 
+	public Location getLeftUpper() {
+		return leftUpper;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public BlockFace getDirection() {
+		return direction;
+	}
+
+	public boolean isPrivate() {
+		return isPrivate;
+	}
+	
+	public String getPassword() {
+		return password;
+	}
+
 }