change package name keep api package and clean up CustomConfig...

Signed-off-by: 502647092 <jtb1@163.com>
master
502647092 2015-10-30 09:13:55 +08:00
parent b5f5afe770
commit afe6792900
115 changed files with 646 additions and 750 deletions

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.util.Calendar;
import java.util.Collection;
@ -22,46 +22,46 @@ import org.bukkit.scheduler.BukkitTask;
import com.earth2me.essentials.Essentials;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.backup.JsonCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.commands.AdminCommand;
import cn.citycraft.AuthMe.commands.CaptchaCommand;
import cn.citycraft.AuthMe.commands.ChangePasswordCommand;
import cn.citycraft.AuthMe.commands.ConverterCommand;
import cn.citycraft.AuthMe.commands.LoginCommand;
import cn.citycraft.AuthMe.commands.LogoutCommand;
import cn.citycraft.AuthMe.commands.RegisterCommand;
import cn.citycraft.AuthMe.commands.UnregisterCommand;
import cn.citycraft.AuthMe.converter.Converter;
import cn.citycraft.AuthMe.converter.ForceFlatToSqlite;
import cn.citycraft.AuthMe.datasource.CacheDataSource;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.datasource.DatabaseCalls;
import cn.citycraft.AuthMe.datasource.FlatFile;
import cn.citycraft.AuthMe.datasource.MySQL;
import cn.citycraft.AuthMe.datasource.SQLite;
import cn.citycraft.AuthMe.datasource.SQLite_HIKARI;
import cn.citycraft.AuthMe.listener.AuthMeBlockListener;
import cn.citycraft.AuthMe.listener.AuthMeEntityListener;
import cn.citycraft.AuthMe.listener.AuthMeInventoryPacketAdapter;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener16;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener18;
import cn.citycraft.AuthMe.listener.AuthMeServerListener;
import cn.citycraft.AuthMe.plugin.manager.BungeeCordMessage;
import cn.citycraft.AuthMe.plugin.manager.EssSpawn;
import cn.citycraft.AuthMe.process.Management;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.OtherAccounts;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.settings.Spawn;
import cn.citycraft.PluginHelper.config.FileConfig;
import cn.citycraft.PluginHelper.utils.VersionChecker;
import fr.xephi.authme.api.API;
import fr.xephi.authme.api.NewAPI;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.backup.JsonCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.commands.AdminCommand;
import fr.xephi.authme.commands.CaptchaCommand;
import fr.xephi.authme.commands.ChangePasswordCommand;
import fr.xephi.authme.commands.ConverterCommand;
import fr.xephi.authme.commands.LoginCommand;
import fr.xephi.authme.commands.LogoutCommand;
import fr.xephi.authme.commands.RegisterCommand;
import fr.xephi.authme.commands.UnregisterCommand;
import fr.xephi.authme.converter.Converter;
import fr.xephi.authme.converter.ForceFlatToSqlite;
import fr.xephi.authme.datasource.CacheDataSource;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.datasource.DatabaseCalls;
import fr.xephi.authme.datasource.FlatFile;
import fr.xephi.authme.datasource.MySQL;
import fr.xephi.authme.datasource.SQLite;
import fr.xephi.authme.datasource.SQLite_HIKARI;
import fr.xephi.authme.listener.AuthMeBlockListener;
import fr.xephi.authme.listener.AuthMeEntityListener;
import fr.xephi.authme.listener.AuthMeInventoryPacketAdapter;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.listener.AuthMePlayerListener16;
import fr.xephi.authme.listener.AuthMePlayerListener18;
import fr.xephi.authme.listener.AuthMeServerListener;
import fr.xephi.authme.plugin.manager.BungeeCordMessage;
import fr.xephi.authme.plugin.manager.EssSpawn;
import fr.xephi.authme.process.Management;
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 net.milkbowl.vault.permission.Permission;
public class AuthMe extends JavaPlugin {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.util.logging.Filter;
import java.util.logging.LogRecord;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.io.IOException;
import java.nio.file.Files;
@ -10,8 +10,8 @@ import java.util.logging.Logger;
import com.google.common.base.Throwables;
import cn.citycraft.AuthMe.settings.Settings;
import fr.xephi.authme.api.NewAPI;
import fr.xephi.authme.settings.Settings;
public class ConsoleLogger {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.io.File;
import java.util.List;
@ -11,7 +11,7 @@ import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.settings.Settings;
import net.milkbowl.vault.permission.Permission;
public class DataManager {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.awt.Color;
import java.awt.Font;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.io.File;
import java.io.FileInputStream;
@ -9,7 +9,7 @@ import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.settings.Settings;
/**
*

View File

@ -1,4 +1,4 @@
package fr.xephi.authme;
package cn.citycraft.AuthMe;
import java.io.File;
import java.io.FileOutputStream;
@ -21,11 +21,11 @@ import org.bukkit.entity.Player;
import com.maxmind.geoip.LookupService;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.settings.Settings;
import fr.xephi.authme.events.AuthMeTeleportEvent;
import fr.xephi.authme.settings.Settings;
public class Utils {

View File

@ -1,7 +1,7 @@
package fr.xephi.authme.cache.auth;
package cn.citycraft.AuthMe.cache.auth;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.security.HashAlgorithm;
import cn.citycraft.AuthMe.settings.Settings;
public class PlayerAuth {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.cache.auth;
package cn.citycraft.AuthMe.cache.auth;
import java.util.concurrent.ConcurrentHashMap;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.cache.backup;
package cn.citycraft.AuthMe.cache.backup;
public class DataFileCache {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.cache.backup;
package cn.citycraft.AuthMe.cache.backup;
import java.io.File;
import java.io.IOException;
@ -18,9 +18,9 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.settings.Settings;
public class JsonCache {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.cache.limbo;
package cn.citycraft.AuthMe.cache.limbo;
import java.util.concurrent.ConcurrentHashMap;
@ -7,13 +7,13 @@ import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.backup.DataFileCache;
import fr.xephi.authme.cache.backup.JsonCache;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.backup.DataFileCache;
import cn.citycraft.AuthMe.cache.backup.JsonCache;
import cn.citycraft.AuthMe.settings.Settings;
import fr.xephi.authme.events.ResetInventoryEvent;
import fr.xephi.authme.events.StoreInventoryEvent;
import fr.xephi.authme.settings.Settings;
public class LimboCache {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.cache.limbo;
package cn.citycraft.AuthMe.cache.limbo;
import org.bukkit.GameMode;
import org.bukkit.Location;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@ -18,20 +18,20 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.Utils.GroupType;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.security.PasswordSecurity;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.settings.Spawn;
import cn.citycraft.AuthMe.task.MessageTask;
import cn.citycraft.AuthMe.task.TimeoutTask;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.Spawn;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
public class AdminCommand implements CommandExecutor {

View File

@ -1,15 +1,15 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.security.RandomString;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
public class CaptchaCommand implements CommandExecutor {

View File

@ -1,15 +1,15 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.ChangePasswordTask;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.task.ChangePasswordTask;
public class ChangePasswordCommand implements CommandExecutor {

View File

@ -1,20 +1,20 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.converter.Converter;
import fr.xephi.authme.converter.CrazyLoginConverter;
import fr.xephi.authme.converter.FlatToSql;
import fr.xephi.authme.converter.FlatToSqlite;
import fr.xephi.authme.converter.RakamakConverter;
import fr.xephi.authme.converter.RoyalAuthConverter;
import fr.xephi.authme.converter.SqlToFlat;
import fr.xephi.authme.converter.vAuthConverter;
import fr.xephi.authme.settings.Messages;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.converter.Converter;
import cn.citycraft.AuthMe.converter.CrazyLoginConverter;
import cn.citycraft.AuthMe.converter.FlatToSql;
import cn.citycraft.AuthMe.converter.FlatToSqlite;
import cn.citycraft.AuthMe.converter.RakamakConverter;
import cn.citycraft.AuthMe.converter.RoyalAuthConverter;
import cn.citycraft.AuthMe.converter.SqlToFlat;
import cn.citycraft.AuthMe.converter.vAuthConverter;
import cn.citycraft.AuthMe.settings.Messages;
public class ConverterCommand implements CommandExecutor {

View File

@ -1,12 +1,12 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.settings.Messages;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.settings.Messages;
public class LoginCommand implements CommandExecutor {

View File

@ -1,12 +1,12 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.settings.Messages;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.settings.Messages;
public class LogoutCommand implements CommandExecutor {

View File

@ -1,15 +1,15 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.security.RandomString;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
public class RegisterCommand implements CommandExecutor {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.commands;
package cn.citycraft.AuthMe.commands;
import java.security.NoSuchAlgorithmException;
@ -12,19 +12,19 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.backup.JsonCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.Utils.GroupType;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.backup.JsonCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.security.PasswordSecurity;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.task.MessageTask;
import cn.citycraft.AuthMe.task.TimeoutTask;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
public class UnregisterCommand implements CommandExecutor {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
public interface Converter extends Runnable {
}

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.io.BufferedReader;
import java.io.File;
@ -7,11 +7,11 @@ import java.io.IOException;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.settings.Settings;
/**
* @author Xephi59

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -7,9 +7,9 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.settings.Settings;
/**
* @author Xephi59

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.io.BufferedReader;
import java.io.File;
@ -13,8 +13,8 @@ import java.sql.Statement;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.settings.Settings;
public class FlatToSqlite implements Converter {

View File

@ -1,11 +1,11 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.datasource.SQLite;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.datasource.SQLite;
import cn.citycraft.AuthMe.settings.Settings;
public class ForceFlatToSqlite implements Converter {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.io.BufferedReader;
import java.io.File;
@ -10,13 +10,13 @@ import java.util.Map.Entry;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.security.HashAlgorithm;
import cn.citycraft.AuthMe.security.PasswordSecurity;
import cn.citycraft.AuthMe.settings.Settings;
/**
* @author Xephi59

View File

@ -1,13 +1,13 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.io.File;
import org.bukkit.OfflinePlayer;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.datasource.DataSource;
public class RoyalAuthConverter implements Converter {

View File

@ -0,0 +1,20 @@
package cn.citycraft.AuthMe.converter;
import java.io.File;
import cn.citycraft.PluginHelper.config.FileConfig;
public class RoyalAuthYamlReader extends FileConfig {
public RoyalAuthYamlReader(final File file) {
super(file);
}
public String getHash() {
return getString("login.password");
}
public long getLastLogin() {
return getLong("timestamps.quit");
}
}

View File

@ -1,15 +1,15 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.util.List;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.datasource.FlatFile;
import fr.xephi.authme.settings.Messages;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.datasource.FlatFile;
import cn.citycraft.AuthMe.settings.Messages;
public class SqlToFlat implements Converter {

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.datasource.DataSource;
public class vAuthConverter implements Converter {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.converter;
package cn.citycraft.AuthMe.converter;
import java.io.File;
import java.io.IOException;
@ -9,10 +9,10 @@ import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.datasource.DataSource;
public class vAuthFileReader {

View File

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

View File

@ -1,8 +1,8 @@
package fr.xephi.authme.datasource;
package cn.citycraft.AuthMe.datasource;
import java.util.List;
import fr.xephi.authme.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
public interface DataSource {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.datasource;
package cn.citycraft.AuthMe.datasource;
import java.util.ArrayList;
import java.util.List;
@ -6,7 +6,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import fr.xephi.authme.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
public class DatabaseCalls implements DataSource {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.datasource;
package cn.citycraft.AuthMe.datasource;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -10,11 +10,11 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.settings.Settings;
public class FlatFile implements DataSource {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.datasource;
package cn.citycraft.AuthMe.datasource;
import java.sql.Blob;
import java.sql.Connection;
@ -13,11 +13,11 @@ import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import com.zaxxer.hikari.pool.PoolInitializationException;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.security.HashAlgorithm;
import cn.citycraft.AuthMe.settings.Settings;
public class MySQL implements DataSource {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.datasource;
package cn.citycraft.AuthMe.datasource;
import java.sql.Connection;
import java.sql.DriverManager;
@ -9,9 +9,9 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.settings.Settings;
public class SQLite implements DataSource {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.datasource;
package cn.citycraft.AuthMe.datasource;
import java.sql.Connection;
import java.sql.PreparedStatement;
@ -11,10 +11,10 @@ import java.util.List;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.settings.Settings;
public class SQLite_HIKARI implements DataSource {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -6,8 +6,8 @@ import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
public class AuthMeBlockListener implements Listener {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import java.lang.reflect.Method;
@ -19,8 +19,8 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.projectiles.ProjectileSource;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
public class AuthMeEntityListener implements Listener {

View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
@ -32,9 +32,9 @@ import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.settings.Settings;
public class AuthMeInventoryPacketAdapter extends PacketAdapter {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import java.util.ArrayList;
import java.util.Arrays;
@ -40,15 +40,15 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.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 cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
public class AuthMePlayerListener implements Listener {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -6,8 +6,8 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerEditBookEvent;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
public class AuthMePlayerListener16 implements Listener {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -6,8 +6,8 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerInteractAtEntityEvent;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
public class AuthMePlayerListener18 implements Listener {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.listener;
package cn.citycraft.AuthMe.listener;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -7,11 +7,11 @@ import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListPingEvent;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
public class AuthMeServerListener implements Listener {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.plugin.manager;
package cn.citycraft.AuthMe.plugin.manager;
import org.bukkit.entity.Player;
import org.bukkit.plugin.messaging.PluginMessageListener;
@ -6,7 +6,7 @@ import org.bukkit.plugin.messaging.PluginMessageListener;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class BungeeCordMessage implements PluginMessageListener {

View File

@ -1,20 +1,19 @@
package fr.xephi.authme.plugin.manager;
package cn.citycraft.AuthMe.plugin.manager;
import java.io.File;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import fr.xephi.authme.settings.CustomConfiguration;
import cn.citycraft.PluginHelper.config.FileConfig;
public class EssSpawn extends CustomConfiguration {
public class EssSpawn extends FileConfig {
private static EssSpawn spawn;
public EssSpawn() {
super(new File("." + File.separator + "plugins" + File.separator + "Essentials" + File.separator + "spawn.yml"));
spawn = this;
load();
}
public static EssSpawn getInstance() {
@ -26,12 +25,14 @@ public class EssSpawn extends CustomConfiguration {
public Location getLocation() {
try {
if (!this.contains("spawns.default.world"))
if (!this.contains("spawns.default.world")) {
return null;
if (this.getString("spawns.default.world").isEmpty() || this.getString("spawns.default.world").equals(""))
}
if (this.getString("spawns.default.world").isEmpty() || this.getString("spawns.default.world").equals("")) {
return null;
Location location = new Location(Bukkit.getWorld(this.getString("spawns.default.world")), this.getDouble("spawns.default.x"), this.getDouble("spawns.default.y"),
this.getDouble("spawns.default.z"), Float.parseFloat(this.getString("spawns.default.yaw")), Float.parseFloat(this.getString("spawns.default.pitch")));
}
final Location location = new Location(Bukkit.getWorld(this.getString("spawns.default.world")), this.getDouble("spawns.default.x"), this.getDouble("spawns.default.y"), this
.getDouble("spawns.default.z"), Float.parseFloat(this.getString("spawns.default.yaw")), Float.parseFloat(this.getString("spawns.default.pitch")));
return location;
} catch (NullPointerException | NumberFormatException npe) {
return null;

View File

@ -1,17 +1,17 @@
package fr.xephi.authme.process;
package cn.citycraft.AuthMe.process;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.process.join.AsyncronousJoin;
import fr.xephi.authme.process.login.AsyncronousLogin;
import fr.xephi.authme.process.logout.AsyncronousLogout;
import fr.xephi.authme.process.quit.AsyncronousQuit;
import fr.xephi.authme.process.register.AsyncronousRegister;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.process.join.AsyncronousJoin;
import cn.citycraft.AuthMe.process.login.AsyncronousLogin;
import cn.citycraft.AuthMe.process.logout.AsyncronousLogout;
import cn.citycraft.AuthMe.process.quit.AsyncronousQuit;
import cn.citycraft.AuthMe.process.register.AsyncronousRegister;
import cn.citycraft.AuthMe.security.RandomString;
import cn.citycraft.AuthMe.settings.Settings;
/**
*

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.process.join;
package cn.citycraft.AuthMe.process.join;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
@ -11,23 +11,23 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.Utils.GroupType;
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.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.Utils.GroupType;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.settings.Spawn;
import cn.citycraft.AuthMe.task.MessageTask;
import cn.citycraft.AuthMe.task.TimeoutTask;
import fr.xephi.authme.events.FirstSpawnTeleportEvent;
import fr.xephi.authme.events.ProtectInventoryEvent;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.Spawn;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
public class AsyncronousJoin {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.process.login;
package cn.citycraft.AuthMe.process.login;
import java.util.Date;
import java.util.List;
@ -7,20 +7,20 @@ import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.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.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener;
import cn.citycraft.AuthMe.security.PasswordSecurity;
import cn.citycraft.AuthMe.security.RandomString;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.task.MessageTask;
import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
public class AsyncronousLogin {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.process.login;
package cn.citycraft.AuthMe.process.login;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
@ -7,20 +7,20 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import org.bukkit.potion.PotionEffectType;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import fr.xephi.authme.Utils.GroupType;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.backup.JsonCache;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.Utils.GroupType;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.backup.JsonCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener;
import cn.citycraft.AuthMe.settings.Settings;
import fr.xephi.authme.events.AuthMeTeleportEvent;
import fr.xephi.authme.events.LoginEvent;
import fr.xephi.authme.events.RestoreInventoryEvent;
import fr.xephi.authme.events.SpawnTeleportEvent;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Settings;
public class ProcessSyncronousPlayerLogin implements Runnable {

View File

@ -1,19 +1,19 @@
package fr.xephi.authme.process.logout;
package cn.citycraft.AuthMe.process.logout;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import fr.xephi.authme.Utils.GroupType;
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.datasource.DataSource;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.Utils.GroupType;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import fr.xephi.authme.events.AuthMeTeleportEvent;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
public class AsyncronousLogout {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.process.logout;
package cn.citycraft.AuthMe.process.logout;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -7,14 +7,14 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.task.MessageTask;
import cn.citycraft.AuthMe.task.TimeoutTask;
import fr.xephi.authme.events.LogoutEvent;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
public class ProcessSyncronousPlayerLogout implements Runnable {

View File

@ -1,19 +1,19 @@
package fr.xephi.authme.process.quit;
package cn.citycraft.AuthMe.process.quit;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.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.datasource.DataSource;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.listener.AuthMePlayerListener;
import cn.citycraft.AuthMe.settings.Settings;
public class AsyncronousQuit {

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.process.quit;
package cn.citycraft.AuthMe.process.quit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.settings.Settings;
public class ProcessSyncronousPlayerQuit implements Runnable {

View File

@ -1,18 +1,18 @@
package fr.xephi.authme.process.register;
package cn.citycraft.AuthMe.process.register;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.cache.auth.PlayerCache;
import cn.citycraft.AuthMe.datasource.DataSource;
import cn.citycraft.AuthMe.security.PasswordSecurity;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
public class AsyncronousRegister {

View File

@ -1,18 +1,18 @@
package fr.xephi.authme.process.register;
package cn.citycraft.AuthMe.process.register;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.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 cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.task.MessageTask;
import cn.citycraft.AuthMe.task.TimeoutTask;
public class ProcessSyncronousEmailRegister implements Runnable {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.process.register;
package cn.citycraft.AuthMe.process.register;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
@ -8,19 +8,19 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.cache.limbo.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.AuthMe.Utils;
import cn.citycraft.AuthMe.cache.limbo.LimboCache;
import cn.citycraft.AuthMe.cache.limbo.LimboPlayer;
import cn.citycraft.AuthMe.settings.Messages;
import cn.citycraft.AuthMe.settings.Settings;
import cn.citycraft.AuthMe.task.MessageTask;
import cn.citycraft.AuthMe.task.TimeoutTask;
import fr.xephi.authme.events.AuthMeTeleportEvent;
import fr.xephi.authme.events.LoginEvent;
import fr.xephi.authme.events.RegisterTeleportEvent;
import fr.xephi.authme.events.RestoreInventoryEvent;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
public class ProcessSyncronousPasswordRegister implements Runnable {

View File

@ -0,0 +1,74 @@
package cn.citycraft.AuthMe.security;
import org.apache.commons.lang.ObjectUtils.Null;
import cn.citycraft.AuthMe.security.crypts.BCRYPT;
import cn.citycraft.AuthMe.security.crypts.BCRYPT2Y;
import cn.citycraft.AuthMe.security.crypts.CRAZYCRYPT1;
import cn.citycraft.AuthMe.security.crypts.CryptPBKDF2;
import cn.citycraft.AuthMe.security.crypts.CryptPBKDF2Django;
import cn.citycraft.AuthMe.security.crypts.DOUBLEMD5;
import cn.citycraft.AuthMe.security.crypts.IPB3;
import cn.citycraft.AuthMe.security.crypts.JOOMLA;
import cn.citycraft.AuthMe.security.crypts.MD5;
import cn.citycraft.AuthMe.security.crypts.MD5VB;
import cn.citycraft.AuthMe.security.crypts.MYBB;
import cn.citycraft.AuthMe.security.crypts.PHPBB;
import cn.citycraft.AuthMe.security.crypts.PHPFUSION;
import cn.citycraft.AuthMe.security.crypts.PLAINTEXT;
import cn.citycraft.AuthMe.security.crypts.ROYALAUTH;
import cn.citycraft.AuthMe.security.crypts.SALTED2MD5;
import cn.citycraft.AuthMe.security.crypts.SALTEDSHA512;
import cn.citycraft.AuthMe.security.crypts.SHA1;
import cn.citycraft.AuthMe.security.crypts.SHA256;
import cn.citycraft.AuthMe.security.crypts.SHA512;
import cn.citycraft.AuthMe.security.crypts.SMF;
import cn.citycraft.AuthMe.security.crypts.WBB3;
import cn.citycraft.AuthMe.security.crypts.WBB4;
import cn.citycraft.AuthMe.security.crypts.WHIRLPOOL;
import cn.citycraft.AuthMe.security.crypts.WORDPRESS;
import cn.citycraft.AuthMe.security.crypts.XAUTH;
import cn.citycraft.AuthMe.security.crypts.XF;
public enum HashAlgorithm {
BCRYPT(BCRYPT.class),
BCRYPT2Y(BCRYPT2Y.class),
CRAZYCRYPT1(CRAZYCRYPT1.class),
CUSTOM(Null.class),
DOUBLEMD5(DOUBLEMD5.class),
IPB3(IPB3.class),
JOOMLA(JOOMLA.class),
MD5(MD5.class),
MD5VB(MD5VB.class),
MYBB(MYBB.class),
PBKDF2(CryptPBKDF2.class),
PBKDF2DJANGO(CryptPBKDF2Django.class),
PHPBB(PHPBB.class),
PHPFUSION(PHPFUSION.class),
PLAINTEXT(PLAINTEXT.class),
ROYALAUTH(ROYALAUTH.class),
SALTED2MD5(SALTED2MD5.class),
SALTEDSHA512(SALTEDSHA512.class),
SHA1(SHA1.class),
SHA256(SHA256.class),
SHA512(SHA512.class),
SMF(SMF.class),
WBB3(WBB3.class),
WBB4(WBB4.class),
WHIRLPOOL(WHIRLPOOL.class),
WORDPRESS(WORDPRESS.class),
XAUTH(XAUTH.class),
XENFORO(XF.class);
Class<?> classe;
HashAlgorithm(final Class<?> classe) {
this.classe = classe;
}
public Class<?> getclasse() {
return classe;
}
}

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security;
package cn.citycraft.AuthMe.security;
import java.math.BigInteger;
import java.security.MessageDigest;
@ -8,12 +8,12 @@ import java.util.HashMap;
import org.bukkit.Bukkit;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.cache.auth.PlayerAuth;
import cn.citycraft.AuthMe.security.crypts.BCRYPT;
import cn.citycraft.AuthMe.security.crypts.EncryptionMethod;
import cn.citycraft.AuthMe.settings.Settings;
import fr.xephi.authme.events.PasswordEncryptionEvent;
import fr.xephi.authme.security.crypts.BCRYPT;
import fr.xephi.authme.security.crypts.EncryptionMethod;
import fr.xephi.authme.settings.Settings;
public class PasswordSecurity {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security;
package cn.citycraft.AuthMe.security;
import java.util.Calendar;
import java.util.Random;

View File

@ -11,7 +11,7 @@
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.nio.charset.Charset;
import java.security.MessageDigest;

View File

@ -1,9 +1,9 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;
import fr.xephi.authme.security.pbkdf2.PBKDF2Engine;
import fr.xephi.authme.security.pbkdf2.PBKDF2Parameters;
import cn.citycraft.AuthMe.security.pbkdf2.PBKDF2Engine;
import cn.citycraft.AuthMe.security.pbkdf2.PBKDF2Parameters;
public class CryptPBKDF2 implements EncryptionMethod {

View File

@ -1,11 +1,11 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;
import javax.xml.bind.DatatypeConverter;
import fr.xephi.authme.security.pbkdf2.PBKDF2Engine;
import fr.xephi.authme.security.pbkdf2.PBKDF2Parameters;
import cn.citycraft.AuthMe.security.pbkdf2.PBKDF2Engine;
import cn.citycraft.AuthMe.security.pbkdf2.PBKDF2Parameters;
public class CryptPBKDF2Django implements EncryptionMethod {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class IPB3 implements EncryptionMethod {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class MYBB implements EncryptionMethod {

View File

@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates and open the template in
* the editor.
*/
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
@ -9,7 +9,7 @@ import java.security.NoSuchAlgorithmException;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class PHPFUSION implements EncryptionMethod {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class SALTED2MD5 implements EncryptionMethod {

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class SALTEDSHA512 implements EncryptionMethod {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class WBB3 implements EncryptionMethod {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
/**
* The Whirlpool hashing function.

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.NoSuchAlgorithmException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.crypts;
package cn.citycraft.AuthMe.security.crypts;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@ -7,7 +7,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import fr.xephi.authme.AuthMe;
import cn.citycraft.AuthMe.AuthMe;
public class XF implements EncryptionMethod {

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
/**
* <p>

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
/**
* <p>

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
import java.io.IOException;
import java.io.UnsupportedEncodingException;

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
/**
* <p>

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
/**
* <p>

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
/**
* <p>

View File

@ -1,4 +1,4 @@
package fr.xephi.authme.security.pbkdf2;
package cn.citycraft.AuthMe.security.pbkdf2;
/**
* <p>

View File

@ -1,10 +1,10 @@
package fr.xephi.authme.settings;
package cn.citycraft.AuthMe.settings;
import org.bukkit.command.CommandSender;
import cn.citycraft.AuthMe.AuthMe;
import cn.citycraft.AuthMe.ConsoleLogger;
import cn.citycraft.PluginHelper.config.FileConfig;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
public class Messages {

Some files were not shown because too many files have changed in this diff Show More