Merge pull request #18 from Xephi/master

Up

src/main/java/fr/xephi/authme/api/API.java

@@ -30,6 +30,7 @@ public class API {
      * 
      * @return AuthMe instance
      */
+    @Deprecated
     public static AuthMe hookAuthMe() {
         if (instance != null)
             return instance;
@@ -41,6 +42,7 @@ public class API {
         return instance;
     }
 
+    @Deprecated
     public AuthMe getPlugin() {
         return instance;
     }
@@ -50,6 +52,7 @@ public class API {
      * @param player
      * @return true if player is authenticate
      */
+    @Deprecated
     public static boolean isAuthenticated(Player player) {
         return PlayerCache.getInstance().isAuthenticated(player.getName());
     }
@@ -71,6 +74,7 @@ public class API {
      * @param player
      * @return true if player is a npc
      */
+    @Deprecated
     public boolean isNPC(Player player) {
         if (instance.getCitizensCommunicator().isNPC(player))
             return true;
@@ -82,10 +86,12 @@ public class API {
      * @param player
      * @return true if the player is unrestricted
      */
+    @Deprecated
     public static boolean isUnrestricted(Player player) {
         return Utils.getInstance().isUnrestricted(player);
     }
 
+    @Deprecated
     public static Location getLastLocation(Player player) {
         try {
             PlayerAuth auth = PlayerCache.getInstance().getAuth(player.getName().toLowerCase());
@@ -102,6 +108,7 @@ public class API {
         }
     }
 
+    @Deprecated
     public static void setPlayerInventory(Player player, ItemStack[] content,
             ItemStack[] armor) {
         try {
@@ -116,6 +123,7 @@ public class API {
      * @param playerName
      * @return true if player is registered
      */
+    @Deprecated
     public static boolean isRegistered(String playerName) {
         String player = playerName.toLowerCase();
         return instance.database.isAuthAvailable(player);
@@ -126,6 +134,7 @@ public class API {
      *            playerName, String passwordToCheck
      * @return true if the password is correct , false else
      */
+    @Deprecated
     public static boolean checkPassword(String playerName,
             String passwordToCheck) {
         if (!isRegistered(playerName))
@@ -146,6 +155,7 @@ public class API {
      *            playerName, String password
      * @return true if the player is register correctly
      */
+    @Deprecated
     public static boolean registerPlayer(String playerName, String password) {
         try {
             String name = playerName.toLowerCase();
@@ -169,6 +179,7 @@ public class API {
      * @param Player
      *            player
      */
+    @Deprecated
     public static void forceLogin(Player player) {
         instance.management.performLogin(player, "dontneed", true);
     }

src/main/java/fr/xephi/authme/cache/backup/FileCache.java

@@ -22,9 +22,9 @@ import com.comphenix.attribute.Attributes.Operation;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.Utils;
 import fr.xephi.authme.api.API;
 import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.Utils;
 
 public class FileCache {
 
@@ -217,9 +217,7 @@ public class FileCache {
                 boolean op = false;
                 boolean flying = false;
 
-                Scanner reader = null;
+                Scanner reader = new Scanner(file);
-                try {
-                    reader = new Scanner(file);
 
                 int i = 0;
                 int a = 0;
@@ -271,8 +269,7 @@ public class FileCache {
                                 k++;
                             }
                         }
-                            try {
+                        ItemMeta meta = stacki[i].getItemMeta();
-                                ItemMeta meta = plugin.getServer().getItemFactory().getItemMeta(stacki[i].getType());
                         if (!name.isEmpty()) {
                             meta.setDisplayName(name);
                         }
@@ -285,8 +282,6 @@ public class FileCache {
                         }
                         if (meta != null)
                             stacki[i].setItemMeta(meta);
-                            } catch (Exception e) {
-                            }
                         i++;
                     } else {
                         stacka[a] = new ItemStack(Material.getMaterial(in[1]), Integer.parseInt(in[2]), Short.parseShort((in[3])));
@@ -296,8 +291,7 @@ public class FileCache {
                                 k++;
                             }
                         }
-                            try {
+                        ItemMeta meta = stacka[a].getItemMeta();
-                                ItemMeta meta = plugin.getServer().getItemFactory().getItemMeta(stacka[a].getType());
                         if (!name.isEmpty())
                             meta.setDisplayName(name);
                         if (!lores.isEmpty()) {
@@ -309,18 +303,9 @@ public class FileCache {
                         }
                         if (meta != null)
                             stacki[i].setItemMeta(meta);
-                            } catch (Exception e) {
-                            }
                         a++;
                     }
                 }
-                } catch (final Exception e) {
-                    ConsoleLogger.showError("Error on creating a file cache for " + player.getName() + ", maybe wipe inventory...");
-                } finally {
-                    if (reader != null) {
-                        reader.close();
-                    }
-                }
                 return new DataFileCache(stacki, stacka, group, op, flying);
             } else {
                 // NEW METHOD
@@ -548,7 +533,7 @@ public class FileCache {
                 file.delete();
             } else {
                 file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + player.getName().toLowerCase() + ".cache");
-                if(file.isFile()){
+                if (file.isFile()) {
                     file.delete();
                 } else {
                     ConsoleLogger.showError("Failed to remove" + player.getName() + "cache, it doesn't exist!");