Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18 from Xephi/master

Browse Source 
Up
This commit is contained in:
Gabriele C. 2015-07-31 01:05:15 +02:00
commit 4568b11664
2 changed files with 94 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/fr/xephi/authme/api/API.java
View File

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

181
src/main/java/fr/xephi/authme/cache/backup/FileCache.java vendored
View File

@ -22,9 +22,9 @@ import com.comphenix.attribute.Attributes.Operation;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.api.API; import fr.xephi.authme.api.API;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.Utils;
public class FileCache { public class FileCache {
@ -217,108 +217,93 @@ public class FileCache {
boolean op = false; boolean op = false;
boolean flying = false; boolean flying = false;
Scanner reader = null; Scanner reader = new Scanner(file);
try {
reader = new Scanner(file);
int i = 0; int i = 0;
int a = 0; int a = 0;
while (reader.hasNextLine()) { while (reader.hasNextLine()) {
String line = reader.nextLine(); String line = reader.nextLine();
if (!line.contains(":")) { if (!line.contains(":")) {
// the fist line represent the player group, // the fist line represent the player group,
// operator // operator
// status // status
// and flying status // and flying status
final String[] playerInfo = line.split(";"); final String[] playerInfo = line.split(";");
group = playerInfo[0]; group = playerInfo[0];
if (Integer.parseInt(playerInfo[1]) == 1) { if (Integer.parseInt(playerInfo[1]) == 1) {
op = true; op = true;
} else op = false; } else op = false;
if (playerInfo.length > 2) { if (playerInfo.length > 2) {
if (Integer.parseInt(playerInfo[2]) == 1) if (Integer.parseInt(playerInfo[2]) == 1)
flying = true; flying = true;
else flying = false; else flying = false;
}
continue;
} }
if (!line.startsWith("i") && !line.startsWith("w")) { continue;
continue;
}
String lores = "";
String name = "";
if (line.split("\\*").length > 1) {
lores = line.split("\\*")[1];
line = line.split("\\*")[0];
}
if (line.split(";").length > 1) {
name = line.split(";")[1];
line = line.split(";")[0];
}
final String[] in = line.split(":");
// can enchant item? size ofstring in file - 4 all / 2 =
// number
// of enchant
if (in[0].equals("i")) {
stacki[i] = new ItemStack(Material.getMaterial(in[1]), Integer.parseInt(in[2]), Short.parseShort((in[3])));
if (in.length > 4 && !in[4].isEmpty()) {
for (int k = 4; k < in.length - 1; k++) {
stacki[i].addUnsafeEnchantment(Enchantment.getByName(in[k]), Integer.parseInt(in[k + 1]));
k++;
}
}
try {
ItemMeta meta = plugin.getServer().getItemFactory().getItemMeta(stacki[i].getType());
if (!name.isEmpty()) {
meta.setDisplayName(name);
}
if (!lores.isEmpty()) {
List<String> loreList = new ArrayList<String>();
for (String s : lores.split("%newline%")) {
loreList.add(s);
}
meta.setLore(loreList);
}
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])));
if (in.length > 4 && !in[4].isEmpty()) {
for (int k = 4; k < in.length - 1; k++) {
stacka[a].addUnsafeEnchantment(Enchantment.getByName(in[k]), Integer.parseInt(in[k + 1]));
k++;
}
}
try {
ItemMeta meta = plugin.getServer().getItemFactory().getItemMeta(stacka[a].getType());
if (!name.isEmpty())
meta.setDisplayName(name);
if (!lores.isEmpty()) {
List<String> loreList = new ArrayList<String>();
for (String s : lores.split("%newline%")) {
loreList.add(s);
}
meta.setLore(loreList);
}
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..."); if (!line.startsWith("i") && !line.startsWith("w")) {
} finally { continue;
if (reader != null) { }
reader.close(); String lores = "";
String name = "";
if (line.split("\\*").length > 1) {
lores = line.split("\\*")[1];
line = line.split("\\*")[0];
}
if (line.split(";").length > 1) {
name = line.split(";")[1];
line = line.split(";")[0];
}
final String[] in = line.split(":");
// can enchant item? size ofstring in file - 4 all / 2 =
// number
// of enchant
if (in[0].equals("i")) {
stacki[i] = new ItemStack(Material.getMaterial(in[1]), Integer.parseInt(in[2]), Short.parseShort((in[3])));
if (in.length > 4 && !in[4].isEmpty()) {
for (int k = 4; k < in.length - 1; k++) {
stacki[i].addUnsafeEnchantment(Enchantment.getByName(in[k]), Integer.parseInt(in[k + 1]));
k++;
}
}
ItemMeta meta = stacki[i].getItemMeta();
if (!name.isEmpty()) {
meta.setDisplayName(name);
}
if (!lores.isEmpty()) {
List<String> loreList = new ArrayList<String>();
for (String s : lores.split("%newline%")) {
loreList.add(s);
}
meta.setLore(loreList);
}
if (meta != null)
stacki[i].setItemMeta(meta);
i++;
} else {
stacka[a] = new ItemStack(Material.getMaterial(in[1]), Integer.parseInt(in[2]), Short.parseShort((in[3])));
if (in.length > 4 && !in[4].isEmpty()) {
for (int k = 4; k < in.length - 1; k++) {
stacka[a].addUnsafeEnchantment(Enchantment.getByName(in[k]), Integer.parseInt(in[k + 1]));
k++;
}
}
ItemMeta meta = stacka[a].getItemMeta();
if (!name.isEmpty())
meta.setDisplayName(name);
if (!lores.isEmpty()) {
List<String> loreList = new ArrayList<String>();
for (String s : lores.split("%newline%")) {
loreList.add(s);
}
meta.setLore(loreList);
}
if (meta != null)
stacki[i].setItemMeta(meta);
a++;
} }
} }
return new DataFileCache(stacki, stacka, group, op, flying); return new DataFileCache(stacki, stacka, group, op, flying);
@ -548,7 +533,7 @@ public class FileCache {
file.delete(); file.delete();
} else { } else {
file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + player.getName().toLowerCase() + ".cache"); file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + player.getName().toLowerCase() + ".cache");
if(file.isFile()){ if (file.isFile()) {
file.delete(); file.delete();
} else { } else {
ConsoleLogger.showError("Failed to remove" + player.getName() + "cache, it doesn't exist!"); ConsoleLogger.showError("Failed to remove" + player.getName() + "cache, it doesn't exist!");