diff --git a/pom.xml b/pom.xml index 3a4b7c1a..57558241 100644 --- a/pom.xml +++ b/pom.xml @@ -1,623 +1,575 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - fr.xephi - authme - 5.0-SNAPSHOT + fr.xephi + authme + 5.0-SNAPSHOT - jar + AuthMeReloaded + Authentication plugin for CraftBukkit/Spigot! + 2013 + http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ + - AuthMeReloaded - Authentication plugin for CraftBukkit/Spigot! - 2013 - http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ - + + scm:git:https://github.com/Xephi/AuthMeReloaded.git + scm:git:git@github.com:Xephi/AuthMeReloaded.git + http://github.com/Xephi/AuthMeReloaded + - - scm:git:https://github.com/Xephi/AuthMeReloaded.git - scm:git:git@github.com:Xephi/AuthMeReloaded.git - http://github.com/Xephi/AuthMeReloaded - HEAD - + + + jenkins + http://ci.xephi.fr/job/AuthMeReloaded/ + - - - jenkins - http://ci.xephi.fr/job/AuthMeReloaded/ - + + GitHub + https://github.com/Xephi/AuthMeReloaded/issues + - - GitHub - https://github.com/Xephi/AuthMeReloaded/issues - + + + Apache-2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + UTF-8 + + 1.7 + + 1.8.8-R0.1-SNAPSHOT + - - UTF-8 + + ${project.name}-${project.version} + + + . + true + ${basedir}/src/main/resources/ + + *.yml + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + ${javaVersion} + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.1 + + + + com.maxmind.geoip:* + javax.mail:* + com.sun.mail:* + com.comphenix.attribute:* + org.mcstats.*:* + com.zaxxer:* + org.slf4j:* + + + + + org.mcstats + fr.xephi.authme + + + + + + package + + shade + + + + + + - - 1.7 - 1.7 + - - 1.8.8-R0.1-SNAPSHOT - - AuthMe - + + + spigot-repo + https://hub.spigotmc.org/nexus/content/groups/public + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - ${maven.compiler.source} - ${maven.compiler.target} - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - prepare-package - - replace - - - - - target/classes/plugin.yml - - - maven-version - ${project.version} - - - - - - maven-jar-plugin - 2.6 - - - ${manifest.file} - - ${jarPluginName}-${project.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.1 - - - - com.maxmind.geoip:* - javax.mail:* - com.sun.mail:* - com.comphenix.attribute:* - org.mcstats.*:* - com.zaxxer:* - org.slf4j:* - - - - - org.mcstats - fr.xephi.authme - - - - - - package - - shade - - - - - - com.versioneye - versioneye-maven-plugin - 3.5.1 - - 55bab9e8653762002000190a - - - - - + + + ess-repo + http://repo.ess3.net/content/groups/public + - + + + citizensapi-repo + http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository + - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public - + + + minelink-thirdparty + http://repo.minelink.net/content/repositories/public + - - - ess-repo - http://repo.ess3.net/content/groups/public - + + + comphenix-snapshots + http://repo.comphenix.net/content/repositories/public + - - - citizensapi-repo - http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository - + + + onarandombox + http://repo.onarandombox.com/content/groups/public + - - - minelink-thirdparty - http://repo.minelink.net/content/repositories/public - + + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases + - - - comphenix-snapshots - http://repo.comphenix.net/content/repositories/public - + + + luricos-releases + http://repo.luricos.de/content/repositories/releases + - - - onarandombox - http://repo.onarandombox.com/content/groups/public - + + + xephi-repo + http://ci.xephi.fr/plugin/repository/everything/ + - - - vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases - + + + mcstats-snapshots + http://repo.mcstats.org/content/repositories/snapshots/ + - - - luricos-releases - http://repo.luricos.de/content/repositories/releases - + - - - xephi-repo - http://ci.xephi.fr/plugin/repository/everything/ - + - - - mcstats-snapshots - http://repo.mcstats.org/content/repositories/snapshots/ - + - + + + org.slf4j + slf4j-simple + 1.7.12 + compile + + + com.zaxxer + HikariCP + 2.4.0 + compile + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + + + - + + + org.xerial + sqlite-jdbc + 3.8.11 + compile + - - - - - org.slf4j - slf4j-simple - 1.7.12 - compile - - - com.zaxxer - HikariCP - 2.4.0 - compile - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - - - - - org.xerial - sqlite-jdbc - 3.8.11 - compile - - - - - com.sun.mail - javax.mail - 1.5.4 - compile - + + + com.sun.mail + javax.mail + 1.5.4 + compile + - - - com.maxmind.geoip - geoip-api - 1.2.15 - compile - + + + com.maxmind.geoip + geoip-api + 1.2.15 + compile + - - - org.mcstats.bukkit - metrics - R8-SNAPSHOT - compile - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - + + + org.mcstats.bukkit + metrics + R8-SNAPSHOT + compile + + + org.bukkit + bukkit + + + - - - org.spigotmc - spigot-api - ${bukkitVersion} - provided - - - bungeecord-chat - net.md-5 - - - + + + org.bukkit + bukkit + ${bukkitVersion} + provided + - - - com.comphenix.attribute - AttributeStorage - 0.0.2-SNAPSHOT - compile - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - + + + com.comphenix.attribute + AttributeStorage + 0.0.2-SNAPSHOT + compile + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + - - - net.milkbowl.vault - VaultAPI - 1.5 - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - + + + net.milkbowl.vault + VaultAPI + 1.5 + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + - - - net.citizensnpcs - citizensapi - 2.0.16-SNAPSHOT - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - + + + net.citizensnpcs + citizensapi + 2.0.16-SNAPSHOT + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + - - - com.onarandombox.multiversecore - Multiverse-Core - 2.5 - jar - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - AllPay - com.fernferret.allpay - - - Vault - net.milkbowl.vault - - - CommandHandler - com.pneumaticraft.commandhandler - - - + + + com.onarandombox.multiversecore + Multiverse-Core + 2.5 + jar + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + AllPay + com.fernferret.allpay + + + Vault + net.milkbowl.vault + + + CommandHandler + com.pneumaticraft.commandhandler + + + - - - net.ess3 - Essentials - 2.14-SNAPSHOT - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - + + + net.ess3 + Essentials + 2.14-SNAPSHOT + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + - - - net.minelink - CombatTagPlus - 1.2.1-SNAPSHOT - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - CombatTagPlusHook - net.minelink - - - CombatTagPlusFactions-v1_6 - net.minelink - - - CombatTagPlusCompat-v1_7_R3 - net.minelink - - - CombatTagPlusFactions-v1_8 - net.minelink - - - CombatTagPlusCompat-v1_7_R4 - net.minelink - - - CombatTagPlusWG-v5 - net.minelink - - - CombatTagPlusWG-v6 - net.minelink - - - CombatTagPlusCompat-API - net.minelink - - - CombatTagPlusFactions-v2_6 - net.minelink - - - CombatTagPlusCompat-v1_8_R3 - net.minelink - - - CombatTagPlusFactions-v2_7 - net.minelink - - - CombatTagPlusCompat-v1_8_R2 - net.minelink - - - CombatTagPlusCompat-v1_8_R1 - net.minelink - - - metrics-lite - org.mcstats.bukkit - - - + + + net.minelink + CombatTagPlus + 1.2.1-SNAPSHOT + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + CombatTagPlusHook + net.minelink + + + CombatTagPlusFactions-v1_6 + net.minelink + + + CombatTagPlusCompat-v1_7_R3 + net.minelink + + + CombatTagPlusFactions-v1_8 + net.minelink + + + CombatTagPlusCompat-v1_7_R4 + net.minelink + + + CombatTagPlusWG-v5 + net.minelink + + + CombatTagPlusWG-v6 + net.minelink + + + CombatTagPlusCompat-API + net.minelink + + + CombatTagPlusFactions-v2_6 + net.minelink + + + CombatTagPlusCompat-v1_8_R3 + net.minelink + + + CombatTagPlusFactions-v2_7 + net.minelink + + + CombatTagPlusCompat-v1_8_R2 + net.minelink + + + CombatTagPlusCompat-v1_8_R1 + net.minelink + + + metrics-lite + org.mcstats.bukkit + + + - - - com.trc202 - CombatTag - 6.2.1-SNAPSHOT - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - + + + com.trc202 + CombatTag + 6.2.1-SNAPSHOT + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + - - - de.luricos.bukkit - xAuth - 2.6 - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - updater - net.gravitydevelopment.updater - - - lombok - org.projectlombok - - - EssentialsGroupManager - net.ess3 - - - PermissionsEx - ru.tehkode - - - AccountsClient - com.mojang - - - + + + de.luricos.bukkit + xAuth + 2.6 + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + updater + net.gravitydevelopment.updater + + + lombok + org.projectlombok + + + EssentialsGroupManager + net.ess3 + + + PermissionsEx + ru.tehkode + + + AccountsClient + com.mojang + + + - - - com.acrobot.chestshop - chestshop - 3.8.12 - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - Vault - net.milkbowl.vault - - - odditem - info.somethingodd - - - scrollingmenusign - me.desht - - - truezip - de.schlichtherle - - - residence - net.t00thpick1 - - - Heroes - com.herocraftonline.heroes - - - HeroChat - com.dthielke.herochat - - - worldguard - com.sk89q - - - worldedit - com.sk89q - - - lwc - com.griefcraft.lwc - - - js - rhino - - - jchronic - com.sk89q - - - deadbolt - com.daemitus.deadbolt - - - bukkit-classloader-check - com.sk89q.spigot - - - jsr305 - com.google.code.findbugs - - - opencsv - net.sf.opencsv - - - simplechestlock - - com.webkonsept.bukkit.simplechestlock - - - - commandbook - com.sk89q - - - lockette - org.yi.acru.bukkit.lockette - - - + + + com.acrobot.chestshop + chestshop + 3.8.12 + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + Vault + net.milkbowl.vault + + + odditem + info.somethingodd + + + scrollingmenusign + me.desht + + + truezip + de.schlichtherle + + + residence + net.t00thpick1 + + + Heroes + com.herocraftonline.heroes + + + HeroChat + com.dthielke.herochat + + + worldguard + com.sk89q + + + worldedit + com.sk89q + + + lwc + com.griefcraft.lwc + + + js + rhino + + + jchronic + com.sk89q + + + deadbolt + com.daemitus.deadbolt + + + bukkit-classloader-check + com.sk89q.spigot + + + jsr305 + com.google.code.findbugs + + + opencsv + net.sf.opencsv + + + simplechestlock + + com.webkonsept.bukkit.simplechestlock + + + + commandbook + com.sk89q + + + lockette + org.yi.acru.bukkit.lockette + + + - + diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 7ed3dd9f..9cf420a7 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -120,6 +120,7 @@ public class AuthMe extends JavaPlugin { this.database = database; } + @SuppressWarnings("deprecation") @Override public void onEnable() { authme = this; diff --git a/src/main/java/fr/xephi/authme/cache/backup/FileCache.java b/src/main/java/fr/xephi/authme/cache/backup/FileCache.java index 6c4e4be7..2a4b09eb 100644 --- a/src/main/java/fr/xephi/authme/cache/backup/FileCache.java +++ b/src/main/java/fr/xephi/authme/cache/backup/FileCache.java @@ -504,7 +504,8 @@ public class FileCache { armours[i] = attributes.getStack(); else armours[i] = item; } - + } catch (final RuntimeException e) { + ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming..."); } catch (final Exception e) { ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming..."); } finally { @@ -513,6 +514,9 @@ public class FileCache { } return new DataFileCache(inv, armours, group, op, flying); } + } catch (RuntimeException e) { + ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming..."); + return null; } catch (Exception e) { ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming..."); return null; diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java index 10a4e950..7ee7e42c 100644 --- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java +++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java @@ -477,6 +477,7 @@ public class AdminCommand implements CommandExecutor { m.send(sender, "error"); return true; } + @SuppressWarnings("deprecation") Player target = Bukkit.getPlayer(name); PlayerCache.getInstance().removePlayer(name); Utils.getInstance().setGroup(name, groupType.UNREGISTERED); @@ -559,6 +560,7 @@ public class AdminCommand implements CommandExecutor { sender.sendMessage("Usage: /authme getip "); return true; } + @SuppressWarnings("deprecation") Player player = Bukkit.getPlayer(args[1]); if (player == null) { sender.sendMessage("This player is not actually online"); @@ -574,6 +576,7 @@ public class AdminCommand implements CommandExecutor { return true; } try { + @SuppressWarnings("deprecation") Player player = Bukkit.getPlayer(args[1]); if (player == null || !player.isOnline()) { sender.sendMessage("Player needs to be online!");