From f6bfb40a8185fceae21a139dc0fd495817cc3c3d Mon Sep 17 00:00:00 2001 From: Stijn Bannink Date: Thu, 14 Sep 2023 14:30:25 +0200 Subject: [PATCH] Renamed permission --- .../java/tech/sbdevelopment/showcontrol/api/ShowAPI.java | 5 +++-- .../tech/sbdevelopment/showcontrol/commands/ShowCMD.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java b/src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java index e022170..3de7862 100644 --- a/src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java @@ -52,8 +52,9 @@ public class ShowAPI { throw new InvalidTriggerException("Provided trigger " + triggerType + " does not exists!"); Constructor ctor = (Constructor) triggers.get(triggerType).getConstructor(String[].class); - if (dataSplitter.length < triggers.get(triggerType).getAnnotation(TriggerIdentifier.class).minArgs() + 1) - throw new TooFewArgumentsException("Provided triggerdata " + data + " has too few arguments!"); + TriggerIdentifier identifier = triggers.get(triggerType).getAnnotation(TriggerIdentifier.class); + if (dataSplitter.length < identifier.minArgs() + 1) + throw new TooFewArgumentsException(identifier.argDesc()); return ctor.newInstance(new Object[]{dataSplitterNew}); } } diff --git a/src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java b/src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java index 4ebb5a0..1b35065 100644 --- a/src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java @@ -14,7 +14,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandAlias("showcontrol|sc") -@CommandPermission("mctp.show") +@CommandPermission("sc.admin") public class ShowCMD extends BaseCommand { @Subcommand("create") @Description("") @@ -71,7 +71,7 @@ public class ShowCMD extends BaseCommand { sender.sendMessage(ChatColor.RED + "The provided trigger does not exists."); return; } catch (TooFewArgumentsException e) { - sender.sendMessage(ChatColor.RED + "You did not provide enough information for the chosen trigger."); + sender.sendMessage(ChatColor.RED + "You did not provide enough information for the chosen trigger! Required arguments: " + e.getMessage()); return; } catch (IllegalArgumentException e) { sender.sendMessage(ChatColor.RED + "Couldn't create the trigger: " + e.getMessage());