From 20eb731b9360eff8b181381a962931d6a44433d5 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Fri, 7 May 2021 00:23:39 +0200 Subject: [PATCH] fix format --- .../bukkit/command/MainCommandExecutor.java | 11 +++++++---- .../commandwhitelist/common/ConfigCache.java | 9 +++------ .../commandwhitelist/common/commands/CWCommand.java | 2 -- .../waterfall/CommandWhitelistWaterfall.java | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java index f8ef948..e20170b 100644 --- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java +++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java @@ -42,9 +42,9 @@ public class MainCommandExecutor implements TabExecutor { } if (args.length == 3) { if (CWCommand.addToWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1])) - audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().added_to_whitelist)); + audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().added_to_whitelist, args[2], args[1]))); else - audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist)); + audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1]))); } else audiences.sender(sender).sendMessage(Component.text("/" + label + " add ")); return true; @@ -55,9 +55,9 @@ public class MainCommandExecutor implements TabExecutor { } if (args.length == 3) { if (CWCommand.removeFromWhitelist(CommandWhitelistBukkit.getConfigCache(), args[2], args[1])) - audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().removed_from_whitelist)); + audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().removed_from_whitelist, args[2], args[1]))); else - audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist)); + audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(String.format(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().group_doesnt_exist, args[1]))); } else audiences.sender(sender).sendMessage(Component.text("/" + label + " remove ")); return true; @@ -126,6 +126,9 @@ public class MainCommandExecutor implements TabExecutor { } cmd = cmd.replace("/", ""); + if (config.getGroupList().get(args[1]) == null) + continue; + if (config.getGroupList().get(args[1]).getCommands().contains(cmd)) continue; diff --git a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java index 5bc3258..097496c 100644 --- a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java +++ b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java @@ -2,14 +2,11 @@ package eu.endermite.commandwhitelist.common; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; - import java.io.*; import java.util.*; public class ConfigCache { - //TODO probably rewrite this yet again - private final File configFile; private final boolean canDoProtocolLib; private final HashMap groupList = new LinkedHashMap<>(); @@ -93,7 +90,7 @@ public class ConfigCache { this.config_reloaded = messages.get("config_reloaded"); this.added_to_whitelist = messages.get("added_to_whitelist"); this.removed_from_whitelist = messages.get("removed_from_whitelist"); - this.group_doesnt_exist = messages.get("group_doesnt-exist"); + this.group_doesnt_exist = messages.get("group_doesnt_exist"); this.subcommand_denied = messages.get("subcommand_denied"); if (canDoProtocolLib) @@ -129,8 +126,8 @@ public class ConfigCache { messages.put("no_permission", stringOrDefault(no_permission, "You don't have permission to do this.")); messages.put("no_such_subcommand", stringOrDefault(no_such_subcommand, "No subcommand by that name.")); messages.put("config_reloaded", stringOrDefault(config_reloaded, "Configuration reloaded.")); - messages.put("added_to_whitelist", stringOrDefault(added_to_whitelist, "Whitelisted command %s for permission %s")); - messages.put("removed_from_whitelist", stringOrDefault(removed_from_whitelist, "Removed command %s from permission %s")); + messages.put("added_to_whitelist", stringOrDefault(added_to_whitelist, "Whitelisted command %s for permission %s")); + messages.put("removed_from_whitelist", stringOrDefault(removed_from_whitelist, "Removed command %s from permission %s")); messages.put("group_doesnt_exist", stringOrDefault(group_doesnt_exist, "Group doesn't exist or error occured")); return messages; } diff --git a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java index bcfb00c..a91c36c 100644 --- a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java +++ b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java @@ -1,6 +1,5 @@ package eu.endermite.commandwhitelist.common.commands; -import com.mojang.brigadier.tree.LiteralCommandNode; import eu.endermite.commandwhitelist.common.CWGroup; import eu.endermite.commandwhitelist.common.ConfigCache; import net.kyori.adventure.text.Component; @@ -9,7 +8,6 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.minimessage.MiniMessage; - public class CWCommand { public static boolean addToWhitelist(ConfigCache configCache, String command, String group) { diff --git a/CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/CommandWhitelistWaterfall.java b/CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/CommandWhitelistWaterfall.java index c58ceb4..6a58002 100644 --- a/CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/CommandWhitelistWaterfall.java +++ b/CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/CommandWhitelistWaterfall.java @@ -31,7 +31,7 @@ public final class CommandWhitelistWaterfall extends Plugin { audiences = BungeeAudiences.create(this); this.getProxy().getPluginManager().registerListener(this, new BungeeChatEventListener()); try { - Class.forName("io.github.waterfallmc.waterfall.conf.WaterfallConfiguration"); + Class.forName("io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent"); this.getProxy().getPluginManager().registerListener(this, new WaterfallDefineCommandsListener()); } catch (ClassNotFoundException e) { getLogger().severe(ChatColor.DARK_RED+"Bungee tab completion blocker requires Waterfall other Waterfall fork.");