reload command for bungee

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <packaging>jar</packaging>
 
     <name>CommandWhitelist</name>
@@ -62,6 +62,10 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -71,5 +75,18 @@
             <version>1.16.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.15-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.PaperMC</groupId>
+            <artifactId>Waterfall</artifactId>
+            <version>1.16</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/waterfall-366.jar</systemPath>
+        </dependency>
     </dependencies>
 </project>

src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java

@@ -0,0 +1,83 @@
+package eu.endermite.commandwhitelist.bungee;
+
+import com.google.common.io.ByteStreams;
+import eu.endermite.commandwhitelist.bungee.command.BungeeMainCommand;
+import eu.endermite.commandwhitelist.bungee.config.BungeeConfigCache;
+import eu.endermite.commandwhitelist.bungee.listeners.BungeeChatEventListener;
+import eu.endermite.commandwhitelist.bungee.listeners.BungeeTabCompleteListener;
+import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+
+public final class CommandWhitelistBungee extends Plugin {
+
+    private static CommandWhitelistBungee plugin;
+    private static BungeeConfigCache configCache;
+
+    @Override
+    public void onEnable() {
+
+        plugin = this;
+        getLogger().info("Running on "+ ChatColor.DARK_AQUA+getProxy().getName());
+        loadConfig();
+        this.getProxy().getPluginManager().registerListener(this, new BungeeChatEventListener());
+        if (this.getProxy().getName().contains("Waterfall") || getProxy().getName().contains("FlameCord")) {
+            this.getProxy().getPluginManager().registerListener(this, new BungeeTabCompleteListener());
+        } else {
+            getLogger().info("Bungee tab completion requires Waterfall, FlameCord or other Waterfall fork.");
+        }
+        getProxy().getPluginManager().registerCommand(this, new BungeeMainCommand());
+
+    }
+
+    public static CommandWhitelistBungee getPlugin() {
+        return plugin;
+    }
+
+    public static BungeeConfigCache getConfigCache() {
+        return configCache;
+    }
+
+
+    public void loadConfig() {
+        try {
+            if (!getDataFolder().exists()) {
+                getDataFolder().mkdir();
+            }
+
+            File file = new File(getDataFolder(), "config.yml");
+
+            if (!file.exists()) {
+                file.createNewFile();
+                try (InputStream in = getResourceAsStream("bungeeconfig.yml");
+                     OutputStream out = new FileOutputStream(file)) {
+                    ByteStreams.copy(in, out);
+                }
+            }
+            final Configuration config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file);
+            ConfigurationProvider.getProvider(YamlConfiguration.class).save(config, new File(getDataFolder(), "config.yml"));
+            configCache = new BungeeConfigCache(config);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void loadConfigAsync(CommandSender sender) {
+        getProxy().getScheduler().runAsync(this, () -> {
+            loadConfig();
+            sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getConfigReloaded()));
+
+        });
+    }
+
+}

src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java

@@ -0,0 +1,34 @@
+package eu.endermite.commandwhitelist.bungee.command;
+
+import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.plugin.Command;
+
+
+public class BungeeMainCommand extends Command {
+    public BungeeMainCommand() {
+        super("bungeecommandwhitelist", "none", "bcw");
+
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (args.length > 0) {
+            if (args[0].equalsIgnoreCase("reload")) {
+                if (sender.hasPermission("commandwhitelist.reload")) {
+                    CommandWhitelistBungee.getPlugin().loadConfigAsync(sender);
+                } else {
+                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoPermission()));
+                }
+            } else {
+                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getNoSubCommand()));
+            }
+        } else {
+            sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&bCommand Whitelist by YouHaveTrouble"));
+            if (sender.hasPermission("commandwhitelist.reload")) {
+                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&9/bcw reload &b- Reload bungee plugin configuration"));
+            }
+        }
+    }
+}

src/main/java/eu/endermite/commandwhitelist/bungee/config/BungeeConfigCache.java

@@ -0,0 +1,38 @@
+package eu.endermite.commandwhitelist.bungee.config;
+
+import net.md_5.bungee.config.Configuration;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+public class BungeeConfigCache {
+
+    private HashMap<String, List<String>> permList = new HashMap<>();
+    private String prefix, commandDenied, noPermission, noSubCommand, configReloaded;
+
+    public BungeeConfigCache(Configuration config) {
+
+        prefix = config.getString("messages.prefix");
+        commandDenied = config.getString("messages.command-denied");
+        noPermission = config.getString("messages.no-permission");
+        noSubCommand = config.getString("messages.no-such-subcommand");
+        configReloaded = config.getString("messages.config-reloaded");
+
+        Collection<String> perms = config.getSection("commands").getKeys();
+        for (String s : perms) {
+            this.permList.put(s, config.getStringList("commands."+s));
+        }
+    }
+
+    public HashMap<String, List<String>> getPermList() {
+        return permList;
+    }
+
+    public String getPrefix() {return prefix;}
+    public String getCommandDenied() {return commandDenied;}
+    public String getNoPermission() {return noPermission;}
+    public String getNoSubCommand() {return  noSubCommand;}
+    public String getConfigReloaded() {return  configReloaded;}
+
+}

src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java

@@ -0,0 +1,46 @@
+package eu.endermite.commandwhitelist.bungee.listeners;
+
+import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+import java.util.List;
+import java.util.Map;
+
+public class BungeeChatEventListener implements Listener {
+
+    @EventHandler
+    public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) {
+
+        if (!event.isCancelled() && event.getSender() instanceof ProxiedPlayer) {
+            ProxiedPlayer player = (ProxiedPlayer) event.getSender();
+            if (event.isProxyCommand()) {
+                if (player.hasPermission("commandwhitelist.bypass")) {
+                    return;
+                }
+                String command = event.getMessage().toLowerCase();
+                boolean found = false;
+                for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
+                    if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
+                        for (String comm : s.getValue()) {
+                            comm = comm.toLowerCase();
+                            if (command.equalsIgnoreCase("/"+comm)) {
+                                found = true;
+                                break;
+                            }
+                            else if (command.startsWith("/" + comm + " ")) {
+                                found = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+                if (!found) {
+                    event.setCancelled(true);
+                    player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied()));
+                }
+            }
+        }
+    }
+}

src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeTabCompleteListener.java

@@ -0,0 +1,46 @@
+package eu.endermite.commandwhitelist.bungee.listeners;
+
+import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BungeeTabCompleteListener implements Listener {
+
+    @EventHandler
+    public void onProxyDefineCommandsEvent(io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event) {
+
+        if (event.getReceiver() instanceof ProxiedPlayer) {
+            ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
+
+            if (player.hasPermission("commandwhitelist.bypass")) {
+                return;
+            }
+
+            List<String> commandList = new ArrayList<>();
+            for (Map.Entry<String, List<String>> entry : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
+                if (player.hasPermission("commandwhitelist.commands."+entry.getKey())) {
+                    commandList.addAll(entry.getValue());
+                }
+            }
+            HashMap<String, Command> commandHashMap = new HashMap<>();
+            for (String s : commandList) {
+                for (Map.Entry<String, Command> command : CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()) {
+                    if (s.equalsIgnoreCase(command.getValue().getName())) {
+                        commandHashMap.put(command.getKey(), command.getValue());
+                    }
+                }
+            }
+            event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd));
+        }
+
+
+        
+    }
+
+}

src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java

@@ -1,9 +1,9 @@
-package eu.endermite.commandwhitelist;
+package eu.endermite.commandwhitelist.spigot;
 
-import eu.endermite.commandwhitelist.command.MainCommand;
+import eu.endermite.commandwhitelist.spigot.command.MainCommand;
-import eu.endermite.commandwhitelist.config.ConfigCache;
+import eu.endermite.commandwhitelist.spigot.config.ConfigCache;
-import eu.endermite.commandwhitelist.listeners.PlayerCommandPreProcessListener;
+import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandPreProcessListener;
-import eu.endermite.commandwhitelist.listeners.PlayerCommandSendListener;
+import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandSendListener;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java

@@ -1,6 +1,6 @@
-package eu.endermite.commandwhitelist.command;
+package eu.endermite.commandwhitelist.spigot.command;
 
-import eu.endermite.commandwhitelist.CommandWhitelist;
+import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java

@@ -1,6 +1,6 @@
-package eu.endermite.commandwhitelist.config;
+package eu.endermite.commandwhitelist.spigot.config;
 
-import eu.endermite.commandwhitelist.CommandWhitelist;
+import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
 import org.bukkit.configuration.Configuration;
 
 import java.util.HashMap;

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java

@@ -1,6 +1,6 @@
-package eu.endermite.commandwhitelist.listeners;
+package eu.endermite.commandwhitelist.spigot.listeners;
 
-import eu.endermite.commandwhitelist.CommandWhitelist;
+import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java

@@ -1,6 +1,6 @@
-package eu.endermite.commandwhitelist.listeners;
+package eu.endermite.commandwhitelist.spigot.listeners;
 
-import eu.endermite.commandwhitelist.CommandWhitelist;
+import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/resources/bungee.yml

@@ -0,0 +1,4 @@
+name: CommandWhitelistBungee
+version: ${project.version}
+main: eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee
+author: YouHaveTrouble

src/main/resources/bungeeconfig.yml

@@ -0,0 +1,20 @@
+# This is bungeecord version of the config.
+messages:
+  prefix: "CommandWhitelist > "
+  command-denied: "No such command."
+  no-permission: "&cYou don't have permission to do this."
+  no-such-subcommand: "&cNo subcommand by that name."
+  config-reloaded: "&eConfiguration reloaded."
+
+commands:
+  # Permissions that control what commands players can use
+  # you can add unlimited amount of whitelists
+
+  # commandwhitelist.commands.default
+  # this will be automatically given to players by default
+  default:
+    - glist
+    - server
+  # commandwhitelist.commands.example
+  example:
+    - example

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: CommandWhitelist
 version: ${project.version}
-main: eu.endermite.commandwhitelist.CommandWhitelist
+main: eu.endermite.commandwhitelist.spigot.CommandWhitelist
 api-version: 1.13
 authors: [YouHaveTrouble]
 description: Control what commands players can use