Cleaned deprecated functions

6 files changed, 23 insertions, 44 deletions

diff --git a/Essentials/src/com/earth2me/essentials/FakeWorld.java b/Essentials/src/com/earth2me/essentials/FakeWorld.java
index 7f5acae03..d39df60e4 100644
--- a/Essentials/src/com/earth2me/essentials/FakeWorld.java
+++ b/Essentials/src/com/earth2me/essentials/FakeWorld.java
@@ -174,26 +174,6 @@ public class FakeWorld implements World
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	public Minecart spawnMinecart(Location lctn)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	public StorageMinecart spawnStorageMinecart(Location lctn)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	public PoweredMinecart spawnPoweredMinecart(Location lctn)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	public Boat spawnBoat(Location lctn)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
 	public LivingEntity spawnCreature(Location lctn, CreatureType ct)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 515ef83a5..2ba7f0eb7 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -375,7 +375,6 @@ public class Util
 						}
 						catch (IOException ex)
 						{
-							return cl.getResourceAsStream(string);
 						}
 					}
 				}
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index 4884ce6f0..52b16404e 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -196,7 +196,7 @@ public class EssentialsSign
 
 	public static boolean checkIfBlockBreaksSigns(final Block block)
 	{
-		if (block.getFace(BlockFace.UP).getType() == Material.SIGN_POST)
+		if (block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST)
 		{
 			return true;
 		}
@@ -209,7 +209,7 @@ public class EssentialsSign
 		};
 		for (BlockFace blockFace : directions)
 		{
-			final Block signblock = block.getFace(blockFace);
+			final Block signblock = block.getRelative(blockFace);
 			if (signblock.getType() == Material.WALL_SIGN)
 			{
 				final org.bukkit.material.Sign sign = (org.bukkit.material.Sign)signblock.getState().getData();
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
index 1e2813b5b..4922b3dbb 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
@@ -168,12 +168,12 @@ public class SignProtection extends EssentialsSign
 	{
 		return new Block[]
 				{
-					block.getFace(BlockFace.NORTH),
-					block.getFace(BlockFace.SOUTH),
-					block.getFace(BlockFace.EAST),
-					block.getFace(BlockFace.WEST),
-					block.getFace(BlockFace.DOWN),
-					block.getFace(BlockFace.UP)
+					block.getRelative(BlockFace.NORTH),
+					block.getRelative(BlockFace.SOUTH),
+					block.getRelative(BlockFace.EAST),
+					block.getRelative(BlockFace.WEST),
+					block.getRelative(BlockFace.DOWN),
+					block.getRelative(BlockFace.UP)
 				};
 	}
 
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
index 5d0a62d72..de6791305 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
@@ -60,7 +60,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 			prot.alert(user, blockPlaced.getType().toString(), Util.i18n("alertPlaced"));
 		}
 
-		final Block below = blockPlaced.getFace(BlockFace.DOWN);
+		final Block below = blockPlaced.getRelative(BlockFace.DOWN);
 		if (below.getType() == Material.RAILS
 			&& prot.getSettingBool(ProtectConfig.prevent_block_on_rail)
 			&& prot.getStorage().isProtected(below, user.getName()))
@@ -77,7 +77,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 			protect.add(blockPlaced);
 			if (prot.getSettingBool(ProtectConfig.protect_below_rails))
 			{
-				protect.add(blockPlaced.getFace(BlockFace.DOWN));
+				protect.add(blockPlaced.getRelative(BlockFace.DOWN));
 			}
 		}
 		if ((blockPlaced.getType() == Material.SIGN_POST || blockPlaced.getType() == Material.WALL_SIGN)
@@ -117,7 +117,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 			return;
 		}
 		if (event.getBlock().getType() == Material.OBSIDIAN
-			|| event.getBlock().getFace(BlockFace.DOWN).getType() == Material.OBSIDIAN)
+			|| event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN)
 		{
 			event.setCancelled(prot.getSettingBool(ProtectConfig.prevent_portal_creation));
 			return;
@@ -262,14 +262,14 @@ public class EssentialsProtectBlockListener extends BlockListener
 				storage.unprotectBlock(block);
 				if (type == Material.RAILS || type == Material.SIGN_POST)
 				{
-					final Block below = block.getFace(BlockFace.DOWN);
+					final Block below = block.getRelative(BlockFace.DOWN);
 					storage.unprotectBlock(below);
 				}
 				else
 				{
 					for (BlockFace blockFace : faces)
 					{
-						final Block against = block.getFace(blockFace);
+						final Block against = block.getRelative(blockFace);
 						storage.unprotectBlock(against);
 					}
 				}
@@ -278,7 +278,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 			{
 				for (BlockFace blockFace : faces)
 				{
-					final Block against = block.getFace(blockFace);
+					final Block against = block.getRelative(blockFace);
 					storage.unprotectBlock(against);
 				}
 			}
@@ -298,14 +298,14 @@ public class EssentialsProtectBlockListener extends BlockListener
 					storage.unprotectBlock(block);
 					if (type == Material.RAILS || type == Material.SIGN_POST)
 					{
-						final Block below = block.getFace(BlockFace.DOWN);
+						final Block below = block.getRelative(BlockFace.DOWN);
 						storage.unprotectBlock(below);
 					}
 					else
 					{
 						for (BlockFace blockFace : faces)
 						{
-							final Block against = block.getFace(blockFace);
+							final Block against = block.getRelative(blockFace);
 							storage.unprotectBlock(against);
 						}
 					}
@@ -314,7 +314,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 				{
 					for (BlockFace blockFace : faces)
 					{
-						final Block against = block.getFace(blockFace);
+						final Block against = block.getRelative(blockFace);
 						storage.unprotectBlock(against);
 					}
 				}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index defbde243..ceb72bd8d 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -240,19 +240,19 @@ public class EssentialsProtectEntityListener extends EntityListener
 

 		for (Block block : event.blockList())

 		{

-			if ((block.getType() == Material.RAILS || block.getFace(BlockFace.UP).getType() == Material.RAILS)

+			if ((block.getType() == Material.RAILS || block.getRelative(BlockFace.UP).getType() == Material.RAILS)

 				&& prot.getSettingBool(ProtectConfig.protect_rails))

 			{

 				event.setCancelled(true);

 				return;

 			}

 			if ((block.getType() == Material.WALL_SIGN

-				 || block.getFace(BlockFace.NORTH).getType() == Material.WALL_SIGN

-				 || block.getFace(BlockFace.EAST).getType() == Material.WALL_SIGN

-				 || block.getFace(BlockFace.SOUTH).getType() == Material.WALL_SIGN

-				 || block.getFace(BlockFace.WEST).getType() == Material.WALL_SIGN

+				 || block.getRelative(BlockFace.NORTH).getType() == Material.WALL_SIGN

+				 || block.getRelative(BlockFace.EAST).getType() == Material.WALL_SIGN

+				 || block.getRelative(BlockFace.SOUTH).getType() == Material.WALL_SIGN

+				 || block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN

 				 || block.getType() == Material.SIGN_POST

-				 || block.getFace(BlockFace.UP).getType() == Material.SIGN_POST)

+				 || block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST)

 				&& prot.getSettingBool(ProtectConfig.protect_signs))

 			{

 				event.setCancelled(true);