Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-27 12:45:57 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup2: The Revenge

Browse Source
This commit is contained in:
Gabriele C 2015-11-02 00:09:34 +01:00
parent da9cfc93d3
commit 5e7c5560cf
22 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -11,8 +11,6 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
import fr.xephi.authme.command.CommandHandler;
import fr.xephi.authme.util.Utils;
import org.apache.logging.log4j.LogManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -63,6 +61,7 @@ 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.util.Utils;
import net.milkbowl.vault.permission.Permission;
import net.minelink.ctplus.CombatTagPlus;

2
src/main/java/fr/xephi/authme/DataManager.java
View File

@ -7,12 +7,12 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import fr.xephi.authme.util.Utils;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
import net.milkbowl.vault.permission.Permission;
public class DataManager {

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

@ -9,11 +9,11 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
public class API {

2
src/main/java/fr/xephi/authme/api/NewAPI.java
View File

@ -9,11 +9,11 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
public class NewAPI {

2
src/main/java/fr/xephi/authme/cache/backup/JsonCache.java vendored
View File

@ -19,8 +19,8 @@ import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
public class JsonCache {

2
src/main/java/fr/xephi/authme/command/CommandManager.java
View File

@ -52,7 +52,7 @@ public class CommandManager {
/**
* Register all commands.
*/
@SuppressWarnings("SpellCheckingInspection")
@SuppressWarnings({ "SpellCheckingInspection", "serial" })
public void registerCommands() {
// Register the base AuthMe Reloaded command
CommandDescription authMeBaseCommand = new CommandDescription(

5
src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
View File

@ -34,7 +34,7 @@ public class ReloadCommand extends ExecutableCommand {
Messages m = Messages.getInstance();
// Show a status message
//sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
// sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
try {
Settings.reload();
@ -49,10 +49,11 @@ public class ReloadCommand extends ExecutableCommand {
}
// Show a status message
// TODO: add the profiler result
m.send(sender, "reload");
// AuthMeReloaded reloaded, show a status message
//sender.sendMessage(ChatColor.GREEN + "AuthMeReloaded has been reloaded successfully, took " + p.getTimeFormatted() + "!");
// sender.sendMessage(ChatColor.GREEN + "AuthMeReloaded has been reloaded successfully, took " + p.getTimeFormatted() + "!");
return true;
}
}

2
src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
View File

@ -11,7 +11,6 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.command.CommandParts;
@ -21,6 +20,7 @@ import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
public class UnregisterCommand extends ExecutableCommand {

4
src/main/java/fr/xephi/authme/commands/AdminCommand.java
View File

@ -20,8 +20,6 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -32,6 +30,8 @@ import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.Spawn;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
public class AdminCommand implements CommandExecutor {

2
src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
View File

@ -10,9 +10,9 @@ import java.util.concurrent.Executors;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.util.Utils;
public class CacheDataSource implements DataSource {

2
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -42,13 +42,13 @@ import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
public class AuthMePlayerListener implements Listener {

2
src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
View File

@ -9,9 +9,9 @@ import org.bukkit.event.server.ServerListPingEvent;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
public class AuthMeServerListener implements Listener {

4
src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
View File

@ -13,8 +13,6 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -28,6 +26,8 @@ import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.Spawn;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
public class AsyncronousJoin {

2
src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
View File

@ -9,7 +9,6 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -21,6 +20,7 @@ import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.util.Utils;
public class AsyncronousLogin {

4
src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
View File

@ -8,8 +8,6 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.potion.PotionEffectType;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.backup.JsonCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -21,6 +19,8 @@ import fr.xephi.authme.events.RestoreInventoryEvent;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
public class ProcessSyncronousPlayerLogin implements Runnable {

4
src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
View File

@ -5,8 +5,6 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -14,6 +12,8 @@ import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.events.AuthMeTeleportEvent;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
public class AsyncronousLogout {

2
src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
View File

@ -6,7 +6,6 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -14,6 +13,7 @@ import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
public class AsyncronousQuit {

2
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
View File

@ -6,13 +6,13 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
public class ProcessSyncronousEmailRegister implements Runnable {

2
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
View File

@ -10,7 +10,6 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.events.AuthMeTeleportEvent;
@ -21,6 +20,7 @@ import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
public class ProcessSyncronousPasswordRegister implements Runnable {

4
src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
View File

@ -11,8 +11,6 @@ import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.backup.JsonCache;
import fr.xephi.authme.cache.limbo.LimboCache;
@ -22,6 +20,8 @@ import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
public class AsyncronousUnregister {

2
src/main/java/fr/xephi/authme/task/MessageTask.java
View File

@ -4,9 +4,9 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.util.Utils;
public class MessageTask implements Runnable {

4
src/main/java/fr/xephi/authme/util/Utils.java
View File

@ -12,8 +12,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.zip.GZIPInputStream;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
@ -23,6 +21,8 @@ import org.bukkit.entity.Player;
import com.maxmind.geoip.LookupService;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;