Removed Executable

Author: CroaBeast

README.md

@@ -87,7 +87,7 @@ Paper forks of Bukkit/Spigot often break traditional command registration method
 
 ## Usage Examples
 
-### Example 1: Custom Command by Extending BukkitCommand
+### Example: Custom Command by Extending BukkitCommand
 
 Create a custom command by extending `BukkitCommand`:
 
@@ -96,16 +96,13 @@ package com.example.myplugin.command;
 
 import me.croabeast.command.BukkitCommand;
 import me.croabeast.command.BaseCommand;
-import me.croabeast.command.Executable;
 import me.croabeast.command.SubCommand;
 import me.croabeast.command.TabBuilder;
 import me.croabeast.command.DefaultPermissible;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-
 public class GreetCommand extends BukkitCommand implements DefaultPermissible {
 
     /**
@@ -115,7 +112,7 @@ public class GreetCommand extends BukkitCommand implements DefaultPermissible {
      */
     public GreetCommand(Plugin plugin) {
         super(plugin, "greet");
-        
+
         // Set up the main command executable
         setExecutable((CommandSender sender, String[] args) -> {
             sender.sendMessage("Hello, " + sender.getName() + "!");
@@ -124,10 +121,10 @@ public class GreetCommand extends BukkitCommand implements DefaultPermissible {
 
         // Register a sub-command "reload" with an alias "r"
         SubCommand reloadSub = new SubCommand(this, "reload;r");
-        reloadSub.setExecutable((sender, args) -> {
+        reloadSub.setPredicate((sender, args) -> {
             // Reload logic here
             sender.sendMessage("GreetCommand configuration reloaded.");
-            return Executable.State.TRUE;
+            return true;
         });
         registerSubCommand(reloadSub);
     }
@@ -183,43 +180,6 @@ public class MyPlugin extends JavaPlugin {
 }
 ```
 
-### Example 2: Creating a Command with CommandBuilder
-
-Alternatively, use the fluent API provided by `CommandBuilder`:
-
-```java
-package com.example.myplugin;
-
-import com.example.myplugin.command.CommandBuilder;
-import com.example.myplugin.command.Executable;
-import com.example.myplugin.command.TabBuilder;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.Arrays;
-
-public class MyPlugin extends JavaPlugin {
-
-    @Override
-    public void onEnable() {
-        // Create a command "example" using CommandBuilder
-        CommandBuilder builder = CommandBuilder.from(this, "example")
-            .setOverriding(true)
-            .setCompletions((sender, args) -> Arrays.asList("optionA", "optionB", "optionC"))
-            .setCompletionBuilder(new TabBuilder().addArgument(1, "optionA"))
-            .apply(cmd -> cmd.setExecutable((sender, args) -> {
-                sender.sendMessage("Example command executed with arguments: " + String.join(" ", args));
-                return Executable.State.TRUE;
-            }));
-
-        // Register the command at runtime (works seamlessly on Paper)
-        builder.register();
-
-        // To unregister later:
-        // builder.unregister();
-    }
-}
-```
-
 ---
 
 ## Maven / Gradle Installation

src/main/java/me/croabeast/command/BaseCommand.java

@@ -11,7 +11,7 @@
  * <ul>
  *   <li>The command name, as returned by {@link #getName()}.</li>
  *   <li>A list of alternative names (aliases) via {@link #getAliases()}.</li>
- *   <li>An executable action defined by {@link Executable}, which is run when the command is invoked.</li>
+ *   <li>An executable predicate defined by {@link CommandPredicate}, which is run when the command is invoked.</li>
  * </ul>
  * </p>
  * <p>
@@ -34,10 +34,10 @@
  *     }
  *
  *     {@literal @}Override
- *     public Executable getExecutable() {
+ *     public CommandPredicate getPredicate() {
  *         return (sender, args) -&gt; {
  *             // command execution logic
- *             return Executable.State.TRUE;
+ *             return true;
  *         };
  *     }
  *
@@ -48,7 +48,7 @@
  * }</code></pre></p>
  *
  * @see Permissible
- * @see Executable
+ * @see CommandPredicate
  */
 public interface BaseCommand extends Permissible {
 
@@ -72,13 +72,13 @@ public interface BaseCommand extends Permissible {
     List<String> getAliases();
 
     /**
-     * Gets the executable action associated with this command.
+     * Gets the executable predicate associated with this command.
      * <p>
-     * The returned {@link Executable} defines the logic that is run when the command is invoked.
+     * The returned {@link CommandPredicate} defines the logic that is run when the command is invoked.
      * </p>
      *
-     * @return the {@link Executable} instance representing the command's behavior.
+     * @return the {@link CommandPredicate} instance representing the command's behavior.
      */
     @NotNull
-    Executable getExecutable();
+    CommandPredicate getPredicate();
 }

src/main/java/me/croabeast/command/BukkitCommand.java

@@ -73,7 +73,7 @@ public abstract class BukkitCommand extends org.bukkit.command.Command implement
     /**
      * The executable action performed when this command is executed.
      */
-    private Executable executable = null;
+    private CommandPredicate executable = null;
 
     /**
      * Predicate for handling errors during command execution.
@@ -323,15 +323,15 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String label, @No
                 if (args.length > 1)
                     System.arraycopy(args, 1, newArgs, 0, last);
                 try {
-                    success = sub.getExecutable().executeAction(sender, newArgs).asBoolean();
+                    success = sub.getPredicate().test(sender, newArgs);
                 } catch (Throwable e) {
                     success = executingError.test(sender, e);
                 }
                 return success;
             }
         }
         try {
-            success = getExecutable().executeAction(sender, args).asBoolean();
+            success = getPredicate().test(sender, args);
         } catch (Throwable e) {
             success = executingError.test(sender, e);
         }
@@ -367,41 +367,32 @@ public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String a
     }
 
     /**
-     * Retrieves the executable action associated with this command.
+     * Retrieves the executable predicate associated with this command.
      *
-     * @return the {@link Executable} representing the command's action.
-     * @throws NullPointerException if the executable action is not set.
+     * @return the {@link CommandPredicate} representing the command's action.
+     * @throws NullPointerException if the executable predicate is not set.
      */
     @NotNull
-    public Executable getExecutable() {
-        return Objects.requireNonNull(executable, "Executable action is not set");
+    public CommandPredicate getPredicate() {
+        return Objects.requireNonNull(executable, "Executable predicate is not set");
     }
 
     /**
-     * Sets the executable action for this command.
+     * Sets the executable predicate based on a provided {@link CommandPredicate}.
      *
-     * @param executable the executable action to assign.
-     */
-    public void setExecutable(Executable executable) {
-        this.executable = executable;
-    }
-
-    /**
-     * Sets the executable action based on a provided {@link CommandPredicate}.
-     *
-     * @param predicate the command predicate used to generate the executable action.
+     * @param predicate the command predicate used to generate the executable predicate.
      */
     public void setExecutable(CommandPredicate predicate) {
-        this.executable = Executable.from(predicate);
+        this.executable = predicate;
     }
 
     /**
-     * Sets the executable action to a constant boolean value.
+     * Sets the executable predicate to a constant boolean value.
      *
      * @param value the boolean value representing the command outcome.
      */
     public void setExecutable(boolean value) {
-        this.executable = Executable.from(value);
+        this.executable = (sender, strings) -> value;
     }
 
     /**
@@ -539,7 +530,7 @@ public static void syncCommands() {
      * @return {@code true} if the command was successfully registered; {@code false} otherwise.
      */
     public boolean register(boolean sync) {
-        if (registered || !isEnabled()) return false;
+        if (registered) return false;
 
         org.bukkit.command.Command c = knownCommands().get(getName());
         if (isOverriding() && c != null)
@@ -574,7 +565,7 @@ public boolean register() {
      */
     @SuppressWarnings("all")
     public boolean unregister(boolean sync) {
-        if (!registered || isEnabled()) return false;
+        if (!registered) return false;
 
         org.bukkit.command.Command c = knownCommands().get(getName());
         if (!Objects.equals(c, this)) return false;

src/main/java/me/croabeast/command/Command.java

@@ -15,7 +15,7 @@
  * <p>
  * A {@code Command} extends multiple interfaces to provide a comprehensive structure for commands:
  * <ul>
- *   <li>{@link BaseCommand} for basic command properties (name, aliases, and executable action).</li>
+ *   <li>{@link BaseCommand} for basic command properties (name, aliases, and executable predicate).</li>
  *   <li>{@link Completable} for generating tab-completion suggestions.</li>
  *   <li>{@link PluginIdentifiableCommand} and {@link Keyed} for associating the command with a plugin.</li>
  *   <li>{@link Registrable} for handling command registration.</li>
@@ -42,10 +42,10 @@
  *     }
  *
  *     {@literal @}Override
- *     public Executable getExecutable() {
+ *     public CommandPredicate getPredicate() {
  *         return (sender, args) -&gt; {
  *             // command logic
- *             return Executable.State.TRUE;
+ *             return true;
  *         };
  *     }
  *