mirror of
https://github.com/YouHaveTrouble/CommandWhitelist.git
synced 2026-05-12 06:26:57 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 103a793a63 | |||
| 2a93f8c636 | |||
| c135815ce3 | |||
| 9254c7fc7b | |||
| b9db85278c | |||
| 87e59e3f2b | |||
| 292cac7415 | |||
| 7629b580ae | |||
| 7101d3d713 |
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Create a report to help us improve
|
||||||
|
title: ''
|
||||||
|
labels: bug
|
||||||
|
assignees: YouHaveTrouble
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Describe the bug**
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
|
||||||
|
**Expected behavior**
|
||||||
|
A clear and concise description of what you expected to happen.
|
||||||
|
|
||||||
|
**To Reproduce**
|
||||||
|
Steps to reproduce the behavior:
|
||||||
|
1. Go to '...'
|
||||||
|
2. Click on '....'
|
||||||
|
3. Scroll down to '....'
|
||||||
|
4. See error
|
||||||
|
|
||||||
|
**Screenshots**
|
||||||
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context about the problem here.
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
name: Feature request
|
||||||
|
about: Suggest an idea for this project
|
||||||
|
title: ''
|
||||||
|
labels: enhancement
|
||||||
|
assignees: YouHaveTrouble
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Is your feature request related to a problem? Please describe.**
|
||||||
|
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
|
||||||
|
**Describe the solution you'd like**
|
||||||
|
A clear and concise description of what you want to happen.
|
||||||
|
|
||||||
|
**Describe alternatives you've considered**
|
||||||
|
A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context or screenshots about the feature request here.
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
name: Other issue
|
||||||
|
about: For other issues
|
||||||
|
title: ''
|
||||||
|
labels: ''
|
||||||
|
assignees: YouHaveTrouble
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>eu.endermite</groupId>
|
<groupId>eu.endermite</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>1.5.0</version>
|
<version>1.6.0-BETA</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>CommandWhitelist</name>
|
<name>CommandWhitelist</name>
|
||||||
@@ -74,6 +74,10 @@
|
|||||||
<id>papermc</id>
|
<id>papermc</id>
|
||||||
<url>https://papermc.io/repo/repository/maven-public/</url>
|
<url>https://papermc.io/repo/repository/maven-public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>velocity</id>
|
||||||
|
<url>https://repo.velocitypowered.com/snapshots/</url>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -95,6 +99,12 @@
|
|||||||
<version>1.16-R0.4-SNAPSHOT</version>
|
<version>1.16-R0.4-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.velocitypowered</groupId>
|
||||||
|
<artifactId>velocity-api</artifactId>
|
||||||
|
<version>1.1.0-SNAPSHOT</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.comphenix.protocol</groupId>
|
<groupId>com.comphenix.protocol</groupId>
|
||||||
<artifactId>ProtocolLib</artifactId>
|
<artifactId>ProtocolLib</artifactId>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ precisely what commands players can see and use.
|
|||||||
<li>Overwrites default "no such command" message with your branding
|
<li>Overwrites default "no such command" message with your branding
|
||||||
<li>Blocks tab completion on spigot and bungeecord*</li>
|
<li>Blocks tab completion on spigot and bungeecord*</li>
|
||||||
<li>Blocks command execution on spigot and bungeecord</li>
|
<li>Blocks command execution on spigot and bungeecord</li>
|
||||||
|
<li>Blocks completion and execution of specific subcommands (spigot only)</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
\*This only works on Waterfall and its forks
|
\*This only works on Waterfall and its forks
|
||||||
|
|||||||
@@ -2,37 +2,48 @@ package eu.endermite.commandwhitelist.api;
|
|||||||
|
|
||||||
import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
|
import eu.endermite.commandwhitelist.bungee.CommandWhitelistBungee;
|
||||||
import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
|
import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class CommandsList {
|
public class CommandsList {
|
||||||
|
|
||||||
public static List<String> getCommands(Player player) {
|
public static List<String> getCommands(org.bukkit.entity.Player player) {
|
||||||
List<String> commandList = new ArrayList<>();
|
List<String> commandList = new ArrayList<>();
|
||||||
for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
|
for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
|
||||||
if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
|
if (s.getKey().equalsIgnoreCase("default"))
|
||||||
|
commandList.addAll(s.getValue());
|
||||||
|
else if (player.hasPermission("commandwhitelist.commands." + s.getKey()))
|
||||||
commandList.addAll(s.getValue());
|
commandList.addAll(s.getValue());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return commandList;
|
return commandList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> getCommands(ProxiedPlayer player) {
|
public static List<String> getCommands(net.md_5.bungee.api.connection.ProxiedPlayer player) {
|
||||||
List<String> commandList = new ArrayList<>();
|
List<String> commandList = new ArrayList<>();
|
||||||
for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
|
for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
|
||||||
if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
|
if (s.getKey().equalsIgnoreCase("default"))
|
||||||
|
commandList.addAll(s.getValue());
|
||||||
|
else if (player.hasPermission("commandwhitelist.commands." + s.getKey()))
|
||||||
commandList.addAll(s.getValue());
|
commandList.addAll(s.getValue());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return commandList;
|
return commandList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> getSuggestions(Player player) {
|
public static List<String> getCommands(com.velocitypowered.api.proxy.Player player) {
|
||||||
List<String> suggestionList = new ArrayList<>();
|
List<String> commandList = new ArrayList<>();
|
||||||
|
for (Map.Entry<String, List<String>> s : CommandWhitelistVelocity.getConfigCache().getPermList().entrySet()) {
|
||||||
|
if (s.getKey().equalsIgnoreCase("default"))
|
||||||
|
commandList.addAll(s.getValue());
|
||||||
|
else if (player.hasPermission("commandwhitelist.commands." + s.getKey()))
|
||||||
|
commandList.addAll(s.getValue());
|
||||||
|
}
|
||||||
|
return commandList;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<String> getSuggestions(org.bukkit.entity.Player player) {
|
||||||
|
List<String> suggestionList = new ArrayList<>();
|
||||||
for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermSubList().entrySet()) {
|
for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermSubList().entrySet()) {
|
||||||
if (player.hasPermission("commandwhitelist.subcommands." + s.getKey()))
|
if (player.hasPermission("commandwhitelist.subcommands." + s.getKey()))
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ public final class CommandWhitelistBungee extends Plugin {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
|
|
||||||
plugin = this;
|
plugin = this;
|
||||||
getLogger().info("Running on "+ ChatColor.DARK_AQUA+getProxy().getName());
|
getLogger().info("Running on "+ ChatColor.DARK_AQUA+getProxy().getName());
|
||||||
loadConfig();
|
loadConfig();
|
||||||
@@ -40,18 +39,15 @@ public final class CommandWhitelistBungee extends Plugin {
|
|||||||
|
|
||||||
int pluginId = 8704;
|
int pluginId = 8704;
|
||||||
new BungeeMetrics(this, pluginId);
|
new BungeeMetrics(this, pluginId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CommandWhitelistBungee getPlugin() {
|
public static CommandWhitelistBungee getPlugin() {
|
||||||
return plugin;
|
return plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static BungeeConfigCache getConfigCache() {
|
public static BungeeConfigCache getConfigCache() {
|
||||||
return configCache;
|
return configCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void loadConfig() {
|
public void loadConfig() {
|
||||||
try {
|
try {
|
||||||
if (!getDataFolder().exists()) {
|
if (!getDataFolder().exists()) {
|
||||||
@@ -81,5 +77,4 @@ public final class CommandWhitelistBungee extends Plugin {
|
|||||||
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getConfigReloaded()));
|
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getConfigReloaded()));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
public class BungeeMainCommand extends Command implements TabExecutor {
|
public class BungeeMainCommand extends Command implements TabExecutor {
|
||||||
|
|
||||||
public BungeeMainCommand(String name) {
|
public BungeeMainCommand(String name) {
|
||||||
|
|||||||
+1
-9
@@ -14,28 +14,20 @@ public class BungeeChatEventListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) {
|
public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) {
|
||||||
|
|
||||||
if (event.isCancelled())
|
if (event.isCancelled())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!(event.getSender() instanceof ProxiedPlayer))
|
if (!(event.getSender() instanceof ProxiedPlayer))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!event.isProxyCommand())
|
if (!event.isProxyCommand())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ProxiedPlayer player = (ProxiedPlayer) event.getSender();
|
ProxiedPlayer player = (ProxiedPlayer) event.getSender();
|
||||||
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
if (player.hasPermission("commandwhitelist.bypass")) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
String command = event.getMessage().toLowerCase();
|
String command = event.getMessage().toLowerCase();
|
||||||
boolean found = false;
|
boolean found = false;
|
||||||
for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
|
for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
|
||||||
if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
|
if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
for (String comm : s.getValue()) {
|
for (String comm : s.getValue()) {
|
||||||
comm = comm.toLowerCase();
|
comm = comm.toLowerCase();
|
||||||
if (command.equalsIgnoreCase("/" + comm)) {
|
if (command.equalsIgnoreCase("/" + comm)) {
|
||||||
|
|||||||
+1
-9
@@ -13,25 +13,17 @@ public class WaterfallDefineCommandsListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onProxyDefineCommandsEvent(io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event) {
|
public void onProxyDefineCommandsEvent(io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event) {
|
||||||
|
|
||||||
if (event.getReceiver() instanceof ProxiedPlayer) {
|
if (event.getReceiver() instanceof ProxiedPlayer) {
|
||||||
ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
|
ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
|
||||||
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
if (player.hasPermission("commandwhitelist.bypass")) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
HashMap<String, Command> commandHashMap = new HashMap<>();
|
HashMap<String, Command> commandHashMap = new HashMap<>();
|
||||||
CommandsList.getCommands(player).forEach(cmdName ->
|
CommandsList.getCommands(player).forEach(cmdName ->
|
||||||
CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()
|
CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(commandEntry -> cmdName.equalsIgnoreCase(commandEntry.getValue().getName()))
|
.filter(commandEntry -> cmdName.equalsIgnoreCase(commandEntry.getValue().getName()))
|
||||||
.forEach(commandEntry -> commandHashMap.put(commandEntry.getKey(), commandEntry.getValue())));
|
.forEach(commandEntry -> commandHashMap.put(commandEntry.getKey(), commandEntry.getValue())));
|
||||||
|
|
||||||
event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd));
|
event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,6 @@ public class MainCommand implements TabExecutor {
|
|||||||
} else {
|
} else {
|
||||||
sender.sendMessage("/cw remove <group> <command>");
|
sender.sendMessage("/cw remove <group> <command>");
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoSubCommand()));
|
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoSubCommand()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,9 @@ public class ConfigCache {
|
|||||||
}
|
}
|
||||||
public boolean addCommand(String command, String group) {
|
public boolean addCommand(String command, String group) {
|
||||||
try {
|
try {
|
||||||
|
if (this.permList.get(group).contains(command)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
this.permList.get(group).add(command);
|
this.permList.get(group).add(command);
|
||||||
this.config.set("commands."+group, permList.get(group));
|
this.config.set("commands."+group, permList.get(group));
|
||||||
config.save(CommandWhitelist.getPlugin().getDataFolder()+"/config.yml");
|
config.save(CommandWhitelist.getPlugin().getDataFolder()+"/config.yml");
|
||||||
|
|||||||
+1
-6
@@ -27,9 +27,8 @@ public class LegacyPlayerTabChatCompleteListener {
|
|||||||
public void onPacketSending(PacketEvent event) {
|
public void onPacketSending(PacketEvent event) {
|
||||||
try {
|
try {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
if (player.hasPermission("commandwhitelist.bypass")) {
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
PacketContainer packet = event.getPacket();
|
PacketContainer packet = event.getPacket();
|
||||||
String[] message = packet.getSpecificModifier(String[].class).read(0);
|
String[] message = packet.getSpecificModifier(String[].class).read(0);
|
||||||
List<String> commandList = CommandsList.getCommands(player);
|
List<String> commandList = CommandsList.getCommands(player);
|
||||||
@@ -43,18 +42,14 @@ public class LegacyPlayerTabChatCompleteListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String[] toWrite = new String[components];
|
String[] toWrite = new String[components];
|
||||||
int counter = 0;
|
int counter = 0;
|
||||||
for (String cmd : finalList) {
|
for (String cmd : finalList) {
|
||||||
toWrite[counter++] = cmd;
|
toWrite[counter++] = cmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
packet.getSpecificModifier(String[].class).write(0, toWrite);
|
packet.getSpecificModifier(String[].class).write(0, toWrite);
|
||||||
|
|
||||||
} catch (Exception ignored) {}
|
} catch (Exception ignored) {}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -9,12 +9,10 @@ import org.bukkit.entity.Player;
|
|||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class PlayerCommandPreProcessListener implements Listener {
|
public class PlayerCommandPreProcessListener implements Listener {
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
|
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
@@ -30,7 +28,7 @@ public class PlayerCommandPreProcessListener implements Listener {
|
|||||||
String rawCmd = event.getMessage();
|
String rawCmd = event.getMessage();
|
||||||
List<String> bannedSubCommands = CommandsList.getSuggestions(player);
|
List<String> bannedSubCommands = CommandsList.getSuggestions(player);
|
||||||
for (String bannedSubCommand : bannedSubCommands) {
|
for (String bannedSubCommand : bannedSubCommands) {
|
||||||
if (rawCmd.equalsIgnoreCase("/"+bannedSubCommand) || rawCmd.equalsIgnoreCase("/"+bannedSubCommand+" ")) {
|
if (rawCmd.startsWith("/"+bannedSubCommand)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
ConfigCache config = CommandWhitelist.getConfigCache();
|
ConfigCache config = CommandWhitelist.getConfigCache();
|
||||||
player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied())));
|
player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied())));
|
||||||
@@ -39,13 +37,10 @@ public class PlayerCommandPreProcessListener implements Listener {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
ConfigCache config = CommandWhitelist.getConfigCache();
|
ConfigCache config = CommandWhitelist.getConfigCache();
|
||||||
player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied())));
|
player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied())));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-10
@@ -8,21 +8,12 @@ import org.bukkit.event.Listener;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class PlayerCommandSendListener implements Listener {
|
public class PlayerCommandSendListener implements Listener {
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
|
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
if (player.hasPermission("commandwhitelist.bypass")) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
List<String> commandList = CommandsList.getCommands(player);
|
List<String> commandList = CommandsList.getCommands(player);
|
||||||
|
|
||||||
event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
|
event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -8,7 +8,6 @@ import org.bukkit.event.Listener;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class TabCompleteBlockerListener implements Listener {
|
public class TabCompleteBlockerListener implements Listener {
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
public void onCommandTabComplete(org.bukkit.event.server.TabCompleteEvent event) {
|
public void onCommandTabComplete(org.bukkit.event.server.TabCompleteEvent event) {
|
||||||
if (!(event.getSender() instanceof Player))
|
if (!(event.getSender() instanceof Player))
|
||||||
@@ -25,7 +24,9 @@ public class TabCompleteBlockerListener implements Listener {
|
|||||||
if (cmd.startsWith("/" + scommand + " ")) {
|
if (cmd.startsWith("/" + scommand + " ")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
suggestions.remove(slast);
|
suggestions.remove(slast);
|
||||||
|
} catch (Exception ignored) {}
|
||||||
}
|
}
|
||||||
event.setCompletions(suggestions);
|
event.setCompletions(suggestions);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,112 @@
|
|||||||
|
package eu.endermite.commandwhitelist.velocity;
|
||||||
|
|
||||||
|
import com.moandjiezana.toml.Toml;
|
||||||
|
import com.velocitypowered.api.command.CommandMeta;
|
||||||
|
import com.velocitypowered.api.command.CommandSource;
|
||||||
|
import com.velocitypowered.api.event.Subscribe;
|
||||||
|
import com.velocitypowered.api.event.command.CommandExecuteEvent;
|
||||||
|
import com.velocitypowered.api.event.command.PlayerAvailableCommandsEvent;
|
||||||
|
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
|
||||||
|
import com.velocitypowered.api.plugin.Plugin;
|
||||||
|
import com.velocitypowered.api.plugin.annotation.DataDirectory;
|
||||||
|
import com.velocitypowered.api.proxy.Player;
|
||||||
|
import com.velocitypowered.api.proxy.ProxyServer;
|
||||||
|
import eu.endermite.commandwhitelist.api.CommandsList;
|
||||||
|
import eu.endermite.commandwhitelist.velocity.command.VelocityMainCommand;
|
||||||
|
import eu.endermite.commandwhitelist.velocity.config.VelocityConfigCache;
|
||||||
|
import net.kyori.adventure.identity.Identity;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import javax.inject.Inject;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class CommandWhitelistVelocity {
|
||||||
|
|
||||||
|
private static CommandWhitelistVelocity plugin;
|
||||||
|
private static ProxyServer server;
|
||||||
|
private static VelocityConfigCache configCache;
|
||||||
|
private static Path folder;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public CommandWhitelistVelocity(ProxyServer server, Logger logger, @DataDirectory final Path folder) {
|
||||||
|
CommandWhitelistVelocity.server = server;
|
||||||
|
CommandWhitelistVelocity.folder = folder;
|
||||||
|
CommandWhitelistVelocity.plugin = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Toml loadConfig(Path path) {
|
||||||
|
File folder = path.toFile();
|
||||||
|
File file = new File(folder, "config.toml");
|
||||||
|
if (!file.getParentFile().exists())
|
||||||
|
file.getParentFile().mkdirs();
|
||||||
|
|
||||||
|
if (!file.exists()) {
|
||||||
|
try (InputStream input = CommandWhitelistVelocity.class.getResourceAsStream("/" + file.getName())) {
|
||||||
|
if (input != null) {
|
||||||
|
Files.copy(input, file.toPath());
|
||||||
|
} else {
|
||||||
|
file.createNewFile();
|
||||||
|
}
|
||||||
|
} catch (IOException exception) {
|
||||||
|
exception.printStackTrace();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new Toml().read(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void reloadConfig() {
|
||||||
|
configCache = new VelocityConfigCache(loadConfig(folder));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void reloadConfig(CommandSource source) {
|
||||||
|
server.getScheduler().buildTask(plugin, () -> {
|
||||||
|
reloadConfig();
|
||||||
|
source.sendMessage(Identity.nil(), Component.text(getConfigCache().getConfigReloaded()));
|
||||||
|
}).schedule();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void onProxyInitialization(ProxyInitializeEvent event) {
|
||||||
|
reloadConfig();
|
||||||
|
CommandMeta commandMeta = server.getCommandManager().metaBuilder("vcw").build();
|
||||||
|
server.getCommandManager().register(commandMeta, new VelocityMainCommand());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void onUserCommandSendEvent(PlayerAvailableCommandsEvent event) {
|
||||||
|
if (event.getPlayer().hasPermission("commandwhitelist.bypass"))
|
||||||
|
return;
|
||||||
|
List<String> allowedCommands = CommandsList.getCommands(event.getPlayer());
|
||||||
|
event.getRootNode().getChildren().removeIf((commandNode) ->
|
||||||
|
server.getCommandManager().hasCommand(commandNode.getName())
|
||||||
|
&& !allowedCommands.contains(commandNode.getName())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void onUserCommandExecuteEvent(com.velocitypowered.api.event.command.CommandExecuteEvent event) {
|
||||||
|
if (!(event.getCommandSource() instanceof Player))
|
||||||
|
return;
|
||||||
|
Player player = (Player) event.getCommandSource();
|
||||||
|
|
||||||
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
|
return;
|
||||||
|
|
||||||
|
List<String> allowedCommands = CommandsList.getCommands(player);
|
||||||
|
String command = event.getCommand().split(" ")[0];
|
||||||
|
if (server.getCommandManager().hasCommand(command)
|
||||||
|
&& !allowedCommands.contains(command))
|
||||||
|
event.setResult(CommandExecuteEvent.CommandResult.forwardToServer());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VelocityConfigCache getConfigCache() {
|
||||||
|
return configCache;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package eu.endermite.commandwhitelist.velocity.command;
|
||||||
|
|
||||||
|
import com.velocitypowered.api.command.CommandSource;
|
||||||
|
import com.velocitypowered.api.command.SimpleCommand;
|
||||||
|
import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
public class VelocityMainCommand implements SimpleCommand {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute(final Invocation invocation) {
|
||||||
|
CommandSource source = invocation.source();
|
||||||
|
String[] args = invocation.arguments();
|
||||||
|
if (args.length > 0) {
|
||||||
|
if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
|
||||||
|
if (source.hasPermission("commandwhitelist.reload")) {
|
||||||
|
CommandWhitelistVelocity.reloadConfig(source);
|
||||||
|
} else {
|
||||||
|
source.sendMessage(Component.text(CommandWhitelistVelocity.getConfigCache().getNoPermission()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
source.sendMessage(Component.text("&bCommand Whitelist by YouHaveTrouble".replaceAll("&", "§")));
|
||||||
|
if (source.hasPermission("commandwhitelist.reload")) {
|
||||||
|
source.sendMessage(Component.text("&9/vcw reload &b- Reload velocity plugin configuration".replaceAll("&", "§")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<List<String>> suggestAsync(Invocation invocation) {
|
||||||
|
CommandSource source = invocation.source();
|
||||||
|
String[] args = invocation.arguments();
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
List<String> suggestions = new ArrayList<>();
|
||||||
|
if (args.length == 1) {
|
||||||
|
if (source.hasPermission("commandwhitelist.reload") && "reload".startsWith(args[0]))
|
||||||
|
suggestions.add("reload");
|
||||||
|
}
|
||||||
|
return suggestions;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package eu.endermite.commandwhitelist.velocity.config;
|
||||||
|
|
||||||
|
import com.moandjiezana.toml.Toml;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class VelocityConfigCache {
|
||||||
|
|
||||||
|
private HashMap<String, List<String>> permList = new HashMap<>();
|
||||||
|
private final String noPermission, noSubCommand, configReloaded;
|
||||||
|
|
||||||
|
|
||||||
|
public VelocityConfigCache(Toml config) {
|
||||||
|
|
||||||
|
Toml messages = config.getTable("messages");
|
||||||
|
noPermission = messages.getString("no-permission", "&cYou don't have permission to do this.");
|
||||||
|
noSubCommand = messages.getString("no-such-subcommand", "&cNo subcommand by that name.");
|
||||||
|
configReloaded = messages.getString("config-reloaded", "&eConfiguration reloaded.");
|
||||||
|
|
||||||
|
Toml groups = config.getTable("commands");
|
||||||
|
|
||||||
|
for (Map.Entry<String, Object> set : groups.entrySet()) {
|
||||||
|
this.permList.put(set.getKey(), (List<String>) set.getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public HashMap<String, List<String>> getPermList() {
|
||||||
|
return permList;
|
||||||
|
}
|
||||||
|
public String getNoPermission() {
|
||||||
|
return noPermission.replaceAll("&", "§");
|
||||||
|
}
|
||||||
|
public String getNoSubCommand() {return noSubCommand.replaceAll("&", "§");}
|
||||||
|
public String getConfigReloaded() {return configReloaded.replaceAll("&", "§");}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -13,9 +13,7 @@ commands:
|
|||||||
# Permissions that control what commands players can use
|
# Permissions that control what commands players can use
|
||||||
# you can add unlimited amount of whitelists
|
# you can add unlimited amount of whitelists
|
||||||
|
|
||||||
# commandwhitelist.commands.default
|
# this will be automatically given to players by default
|
||||||
# this will NOT be automatically given to players by default!
|
|
||||||
# you have to give this permission to default droup by yourself as there is no automatic way to do it for a plugin
|
|
||||||
default:
|
default:
|
||||||
- glist
|
- glist
|
||||||
- server
|
- server
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# This is velocity version of the config.
|
||||||
|
[messages]
|
||||||
|
prefix="CommandWhitelist > "
|
||||||
|
command-denied="No such command."
|
||||||
|
subcommand-denied="You cannot use this subcommand"
|
||||||
|
no-permission="&cYou don't have permission to do this."
|
||||||
|
no-such-subcommand="&cNo subcommand by that name."
|
||||||
|
config-reloaded="&eConfiguration reloaded."
|
||||||
|
added-to-whitelist="&eWhitelisted command &6%s &efor permission &6%s"
|
||||||
|
removed-from-whitelist="&eRemoved command &6%s &efrom permission &6%s"
|
||||||
|
group-doesnt-exist="&cGroup doesn't exist or error occured"
|
||||||
|
|
||||||
|
# Permissions that control what commands players can use
|
||||||
|
# you can add unlimited amount of whitelists
|
||||||
|
[commands]
|
||||||
|
# this will be automatically given to players by default
|
||||||
|
default= [
|
||||||
|
"velocity",
|
||||||
|
"server",
|
||||||
|
]
|
||||||
|
# commandwhitelist.commands.example
|
||||||
|
example= [
|
||||||
|
"example"
|
||||||
|
]
|
||||||
@@ -13,7 +13,6 @@ commands:
|
|||||||
# Permissions that control what commands players can use
|
# Permissions that control what commands players can use
|
||||||
# you can add unlimited amount of whitelists
|
# you can add unlimited amount of whitelists
|
||||||
|
|
||||||
# commandwhitelist.commands.default
|
|
||||||
# this will be automatically given to players by default
|
# this will be automatically given to players by default
|
||||||
default:
|
default:
|
||||||
- help
|
- help
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"id":"commandwhitelist",
|
||||||
|
"name":"CommandWhitelist",
|
||||||
|
"version":"${project.version}",
|
||||||
|
"description":"Control what commands players can use",
|
||||||
|
"authors":["YouHaveTrouble"],
|
||||||
|
"dependencies":[],
|
||||||
|
"main":"eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity"
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user