From 0b43300b216b88d1cfb7e79581e3b4b8354741c6 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Mon, 1 Jan 2018 10:50:42 -0800 Subject: [PATCH] Remove UUID lib dependency. Will resolve #317 --- dependency-reduced-pom.xml | 94 ++++++++++++++++++ lib/UUID-Library.jar | Bin 41665 -> 0 bytes pom.xml | 35 +------ .../playervaults/commands/ConvertCommand.java | 26 +---- .../converters/BackpackConverter.java | 19 ++-- .../playervaults/converters/Converter.java | 4 +- 6 files changed, 108 insertions(+), 70 deletions(-) create mode 100644 dependency-reduced-pom.xml delete mode 100644 lib/UUID-Library.jar diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..8a2aada --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,94 @@ + + + 4.0.0 + com.drtshock + PlayerVaultsX + PlayerVaultsX + 4.0.1 + http://dev.bukkit.org/pancakes/playervaults/ + + clean install + + + true + src/main/resources/ + + *.yml + + + + PlayerVaultsX + + + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + maven-shade-plugin + 2.4.3 + + + package + + shade + + + true + + + com.turt2live.uuid + + + + + com.turt2live.uuid + com.drtshock.playervaults.lib + + + + + + + + + + + vault-repo + http://nexus.hc.to/content/repositories/pub_releases/ + + + spigot-repo + https://hub.spigotmc.org/nexus/content/groups/public/ + + + + + org.spigotmc + spigot-api + 1.12.2-R0.1-SNAPSHOT + compile + + + net.milkbowl.vault + VaultAPI + 1.6 + compile + + + com.turt2live + UUID-Library + 0.0.1-SNAPSHOT + system + ${basedir}/lib/UUID-Library.jar + + + + SNAPSHOT + UTF-8 + + + diff --git a/lib/UUID-Library.jar b/lib/UUID-Library.jar deleted file mode 100644 index 24d7445c8b16d150566e7fba280acc737f919c23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41665 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 diff --git a/pom.xml b/pom.xml index 695e866..69583b2 100644 --- a/pom.xml +++ b/pom.xml @@ -34,32 +34,6 @@ 1.7 - - org.apache.maven.plugins - maven-shade-plugin - 1.5 - - - package - - shade - - - - - com.turt2live:UUID-Library - - - - - com.turt2live.uuid - com.drtshock.playervaults.lib.uuid - - - - - - @@ -79,18 +53,13 @@ org.spigotmc spigot-api 1.12.2-R0.1-SNAPSHOT + provided net.milkbowl.vault VaultAPI 1.6 - - - com.turt2live - UUID-Library - 1.0 - system - ${basedir}/lib/UUID-Library.jar + provided diff --git a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java index 88a2537..9fa71a6 100644 --- a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java +++ b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java @@ -5,24 +5,16 @@ import com.drtshock.playervaults.converters.BackpackConverter; import com.drtshock.playervaults.converters.Converter; import com.drtshock.playervaults.util.Lang; import com.drtshock.playervaults.vaultmanagement.VaultOperations; -import com.turt2live.uuid.CachingServiceProvider; -import com.turt2live.uuid.ServiceProvider; -import com.turt2live.uuid.turt2live.v2.ApiV2Service; -import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.UUID; public class ConvertCommand implements CommandExecutor { private final List converters = new ArrayList<>(); - private ServiceProvider uuidProvider; public ConvertCommand() { converters.add(new BackpackConverter()); @@ -56,27 +48,15 @@ public class ConvertCommand implements CommandExecutor { PlayerVaults.getInstance().getServer().getScheduler().runTaskLaterAsynchronously(PlayerVaults.getInstance(), new Runnable() { @Override public void run() { - if (uuidProvider == null) { - CachingServiceProvider cachingUuidProvider = new CachingServiceProvider(new ApiV2Service()); - Map seed = new HashMap<>(); - - for (OfflinePlayer player : PlayerVaults.getInstance().getServer().getOfflinePlayers()) { - if (player.hasPlayedBefore()) { - seed.put(player.getUniqueId(), player.getName()); - } - } - - cachingUuidProvider.seedLoad(seed, 6 * 60 * 60); // 6 hour cache time - uuidProvider = cachingUuidProvider; - } - int converted = 0; VaultOperations.setLocked(true); + for (Converter converter : applicableConverters) { if (converter.canConvert()) { - converted += converter.run(sender, uuidProvider); + converted += converter.run(sender); } } + VaultOperations.setLocked(false); sender.sendMessage(Lang.TITLE + Lang.CONVERT_COMPLETE.toString().replace("%converted", converted + "")); } diff --git a/src/main/java/com/drtshock/playervaults/converters/BackpackConverter.java b/src/main/java/com/drtshock/playervaults/converters/BackpackConverter.java index c3c97e6..14d33cb 100644 --- a/src/main/java/com/drtshock/playervaults/converters/BackpackConverter.java +++ b/src/main/java/com/drtshock/playervaults/converters/BackpackConverter.java @@ -2,8 +2,8 @@ package com.drtshock.playervaults.converters; import com.drtshock.playervaults.PlayerVaults; import com.drtshock.playervaults.vaultmanagement.VaultManager; -import com.turt2live.uuid.PlayerRecord; -import com.turt2live.uuid.ServiceProvider; +import org.bukkit.Bukkit; +import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -22,10 +22,7 @@ import java.util.UUID; public class BackpackConverter implements Converter { @Override - public int run(CommandSender initiator, ServiceProvider uuidProvider) { - if (uuidProvider == null) { - throw new IllegalArgumentException(); - } + public int run(CommandSender initiator) { PlayerVaults plugin = PlayerVaults.getInstance(); File destination = new File(plugin.getDataFolder().getParentFile(), "Backpack" + File.separator + "backpacks"); @@ -39,7 +36,7 @@ public class BackpackConverter implements Converter { int vaultNum = 1; for (File file : worldDirs != null ? worldDirs : new File[0]) { if (file.isDirectory()) { - converted += convert(file, vaultNum, uuidProvider); + converted += convert(file, vaultNum); vaultNum++; } } @@ -47,7 +44,7 @@ public class BackpackConverter implements Converter { return converted; } - private int convert(File worldFolder, int intoVaultNum, ServiceProvider uuidProvider) { + private int convert(File worldFolder, int intoVaultNum) { PlayerVaults plugin = PlayerVaults.getInstance(); VaultManager vaults = VaultManager.getInstance(); int converted = 0; @@ -56,11 +53,11 @@ public class BackpackConverter implements Converter { for (File file : files != null ? files : new File[0]) { if (file.isFile() && file.getName().toLowerCase().endsWith(".yml")) { try { - PlayerRecord player = uuidProvider.doLookup(file.getName().substring(0, file.getName().lastIndexOf('.'))); - if (player == null || player.getUuid() == null) { + OfflinePlayer player = Bukkit.getOfflinePlayer(file.getName().substring(0, file.getName().lastIndexOf('.'))); + if (player == null || player.getUniqueId() == null) { plugin.getLogger().warning("Unable to convert Backpack for player: " + (player != null ? player.getName() : file.getName())); } else { - UUID uuid = player.getUuid(); + UUID uuid = player.getUniqueId(); FileConfiguration yaml = YamlConfiguration.loadConfiguration(file); ConfigurationSection section = yaml.getConfigurationSection("backpack"); if (section.getKeys(false).size() <= 0) { diff --git a/src/main/java/com/drtshock/playervaults/converters/Converter.java b/src/main/java/com/drtshock/playervaults/converters/Converter.java index 6f03fa6..6e4975c 100644 --- a/src/main/java/com/drtshock/playervaults/converters/Converter.java +++ b/src/main/java/com/drtshock/playervaults/converters/Converter.java @@ -1,6 +1,5 @@ package com.drtshock.playervaults.converters; -import com.turt2live.uuid.ServiceProvider; import org.bukkit.command.CommandSender; /** @@ -14,11 +13,10 @@ public interface Converter { * Converts the other plugin's data. * * @param initiator the initiator of the conversion. May be null - * @param uuidProvider the UUID provider to use, cannot be null * * @return the number of vaults converted. Returns 0 on none converted or -1 if no vaults were converted. */ - int run(CommandSender initiator, ServiceProvider uuidProvider); + int run(CommandSender initiator); /** * Determines if this converter is applicable for converting to PlayerVaults. This may check for the existance of a