replace cache with Json
This commit is contained in:
parent
cb59f44b9b
commit
b0fc123229
@ -1,23 +1,31 @@
|
|||||||
package fr.xephi.authme;
|
package fr.xephi.authme;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import com.earth2me.essentials.Essentials;
|
||||||
import java.io.File;
|
import com.maxmind.geoip.LookupService;
|
||||||
import java.io.FileOutputStream;
|
import com.onarandombox.MultiverseCore.MultiverseCore;
|
||||||
import java.io.IOException;
|
import com.zaxxer.hikari.pool.PoolInitializationException;
|
||||||
import java.io.InputStream;
|
import fr.xephi.authme.api.API;
|
||||||
import java.io.InputStreamReader;
|
import fr.xephi.authme.api.NewAPI;
|
||||||
import java.io.OutputStream;
|
import fr.xephi.authme.cache.auth.PlayerAuth;
|
||||||
import java.net.URL;
|
import fr.xephi.authme.cache.auth.PlayerCache;
|
||||||
import java.net.URLConnection;
|
import fr.xephi.authme.cache.backup.JsonCache;
|
||||||
import java.sql.SQLException;
|
import fr.xephi.authme.cache.limbo.LimboCache;
|
||||||
import java.util.Calendar;
|
import fr.xephi.authme.cache.limbo.LimboPlayer;
|
||||||
import java.util.Collection;
|
import fr.xephi.authme.commands.*;
|
||||||
import java.util.Date;
|
import fr.xephi.authme.converter.Converter;
|
||||||
import java.util.List;
|
import fr.xephi.authme.converter.ForceFlatToSqlite;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import fr.xephi.authme.datasource.*;
|
||||||
import java.util.logging.Logger;
|
import fr.xephi.authme.listener.*;
|
||||||
import java.util.zip.GZIPInputStream;
|
import fr.xephi.authme.plugin.manager.BungeeCordMessage;
|
||||||
|
import fr.xephi.authme.plugin.manager.CitizensCommunicator;
|
||||||
|
import fr.xephi.authme.plugin.manager.CombatTagComunicator;
|
||||||
|
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;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@ -31,51 +39,17 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|||||||
import org.bukkit.scheduler.BukkitTask;
|
import org.bukkit.scheduler.BukkitTask;
|
||||||
import org.mcstats.Metrics;
|
import org.mcstats.Metrics;
|
||||||
|
|
||||||
import com.earth2me.essentials.Essentials;
|
import java.io.*;
|
||||||
import com.maxmind.geoip.LookupService;
|
import java.net.URL;
|
||||||
import com.onarandombox.MultiverseCore.MultiverseCore;
|
import java.net.URLConnection;
|
||||||
import com.zaxxer.hikari.pool.PoolInitializationException;
|
import java.sql.SQLException;
|
||||||
|
import java.util.Calendar;
|
||||||
import fr.xephi.authme.api.API;
|
import java.util.Collection;
|
||||||
import fr.xephi.authme.api.NewAPI;
|
import java.util.Date;
|
||||||
import fr.xephi.authme.cache.auth.PlayerAuth;
|
import java.util.List;
|
||||||
import fr.xephi.authme.cache.auth.PlayerCache;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import fr.xephi.authme.cache.backup.FileCache;
|
import java.util.logging.Logger;
|
||||||
import fr.xephi.authme.cache.limbo.LimboCache;
|
import java.util.zip.GZIPInputStream;
|
||||||
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.EmailCommand;
|
|
||||||
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.AuthMeChestShopListener;
|
|
||||||
import fr.xephi.authme.listener.AuthMeEntityListener;
|
|
||||||
import fr.xephi.authme.listener.AuthMePlayerListener;
|
|
||||||
import fr.xephi.authme.listener.AuthMeServerListener;
|
|
||||||
import fr.xephi.authme.plugin.manager.BungeeCordMessage;
|
|
||||||
import fr.xephi.authme.plugin.manager.CitizensCommunicator;
|
|
||||||
import fr.xephi.authme.plugin.manager.CombatTagComunicator;
|
|
||||||
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 {
|
public class AuthMe extends JavaPlugin {
|
||||||
|
|
||||||
@ -90,7 +64,8 @@ public class AuthMe extends JavaPlugin {
|
|||||||
private Messages m;
|
private Messages m;
|
||||||
public DataManager dataManager;
|
public DataManager dataManager;
|
||||||
public DataSource database;
|
public DataSource database;
|
||||||
private FileCache playerBackup = new FileCache(this);
|
|
||||||
|
private JsonCache playerBackup = new JsonCache(this);
|
||||||
public OtherAccounts otherAccounts;
|
public OtherAccounts otherAccounts;
|
||||||
public Permission permission;
|
public Permission permission;
|
||||||
public Essentials ess;
|
public Essentials ess;
|
||||||
@ -564,6 +539,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean authmePermissible(CommandSender sender, String perm) {
|
public boolean authmePermissible(CommandSender sender, String perm) {
|
||||||
if (sender.hasPermission(perm)) {
|
if (sender.hasPermission(perm)) {
|
||||||
return true;
|
return true;
|
||||||
@ -840,8 +816,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
/**
|
/**
|
||||||
* Get Player real IP through VeryGames method
|
* Get Player real IP through VeryGames method
|
||||||
*
|
*
|
||||||
* @param player
|
* @param player player
|
||||||
* player
|
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public String getVeryGamesIP(Player player) {
|
public String getVeryGamesIP(Player player) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user