New command system

build.gradle

@@ -3,14 +3,13 @@ plugins {
     id 'maven-publish'
 }
 
-apply plugin: 'maven-publish'
-
 allprojects {
-    group = 'com.wizardlybump17.wlib'
-    version = '1.6.7'
-
     apply plugin: 'com.github.johnrengelman.shadow'
     apply plugin: 'java'
+    apply plugin: 'maven-publish'
+
+    group = 'com.wizardlybump17.wlib'
+    version = '1.6.7-ncs-2'
 
     repositories {
         mavenLocal()
@@ -24,6 +23,10 @@ allprojects {
         compileJava {
             options.encoding = 'UTF-8'
         }
+
+        assemble {
+            dependsOn(shadowJar)
+        }
     }
 
     java {
@@ -32,8 +35,6 @@ allprojects {
 }
 
 subprojects {
-    apply plugin: 'maven-publish'
-
     if (project.name == 'versions' || project.name.matches('v\\d_\\d+_R\\d+')) {
         tasks.withType(PublishToMavenRepository).configureEach {
             it.enabled = false
@@ -79,8 +80,4 @@ subprojects {
             events "passed", "skipped", "failed", "standardOut", "standardError"
         }
     }
-
-    build {
-        dependsOn(test, shadowJar)
-    }
 }

bukkit-utils/build.gradle

@@ -4,6 +4,9 @@ dependencies {
             'org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT',
             'org.jetbrains:annotations:23.0.0',
     )
+    compileOnly("net.kyori:adventure-api:4.18.0")
+    compileOnly("net.kyori:adventure-text-minimessage:4.18.0")
+    compileOnly("net.kyori:adventure-platform-bukkit:4.3.4")
     implementation(
             project(':utils')
     )

bukkit-utils/src/main/java/com/wizardlybump17/wlib/util/bukkit/MiniMessageUtil.java

@@ -0,0 +1,39 @@
+package com.wizardlybump17.wlib.util.bukkit;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+public final class MiniMessageUtil {
+
+    private MiniMessageUtil() {
+    }
+
+    public static @NotNull Component getMessage(@NotNull String message, @NotNull Map<String, Object> placeholders) {
+        MiniMessage miniMessage = MiniMessage.miniMessage();
+        if (placeholders.isEmpty())
+            return miniMessage.deserialize(message);
+
+        TagResolver[] resolvers = new TagResolver[placeholders.size()];
+        int resolverIndex = 0;
+        for (Map.Entry<String, Object> entry : placeholders.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            resolvers[resolverIndex++] = TagResolver.builder()
+                    .tag(
+                            key,
+                            Tag.inserting(value instanceof Component component ? component : Component.text(String.valueOf(value)))
+                    )
+                    .build();
+        }
+        return miniMessage.deserialize(message, resolvers);
+    }
+
+    public static @NotNull Component getMessage(@NotNull String message) {
+        return getMessage(message, Map.of());
+    }
+}

bungee/src/main/java/com/wizardlybump17/wlib/bungee/command/BungeeCommandExecutor.java

@@ -1,13 +1,13 @@
 package com.wizardlybump17.wlib.bungee.command;
 
-import com.wizardlybump17.wlib.bungee.command.sender.GenericSender;
-import com.wizardlybump17.wlib.bungee.command.sender.ProxiedPlayerSender;
+import com.wizardlybump17.wlib.bungee.command.sender.BungeeCommandSender;
 import com.wizardlybump17.wlib.command.CommandManager;
-import com.wizardlybump17.wlib.command.CommandSender;
+import com.wizardlybump17.wlib.command.exception.CommandException;
 import com.wizardlybump17.wlib.command.holder.CommandExecutor;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 
+import java.util.logging.Level;
+
 public class BungeeCommandExecutor extends Command implements CommandExecutor {
 
     private final CommandManager manager;
@@ -18,17 +18,16 @@ public BungeeCommandExecutor(CommandManager manager, String name) {
     }
 
     @Override
-    public void execute(CommandSender<?> sender, String commandName, String[] args) {
+    public void execute(com.wizardlybump17.wlib.command.sender.CommandSender<?> sender, String commandName, String[] args) throws CommandException {
         manager.execute(sender, commandName + " " + String.join(" ", args));
     }
 
     @Override
     public void execute(net.md_5.bungee.api.CommandSender sender, String[] args) {
-        CommandSender<?> realSender;
-        if (sender instanceof ProxiedPlayer)
-            realSender = new ProxiedPlayerSender((ProxiedPlayer) sender);
-        else
-            realSender = new GenericSender(sender);
-        execute(realSender, getName(), args);
+        try {
+            execute(new BungeeCommandSender(sender), getName(), args);
+        } catch (CommandException e) {
+            manager.getHolder().getLogger().log(Level.SEVERE, "Error while executing a command", e);
+        }
     }
 }

bungee/src/main/java/com/wizardlybump17/wlib/bungee/command/BungeeCommandManager.java

@@ -1,9 +1,10 @@
 package com.wizardlybump17.wlib.bungee.command;
 
 import com.wizardlybump17.wlib.command.CommandManager;
-import com.wizardlybump17.wlib.command.RegisteredCommand;
+import com.wizardlybump17.wlib.command.registered.RegisteredCommand;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
 
 public class BungeeCommandManager extends CommandManager {
 
@@ -12,7 +13,7 @@ public BungeeCommandManager(BungeeCommandHolder holder) {
     }
 
     @Override
-    public void registerCommands(Object... objects) {
+    public void registerCommands(@NotNull Object @NotNull ... objects) {
         super.registerCommands(objects);
         for (Object object : objects) {
             for (RegisteredCommand command : getCommands(object)) {

bungee/src/main/java/com/wizardlybump17/wlib/bungee/command/sender/GenericSender.java → bungee/src/main/java/com/wizardlybump17/wlib/bungee/command/sender/BungeeCommandSender.java

@@ -1,11 +1,15 @@
 package com.wizardlybump17.wlib.bungee.command.sender;
 
-import com.wizardlybump17.wlib.command.CommandSender;
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.ConnectedPlayer;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
 
 @RequiredArgsConstructor
-public class GenericSender implements CommandSender<net.md_5.bungee.api.CommandSender> {
+public class BungeeCommandSender implements com.wizardlybump17.wlib.command.sender.CommandSender<net.md_5.bungee.api.CommandSender> {
 
     private final net.md_5.bungee.api.CommandSender handle;
 
@@ -34,12 +38,16 @@ public boolean hasPermission(String permission) {
         return handle.hasPermission(permission);
     }
 
-    @Override
-    public GenericSender toGeneric() {
-        return this;
+    public @NotNull ProxiedPlayer asProxiedPlayer() {
+        return (ProxiedPlayer) handle;
     }
 
-    public static boolean isGeneric() {
-        return true;
+    public @NotNull ConnectedPlayer asConnectedPlayer() {
+        return (ConnectedPlayer) handle;
+    }
+
+    @Override
+    public boolean hasId(@NotNull UUID id) {
+        return handle instanceof ProxiedPlayer player && player.getUniqueId().equals(id);
     }
 }

commands/build.gradle

@@ -11,6 +11,7 @@ dependencies {
     implementation("com.github.sisyphsu:dateparser:1.0.11") {
         exclude(group: "org.projectlombok", module: "lombok")
     }
+    testCompileOnly("org.jetbrains:annotations:26.0.1")
 }
 
 shadowJar {