diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java index 804c398..b9d11d0 100644 --- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java +++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java @@ -1,21 +1,10 @@ package me.StevenLawson.TotalFreedomMod.commands; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import me.StevenLawson.TotalFreedomMod.admin.Admin; -import me.StevenLawson.TotalFreedomMod.admin.AdminList; -import me.StevenLawson.TotalFreedomMod.manager.UUIDManager; -import me.StevenLawson.TotalFreedomMod.manager.UUIDManager.TFM_UuidResolver; -import me.StevenLawson.TotalFreedomMod.player.Player; -import me.StevenLawson.TotalFreedomMod.player.PlayerList; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE) +@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) public class Command_uuid extends FreedomCommand { @Override @@ -25,84 +14,15 @@ public class Command_uuid extends FreedomCommand { return false; } - if ("purge".equals(args[0])) { - playerMsg(sender, "Purged " + UUIDManager.purge() + " cached UUIDs."); - return true; - } - - if ("recalculate".equals(args[0])) { - playerMsg(sender, "Recalculating UUIDs..."); - - // Playerlist uuids - final Set players = PlayerList.getAllPlayers(); - final List names = new ArrayList(); - - for (Player player : players) { - names.add(player.getLastLoginName()); - } - - final Map playerUuids = new TFM_UuidResolver(names).call(); - - int updated = 0; - for (String name : playerUuids.keySet()) { - for (Player player : players) { - if (!player.getLastLoginName().equalsIgnoreCase(name)) { - continue; - } - - if (player.getUniqueId().equals(playerUuids.get(name))) { - continue; - } - - PlayerList.setUniqueId(player, playerUuids.get(name)); - UUIDManager.rawSetUUID(name, playerUuids.get(name)); - updated++; - break; - } - } - - playerMsg(sender, "Recalculated " + updated + " player UUIDs"); - names.clear(); - - // Adminlist UUIDs - final Set admins = AdminList.getAllAdmins(); - for (Admin admin : admins) { - names.add(admin.getLastLoginName()); - } - - final Map adminUuids = new TFM_UuidResolver(names).call(); - - updated = 0; - for (String name : adminUuids.keySet()) { - for (Admin admin : admins) { - if (!admin.getLastLoginName().equalsIgnoreCase(name)) { - continue; - } - - if (admin.getUniqueId().equals(adminUuids.get(name))) { - continue; - } - - AdminList.setUuid(admin, admin.getUniqueId(), adminUuids.get(name)); - UUIDManager.rawSetUUID(name, adminUuids.get(name)); - updated++; - break; - } - } - - playerMsg(sender, "Recalculated " + updated + " admin UUIDs"); - - return true; - } - org.bukkit.entity.Player player = Bukkit.getPlayer(args[0]); if (player != null) { - playerMsg(sender, String.format("%s's UUID is %s", player.getName(), + playerMsg(sender, String.format("%s's UUID is %s.", player.getName(), player.getUniqueId().toString())); return true; + } else { + playerMsg(sender, "Player not found, bozo."); + return true; } - - return false; } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 351d371..29a72b5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -181,8 +181,8 @@ commands: usage: 'access' aliases: 'ov' uuid: - description: 'Provides uuid tools' - usage: '/ ' + description: 'Calculate yourself or someone else''s UUID' + usage: '/ ' logs: description: 'Register your connection with the TFM logviewer.' usage: '/ [off]'