GH-97 Remove litecommands and improve output plugin.yml (#102)

vLuckyyy · web-flow · commit 53e5a967a98c · 2023-11-16T17:43:15.000+01:00
* Remove litecommands and improve output plugin.yml.

* Change permision, improve tab-completa.

* Follow rollczi's suggestions.

* Follow rollczi's suggestions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@
 - `chatformatter.selector` - `<selector>`
 - `chatformatter.keybind` - `<key>`
 - `chatformatter.newline` - `<newline>`
-- `chatformatter.chat.reload` - reloads the plugin with `/chatformatter reload`
+- `chatformatter.reload` - reloads the plugin with `/chatformatter reload`
 - `chatformatter.receiveupdates` - receive update announcements for this plugin
 
 ### Additional color permissions:
@@ -75,6 +75,7 @@
 - `chatformatter.color.light_purple` - `<light_purple>`
 - `chatformatter.color.yellow` - `<yellow>`
 - `chatformatter.color.white` - `<white>`
+
 ### config.yml
 
 ```yaml
diff --git a/chatformatter-core/build.gradle.kts b/chatformatter-core/build.gradle.kts
@@ -17,9 +17,6 @@ dependencies {
     testImplementation("net.kyori:adventure-platform-bukkit:$adventureVersion")
     testImplementation("net.kyori:adventure-text-minimessage:$miniMessageVersion")
 
-    // LiteCommands
-    implementation("dev.rollczi.litecommands:bukkit:2.8.9")
-
     // CDN Configs
     val cdnVersion = "1.14.4"
     implementation("net.dzikoysk:cdn:$cdnVersion")
@@ -61,7 +58,6 @@ tasks {
         listOf(
             "com.eternalcode.gitcheck",
             "net.dzikoysk",
-            "dev.rollczi",
             "panda",
             "org.panda_lang",
             "net.kyori",
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterCommand.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterCommand.java
@@ -2,21 +2,26 @@
 
 import com.eternalcode.formatter.config.ConfigManager;
 import com.google.common.base.Stopwatch;
-import dev.rollczi.litecommands.command.execute.Execute;
-import dev.rollczi.litecommands.command.permission.Permission;
-import dev.rollczi.litecommands.command.route.Route;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-@Route(name = "chatformatter")
-@Permission("chatformatter.chat.reload")
-class ChatFormatterCommand {
+class ChatFormatterCommand implements CommandExecutor, TabCompleter {
+
+    private static final String RELOAD_MESSAGE = "<b><gradient:#29fbff:#38b3ff>ChatFormatter:</gradient></b> <green>Successfully reloaded configs in %sms!";
+    public static final String RELOAD_PERMISSION = "chatformatter.reload";
 
     private final ConfigManager configManager;
     private final AudienceProvider provider;
@@ -28,19 +33,40 @@ class ChatFormatterCommand {
         this.miniMessage = miniMessage;
     }
 
-    @Execute(route = "reload")
-    void reload(CommandSender commandSender) {
-        Stopwatch stopwatch = Stopwatch.createStarted();
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0 || !args[0].equalsIgnoreCase("reload")) {
+            sender.sendMessage(command.getUsage());
+            return true;
+        }
+
+        if (sender.hasPermission(RELOAD_PERMISSION)) {
+            Stopwatch stopwatch = Stopwatch.createStarted();
+
+            this.configManager.loadAndRenderConfigs();
+            long millis = stopwatch.elapsed(TimeUnit.MILLISECONDS);
+
+            Component deserialized = this.miniMessage.deserialize(String.format(RELOAD_MESSAGE, millis));
+            Audience audience = sender instanceof Player player
+                ? this.provider.player(player.getUniqueId())
+                : this.provider.console();
 
-        this.configManager.loadAndRenderConfigs();
-        long millis = stopwatch.elapsed(TimeUnit.MILLISECONDS);
+            audience.sendMessage(deserialized);
 
-        Component deserialized = this.miniMessage.deserialize("<b><gradient:#29fbff:#38b3ff>ChatFormatter:</gradient></b> <green>Successfully reloaded configs in " + millis + "ms!");
-        Audience audience = commandSender instanceof Player player
-            ? this.provider.player(player.getUniqueId())
-            : this.provider.console();
+            return true;
+        }
 
-        audience.sendMessage(deserialized);
+        return false;
     }
 
-}
+
+    @Nullable
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (args.length == 1 && sender.hasPermission(RELOAD_PERMISSION)) {
+            return List.of("reload");
+        }
+
+        return Collections.emptyList();
+    }
+}
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java
@@ -5,25 +5,21 @@
 import com.eternalcode.formatter.legacy.LegacyPostProcessor;
 import com.eternalcode.formatter.legacy.LegacyPreProcessor;
 import com.eternalcode.formatter.placeholder.PlaceholderAPIStack;
-import com.eternalcode.formatter.rank.VaultRankProvider;
+import com.eternalcode.formatter.placeholder.PlaceholderRegistry;
 import com.eternalcode.formatter.rank.ChatRankProvider;
+import com.eternalcode.formatter.rank.VaultRankProvider;
 import com.eternalcode.formatter.template.TemplateService;
-import com.eternalcode.formatter.placeholder.PlaceholderRegistry;
 import com.eternalcode.formatter.updater.UpdaterController;
 import com.eternalcode.formatter.updater.UpdaterService;
 import com.google.common.base.Stopwatch;
-import dev.rollczi.litecommands.LiteCommands;
-import dev.rollczi.litecommands.bukkit.LiteBukkitFactory;
 import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class ChatFormatterPlugin implements ChatFormatterApi {
@@ -33,8 +29,6 @@ public class ChatFormatterPlugin implements ChatFormatterApi {
     private final ChatRankProvider rankProvider;
     private final ChatHandler chatHandler;
 
-    private final LiteCommands<CommandSender> liteCommands;
-
     public ChatFormatterPlugin(Plugin plugin) {
         Server server = plugin.getServer();
         Stopwatch stopwatch = Stopwatch.createStarted();
@@ -53,22 +47,17 @@ public ChatFormatterPlugin(Plugin plugin) {
 
         AudienceProvider audienceProvider = BukkitAudiences.create(plugin);
         MiniMessage miniMessage = MiniMessage.builder()
-                .preProcessor(new LegacyPreProcessor())
-                .postProcessor(new LegacyPostProcessor())
-                .build();
-
-        this.liteCommands = LiteBukkitFactory.builder(server, "chat-formatter")
-            .commandInstance(new ChatFormatterCommand(configManager, audienceProvider, miniMessage))
-            .register();
+            .preProcessor(new LegacyPreProcessor())
+            .postProcessor(new LegacyPostProcessor())
+            .build();
 
         // bStats metrics
         new Metrics((JavaPlugin) plugin, 15199);
 
         this.chatHandler = new ChatHandlerImpl(miniMessage, pluginConfig, this.rankProvider, this.placeholderRegistry, this.templateService);
 
-        List.of(
-            new UpdaterController(updaterService, pluginConfig, audienceProvider, miniMessage)
-        ).forEach(listener -> server.getPluginManager().registerEvents(listener, plugin));
+        server.getPluginCommand("chatformatter").setExecutor(new ChatFormatterCommand(configManager, audienceProvider, miniMessage));
+        server.getPluginManager().registerEvents(new UpdaterController(updaterService, pluginConfig, audienceProvider, miniMessage), plugin);
 
         ChatFormatterApiProvider.enable(this);
 
@@ -77,10 +66,6 @@ public ChatFormatterPlugin(Plugin plugin) {
 
     public void close() {
         ChatFormatterApiProvider.disable();
-
-        if (this.liteCommands != null) {
-            this.liteCommands.getPlatform().unregisterAll();
-        }
     }
 
     @Override
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlayerPlaceholderStack.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlayerPlaceholderStack.java
@@ -5,5 +5,4 @@
 public interface PlayerPlaceholderStack {
 
     String apply(String text, Player target);
-
 }
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/rank/VaultRankProvider.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/rank/VaultRankProvider.java
@@ -1,6 +1,5 @@
 package com.eternalcode.formatter.rank;
 
-import com.eternalcode.formatter.rank.ChatRankProvider;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
diff --git a/chatformatter-paper-plugin/build.gradle.kts b/chatformatter-paper-plugin/build.gradle.kts
@@ -1,4 +1,6 @@
-plugins{
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default
+
+plugins {
     id("eternalcode.java")
     id("net.minecrell.plugin-yml.bukkit")
     id("com.github.johnrengelman.shadow")
@@ -12,6 +14,87 @@ bukkit {
     name = "ChatFormatter"
     depend = listOf("PlaceholderAPI", "Vault")
     version = "${project.version}"
+
+    commands {
+        register("chatformatter") {
+            description = "Reloads the configs for ChatFormatter"
+            permission = "chatformatter.reload"
+            usage = "/chatformatter reload"
+        }
+    }
+
+    permissions {
+        register("chatformatter.*") {
+            children = listOf(
+                "chatformatter.decorations.*",
+                "chatformatter.color.*",
+                "chatformatter.receiveupdates",
+                "chatformatter.reset",
+                "chatformatter.gradient",
+                "chatformatter.hover",
+                "chatformatter.click",
+                "chatformatter.insertion",
+                "chatformatter.font",
+                "chatformatter.transition",
+                "chatformatter.translatable",
+                "chatformatter.selector",
+                "chatformatter.keybind",
+                "chatformatter.newline"
+            )
+            default = Default.OP
+        }
+
+
+        register("chatformatter.decorations.*") {
+            children = listOf(
+                "chatformatter.decorations.bold",
+                "chatformatter.decorations.italic",
+                "chatformatter.decorations.underlined",
+                "chatformatter.decorations.strikethrough",
+                "chatformatter.decorations.obfuscated"
+            )
+            default = Default.OP
+        }
+
+        register("chatformatter.reset") { default = Default.OP }
+        register("chatformatter.gradient") { default = Default.OP }
+        register("chatformatter.hover") { default = Default.OP }
+        register("chatformatter.click") { default = Default.OP }
+        register("chatformatter.insertion") { default = Default.OP }
+        register("chatformatter.font") { default = Default.OP }
+        register("chatformatter.transition") { default = Default.OP }
+        register("chatformatter.translatable") { default = Default.OP }
+        register("chatformatter.selector") { default = Default.OP }
+        register("chatformatter.keybind") { default = Default.OP }
+        register("chatformatter.newline") { default = Default.OP }
+
+        register("chatformatter.color.*") {
+            children = listOf(
+                "chatformatter.legacycolor",
+                "chatformatter.color.black",
+                "chatformatter.color.dark_blue",
+                "chatformatter.color.dark_green",
+                "chatformatter.color.dark_aqua",
+                "chatformatter.color.dark_red",
+                "chatformatter.color.dark_purple",
+                "chatformatter.color.gold",
+                "chatformatter.color.gray",
+                "chatformatter.color.dark_gray",
+                "chatformatter.color.blue",
+                "chatformatter.color.green",
+                "chatformatter.color.aqua",
+                "chatformatter.color.red",
+                "chatformatter.color.light_purple",
+                "chatformatter.color.yellow",
+                "chatformatter.color.white"
+            )
+            default = Default.OP
+        }
+
+        register("chatformatter.receiveupdates") {
+            default = Default.OP
+        }
+    }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,4 @@`
`5`	`5`	`public interface PlayerPlaceholderStack {`
`6`	`6`
`7`	`7`	`String apply(String text, Player target);`
`8`		`-`
`9`	`8`	`}`