allow control of the original command

bukkit/src/main/java/io/github/wysohn/triggerreactor/bukkit/bridge/BukkitCommand.java

@@ -7,6 +7,7 @@
 import io.github.wysohn.triggerreactor.core.manager.trigger.command.ITabCompleter;
 import io.github.wysohn.triggerreactor.core.manager.trigger.command.PredefinedTabCompleters;
 import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
 
@@ -16,17 +17,31 @@
 
 public class BukkitCommand implements ICommand {
     private final PluginCommand command;
+    private final Command original;
 
-    public BukkitCommand(PluginCommand command) {
+    private ICommandExecutor executor;
+
+    public BukkitCommand(PluginCommand command,
+                         Command original) {
         this.command = command;
+        this.original = original;
+    }
+
+    public BukkitCommand(PluginCommand command) {
+        this(command, null);
+    }
+
+    @Override
+    public String getName() {
+        return command.getName();
     }
 
     @Override
     public void setTabCompleterMap(Map<Integer, Set<ITabCompleter>> tabCompleterMap) {
         command.setTabCompleter((sender, command12, alias, args) -> {
             if (tabCompleterMap == null
-                    || tabCompleterMap.get(args.length - 1) == null
-                    || tabCompleterMap.get(args.length - 1).size() == 0) {
+                || tabCompleterMap.get(args.length - 1) == null
+                || tabCompleterMap.get(args.length - 1).size() == 0) {
                 return new ArrayList<>();
             }
             Set<ITabCompleter> finalCompleters = new HashSet<>();
@@ -63,8 +78,8 @@ public void setTabCompleterMap(Map<Integer, Set<ITabCompleter>> tabCompleterMap)
 
                     } else { // provide candidates
                         finalProvideList.addAll(values.stream()
-                                .filter(val -> val.toLowerCase().startsWith(partial.toLowerCase()))
-                                .collect(Collectors.toList()));
+                            .filter(val -> val.toLowerCase().startsWith(partial.toLowerCase()))
+                            .collect(Collectors.toList()));
                     }
                 } else {
                     String partial = args[args.length - 1];
@@ -94,9 +109,14 @@ private static List<String> handlePreDefined(PredefinedTabCompleters val) {
         return returning;
     }
 
+    @Override
+    public ICommandExecutor getExecutor() {
+        return this.executor;
+    }
 
     @Override
     public void setExecutor(ICommandExecutor executor) {
+        this.executor = executor;
         command.setExecutor((sender, command1, label, args) -> {
             ICommandSender isender;
 
@@ -106,8 +126,38 @@ public void setExecutor(ICommandExecutor executor) {
                 isender = new BukkitCommandSender(sender);
             }
 
-            executor.execute(isender, label, args);
+            executor.execute(isender, label, args, Optional.ofNullable(original)
+                .map(Overridden::new)
+                .orElse(null));
             return true;
         });
     }
+
+    public static class Overridden implements ICommand {
+        private final Command command;
+
+        public Overridden(Command command) {
+            this.command = command;
+        }
+
+        @Override
+        public String getName() {
+            return command.getName();
+        }
+
+        @Override
+        public void setTabCompleterMap(Map<Integer, Set<ITabCompleter>> tabCompleterMap) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ICommandExecutor getExecutor() {
+            return (sender, label, args, original) -> command.execute(sender.get(), label, args);
+        }
+
+        @Override
+        public void setExecutor(ICommandExecutor executor) {
+            throw new UnsupportedOperationException();
+        }
+    }
 }

bukkit/src/main/java/io/github/wysohn/triggerreactor/bukkit/main/BukkitCommandHandler.java

@@ -54,18 +54,20 @@ public ICommand register(String name, String[] aliases) {
 
         PluginCommand command = createCommand(name);
 
-        Optional.ofNullable(rawCommandMap.get(name))
-                .ifPresent(c -> overridens.put(name, c));
+        Command overridden = rawCommandMap.get(name);
+        Optional.ofNullable(overridden)
+            .ifPresent(c -> overridens.put(name, c));
+
         rawCommandMap.put(name, command);
         // register aliases manually here
         for (String alias : aliases) {
             Optional.ofNullable(rawCommandMap.get(alias))
-                    .ifPresent(c -> overridens.put(alias, c));
+                .ifPresent(c -> overridens.put(alias, c));
             rawCommandMap.put(alias, command);
         }
 
         commandMapHandler.synchronizeCommandMap();
-        return new BukkitCommand(command);
+        return new BukkitCommand(command, overridden);
     }
 
     @Override

core/src/main/java/io/github/wysohn/triggerreactor/core/main/command/ICommand.java

@@ -10,7 +10,11 @@
  * the actual command instance that is registered to the corresponding API.
  */
 public interface ICommand {
+    String getName();
+
     void setTabCompleterMap(Map<Integer, Set<ITabCompleter>> tabCompleterMap);
 
+    ICommandExecutor getExecutor();
+
     void setExecutor(ICommandExecutor executor);
 }

core/src/main/java/io/github/wysohn/triggerreactor/core/main/command/ICommandExecutor.java

@@ -3,5 +3,19 @@
 import io.github.wysohn.triggerreactor.core.bridge.ICommandSender;
 
 public interface ICommandExecutor {
-    void execute(ICommandSender sender, String label, String[] args);
+    /**
+     * Define behavior when the command is executed.
+     *
+     * @param sender   who executed the command
+     * @param label    the label of the command
+     * @param args     the arguments of the command
+     * @param original the original command instance. Null if this executor is
+     *                 handling a newly created command and not replacing an
+     *                 existing one.
+     */
+    void execute(ICommandSender sender, String label, String[] args, ICommand original);
+
+    default void execute(ICommandSender sender, String label, String[] args) {
+        execute(sender, label, args, null);
+    }
 }

core/src/main/java/io/github/wysohn/triggerreactor/core/manager/trigger/command/CommandTriggerManager.java

@@ -76,9 +76,9 @@ public void initialize() {
     @Override
     public void reload() {
         getAllTriggers().stream()
-                .map(Trigger::getInfo)
-                .map(TriggerInfo::getTriggerName)
-                .forEach(commandHandler::unregister);
+            .map(Trigger::getInfo)
+            .map(TriggerInfo::getTriggerName)
+            .forEach(commandHandler::unregister);
 
         super.reload();
 
@@ -115,24 +115,25 @@ public CommandTrigger remove(String name) {
      */
     private boolean registerToAPI(CommandTrigger trigger) {
         ICommand command = commandHandler.register(trigger.getInfo().getTriggerName(),
-                trigger.getAliases());
+            trigger.getAliases());
         if (command == null)
             return false;
 
         trigger.setCommand(command);
         command.setTabCompleterMap(trigger.getTabCompleterMap());
-        command.setExecutor((sender, label, args) -> {
+        command.setExecutor((sender, label, args, original) -> {
             //TODO: remove this if we allow to use the command trigger in the console.
             if (!(sender instanceof IPlayer)) {
                 sender.sendMessage("CommandTrigger works only for Players.");
                 return;
             }
 
             execute(eventManagement.createPlayerCommandEvent(sender, label, args),
-                    sender,
-                    label,
-                    args,
-                    trigger);
+                sender,
+                label,
+                args,
+                trigger,
+                original);
         });
 
         return true;
@@ -172,8 +173,8 @@ public boolean addCommandTrigger(ICommandSender adding, String cmd, String scrip
 
     public CommandTrigger createTempCommandTrigger(String script) throws TriggerInitFailedException {
         CommandTrigger commandTrigger = factory.create(new TriggerInfo(null,
-                IConfigSource.empty(),
-                "temp") {
+            IConfigSource.empty(),
+            "temp") {
             @Override
             public boolean isValid() {
                 return false;
@@ -185,21 +186,26 @@ public boolean isValid() {
 
     public void reregisterCommand(String triggerName) {
         Optional.ofNullable(get(triggerName))
-                .ifPresent(trigger -> {
-                    commandHandler.unregister(triggerName);
-                    registerToAPI(trigger);
+            .ifPresent(trigger -> {
+                commandHandler.unregister(triggerName);
+                registerToAPI(trigger);
 
-                    commandHandler.sync();
-                });
+                commandHandler.sync();
+            });
     }
 
-    private void execute(Object context, ICommandSender sender, String cmd, String[] args, CommandTrigger trigger) {
+    private void execute(Object context,
+                         ICommandSender sender,
+                         String cmd,
+                         String[] args,
+                         CommandTrigger trigger,
+                         ICommand original) {
         for (String permission : trigger.getPermissions()) {
             if (!sender.hasPermission(permission)) {
                 sender.sendMessage("&c[TR] You don't have permission!");
                 if (pluginManagement.isDebugging()) {
                     logger.info("Player " + sender.getName() + " executed command " + cmd
-                            + " but didn't have permission " + permission + "");
+                        + " but didn't have permission " + permission + "");
                 }
                 return;
             }
@@ -211,8 +217,34 @@ private void execute(Object context, ICommandSender sender, String cmd, String[]
         varMap.put("command", cmd);
         varMap.put("args", args);
         varMap.put("argslength", args.length);
+        varMap.put("original", new OverrideHandle(sender, cmd, args, original));
 
         trigger.activate(context, varMap);
     }
 
+    public static class OverrideHandle {
+        private final ICommandSender sender;
+        private final String label;
+        private final String[] args;
+        private final ICommand original;
+
+        public OverrideHandle(ICommandSender sender, String label, String[] args, ICommand original) {
+            this.sender = sender;
+            this.label = label;
+            this.args = args;
+            this.original = original;
+        }
+
+        public void forward() {
+            Optional.ofNullable(original)
+                .map(ICommand::getExecutor)
+                .ifPresent(executor -> executor.execute(sender, label, args, original));
+        }
+
+        public void run(String... args) {
+            Optional.ofNullable(original)
+                .map(ICommand::getExecutor)
+                .ifPresent(executor -> executor.execute(sender, label, args, null));
+        }
+    }
 }