- Improved PluginManagerUtils

- Improved plugin list message

Author: BadAccuracyID

.gradle/7.1/executionHistory/executionHistory.bin

@@ -3,7 +3,6 @@
 import cloud.commandframework.annotations.Argument;
 import cloud.commandframework.annotations.CommandDescription;
 import cloud.commandframework.annotations.CommandMethod;
-import cloud.commandframework.annotations.Flag;
 import cloud.commandframework.annotations.specifier.Greedy;
 import cloud.commandframework.annotations.suggestions.Suggestions;
 import cloud.commandframework.context.CommandContext;
@@ -16,7 +15,6 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,20 +27,31 @@ public class PluginManagerCommand extends CommandClass {
     @CommandMethod("luckyessentials pluginmanager|pm list")
     @CommandDescription("Lists all loaded plugin")
     public void listCommand(
-            final @NonNull CommandSender sender,
-            final @Nullable @Flag(value = "fullname", aliases = "f", description = "Should it also show the plugin version?") Boolean fullName
+            final @NonNull CommandSender sender
     ) {
         if (!Utils.checkPermission(sender, "pluginmanager.list")) {
             return;
         }
 
-        boolean includeName = fullName != null && fullName;
-        List<String> pluginNames = Arrays.stream(Bukkit.getPluginManager().getPlugins())
-                .map(it -> PluginManagerUtils.getFormattedName(it, includeName))
-                .sorted(Comparator.naturalOrder())
+        List<PluginManagerUtils.PluginInfo> pluginInfos = Arrays.stream(Bukkit.getPluginManager().getPlugins())
+                .map(PluginManagerUtils::getPluginInfo)
+                .sorted(Comparator.comparing(PluginManagerUtils.PluginInfo::getRawName))
                 .collect(Collectors.toCollection(ArrayList::new));
 
-        sender.sendMessage(plugin.getMainConfigManager().getPrefix() + "§ePlugins §d(" + pluginNames.size() + ")§e: " + Joiner.on(", ").join(pluginNames));
+        final int[] size = {pluginInfos.size()};
+        sender.sendMessage("§ePlugins §d(" + size[0] + ")§e: ");
+        pluginInfos.forEach(it -> {
+            boolean last = (--size[0] < 1);
+            String message;
+            if (last) {
+                message = "§8└─ ";
+            } else {
+                message = "§8├─ ";
+            }
+
+            message += it.getName() + " §7(§6v§e" + it.getVersion() + "§7)";
+            sender.sendMessage(message);
+        });
     }
 
     @CommandMethod("luckyessentials pluginmanager|pm info <pluginName>")

.gradle/7.1/executionHistory/executionHistory.lock

@@ -4,6 +4,7 @@
 import id.luckynetwork.dev.lyrams.lej.LuckyEssentials;
 import id.luckynetwork.dev.lyrams.lej.enums.TrueFalseType;
 import id.luckynetwork.dev.lyrams.lej.utils.Utils;
+import lombok.Data;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -106,17 +107,14 @@ public Plugin getPluginByName(String name) {
      * @param plugin the plugin to format
      * @return the formatted name
      */
-    public String getFormattedName(@NotNull Plugin plugin, boolean includeVersion) {
+    public PluginInfo getPluginInfo(@NotNull Plugin plugin) {
         TrueFalseType trueFalseType = TrueFalseType.DEFAULT;
         trueFalseType.setIfTrue(plugin.getName());
         trueFalseType.setIfFalse(plugin.getName());
 
         String pluginName = Utils.colorizeTrueFalse(plugin.isEnabled(), trueFalseType);
-        if (includeVersion) {
-            pluginName += " (" + plugin.getDescription().getVersion() + ")";
-        }
 
-        return pluginName;
+        return new PluginInfo(plugin.getName(), pluginName, plugin.getDescription().getVersion());
     }
 
     /**
@@ -182,6 +180,7 @@ public Map<String, Command> getKnownCommands() {
             e.printStackTrace();
             return null;
         }
+
         SimpleCommandMap commandMap;
         try {
             commandMap = (SimpleCommandMap) commandMapField.get(Bukkit.getServer());
@@ -199,7 +198,6 @@ public Map<String, Command> getKnownCommands() {
         }
 
         Map<String, Command> knownCommands;
-
         try {
             knownCommands = (Map<String, Command>) knownCommandsField.get(commandMap);
         } catch (IllegalAccessException e) {
@@ -245,7 +243,6 @@ public boolean load(String pluginName) {
                         }
                     } catch (InvalidDescriptionException e) {
                         e.printStackTrace();
-                        return false;
                     }
                 }
             }
@@ -271,10 +268,9 @@ public boolean load(String pluginName) {
                     luckyEssentials.getVersionSupport().getCommandWrap().wrap(command, alias);
                 }
 
-                if (Bukkit.getOnlinePlayers().size() >= 1)
-                    for (Player player : Bukkit.getOnlinePlayers()) {
-                        luckyEssentials.getVersionSupport().reloadCommands(player);
-                    }
+                if (Bukkit.getOnlinePlayers().size() >= 1) {
+                    Bukkit.getOnlinePlayers().forEach(player -> luckyEssentials.getVersionSupport().reloadCommands(player));
+                }
             }, 10L);
         }
 
@@ -308,10 +304,8 @@ public boolean unload(Plugin plugin) {
             }
         }
 
-        String name = plugin.getName();
 
         PluginManager pluginManager = Bukkit.getPluginManager();
-
         SimpleCommandMap commandMap = null;
 
         List<Plugin> plugins = null;
@@ -351,33 +345,36 @@ public boolean unload(Plugin plugin) {
                 e.printStackTrace();
                 return false;
             }
-
         }
 
+        assert pluginManager != null;
         pluginManager.disablePlugin(plugin);
 
         if (plugins != null) {
             plugins.remove(plugin);
         }
 
+        String name = plugin.getName();
         if (names != null) {
             names.remove(name);
         }
 
-        if (listeners != null && reloadlisteners) for (SortedSet<RegisteredListener> set : listeners.values())
-            set.removeIf(value -> value.getPlugin() == plugin);
+        if (listeners != null) {
+            listeners.values().forEach(set -> set.removeIf(value -> value.getPlugin() == plugin));
+        }
 
-        if (commandMap != null)
+        if (commandMap != null) {
             for (Iterator<Map.Entry<String, Command>> it = commands.entrySet().iterator(); it.hasNext(); ) {
                 Map.Entry<String, Command> entry = it.next();
                 if (entry.getValue() instanceof PluginCommand) {
-                    PluginCommand c = (PluginCommand) entry.getValue();
-                    if (c.getPlugin() == plugin) {
-                        c.unregister(commandMap);
+                    PluginCommand command = (PluginCommand) entry.getValue();
+                    if (command.getPlugin() == plugin) {
+                        command.unregister(commandMap);
                         it.remove();
                     }
                 }
             }
+        }
 
         // Attempt to close the classloader to unlock any handles on the plugin's jar file.
         ClassLoader classLoader = plugin.getClass().getClassLoader();
@@ -390,18 +387,15 @@ public boolean unload(Plugin plugin) {
                 Field pluginInitField = classLoader.getClass().getDeclaredField("pluginInit");
                 pluginInitField.setAccessible(true);
                 pluginInitField.set(classLoader, null);
-
             } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex) {
                 Logger.getLogger(PluginManagerUtils.class.getName()).log(Level.SEVERE, null, ex);
             }
 
             try {
-
                 ((URLClassLoader) classLoader).close();
             } catch (IOException ex) {
                 Logger.getLogger(PluginManagerUtils.class.getName()).log(Level.SEVERE, null, ex);
             }
-
         }
 
         // Will not work on processes started with the -XX:+DisableExplicitGC flag, but let's try it anyway.
@@ -426,4 +420,9 @@ public boolean reload(Plugin plugin) {
 
         return false;
     }
+
+    @Data
+    public static class PluginInfo {
+        private final String rawName, name, version;
+    }
 }