Added Bungee Module

Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/OfflinePlayerPart.java

@@ -36,7 +36,8 @@ public List<? extends OfflinePlayer> parseValue(CommandContext context, Argument
         OfflinePlayer player;
 
         if (!stack.hasNext()) {
-            if (orSource && (player = tryGetSender(context)) != null) {
+            player = tryGetSender(context);
+            if (orSource && player != null) {
                 return Collections.singletonList(player);
             }
         }
@@ -52,7 +53,8 @@ public List<? extends OfflinePlayer> parseValue(CommandContext context, Argument
         }
 
         if (player == null) {
-            if (orSource && (player = tryGetSender(context)) != null) {
+            player = tryGetSender(context);
+            if (orSource && player != null) {
                 return Collections.singletonList(player);
             }
         }

Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java

@@ -36,7 +36,8 @@ public List<Player> parseValue(CommandContext context, ArgumentStack stack) thro
         Player player;
 
         if (!stack.hasNext()) {
-            if (orSource && (player = tryGetSender(context)) != null) {
+            player = tryGetSender(context);
+            if (orSource && player != null) {
                 return Collections.singletonList(player);
             }
         }
@@ -63,7 +64,8 @@ public List<Player> parseValue(CommandContext context, ArgumentStack stack) thro
         }
 
         if (player == null) {
-            if (orSource && (player = tryGetSender(context)) != null) {
+            player = tryGetSender(context);
+            if (orSource && player != null) {
                 return Collections.singletonList(player);
             }
         }

Bungee/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>me.fixeddev</groupId>
+        <artifactId>commandflow</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>commandflow-bungee</artifactId>
+
+    <repositories>
+        <repository>
+            <id>bungeecord-repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.fixeddev</groupId>
+            <artifactId>commandflow-universal</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.15-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>text-serializer-gson</artifactId>
+            <version>3.0.0-stripped</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+</project>

Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeAuthorizer.java

@@ -0,0 +1,19 @@
+package me.fixeddev.commandflow.bungee;
+
+import me.fixeddev.commandflow.Authorizer;
+import me.fixeddev.commandflow.Namespace;
+import net.md_5.bungee.api.CommandSender;
+
+public class BungeeAuthorizer implements Authorizer {
+
+    @Override
+    public boolean isAuthorized(Namespace namespace, String permission) {
+        if (permission.isEmpty()) {
+            return true;
+        }
+
+        CommandSender sender = namespace.getObject(CommandSender.class, BungeeCommandManager.SENDER_NAMESPACE);
+        return sender.hasPermission(permission);
+    }
+
+}

Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandManager.java

@@ -0,0 +1,167 @@
+package me.fixeddev.commandflow.bungee;
+
+import me.fixeddev.commandflow.Authorizer;
+import me.fixeddev.commandflow.CommandManager;
+import me.fixeddev.commandflow.Namespace;
+import me.fixeddev.commandflow.SimpleCommandManager;
+import me.fixeddev.commandflow.command.Command;
+import me.fixeddev.commandflow.exception.CommandException;
+import me.fixeddev.commandflow.executor.Executor;
+import me.fixeddev.commandflow.input.InputTokenizer;
+import me.fixeddev.commandflow.translator.Translator;
+import me.fixeddev.commandflow.usage.UsageBuilder;
+import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
+import net.md_5.bungee.api.plugin.Plugin;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public class BungeeCommandManager implements CommandManager {
+
+    public static final String SENDER_NAMESPACE = "SENDER";
+
+    private final CommandManager commandManager;
+    private final Plugin plugin;
+
+    private final Map<String, BungeeCommandWrapper> wrapperMap;
+
+    public BungeeCommandManager(Plugin plugin) {
+        this(new SimpleCommandManager(), plugin);
+    }
+
+    public BungeeCommandManager(CommandManager commandManager, Plugin plugin) {
+        this.commandManager = commandManager;
+        this.plugin = plugin;
+
+        wrapperMap = new HashMap<>();
+
+        setAuthorizer(new BungeeAuthorizer());
+        getTranslator().setProvider(new BungeeDefaultTranslationProvider());
+        getTranslator().setConverterFunction(LegacyComponentSerializer.INSTANCE::deserialize);
+    }
+
+    @Override
+    public void registerCommand(Command command) {
+        commandManager.registerCommand(command);
+
+        BungeeCommandWrapper bungeeCommandWrapper = new BungeeCommandWrapper(command, commandManager, getTranslator());
+        wrapperMap.put(command.getName(), bungeeCommandWrapper);
+
+        plugin.getProxy().getPluginManager().registerCommand(plugin, bungeeCommandWrapper);
+    }
+
+    @Override
+    public void registerCommands(List<Command> commandList) {
+        for (Command command : commandList) {
+            registerCommand(command);
+        }
+    }
+
+    @Override
+    public void unregisterCommand(Command command) {
+        commandManager.unregisterCommand(command);
+
+        BungeeCommandWrapper bungeeCommandWrapper = wrapperMap.get(command.getName());
+        if (bungeeCommandWrapper != null) {
+            plugin.getProxy().getPluginManager().unregisterCommand(bungeeCommandWrapper);
+        }
+    }
+
+    @Override
+    public void unregisterCommands(List<Command> commands) {
+        commandManager.unregisterCommands(commands);
+    }
+
+    @Override
+    public void unregisterAll() {
+        commandManager.unregisterAll();
+    }
+
+    @Override
+    public Set<Command> getCommands() {
+        return commandManager.getCommands();
+    }
+
+    @Override
+    public boolean exists(String commandName) {
+        return commandManager.exists(commandName);
+    }
+
+    @Override
+    public Authorizer getAuthorizer() {
+        return commandManager.getAuthorizer();
+    }
+
+    @Override
+    public void setAuthorizer(Authorizer authorizer) {
+        commandManager.setAuthorizer(authorizer);
+    }
+
+    @Override
+    public InputTokenizer getInputTokenizer() {
+        return commandManager.getInputTokenizer();
+    }
+
+    @Override
+    public void setInputTokenizer(InputTokenizer tokenizer) {
+        commandManager.setInputTokenizer(tokenizer);
+    }
+
+    @Override
+    public Executor getExecutor() {
+        return commandManager.getExecutor();
+    }
+
+    @Override
+    public void setExecutor(Executor executor) {
+        commandManager.setExecutor(executor);
+    }
+
+    @Override
+    public Translator getTranslator() {
+        return commandManager.getTranslator();
+    }
+
+    @Override
+    public void setTranslator(Translator translator) {
+        commandManager.setTranslator(translator);
+    }
+
+    @Override
+    public UsageBuilder getUsageBuilder() {
+        return commandManager.getUsageBuilder();
+    }
+
+    @Override
+    public void setUsageBuilder(UsageBuilder usageBuilder) {
+        commandManager.setUsageBuilder(usageBuilder);
+    }
+
+    @Override
+    public Optional<Command> getCommand(String commandName) {
+        return commandManager.getCommand(commandName);
+    }
+
+    @Override
+    public boolean execute(Namespace accessor, List<String> arguments) throws CommandException {
+        return commandManager.execute(accessor, arguments);
+    }
+
+    @Override
+    public List<String> getSuggestions(Namespace accessor, List<String> arguments) {
+        return commandManager.getSuggestions(accessor, arguments);
+    }
+
+    @Override
+    public boolean execute(Namespace accessor, String line) throws CommandException {
+        return commandManager.execute(accessor, line);
+    }
+
+    @Override
+    public List<String> getSuggestions(Namespace accessor, String line) {
+        return commandManager.getSuggestions(accessor, line);
+    }
+}

Bungee/src/main/java/me/fixeddev/commandflow/bungee/BungeeCommandWrapper.java

@@ -0,0 +1,110 @@
+package me.fixeddev.commandflow.bungee;
+
+import me.fixeddev.commandflow.CommandManager;
+import me.fixeddev.commandflow.Namespace;
+import me.fixeddev.commandflow.NamespaceImpl;
+import me.fixeddev.commandflow.exception.ArgumentParseException;
+import me.fixeddev.commandflow.exception.CommandException;
+import me.fixeddev.commandflow.exception.CommandUsage;
+import me.fixeddev.commandflow.exception.InvalidSubCommandException;
+import me.fixeddev.commandflow.exception.NoMoreArgumentsException;
+import me.fixeddev.commandflow.exception.NoPermissionsException;
+import me.fixeddev.commandflow.translator.Translator;
+import net.kyori.text.Component;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.TabExecutor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class BungeeCommandWrapper extends Command implements TabExecutor {
+
+    private final CommandManager commandManager;
+    private final Translator translator;
+
+    private final String[] aliases;
+    private final String permission;
+
+    public BungeeCommandWrapper(me.fixeddev.commandflow.command.Command command, CommandManager commandManager,
+                                Translator translator) {
+        super(command.getName());
+
+        this.commandManager = commandManager;
+        this.translator = translator;
+
+        this.aliases = command.getAliases().toArray(new String[0]);
+        this.permission = command.getPermission();
+    }
+
+    @Override
+    public void execute(CommandSender commandSender, String[] args) {
+        List<String> argumentLine = new ArrayList<>();
+        argumentLine.add(getName());
+        argumentLine.addAll(Arrays.asList(args));
+
+        Namespace namespace = new NamespaceImpl();
+        namespace.setObject(CommandSender.class, BungeeCommandManager.SENDER_NAMESPACE, commandSender);
+
+
+        try {
+            commandManager.execute(namespace, argumentLine);
+        } catch (CommandUsage e) {
+            CommandException exceptionToSend = e;
+            if (e.getCause() instanceof ArgumentParseException) {
+                exceptionToSend = (ArgumentParseException) e.getCause();
+            }
+
+           sendMessageToSender(exceptionToSend, commandSender, namespace);
+
+        } catch (InvalidSubCommandException e) {
+            sendMessageToSender(e, commandSender, namespace);
+
+            throw new CommandException("An internal parse exception occurred while executing the command " + getName(), e);
+        } catch (ArgumentParseException | NoMoreArgumentsException e) {
+            sendMessageToSender(e, commandSender, namespace);
+        } catch (NoPermissionsException e) {
+           sendMessageToSender(e, commandSender, namespace);
+
+        } catch (CommandException e) {
+            CommandException exceptionToSend = e;
+
+            if (e.getCause() instanceof CommandException) {
+                exceptionToSend = (CommandException) e.getCause();
+            }
+
+           sendMessageToSender(exceptionToSend, commandSender, namespace);
+
+            throw new CommandException("An unexpected exception occurred while executing the command " + getName(), exceptionToSend);
+        }
+    }
+
+    public String getPermission() {
+        return permission;
+    }
+
+    public String[] getAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Iterable<String> onTabComplete(CommandSender commandSender, String[] strings) {
+        List<String> argumentList = Arrays.asList(strings);
+
+        Namespace namespace = new NamespaceImpl();
+        namespace.setObject(CommandSender.class, BungeeCommandManager.SENDER_NAMESPACE, commandSender);
+
+        return commandManager.getSuggestions(namespace, argumentList);
+    }
+
+    private void sendMessageToSender(CommandException exception, CommandSender sender, Namespace namespace) {
+        Component component = exception.getMessageComponent();
+        Component translatedComponent = translator.translate(component, namespace);
+
+        BaseComponent[] components = MessageUtils.kyoriToBungee(translatedComponent);
+
+        sender.sendMessage(components);
+    }
+}