From 7507fb9ea2d952928a4ffcc22af9451cbd44842d Mon Sep 17 00:00:00 2001 From: HaHaWTH Date: Fri, 29 Mar 2024 03:11:00 +0800 Subject: [PATCH] Remove VAuth converter --- .../executable/authme/ConverterCommand.java | 2 - .../datasource/converter/VAuthConverter.java | 81 ------------------- 2 files changed, 83 deletions(-) delete mode 100644 src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java index dad4c32e..2353afee 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java @@ -12,7 +12,6 @@ import fr.xephi.authme.datasource.converter.MySqlToSqlite; import fr.xephi.authme.datasource.converter.RoyalAuthConverter; import fr.xephi.authme.datasource.converter.SqliteToH2; import fr.xephi.authme.datasource.converter.SqliteToSql; -import fr.xephi.authme.datasource.converter.VAuthConverter; import fr.xephi.authme.datasource.converter.XAuthConverter; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.output.ConsoleLoggerFactory; @@ -85,7 +84,6 @@ public class ConverterCommand implements ExecutableCommand { .put("xauth", XAuthConverter.class) .put("crazylogin", CrazyLoginConverter.class) .put("royalauth", RoyalAuthConverter.class) - .put("vauth", VAuthConverter.class) .put("sqlitetosql", SqliteToSql.class) .put("mysqltosqlite", MySqlToSqlite.class) .put("sqlitetoh2", SqliteToH2.class) diff --git a/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java deleted file mode 100644 index 95af9011..00000000 --- a/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java +++ /dev/null @@ -1,81 +0,0 @@ -package fr.xephi.authme.datasource.converter; - -import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.data.auth.PlayerAuth; -import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.initialization.DataFolder; -import fr.xephi.authme.output.ConsoleLoggerFactory; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; -import org.bukkit.command.CommandSender; - -import javax.inject.Inject; -import java.io.File; -import java.io.IOException; -import java.util.Locale; -import java.util.Scanner; -import java.util.UUID; - -import static fr.xephi.authme.util.FileUtils.makePath; - -public class VAuthConverter implements Converter { - - private final ConsoleLogger logger = ConsoleLoggerFactory.get(VAuthConverter.class); - private final DataSource dataSource; - private final File vAuthPasswordsFile; - - @Inject - VAuthConverter(@DataFolder File dataFolder, DataSource dataSource) { - vAuthPasswordsFile = new File(dataFolder.getParent(), makePath("vAuth", "passwords.yml")); - this.dataSource = dataSource; - } - - @Override - public void execute(CommandSender sender) { - try (Scanner scanner = new Scanner(vAuthPasswordsFile)) { - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - String name = line.split(": ")[0]; - String password = line.split(": ")[1]; - PlayerAuth auth; - if (isUuidInstance(password)) { - String pname; - try { - pname = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName(); - } catch (Exception | NoSuchMethodError e) { - pname = getName(UUID.fromString(name)); - } - if (pname == null) { - continue; - } - auth = PlayerAuth.builder() - .name(pname.toLowerCase(Locale.ROOT)) - .realName(pname) - .password(password, null).build(); - } else { - auth = PlayerAuth.builder() - .name(name.toLowerCase(Locale.ROOT)) - .realName(name) - .password(password, null).build(); - } - dataSource.saveAuth(auth); - } - } catch (IOException e) { - logger.logException("Error while trying to import some vAuth data", e); - } - } - - private static boolean isUuidInstance(String s) { - return s.length() > 8 && s.charAt(8) == '-'; - } - - private String getName(UUID uuid) { - for (OfflinePlayer op : Bukkit.getOfflinePlayers()) { - if (op.getUniqueId().compareTo(uuid) == 0) { - return op.getName(); - } - } - return null; - } - -}