mirror of
https://github.com/YouHaveTrouble/CommandWhitelist.git
synced 2026-05-12 14:36:56 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 48fbd59a50 |
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>Bukkit</artifactId>
|
<artifactId>Bukkit</artifactId>
|
||||||
|
|||||||
+2
-2
@@ -6,8 +6,8 @@ import eu.endermite.commandwhitelist.bukkit.listeners.protocollib.PacketCommandP
|
|||||||
import eu.endermite.commandwhitelist.bukkit.listeners.protocollib.PacketCommandSendListener;
|
import eu.endermite.commandwhitelist.bukkit.listeners.protocollib.PacketCommandSendListener;
|
||||||
import eu.endermite.commandwhitelist.common.CWGroup;
|
import eu.endermite.commandwhitelist.common.CWGroup;
|
||||||
import eu.endermite.commandwhitelist.common.ConfigCache;
|
import eu.endermite.commandwhitelist.common.ConfigCache;
|
||||||
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
import org.bstats.bukkit.Metrics;
|
import org.bstats.bukkit.Metrics;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
@@ -79,7 +79,7 @@ public class CommandWhitelistBukkit extends JavaPlugin {
|
|||||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||||
p.updateCommands();
|
p.updateCommands();
|
||||||
}
|
}
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.config_reloaded));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.config_reloaded));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-8
@@ -5,7 +5,6 @@ import eu.endermite.commandwhitelist.common.CWPermission;
|
|||||||
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
@@ -31,34 +30,34 @@ public class MainCommandExecutor implements TabExecutor {
|
|||||||
switch (commandType) {
|
switch (commandType) {
|
||||||
case RELOAD:
|
case RELOAD:
|
||||||
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
|
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
CommandWhitelistBukkit.getPlugin().reloadPluginConfig(sender);
|
CommandWhitelistBukkit.getPlugin().reloadPluginConfig(sender);
|
||||||
return true;
|
return true;
|
||||||
case ADD:
|
case ADD:
|
||||||
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (CWCommand.addToWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1]))
|
if (CWCommand.addToWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1]))
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().added_to_whitelist, args[2], args[1])));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().added_to_whitelist, args[2], args[1])));
|
||||||
else
|
else
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1])));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1])));
|
||||||
} else
|
} else
|
||||||
audiences.sender(sender).sendMessage(Component.text("/" + label + " add <group> <command>"));
|
audiences.sender(sender).sendMessage(Component.text("/" + label + " add <group> <command>"));
|
||||||
return true;
|
return true;
|
||||||
case REMOVE:
|
case REMOVE:
|
||||||
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (CWCommand.removeFromWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1]))
|
if (CWCommand.removeFromWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1]))
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().removed_from_whitelist, args[2], args[1])));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().removed_from_whitelist, args[2], args[1])));
|
||||||
else
|
else
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1])));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1])));
|
||||||
} else
|
} else
|
||||||
audiences.sender(sender).sendMessage(Component.text("/" + label + " remove <group> <command>"));
|
audiences.sender(sender).sendMessage(Component.text("/" + label + " remove <group> <command>"));
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
+3
-3
@@ -3,8 +3,8 @@ package eu.endermite.commandwhitelist.bukkit.listeners;
|
|||||||
import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
|
import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
|
||||||
import eu.endermite.commandwhitelist.common.CommandUtil;
|
import eu.endermite.commandwhitelist.common.CommandUtil;
|
||||||
import eu.endermite.commandwhitelist.common.ConfigCache;
|
import eu.endermite.commandwhitelist.common.ConfigCache;
|
||||||
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
import org.bukkit.entity.Player;
|
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;
|
||||||
@@ -24,7 +24,7 @@ public class PlayerCommandPreProcessListener implements Listener {
|
|||||||
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
|
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
|
||||||
if (!commands.contains(label)) {
|
if (!commands.contains(label)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
audiences.player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.command_denied));
|
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.command_denied));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ public class PlayerCommandPreProcessListener implements Listener {
|
|||||||
for (String bannedSubCommand : bannedSubCommands) {
|
for (String bannedSubCommand : bannedSubCommands) {
|
||||||
if (event.getMessage().toLowerCase().substring(1).startsWith(bannedSubCommand)) {
|
if (event.getMessage().toLowerCase().substring(1).startsWith(bannedSubCommand)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
audiences.player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.subcommand_denied));
|
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.subcommand_denied));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -11,7 +11,7 @@ import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
|
|||||||
import eu.endermite.commandwhitelist.common.CWPermission;
|
import eu.endermite.commandwhitelist.common.CWPermission;
|
||||||
import eu.endermite.commandwhitelist.common.CommandUtil;
|
import eu.endermite.commandwhitelist.common.CommandUtil;
|
||||||
import eu.endermite.commandwhitelist.common.ConfigCache;
|
import eu.endermite.commandwhitelist.common.ConfigCache;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ public class PacketCommandPreProcessListener {
|
|||||||
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
|
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
|
||||||
if (!commands.contains(label)) {
|
if (!commands.contains(label)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
CommandWhitelistBukkit.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.command_denied));
|
CommandWhitelistBukkit.getAudiences().player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.command_denied));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ public class PacketCommandPreProcessListener {
|
|||||||
for (String bannedSubCommand : bannedSubCommands) {
|
for (String bannedSubCommand : bannedSubCommands) {
|
||||||
if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) {
|
if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
CommandWhitelistBukkit.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.subcommand_denied));
|
CommandWhitelistBukkit.getAudiences().player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.subcommand_denied));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ version: ${project.version}
|
|||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
main: eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit
|
main: eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit
|
||||||
authors: [YouHaveTrouble]
|
authors: [YouHaveTrouble]
|
||||||
|
website: youhavetrouble.me
|
||||||
softdepend:
|
softdepend:
|
||||||
- ProtocolLib
|
- ProtocolLib
|
||||||
description: Control what commands players can use
|
description: Control what commands players can use
|
||||||
@@ -14,8 +15,8 @@ commands:
|
|||||||
usage: /commandwhitelist [args]
|
usage: /commandwhitelist [args]
|
||||||
permissions:
|
permissions:
|
||||||
commandwhitelist.reload:
|
commandwhitelist.reload:
|
||||||
default: OP
|
default: op
|
||||||
commandwhitelist.admin:
|
commandwhitelist.admin:
|
||||||
default: OP
|
default: op
|
||||||
commandwhitelist.bypass:
|
commandwhitelist.bypass:
|
||||||
default: OP
|
default: op
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>Common</artifactId>
|
<artifactId>Common</artifactId>
|
||||||
|
|||||||
+12
-1
@@ -5,6 +5,7 @@ import eu.endermite.commandwhitelist.common.ConfigCache;
|
|||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
|
import net.kyori.adventure.text.minimessage.transformation.TransformationType;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -12,6 +13,16 @@ import java.util.List;
|
|||||||
|
|
||||||
public class CWCommand {
|
public class CWCommand {
|
||||||
|
|
||||||
|
public static MiniMessage miniMessage = MiniMessage.builder()
|
||||||
|
.removeDefaultTransformations()
|
||||||
|
.transformation(TransformationType.COLOR)
|
||||||
|
.transformation(TransformationType.DECORATION)
|
||||||
|
.transformation(TransformationType.GRADIENT)
|
||||||
|
.transformation(TransformationType.RESET)
|
||||||
|
.transformation(TransformationType.RAINBOW)
|
||||||
|
.transformation(TransformationType.PRE)
|
||||||
|
.build();
|
||||||
|
|
||||||
public static boolean addToWhitelist(ConfigCache configCache, String command, String group) {
|
public static boolean addToWhitelist(ConfigCache configCache, String command, String group) {
|
||||||
CWGroup cwGroup = configCache.getGroupList().get(group);
|
CWGroup cwGroup = configCache.getGroupList().get(group);
|
||||||
if (cwGroup == null) return false;
|
if (cwGroup == null) return false;
|
||||||
@@ -30,7 +41,7 @@ public class CWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Component helpComponent(String baseCommand, boolean showReloadCommand, boolean showAdminCommands) {
|
public static Component helpComponent(String baseCommand, boolean showReloadCommand, boolean showAdminCommands) {
|
||||||
Component component = MiniMessage.markdown().parse("<rainbow><bold>CommandWhitelist by YouHaveTrouble")
|
Component component = miniMessage.parse("<rainbow><bold>CommandWhitelist by YouHaveTrouble")
|
||||||
.append(Component.newline());
|
.append(Component.newline());
|
||||||
component = component.append(Component.text("/" + baseCommand + " help").color(NamedTextColor.AQUA).append(Component.text(" - Displays this message").color(NamedTextColor.BLUE)));
|
component = component.append(Component.text("/" + baseCommand + " help").color(NamedTextColor.AQUA).append(Component.text(" - Displays this message").color(NamedTextColor.BLUE)));
|
||||||
if (showReloadCommand) {
|
if (showReloadCommand) {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>Velocity</artifactId>
|
<artifactId>Velocity</artifactId>
|
||||||
|
|||||||
+2
-2
@@ -12,9 +12,9 @@ import com.velocitypowered.api.proxy.ProxyServer;
|
|||||||
import eu.endermite.commandwhitelist.common.CWGroup;
|
import eu.endermite.commandwhitelist.common.CWGroup;
|
||||||
import eu.endermite.commandwhitelist.common.CWPermission;
|
import eu.endermite.commandwhitelist.common.CWPermission;
|
||||||
import eu.endermite.commandwhitelist.common.ConfigCache;
|
import eu.endermite.commandwhitelist.common.ConfigCache;
|
||||||
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import eu.endermite.commandwhitelist.velocity.command.VelocityMainCommand;
|
import eu.endermite.commandwhitelist.velocity.command.VelocityMainCommand;
|
||||||
import net.kyori.adventure.identity.Identity;
|
import net.kyori.adventure.identity.Identity;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
import org.bstats.charts.SimplePie;
|
import org.bstats.charts.SimplePie;
|
||||||
import org.bstats.velocity.Metrics;
|
import org.bstats.velocity.Metrics;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@@ -55,7 +55,7 @@ public class CommandWhitelistVelocity {
|
|||||||
public static void reloadConfig(CommandSource source) {
|
public static void reloadConfig(CommandSource source) {
|
||||||
server.getScheduler().buildTask(plugin, () -> {
|
server.getScheduler().buildTask(plugin, () -> {
|
||||||
reloadConfig();
|
reloadConfig();
|
||||||
source.sendMessage(Identity.nil(), MiniMessage.markdown().parse(getConfigCache().prefix+getConfigCache().config_reloaded));
|
source.sendMessage(Identity.nil(), CWCommand.miniMessage.parse(getConfigCache().prefix+getConfigCache().config_reloaded));
|
||||||
}).schedule();
|
}).schedule();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-8
@@ -6,7 +6,6 @@ import eu.endermite.commandwhitelist.common.CWPermission;
|
|||||||
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
|
import eu.endermite.commandwhitelist.velocity.CommandWhitelistVelocity;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -30,34 +29,34 @@ public class VelocityMainCommand implements SimpleCommand {
|
|||||||
switch (commandType) {
|
switch (commandType) {
|
||||||
case RELOAD:
|
case RELOAD:
|
||||||
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
|
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
|
sender.sendMessage(CWCommand.miniMessage.parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
CommandWhitelistVelocity.reloadConfig(sender);
|
CommandWhitelistVelocity.reloadConfig(sender);
|
||||||
return;
|
return;
|
||||||
case ADD:
|
case ADD:
|
||||||
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
|
sender.sendMessage(CWCommand.miniMessage.parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (CWCommand.addToWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1]))
|
if (CWCommand.addToWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1]))
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().added_to_whitelist, args[2], args[1])));
|
sender.sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().added_to_whitelist, args[2], args[1])));
|
||||||
else
|
else
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1])));
|
sender.sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1])));
|
||||||
} else
|
} else
|
||||||
sender.sendMessage(Component.text("/" + label + " add <group> <command>"));
|
sender.sendMessage(Component.text("/" + label + " add <group> <command>"));
|
||||||
return;
|
return;
|
||||||
case REMOVE:
|
case REMOVE:
|
||||||
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
|
sender.sendMessage(CWCommand.miniMessage.parse(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().no_permission));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (CWCommand.removeFromWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1]))
|
if (CWCommand.removeFromWhitelist(CommandWhitelistVelocity.getConfigCache(), args[2], args[1]))
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().removed_from_whitelist, args[2], args[1])));
|
sender.sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().removed_from_whitelist, args[2], args[1])));
|
||||||
else
|
else
|
||||||
sender.sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1])));
|
sender.sendMessage(CWCommand.miniMessage.parse(String.format(CommandWhitelistVelocity.getConfigCache().prefix + CommandWhitelistVelocity.getConfigCache().group_doesnt_exist, args[1])));
|
||||||
} else
|
} else
|
||||||
sender.sendMessage(Component.text("/" + label + " remove <group> <command>"));
|
sender.sendMessage(Component.text("/" + label + " remove <group> <command>"));
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.2.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>Waterfall</artifactId>
|
<artifactId>Waterfall</artifactId>
|
||||||
|
|||||||
+2
-1
@@ -2,6 +2,7 @@ package eu.endermite.commandwhitelist.waterfall;
|
|||||||
|
|
||||||
import eu.endermite.commandwhitelist.common.CWGroup;
|
import eu.endermite.commandwhitelist.common.CWGroup;
|
||||||
import eu.endermite.commandwhitelist.common.ConfigCache;
|
import eu.endermite.commandwhitelist.common.ConfigCache;
|
||||||
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import eu.endermite.commandwhitelist.waterfall.command.BungeeMainCommand;
|
import eu.endermite.commandwhitelist.waterfall.command.BungeeMainCommand;
|
||||||
import eu.endermite.commandwhitelist.waterfall.listeners.BungeeChatEventListener;
|
import eu.endermite.commandwhitelist.waterfall.listeners.BungeeChatEventListener;
|
||||||
import eu.endermite.commandwhitelist.waterfall.listeners.BungeeTabcompleteListener;
|
import eu.endermite.commandwhitelist.waterfall.listeners.BungeeTabcompleteListener;
|
||||||
@@ -70,7 +71,7 @@ public final class CommandWhitelistWaterfall extends Plugin {
|
|||||||
public void loadConfigAsync(CommandSender sender) {
|
public void loadConfigAsync(CommandSender sender) {
|
||||||
getProxy().getScheduler().runAsync(this, () -> {
|
getProxy().getScheduler().runAsync(this, () -> {
|
||||||
loadConfig();
|
loadConfig();
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistWaterfall.getConfigCache().prefix + CommandWhitelistWaterfall.getConfigCache().config_reloaded));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(CommandWhitelistWaterfall.getConfigCache().prefix + CommandWhitelistWaterfall.getConfigCache().config_reloaded));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-8
@@ -6,7 +6,6 @@ import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
|||||||
import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
|
import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
|
||||||
import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
|
import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import net.md_5.bungee.api.plugin.Command;
|
import net.md_5.bungee.api.plugin.Command;
|
||||||
import net.md_5.bungee.api.plugin.TabExecutor;
|
import net.md_5.bungee.api.plugin.TabExecutor;
|
||||||
@@ -37,34 +36,34 @@ public class BungeeMainCommand extends Command implements TabExecutor {
|
|||||||
switch (commandType) {
|
switch (commandType) {
|
||||||
case RELOAD:
|
case RELOAD:
|
||||||
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
|
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistWaterfall.getConfigCache().prefix + configCache.no_permission));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(CommandWhitelistWaterfall.getConfigCache().prefix + configCache.no_permission));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
CommandWhitelistWaterfall.getPlugin().loadConfigAsync(sender);
|
CommandWhitelistWaterfall.getPlugin().loadConfigAsync(sender);
|
||||||
return;
|
return;
|
||||||
case ADD:
|
case ADD:
|
||||||
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.no_permission));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.no_permission));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (CWCommand.addToWhitelist(configCache, args[2], args[1]))
|
if (CWCommand.addToWhitelist(configCache, args[2], args[1]))
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.added_to_whitelist));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.added_to_whitelist));
|
||||||
else
|
else
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.group_doesnt_exist));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.group_doesnt_exist));
|
||||||
} else
|
} else
|
||||||
audiences.sender(sender).sendMessage(Component.text("/"+label+" add <group> <command>"));
|
audiences.sender(sender).sendMessage(Component.text("/"+label+" add <group> <command>"));
|
||||||
return;
|
return;
|
||||||
case REMOVE:
|
case REMOVE:
|
||||||
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.no_permission));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.no_permission));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (CWCommand.removeFromWhitelist(configCache, args[2], args[1]))
|
if (CWCommand.removeFromWhitelist(configCache, args[2], args[1]))
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.removed_from_whitelist));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.removed_from_whitelist));
|
||||||
else
|
else
|
||||||
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.group_doesnt_exist));
|
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.group_doesnt_exist));
|
||||||
} else
|
} else
|
||||||
audiences.sender(sender).sendMessage(Component.text("/"+label+" remove <group> <command>"));
|
audiences.sender(sender).sendMessage(Component.text("/"+label+" remove <group> <command>"));
|
||||||
return;
|
return;
|
||||||
|
|||||||
+3
-2
@@ -3,6 +3,7 @@ package eu.endermite.commandwhitelist.waterfall.listeners;
|
|||||||
import eu.endermite.commandwhitelist.common.CWPermission;
|
import eu.endermite.commandwhitelist.common.CWPermission;
|
||||||
import eu.endermite.commandwhitelist.common.CommandUtil;
|
import eu.endermite.commandwhitelist.common.CommandUtil;
|
||||||
import eu.endermite.commandwhitelist.common.ConfigCache;
|
import eu.endermite.commandwhitelist.common.ConfigCache;
|
||||||
|
import eu.endermite.commandwhitelist.common.commands.CWCommand;
|
||||||
import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
|
import eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall;
|
||||||
import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
|
import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
@@ -32,7 +33,7 @@ public class BungeeChatEventListener implements Listener {
|
|||||||
HashSet<String> commands = CommandWhitelistWaterfall.getCommands(player);
|
HashSet<String> commands = CommandWhitelistWaterfall.getCommands(player);
|
||||||
if (!commands.contains(label)) {
|
if (!commands.contains(label)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
CommandWhitelistWaterfall.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.command_denied));
|
CommandWhitelistWaterfall.getAudiences().player(player).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.command_denied));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +41,7 @@ public class BungeeChatEventListener implements Listener {
|
|||||||
for (String bannedSubCommand : bannedSubCommands) {
|
for (String bannedSubCommand : bannedSubCommands) {
|
||||||
if (command.startsWith(bannedSubCommand)) {
|
if (command.startsWith(bannedSubCommand)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
audiences.player(player).sendMessage(MiniMessage.markdown().parse(configCache.prefix + configCache.subcommand_denied));
|
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.subcommand_denied));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.2.1</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>CommandWhitelistCommon</module>
|
<module>CommandWhitelistCommon</module>
|
||||||
<module>CommandWhitelistBukkit</module>
|
<module>CommandWhitelistBukkit</module>
|
||||||
|
|||||||
Reference in New Issue
Block a user