--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2015/03/09 12:29:22	2429
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2015/03/09 13:24:52	2430
@@ -2,27 +2,23 @@
 
 import java.util.Map;
 
-import org.bukkit.Material;
 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 byte data[][];
+	private Location blockLocations[][]; // [width][height] - [0][0] == leftUpper
+	private BlockState blockStates[][];
 	
-	private int direction;
+	private BlockFace direction;
 	
 	private int width;
 	private int height;
@@ -45,22 +41,27 @@
 		this.isPrivate = isPrivate;
 		this.password = password;
 		
+		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;
 		}
 
 		
@@ -72,7 +73,7 @@
 	
 		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();
 				}
@@ -100,7 +101,7 @@
 		loadBlocks();
 	}*/
 
-	public Door(Location loc, int direction, int width, int height, String owner, boolean isPrivate, String password) {
+	public Door(Location loc, BlockFace direction, int width, int height, String owner, boolean isPrivate, String password) {
 		leftUpper = loc;
 		this.direction = direction;
 		this.width = width;
@@ -125,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;
@@ -136,9 +137,8 @@
 	}
 	
 	private void loadBlocks() {
-		blocks = new Location[width][height];		
-		material = new int[width][height];		
-		data = new byte[width][height];		
+		blockLocations = new Location[width][height];		
+		blockStates = new BlockState[width][height];		
 		
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {
@@ -165,11 +165,10 @@
 				
 				//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);
 
-				material[w][h] = blocks[w][h].getBlock().getTypeId();
-				data[w][h] = blocks[w][h].getBlock().getData();
-				
+				blockStates[w][h] = blockLocations[w][h].getBlock().getState();
+	
 			}
 		}
 		
@@ -198,7 +197,7 @@
 	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);
 			}
 		}
 	}
@@ -206,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] );
 			}
 		}
 
@@ -216,7 +215,7 @@
 		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().setType( Material.AIR );
+				blockLocations[w][h].getBlock().setType( Material.AIR );
 			}
 		}
 
@@ -225,7 +224,7 @@
 	public void close() {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {				
-				blocks[w][h].getBlock().setTypeIdAndData( material[w][h], data[w][h], true );
+				blockStates[w][h].update(true, true);
 			}
 		}
 	}
@@ -248,7 +247,7 @@
 		return height;
 	}
 
-	public int getDirection() {
+	public BlockFace getDirection() {
 		return direction;
 	}