From 43b9462ddc1f802144838cc6f1a0746776ad72b8 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Tue, 24 Nov 2015 21:13:09 +0100 Subject: [PATCH] cleanup --- .idea/codeStyleSettings.xml | 2 +- pom.xml | 1203 ++++++++++----------- src/main/java/fr/xephi/authme/AuthMe.java | 2 - src/main/resources/plugin.yml | 2 +- 4 files changed, 600 insertions(+), 609 deletions(-) diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 383543524..6e95fe792 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -3,6 +3,7 @@ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9c19232fd..7e52a4b11 100644 --- a/pom.xml +++ b/pom.xml @@ -1,641 +1,634 @@ - - 4.0.0 - - fr.xephi - authme - 5.1-SNAPSHOT - jar - - AuthMeReloaded - Authentication plugin for CraftBukkit/Spigot! - 2013 - http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ - - - - AuthMe-Team - https://github.com/AuthMe-Team - - - - scm:git:https://github.com/Xephi/AuthMeReloaded.git - scm:git:git@github.com:Xephi/AuthMeReloaded.git - http://github.com/Xephi/AuthMeReloaded - - - - jenkins - http://ci.xephi.fr/job/AuthMeReloaded/ - - - - GitHub - https://github.com/Xephi/AuthMeReloaded/issues - - - - - The GNU General Public Licence version 3 (GPLv3) - http://www.gnu.org/licenses/gpl-3.0.html - - - - + + 4.0.0 + + fr.xephi + authme + 5.1-SNAPSHOT + jar + + AuthMeReloaded + Authentication plugin for CraftBukkit/Spigot! + 2013 + http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ + + + + AuthMe-Team + https://github.com/AuthMe-Team + + + + scm:git:https://github.com/Xephi/AuthMeReloaded.git + scm:git:git@github.com:Xephi/AuthMeReloaded.git + http://github.com/Xephi/AuthMeReloaded + + + + jenkins + http://ci.xephi.fr/job/AuthMeReloaded/ + + + + GitHub + https://github.com/Xephi/AuthMeReloaded/issues + + + + + The GNU General Public Licence version 3 (GPLv3) + http://www.gnu.org/licenses/gpl-3.0.html + + + + + 3.3.3 + + + + UTF-8 + - UTF-8 + AuthMe fr.xephi.authme.AuthMe - 100 + 100 [Xephi, sgdc3, DNx5, timvisee, games647, ljacqu] - - - 1.7 - - - 1.8.8-R0.1-SNAPSHOT - - - AuthMe-${project.version} - src/main/java - src/test/java - - - - . - true - src/main/resources/ - - plugin.yml - - - - . - false - src/main/resources/ - - *.yml - - - plugin.yml - - - - ./messages/ - false - src/main/resources/messages/ - - *.yml - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.7 - ${javaVersion} - - - + + 1.7 + + + 1.8.8-R0.1-SNAPSHOT + + + + AuthMe-${project.version} + src/main/java + src/test/java + + + + . + true + src/main/resources/ + + plugin.yml + + + + . + false + src/main/resources/ + + *.yml + + + plugin.yml + + + + ./messages/ + false + src/main/resources/messages/ + + *.yml + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + true + 1.7 + ${javaVersion} + + + - - org.apache.maven.plugins - maven-shade-plugin - 2.4.2 - - false - false - - - org.mcstats - fr.xephi.authme - - - com.google.gson - fr.xephi.authme.libs.gson - - - com.zaxxer.hikari - fr.xephi.authme.libs.hikari - - - org.slf4j - fr.xephi.authme.libs.slf4j - - - com.maxmind.geoip - fr.xephi.authme.libs.geoip - - - net.ricecode.similarity - fr.xephi.authme.libs.similarity - - - - - - package - - shade - - - - - - + + org.apache.maven.plugins + maven-shade-plugin + 2.4.2 + + false + false + + + org.mcstats + fr.xephi.authme + + + com.google.gson + fr.xephi.authme.libs.gson + + + com.zaxxer.hikari + fr.xephi.authme.libs.hikari + + + org.slf4j + fr.xephi.authme.libs.slf4j + + + com.maxmind.geoip + fr.xephi.authme.libs.geoip + + + net.ricecode.similarity + fr.xephi.authme.libs.similarity + + + + + + package + + shade + + + + + + - - - - spigot-repo - http://hub.spigotmc.org/nexus/content/groups/public - + + + + spigot-repo + http://hub.spigotmc.org/nexus/content/groups/public + - - - ess-repo - http://ci.drtshock.net/plugin/repository/everything - + + + ess-repo + http://ci.drtshock.net/plugin/repository/everything + - - - minelink-thirdparty - http://repo.minelink.net/content/repositories/public - + + + minelink-thirdparty + http://repo.minelink.net/content/repositories/public + - - - dmulloy2-repo - http://repo.dmulloy2.net/content/groups/public/ - + + + dmulloy2-repo + http://repo.dmulloy2.net/content/groups/public/ + - - - onarandombox - http://repo.onarandombox.com/content/groups/public - + + + onarandombox + http://repo.onarandombox.com/content/groups/public + - - - vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases - + + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases + - - - luricos-releases - http://repo.luricos.de/content/repositories/releases - + + + luricos-releases + http://repo.luricos.de/content/repositories/releases + - - - xephi-repo - http://ci.xephi.fr/plugin/repository/everything/ - + + + xephi-repo + http://ci.xephi.fr/plugin/repository/everything/ + - - - pex-repo - http://pex-repo.aoeu.xyz/ - - + + + pex-repo + http://pex-repo.aoeu.xyz/ + + - - - - com.zaxxer - HikariCP - 2.4.1 - compile - - - slf4j-api - org.slf4j - - - true - - - org.slf4j - slf4j-jdk14 - 1.7.12 - compile - true - + + + + com.zaxxer + HikariCP + 2.4.1 + compile + + + slf4j-api + org.slf4j + + + true + + + org.slf4j + slf4j-jdk14 + 1.7.12 + compile + true + - - - org.apache.logging.log4j - log4j-core - - 2.0-beta9 - provided - true - + + + org.apache.logging.log4j + log4j-core + + 2.0-beta9 + provided + true + - - - com.sun.mail - mailapi - 1.5.4 - compile - true - - - com.sun.mail - smtp - 1.5.4 - compile - true - - - org.apache.commons - commons-email - 1.4 - compile - true - + + + org.apache.commons + commons-email + 1.4 + compile + true + - - - com.google.code.gson - gson - 2.4 - compile - true - + + + com.google.code.gson + gson + 2.4 + compile + true + - - - com.maxmind.geoip - geoip-api - 1.2.15 - compile - true - + + + com.maxmind.geoip + geoip-api + 1.2.15 + compile + true + - - - org.mcstats.bukkit - metrics - R8-SNAPSHOT - compile - - - org.bukkit - bukkit - - - true - + + + org.mcstats.bukkit + metrics + R8-SNAPSHOT + compile + + + org.bukkit + bukkit + + + true + - - - org.bukkit - bukkit - ${bukkitVersion} - provided - true - - - junit - junit - - - json-simple - com.googlecode.json-simple - - - gson - com.google.code.gson - - - persistence-api - javax.persistence - - - + + + org.bukkit + bukkit + ${bukkitVersion} + provided + true + + + junit + junit + + + json-simple + com.googlecode.json-simple + + + gson + com.google.code.gson + + + persistence-api + javax.persistence + + + - - - com.comphenix.protocol - ProtocolLib - 3.6.5-SNAPSHOT - provided - true - - - cglib-nodep - cglib - - - BukkitExecutors - com.comphenix.executors - - - + + + com.comphenix.protocol + ProtocolLib + 3.6.5-SNAPSHOT + provided + true + + + cglib-nodep + cglib + + + BukkitExecutors + com.comphenix.executors + + + - - - ru.tehkode - PermissionsEx - 1.23.1 - provided - - - org.bukkit - bukkit - - - net.gravitydevelopment.updater - updater - - - commons-dbcp - commons-dbcp - - - AccountsClient - com.mojang - - - + + + ru.tehkode + PermissionsEx + 1.23.1 + provided + + + org.bukkit + bukkit + + + net.gravitydevelopment.updater + updater + + + commons-dbcp + commons-dbcp + + + AccountsClient + com.mojang + + + - - - org.anjocaido - groupmanager - 2.13.1 - system - ${basedir}/lib/EssentialsGroupManager-2.13.1.jar - + + + org.anjocaido + groupmanager + 2.13.1 + system + ${basedir}/lib/EssentialsGroupManager-2.13.1.jar + - - - de.bananaco - bpermissions - 1.12-DEV - system - ${basedir}/lib/bPermissions-2.12-DEV.jar - + + + de.bananaco + bpermissions + 1.12-DEV + system + ${basedir}/lib/bPermissions-2.12-DEV.jar + - - - org.tyrannyofheaven.bukkit - zPermissions - 1.3-SNAPSHOT - system - ${basedir}/lib/zPermissions-1.3beta1.jar - + + + org.tyrannyofheaven.bukkit + zPermissions + 1.3-SNAPSHOT + system + ${basedir}/lib/zPermissions-1.3beta1.jar + - - - com.nijiko - permissions - 3.1.6 - system - ${basedir}/lib/Permission-3.1.6.jar - + + + com.nijiko + permissions + 3.1.6 + system + ${basedir}/lib/Permission-3.1.6.jar + - - - net.milkbowl.vault - VaultAPI - 1.5 - provided - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - true - + + + net.milkbowl.vault + VaultAPI + 1.5 + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + true + - - - 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 - - - SerializationConfig - me.main__.util - - - Logging - com.dumptruckman.minecraft - - - metrics - org.mcstats.bukkit - - - buscript - com.dumptruckman.minecraft - - - junit - junit - - - true - + + + com.onarandombox.multiversecore + Multiverse-Core + 2.5 + jar + provided + + + org.bukkit + bukkit + + + org.bukkit + craftbukkit + + + AllPay + com.fernferret.allpay + + + VaultAPI + net.milkbowl.vault + + + CommandHandler + com.pneumaticraft.commandhandler + + + SerializationConfig + me.main__.util + + + Logging + com.dumptruckman.minecraft + + + metrics + org.mcstats.bukkit + + + buscript + com.dumptruckman.minecraft + + + junit + junit + + + true + - - - net.ess3 - EssentialsX - 2.0.1-SNAPSHOT - provided - - - org.spigotmc - spigot-api - - - true - + + + net.ess3 + EssentialsX + 2.0.1-SNAPSHOT + provided + + + org.spigotmc + spigot-api + + + true + - - - 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 - - - true - + + + 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 + + + true + - - - 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 - - - log4j-core - org.apache.logging.log4j - - - true - + + + 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 + + + log4j-core + org.apache.logging.log4j + + + true + - - - junit - junit - test - 4.12 - true - - - org.hamcrest - java-hamcrest - test - 2.0.0.0 - true - - - org.mockito - mockito-core - test - 2.0.5-beta - true - + + + junit + junit + test + 4.12 + true + + + org.hamcrest + java-hamcrest + test + 2.0.0.0 + true + + + org.mockito + mockito-core + test + 2.0.5-beta + true + - - - net.ricecode - string-similarity - 1.0.0 - compile - true - - + + + net.ricecode + string-similarity + 1.0.0 + compile + true + + diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index d5aa5e2a6..aff34acd0 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -24,7 +24,6 @@ import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.OtherAccounts; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Spawn; -import fr.xephi.authme.AntiBot; import fr.xephi.authme.util.GeoLiteAPI; import fr.xephi.authme.util.Utils; import net.minelink.ctplus.CombatTagPlus; @@ -70,7 +69,6 @@ public class AuthMe extends JavaPlugin { * Defines the current AuthMeReloaded version code. */ // TODO: Increase this number by one when an update is release - // TODO: Increase the count via maven private static final int PLUGIN_VERSION_CODE = 100; private static AuthMe plugin; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6fed05cbd..9001d7e28 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -name: AuthMe +name: ${pluginName} authors: ${pluginAuthors} website: ${project.url} description: ${project.description}