Skip to content

Commit 6a9d9e7

Browse files
Removed "messages." prefix for messages
1 parent 3fca0d8 commit 6a9d9e7

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/main/java/org/strassburger/serverlinksz/commands/MainCommand.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
2525
if (args.length == 0) {
2626
sender.sendMessage(MessageUtils.getAndFormatMsg(
2727
true,
28-
"messages.versionMsg",
28+
"versionMsg",
2929
"FALLBACK&7You are using version %version%",
3030
new MessageUtils.Replaceable(
3131
"%version%",
@@ -38,7 +38,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
3838
String optionOne = args[0];
3939

4040
if (optionOne.equals("help")) {
41-
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.help", "&7HELP"));
41+
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "help", "&7HELP"));
4242
return false;
4343
}
4444

@@ -54,7 +54,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
5454
LinkManager.updateLinks();
5555
sender.sendMessage(MessageUtils.getAndFormatMsg(
5656
true,
57-
"messages.reloadMsg",
57+
"reloadMsg",
5858
"&7Successfully reloaded the plugin!"
5959
));
6060
if (showHints) sender.sendMessage(MessageUtils.getAndFormatMsg(
@@ -82,20 +82,20 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
8282
boolean allowCommand = args.length > 4 && args[4].equals("true");
8383

8484
if (!isValidURL(url)) {
85-
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.invalidUrlError", "&cThe URL is invalid!"));
85+
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "invalidUrlError", "&cThe URL is invalid!"));
8686
return false;
8787
}
8888

8989
if (!url.startsWith("http://") && !url.startsWith("https://")) {
90-
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.urlProtocolError", "&cThe URL must start with 'http://' or 'https://'!"));
90+
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "urlProtocolError", "&cThe URL must start with 'http://' or 'https://'!"));
9191
return false;
9292
}
9393

9494
LinkManager.addLink(id, name, url, allowCommand);
95-
sender.sendMessage(MessageUtils.getAndFormatMsg(true, "messages.addLinkMsg", "&7Successfully added link with id %id%!", new MessageUtils.Replaceable("%id%", id)));
95+
sender.sendMessage(MessageUtils.getAndFormatMsg(true, "addLinkMsg", "&7Successfully added link with id %id%!", new MessageUtils.Replaceable("%id%", id)));
9696
if (showHints) {
97-
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.rejoinHint", "<#E9D502>⚠ To update the Serverlinks, please rejoin the server!"));
98-
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.moreConfigOptionsHint", "<#E9D502>⚠ For more configuration options, please refer to the config.yml file!"));
97+
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "rejoinHint", "<#E9D502>⚠ To update the Serverlinks, please rejoin the server!"));
98+
sender.sendMessage(MessageUtils.getAndFormatMsg(false, "moreConfigOptionsHint", "<#E9D502>⚠ For more configuration options, please refer to the config.yml file!"));
9999
}
100100
}
101101

@@ -113,20 +113,20 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
113113
String id = args[1];
114114

115115
LinkManager.removeLink(id);
116-
sender.sendMessage(MessageUtils.getAndFormatMsg(true, "messages.removeLinkMsg", "&7Successfully removed link with id %id%!", new MessageUtils.Replaceable("%id%", id)));
117-
if (showHints) sender.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.rejoinHint", "&cTo update the Serverlinks, please rejoin the server!"));
116+
sender.sendMessage(MessageUtils.getAndFormatMsg(true, "removeLinkMsg", "&7Successfully removed link with id %id%!", new MessageUtils.Replaceable("%id%", id)));
117+
if (showHints) sender.sendMessage(MessageUtils.getAndFormatMsg(false, "rejoinHint", "&cTo update the Serverlinks, please rejoin the server!"));
118118
}
119119

120120
return false;
121121
}
122122

123123
private void throwUsageError(CommandSender sender, String usage) {
124-
Component msg = MessageUtils.getAndFormatMsg(false, "messages.usageError", "&cUsage: %usage%", new MessageUtils.Replaceable("%usage%", usage));
124+
Component msg = MessageUtils.getAndFormatMsg(false, "usageError", "&cUsage: %usage%", new MessageUtils.Replaceable("%usage%", usage));
125125
sender.sendMessage(msg);
126126
}
127127

128128
private void throwPermissionError(CommandSender sender) {
129-
Component msg = MessageUtils.getAndFormatMsg(false, "messages.noPermissionError", "&cYou don't have permission to use this!");
129+
Component msg = MessageUtils.getAndFormatMsg(false, "noPermissionError", "&cYou don't have permission to use this!");
130130
sender.sendMessage(msg);
131131
}
132132

0 commit comments

Comments
 (0)