Skip to content

Commit 5c073bb

Browse files
RhythmicSysRhythmicSys
committed
Add confirmation messages for save/delete, rename message and permission class
1 parent f4c6005 commit 5c073bb

14 files changed

Lines changed: 123 additions & 116 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>adhdmc</groupId>
88
<artifactId>SimpleNicks</artifactId>
9-
<version>0.0.4-dev</version>
9+
<version>0.0.4</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SimpleNicks</name>

‎src/main/java/adhdmc/simplenicks/commands/CommandHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package adhdmc.simplenicks.commands;
22

33
import adhdmc.simplenicks.SimpleNicks;
4-
import adhdmc.simplenicks.util.Message;
4+
import adhdmc.simplenicks.util.SNMessage;
55
import net.kyori.adventure.text.minimessage.MiniMessage;
66
import org.bukkit.command.*;
77
import org.jetbrains.annotations.NotNull;
@@ -16,13 +16,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
1616
MiniMessage miniMessage = SimpleNicks.getMiniMessage();
1717
// Arguments Check
1818
if (args.length == 0) {
19-
sender.sendMessage(miniMessage.deserialize(Message.INVALID_COMMAND.getMessage())); // Invalid Arguments
19+
sender.sendMessage(miniMessage.deserialize(SNMessage.INVALID_COMMAND.getMessage())); // Invalid Arguments
2020
return true;
2121
}
2222
// Execute Command
2323
SubCommand subCommand = SimpleNicks.getSubCommands().getOrDefault(args[0].toLowerCase(Locale.ENGLISH), null);
2424
if (subCommand == null) {
25-
sender.sendMessage(miniMessage.deserialize(Message.INVALID_COMMAND.getMessage())); // Invalid SubCommand
25+
sender.sendMessage(miniMessage.deserialize(SNMessage.INVALID_COMMAND.getMessage())); // Invalid SubCommand
2626
return true;
2727
}
2828
subCommand.execute(sender, Arrays.copyOfRange(args, 1, args.length));

‎src/main/java/adhdmc/simplenicks/commands/SubCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package adhdmc.simplenicks.commands;
22

3-
import adhdmc.simplenicks.util.SimpleNickPermission;
3+
import adhdmc.simplenicks.util.SNPerm;
44
import org.bukkit.command.CommandSender;
55

66
import java.util.List;
@@ -10,9 +10,9 @@ public abstract class SubCommand {
1010
private final String name;
1111
private final String description;
1212
private final String syntax;
13-
private final SimpleNickPermission permission;
13+
private final SNPerm permission;
1414

15-
public SubCommand(String name, String description, String syntax, SimpleNickPermission permission) {
15+
public SubCommand(String name, String description, String syntax, SNPerm permission) {
1616
this.name = name;
1717
this.description = description;
1818
this.syntax = syntax;
@@ -31,7 +31,7 @@ public String getSyntax() {
3131
return syntax;
3232
}
3333

34-
public SimpleNickPermission getSimpleNickPermission() {
34+
public SNPerm getSimpleNickPermission() {
3535
return permission;
3636
}
3737

‎src/main/java/adhdmc/simplenicks/commands/subcommands/Delete.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.Message;
5+
import adhdmc.simplenicks.util.SNMessage;
66
import adhdmc.simplenicks.util.NickHandler;
7-
import adhdmc.simplenicks.util.SimpleNickPermission;
7+
import adhdmc.simplenicks.util.SNPerm;
88
import net.kyori.adventure.text.minimessage.MiniMessage;
99
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
1010
import org.bukkit.command.CommandSender;
@@ -16,21 +16,21 @@
1616
public class Delete extends SubCommand {
1717
MiniMessage miniMessage = SimpleNicks.getMiniMessage();
1818
public Delete() {
19-
super("delete", "Deletes a given nickname.", "/nick delete <nickname>", SimpleNickPermission.NICK_DELETE);
19+
super("delete", "Deletes a given nickname.", "/nick delete <nickname>", SNPerm.NICK_DELETE);
2020
}
2121

2222
@Override
2323
public void execute(CommandSender sender, String[] args) {
2424
// Player Check
2525
if (!(sender instanceof Player player)) {
26-
sender.sendMessage(miniMessage.deserialize(Message.CONSOLE_CANNOT_RUN.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
26+
sender.sendMessage(miniMessage.deserialize(SNMessage.CONSOLE_CANNOT_RUN.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
2727
return;
2828
}
2929
String nickname = NickHandler.getInstance().getNickname(player);
3030
if (!NickHandler.getInstance().deleteNickname(player, nickname)) {
31-
player.sendMessage(miniMessage.deserialize(Message.NICK_DELETE_FAILURE.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
31+
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_DELETE_FAILURE.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
3232
}
33-
// TODO: Add command feedback for successful execution of this command.
33+
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_DELETE_SUCCESS.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()), Placeholder.parsed("nickname", nickname)));
3434
}
3535

3636
@Override

‎src/main/java/adhdmc/simplenicks/commands/subcommands/Help.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.Message;
6-
import adhdmc.simplenicks.util.SimpleNickPermission;
5+
import adhdmc.simplenicks.util.SNMessage;
6+
import adhdmc.simplenicks.util.SNPerm;
77
import net.kyori.adventure.text.minimessage.MiniMessage;
88
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
99
import org.bukkit.command.CommandSender;
@@ -13,15 +13,15 @@
1313
public class Help extends SubCommand {
1414
MiniMessage miniMessage = SimpleNicks.getMiniMessage();
1515
public Help() {
16-
super("help", "Help command for SimpleNicks", "/nick help", SimpleNickPermission.NICK_COMMAND);
16+
super("help", "Help command for SimpleNicks", "/nick help", SNPerm.NICK_COMMAND);
1717
}
1818

1919
@Override
2020
public void execute(CommandSender sender, String[] args) {
21-
sender.sendMessage(miniMessage.deserialize(Message.HELP_BASE.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
22-
sender.sendMessage(miniMessage.deserialize(Message.HELP_SET.getMessage()));
23-
sender.sendMessage(miniMessage.deserialize(Message.HELP_RESET.getMessage()));
24-
sender.sendMessage(miniMessage.deserialize(Message.HELP_MINIMESSAGE.getMessage()));
21+
sender.sendMessage(miniMessage.deserialize(SNMessage.HELP_BASE.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
22+
sender.sendMessage(miniMessage.deserialize(SNMessage.HELP_SET.getMessage()));
23+
sender.sendMessage(miniMessage.deserialize(SNMessage.HELP_RESET.getMessage()));
24+
sender.sendMessage(miniMessage.deserialize(SNMessage.HELP_MINIMESSAGE.getMessage()));
2525
}
2626

2727
@Override

‎src/main/java/adhdmc/simplenicks/commands/subcommands/Reload.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.config.Config;
6-
import adhdmc.simplenicks.config.Locale;
7-
import adhdmc.simplenicks.util.Message;
8-
import adhdmc.simplenicks.util.NickHandler;
9-
import adhdmc.simplenicks.util.SimpleNickPermission;
5+
import adhdmc.simplenicks.util.SNMessage;
6+
import adhdmc.simplenicks.util.SNPerm;
107
import net.kyori.adventure.text.minimessage.MiniMessage;
118
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
129
import org.bukkit.command.CommandSender;
@@ -16,17 +13,17 @@
1613
public class Reload extends SubCommand {
1714
MiniMessage miniMessage = SimpleNicks.getMiniMessage();
1815
public Reload() {
19-
super("reload", "Reloads SimpleNicks Config and Locale", "/nick reload", SimpleNickPermission.NICK_RELOAD);
16+
super("reload", "Reloads SimpleNicks Config and Locale", "/nick reload", SNPerm.NICK_RELOAD);
2017
}
2118

2219
@Override
2320
public void execute(CommandSender sender, String[] args) {
24-
if (!sender.hasPermission(SimpleNickPermission.NICK_RELOAD.getPermission())){
25-
sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
21+
if (!sender.hasPermission(SNPerm.NICK_RELOAD.getPermission())){
22+
sender.sendMessage(miniMessage.deserialize(SNMessage.NO_PERMISSION.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
2623
return;
2724
}
2825
SimpleNicks.configReload();
29-
sender.sendMessage(miniMessage.deserialize(Message.CONFIG_RELOADED.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
26+
sender.sendMessage(miniMessage.deserialize(SNMessage.CONFIG_RELOADED.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
3027
}
3128

3229
@Override

‎src/main/java/adhdmc/simplenicks/commands/subcommands/Reset.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.Message;
5+
import adhdmc.simplenicks.util.SNMessage;
66
import adhdmc.simplenicks.util.NickHandler;
7-
import adhdmc.simplenicks.util.SimpleNickPermission;
7+
import adhdmc.simplenicks.util.SNPerm;
88
import net.kyori.adventure.text.minimessage.MiniMessage;
99
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
1010
import org.bukkit.command.CommandSender;
@@ -14,7 +14,7 @@
1414

1515
public class Reset extends SubCommand {
1616
public Reset() {
17-
super("reset", "Resets a nickname", "/nick reset", SimpleNickPermission.NICK_RESET);
17+
super("reset", "Resets a nickname", "/nick reset", SNPerm.NICK_RESET);
1818
}
1919

2020
@Override
@@ -23,48 +23,48 @@ public void execute(CommandSender sender, String[] args) {
2323

2424
// Player Check
2525
if (!(sender instanceof Player)) {
26-
sender.sendMessage(miniMessage.deserialize(Message.CONSOLE_CANNOT_RUN.getMessage(),
27-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
26+
sender.sendMessage(miniMessage.deserialize(SNMessage.CONSOLE_CANNOT_RUN.getMessage(),
27+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
2828
return;
2929
}
3030
// Arguments Check
3131
if (args.length > 1) {
32-
sender.sendMessage(miniMessage.deserialize(Message.TOO_MANY_ARGUMENTS.getMessage(),
33-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // Too Many Arguments
32+
sender.sendMessage(miniMessage.deserialize(SNMessage.TOO_MANY_ARGUMENTS.getMessage(),
33+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Too Many Arguments
3434
return;
3535
}
3636
// Admin Check
37-
if (args.length == 1 && !sender.hasPermission(SimpleNickPermission.NICK_RESET_OTHERS.getPermission())) {
38-
sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage(),
39-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // No Permission
37+
if (args.length == 1 && !sender.hasPermission(SNPerm.NICK_RESET_OTHERS.getPermission())) {
38+
sender.sendMessage(miniMessage.deserialize(SNMessage.NO_PERMISSION.getMessage(),
39+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // No Permission
4040
return;
4141
}
4242
// Valid Player Check
4343
Player player = (args.length == 0) ? (Player) sender : SimpleNicks.getInstance().getServer().getPlayer(args[0]);
4444
if (player == null) {
45-
sender.sendMessage(miniMessage.deserialize(Message.INVALID_PLAYER.getMessage(),
46-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // Invalid Player
45+
sender.sendMessage(miniMessage.deserialize(SNMessage.INVALID_PLAYER.getMessage(),
46+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Player
4747
return;
4848
}
49-
if (sender == player && !sender.hasPermission(SimpleNickPermission.NICK_RESET.getPermission())) {
50-
sender.sendMessage(miniMessage.deserialize(Message.TOO_MANY_ARGUMENTS.getMessage(),
51-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // No Permission
49+
if (sender == player && !sender.hasPermission(SNPerm.NICK_RESET.getPermission())) {
50+
sender.sendMessage(miniMessage.deserialize(SNMessage.TOO_MANY_ARGUMENTS.getMessage(),
51+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // No Permission
5252
return;
5353
}
5454
// Set Nickname
5555
// Saved to player
5656
NickHandler.getInstance().resetNickname(player);
5757
player.displayName(miniMessage.deserialize(player.getName()));
5858
if (player != sender) {
59-
sender.sendMessage(miniMessage.deserialize(Message.NICK_RESET_OTHER.getMessage(),
60-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()),
59+
sender.sendMessage(miniMessage.deserialize(SNMessage.NICK_RESET_OTHER.getMessage(),
60+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()),
6161
Placeholder.parsed("username", player.getName())));
62-
player.sendMessage(miniMessage.deserialize(Message.NICK_RESET_BY_OTHER.getMessage(),
63-
Placeholder.parsed("prefix", Message.PREFIX.getMessage()),
62+
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_RESET_BY_OTHER.getMessage(),
63+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()),
6464
Placeholder.component("username", ((Player) sender).displayName())));
6565
} else {
66-
player.sendMessage(miniMessage.deserialize(Message.NICK_RESET_SELF.getMessage(),
67-
Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
66+
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_RESET_SELF.getMessage(),
67+
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
6868
}
6969
}
7070

‎src/main/java/adhdmc/simplenicks/commands/subcommands/Save.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
55
import adhdmc.simplenicks.config.Config;
6-
import adhdmc.simplenicks.util.Message;
6+
import adhdmc.simplenicks.util.SNMessage;
77
import adhdmc.simplenicks.util.NickHandler;
8-
import adhdmc.simplenicks.util.SimpleNickPermission;
8+
import adhdmc.simplenicks.util.SNPerm;
99
import net.kyori.adventure.text.minimessage.MiniMessage;
1010
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
1111
import org.bukkit.command.CommandSender;
@@ -17,25 +17,25 @@
1717
public class Save extends SubCommand {
1818
MiniMessage miniMessage = SimpleNicks.getMiniMessage();
1919
public Save() {
20-
super("save", "Saves the current or a provided nickname.", "/nick save [nickname]", SimpleNickPermission.NICK_SAVE);
20+
super("save", "Saves the current or a provided nickname.", "/nick save [nickname]", SNPerm.NICK_SAVE);
2121
}
2222

2323
@Override
2424
public void execute(CommandSender sender, String[] args) {
2525
// Player Check
2626
if (!(sender instanceof Player player)) {
27-
sender.sendMessage(miniMessage.deserialize(Message.CONSOLE_CANNOT_RUN.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
27+
sender.sendMessage(miniMessage.deserialize(SNMessage.CONSOLE_CANNOT_RUN.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
2828
return;
2929
}
3030
if (NickHandler.getInstance().getSavedNicknames(player).size() >= Config.getInstance().getMaxSaves()) {
31-
sender.sendMessage(miniMessage.deserialize(Message.NICK_SAVE_FAILURE_TOO_MANY.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
31+
sender.sendMessage(miniMessage.deserialize(SNMessage.NICK_SAVE_FAILURE_TOO_MANY.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
3232
return;
3333
}
3434
String nickname = NickHandler.getInstance().getNickname(player);
3535
if (!NickHandler.getInstance().saveNickname(player, nickname)) {
36-
player.sendMessage(miniMessage.deserialize(Message.NICK_SAVE_FAILURE.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
36+
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_SAVE_FAILURE.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
3737
}
38-
// TODO: Add command feedback for successful execution of this command.
38+
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_SAVE_SUCCESS.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()), Placeholder.parsed("nickname", nickname)));
3939
}
4040

4141
@Override

0 commit comments

Comments
 (0)