Skip to content

Commit 1e32f89

Browse files
RhythmicSysRhythmicSys
committed
Forgot to commit this earlier today
1 parent 71e0244 commit 1e32f89

File tree

14 files changed

+301
-245
lines changed

14 files changed

+301
-245
lines changed

‎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>1.0.0</version>
9+
<version>1.0.1</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SimpleNicks</name>

‎src/main/java/adhdmc/simplenicks/SimpleNicks.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import adhdmc.simplenicks.commands.SubCommand;
55
import adhdmc.simplenicks.commands.subcommands.*;
66
import adhdmc.simplenicks.config.Config;
7-
import adhdmc.simplenicks.config.Locale;
7+
import adhdmc.simplenicks.config.LocaleHandler;
88
import adhdmc.simplenicks.listener.LoginListener;
99
import adhdmc.simplenicks.util.NickHandler;
1010
import adhdmc.simplenicks.util.SNExpansion;
@@ -73,8 +73,7 @@ private void registerSubCommands() {
7373
}
7474

7575
public static void configReload() {
76-
Locale.getInstance().reloadConfig();
77-
Locale.getInstance().loadLocaleMessages();
76+
LocaleHandler.getInstance().loadLocale();
7877
Config.getInstance().reloadConfig();
7978
NickHandler.getInstance().loadSavingType();
8079
}

‎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.SNMessage;
4+
import adhdmc.simplenicks.config.LocaleHandler;
55
import net.kyori.adventure.text.minimessage.MiniMessage;
66
import org.bukkit.command.*;
77
import org.jetbrains.annotations.NotNull;
@@ -19,13 +19,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
1919

2020
// Arguments Check
2121
if (parsedArgs.length == 0) {
22-
sender.sendMessage(miniMessage.deserialize(SNMessage.INVALID_COMMAND.getMessage())); // Invalid Arguments
22+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getInvalidCommand())); // Invalid Arguments
2323
return true;
2424
}
2525
// Execute Command
2626
SubCommand subCommand = SimpleNicks.getSubCommands().getOrDefault(parsedArgs[0].toLowerCase(Locale.ENGLISH), null);
2727
if (subCommand == null) {
28-
sender.sendMessage(miniMessage.deserialize(SNMessage.INVALID_COMMAND.getMessage())); // Invalid SubCommand
28+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getInvalidCommand())); // Invalid SubCommand
2929
return true;
3030
}
3131
subCommand.execute(sender, Arrays.copyOfRange(parsedArgs, 1, parsedArgs.length));

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

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

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.SNMessage;
5+
import adhdmc.simplenicks.config.LocaleHandler;
66
import adhdmc.simplenicks.util.NickHandler;
77
import adhdmc.simplenicks.util.SNPerm;
88
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -23,15 +23,15 @@ public Delete() {
2323
public void execute(CommandSender sender, String[] args) {
2424
// Player Check
2525
if (!(sender instanceof Player player)) {
26-
sender.sendMessage(miniMessage.deserialize(SNMessage.CONSOLE_CANNOT_RUN.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
26+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getConsoleCannotRun(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // 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(SNMessage.NICK_DELETE_FAILURE.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
31+
player.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickDeleteFailure(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix())));
3232
return;
3333
}
34-
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_DELETE_SUCCESS.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()), Placeholder.parsed("nickname", nickname)));
34+
player.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickDeleteSuccess(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()), Placeholder.parsed("nickname", nickname)));
3535
}
3636

3737
@Override

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

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

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.SNMessage;
5+
import adhdmc.simplenicks.config.LocaleHandler;
66
import adhdmc.simplenicks.util.SNPerm;
77
import net.kyori.adventure.text.minimessage.MiniMessage;
88
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -18,10 +18,10 @@ public Help() {
1818

1919
@Override
2020
public void execute(CommandSender sender, String[] args) {
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()));
21+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getHelpBase(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix())));
22+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getHelpSet()));
23+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getHelpReset()));
24+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getHelpMinimessage()));
2525
}
2626

2727
@Override

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

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

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.SNMessage;
5+
import adhdmc.simplenicks.config.LocaleHandler;
66
import adhdmc.simplenicks.util.SNPerm;
77
import net.kyori.adventure.text.minimessage.MiniMessage;
88
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -19,11 +19,11 @@ public Reload() {
1919
@Override
2020
public void execute(CommandSender sender, String[] args) {
2121
if (!sender.hasPermission(SNPerm.NICK_RELOAD.getPermission())){
22-
sender.sendMessage(miniMessage.deserialize(SNMessage.NO_PERMISSION.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
22+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNoPermission(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix())));
2323
return;
2424
}
2525
SimpleNicks.configReload();
26-
sender.sendMessage(miniMessage.deserialize(SNMessage.CONFIG_RELOADED.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
26+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getConfigReload(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix())));
2727
}
2828

2929
@Override

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

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

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.util.SNMessage;
5+
import adhdmc.simplenicks.config.LocaleHandler;
66
import adhdmc.simplenicks.util.NickHandler;
77
import adhdmc.simplenicks.util.SNPerm;
88
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -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(SNMessage.CONSOLE_CANNOT_RUN.getMessage(),
27-
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
26+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getConsoleCannotRun(),
27+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // Invalid Usage (Not a Player)
2828
return;
2929
}
3030
// Arguments Check
3131
if (args.length > 1) {
32-
sender.sendMessage(miniMessage.deserialize(SNMessage.TOO_MANY_ARGUMENTS.getMessage(),
33-
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Too Many Arguments
32+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getTooManyArguments(),
33+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // Too Many Arguments
3434
return;
3535
}
3636
// Admin Check
3737
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
38+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNoPermission(),
39+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // 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(SNMessage.INVALID_PLAYER.getMessage(),
46-
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Player
45+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getInvalidPlayer(),
46+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // Invalid Player
4747
return;
4848
}
4949
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
50+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getTooManyArguments(),
51+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // 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(SNMessage.NICK_RESET_OTHER.getMessage(),
60-
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()),
59+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickResetOther(),
60+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()),
6161
Placeholder.parsed("username", player.getName())));
62-
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_RESET_BY_OTHER.getMessage(),
63-
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()),
62+
player.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickResetByOther(),
63+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()),
6464
Placeholder.component("username", ((Player) sender).displayName())));
6565
} else {
66-
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_RESET_SELF.getMessage(),
67-
Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
66+
player.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickResetSelf(),
67+
Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix())));
6868
}
6969
}
7070

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
55
import adhdmc.simplenicks.config.Config;
6-
import adhdmc.simplenicks.util.SNMessage;
6+
import adhdmc.simplenicks.config.LocaleHandler;
77
import adhdmc.simplenicks.util.NickHandler;
88
import adhdmc.simplenicks.util.SNPerm;
99
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -24,19 +24,19 @@ public Save() {
2424
public void execute(CommandSender sender, String[] args) {
2525
// Player Check
2626
if (!(sender instanceof Player player)) {
27-
sender.sendMessage(miniMessage.deserialize(SNMessage.CONSOLE_CANNOT_RUN.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
27+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getConsoleCannotRun(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // Invalid Usage (Not a Player)
2828
return;
2929
}
3030
if (NickHandler.getInstance().getSavedNicknames(player).size() >= Config.getInstance().getMaxSaves()) {
31-
sender.sendMessage(miniMessage.deserialize(SNMessage.NICK_SAVE_FAILURE_TOO_MANY.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()))); // Invalid Usage (Not a Player)
31+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickSaveFailureTooMany(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()))); // 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(SNMessage.NICK_SAVE_FAILURE.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage())));
36+
player.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickSaveFailure(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix())));
3737
return;
3838
}
39-
player.sendMessage(miniMessage.deserialize(SNMessage.NICK_SAVE_SUCCESS.getMessage(), Placeholder.parsed("prefix", SNMessage.PREFIX.getMessage()), Placeholder.parsed("nickname", nickname)));
39+
player.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getNickSaveSuccess(), Placeholder.parsed("prefix", LocaleHandler.getInstance().getPrefix()), Placeholder.parsed("nickname", nickname)));
4040
}
4141

4242
@Override

0 commit comments

Comments
 (0)