Skip to content

Commit c9f666c

Browse files
RhythmicSysRhythmicSys
committed
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
1 parent 75309de commit c9f666c

8 files changed

Lines changed: 46 additions & 143 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.3</version>
9+
<version>0.0.4</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SimpleNicks</name>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import adhdmc.simplenicks.commands.CommandHandler;
44
import adhdmc.simplenicks.commands.SubCommand;
55
import adhdmc.simplenicks.commands.subcommands.*;
6-
import adhdmc.simplenicks.config.SimpleNicksConfig;
6+
import adhdmc.simplenicks.config.Defaults;
77
import adhdmc.simplenicks.config.Locale;
88
import net.kyori.adventure.text.minimessage.MiniMessage;
99
import org.bukkit.plugin.Plugin;
@@ -29,15 +29,15 @@ public final class SimpleNicks extends JavaPlugin {
2929
private static final MiniMessage miniMessage = MiniMessage.miniMessage();
3030
private static Plugin instance;
3131
private static Locale locale;
32-
private static SimpleNicksConfig simpleNicksConfig;
3332
private static final HashMap<String, SubCommand> subCommands = new HashMap<>();
3433

3534
@Override
3635
public void onEnable() {
3736
instance = this;
3837
registerSubCommands();
3938
locale = Locale.getInstance();
40-
simpleNicksConfig = SimpleNicksConfig.getInstance();
39+
this.saveDefaultConfig();
40+
Defaults.setConfigDefaults();
4141
this.getCommand("nick").setExecutor(new CommandHandler());
4242
instance.getServer().getPluginManager().registerEvents(new LoginListener(), this);
4343
}
@@ -58,6 +58,8 @@ public static Logger getSimpleNicksLogger(){
5858
return instance.getLogger();
5959
}
6060

61+
62+
6163
private void registerSubCommands() {
6264
subCommands.put("reset", new Reset());
6365
subCommands.put("help", new Help());

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
55
import adhdmc.simplenicks.config.Locale;
6-
import adhdmc.simplenicks.config.SimpleNicksConfig;
76
import adhdmc.simplenicks.util.Message;
87
import adhdmc.simplenicks.util.SimpleNickPermission;
98
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -26,8 +25,7 @@ public void execute(CommandSender sender, String[] args) {
2625
}
2726
Locale.getInstance().reloadConfig();
2827
Locale.getInstance().loadLocaleMessages();
29-
SimpleNicksConfig.getInstance().reloadConfig();
30-
SimpleNicksConfig.getInstance().reloadConfigValues();
28+
SimpleNicks.getInstance().reloadConfig();
3129
sender.sendMessage(miniMessage.deserialize(Message.CONFIG_RELOADED.getMessage(), Placeholder.parsed("prefix", Message.PREFIX.getMessage())));
3230
}
3331

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

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

33
import adhdmc.simplenicks.SimpleNicks;
44
import adhdmc.simplenicks.commands.SubCommand;
5-
import adhdmc.simplenicks.config.SimpleNicksConfig;
65
import adhdmc.simplenicks.util.Message;
76
import adhdmc.simplenicks.util.SimpleNickPermission;
87
import net.kyori.adventure.text.Component;
@@ -21,8 +20,8 @@ public class Set extends SubCommand {
2120

2221
public static final NamespacedKey nickNameSave = new NamespacedKey(SimpleNicks.getInstance(), "nickname");
2322

24-
private final int MAX_NICKNAME_LENGTH = SimpleNicksConfig.getMaxNicknameLength();// TODO: Change this temporary constant into a config option.
25-
private final String NICKNAME_REGEX = SimpleNicksConfig.getNicknameRegex(); // TODO: Change this temporary constant into a config option.
23+
private int MAX_NICKNAME_LENGTH = SimpleNicks.getInstance().getConfig().getInt("max-nickname-length");// TODO: Change this temporary constant into a config option.
24+
private String NICKNAME_REGEX = SimpleNicks.getInstance().getConfig().getString("nickname-regex"); // TODO: Change this temporary constant into a config option.
2625

2726
public Set() {
2827
super("set", "sets a nickname", "/nick set", SimpleNickPermission.NICK_COMMAND);
@@ -58,6 +57,8 @@ public void execute(CommandSender sender, String[] args) {
5857

5958
// Nickname Validity Check
6059
String nicknameStripped = miniMessage.stripTags(args[0]);
60+
SimpleNicks.getSimpleNicksLogger().info("Nickname Stripped: " + nicknameStripped);
61+
SimpleNicks.getSimpleNicksLogger().info("Current max nick length: " + MAX_NICKNAME_LENGTH);
6162
// TODO: Allow regex to be modifiable by config.
6263
// TODO: Check if the person has permissions to use the tags, perms & their connected tags are in ConfigDefaults - RhythmicSys
6364
if (!nicknameStripped.matches(NICKNAME_REGEX)) {

‎src/main/java/adhdmc/simplenicks/config/Defaults.java‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,10 @@
88
import java.util.List;
99

1010
public class Defaults {
11-
public static void setLocaleDefaults() {
12-
FileConfiguration locale = Locale.getInstance().getLocaleConfig();
13-
locale.addDefault("invalid-command", "<prefix><red>Invalid command.");
14-
locale.addDefault("no-arguments", "<prefix><red>No arguments provided.");
15-
locale.addDefault("too-many-arguments", "<prefix><red>Too many arguments provided.");
16-
locale.addDefault("cant-nick-username", "<prefix><red>You cannot name yourself <name>, as that is the username of another player on this server. Pick another name");
17-
locale.addDefault("no-permission", "<prefix><red>You do not have permission to run this command");
18-
locale.addDefault("console-cannot-run", "<prefix><red>This command cannot be run on the Console.");
19-
locale.addDefault("invalid-player", "<prefix><red>Invalid player specified");
20-
locale.addDefault("invalid-nick-regex", "<prefix><red>Not a valid nickname, must follow regex: <regex>");
21-
locale.addDefault("invalid-nick-too-long", "<prefix><red>Nickname is too long, must be <= <value>");
22-
locale.addDefault("invalid-tags", "<prefix><red>You have used a color or formatting tag you do not have permission to use. Please try again");
23-
locale.addDefault("prefix", "<aqua>SimpleNicks <white>» ");
24-
locale.addDefault("help-base", "<prefix><green>--------");
25-
locale.addDefault("help-set","<aqua>· <yellow>Setting a nickname: \n <gray>/nick set <nickname>");
26-
locale.addDefault("help-reset","<aqua>· <yellow>removing a nickname: \n <gray>/nick reset");
27-
locale.addDefault("help-minimessage", "<aqua>· <yellow>Formatting: \n <gray>This plugin uses minimessage formatting. You can find a format viewer <aqua><u><click:open_url:'https://webui.adventure.kyori.net/'>here</click></u></aqua>");
28-
locale.addDefault("config-reload", "<prefix><gold>SimpleNicks config and locale reloaded");
29-
locale.addDefault("nick-changed-self", "<prefix><green>Changed your own nickname to <nickname>!");
30-
locale.addDefault("nick-changed-other", "<prefix><green>Changed <username>'s nickname to <nickname>");
31-
locale.addDefault("nick-reset-self", "<prefix><green>Reset your own nickname!");
32-
locale.addDefault("nick-reset-other", "<prefix><green>Reset <username>'s nickname.");
33-
}
11+
3412

3513
public static void setConfigDefaults() {
36-
FileConfiguration config = SimpleNicksConfig.getInstance().getSimpleNickConfig();
14+
FileConfiguration config = SimpleNicks.getInstance().getConfig();
3715
config.addDefault("max-nickname-length", 30);
3816
config.addDefault("nickname-regex","[A-Za-z0-9_]+");
3917
}

‎src/main/java/adhdmc/simplenicks/config/Locale.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static Locale getInstance() {
2727
if (instance == null) {
2828
instance = new Locale();
2929
instance.getLocaleConfig();
30-
Defaults.setLocaleDefaults();
30+
instance.setLocaleDefaults();
3131
instance.saveConfig();
3232
instance.loadLocaleMessages();
3333
}
@@ -84,5 +84,29 @@ public void loadLocaleMessages() {
8484
m.setMessage(message);
8585
}
8686
}
87+
88+
private void setLocaleDefaults() {
89+
FileConfiguration locale = Locale.getInstance().getLocaleConfig();
90+
locale.addDefault("invalid-command", "<prefix><red>Invalid command.");
91+
locale.addDefault("no-arguments", "<prefix><red>No arguments provided.");
92+
locale.addDefault("too-many-arguments", "<prefix><red>Too many arguments provided.");
93+
locale.addDefault("cant-nick-username", "<prefix><red>You cannot name yourself <name>, as that is the username of another player on this server. Pick another name");
94+
locale.addDefault("no-permission", "<prefix><red>You do not have permission to run this command");
95+
locale.addDefault("console-cannot-run", "<prefix><red>This command cannot be run on the Console.");
96+
locale.addDefault("invalid-player", "<prefix><red>Invalid player specified");
97+
locale.addDefault("invalid-nick-regex", "<prefix><red>Not a valid nickname, must follow regex: <regex>");
98+
locale.addDefault("invalid-nick-too-long", "<prefix><red>Nickname is too long, must be <= <value>");
99+
locale.addDefault("invalid-tags", "<prefix><red>You have used a color or formatting tag you do not have permission to use. Please try again");
100+
locale.addDefault("prefix", "<aqua>SimpleNicks <white>» ");
101+
locale.addDefault("help-base", "<prefix><green>--------");
102+
locale.addDefault("help-set","<aqua>· <yellow>Setting a nickname: \n <gray>/nick set <nickname>");
103+
locale.addDefault("help-reset","<aqua>· <yellow>removing a nickname: \n <gray>/nick reset");
104+
locale.addDefault("help-minimessage", "<aqua>· <yellow>Formatting: \n <gray>This plugin uses minimessage formatting. You can find a format viewer <aqua><u><click:open_url:'https://webui.adventure.kyori.net/'>here</click></u></aqua>");
105+
locale.addDefault("config-reload", "<prefix><gold>SimpleNicks config and locale reloaded");
106+
locale.addDefault("nick-changed-self", "<prefix><green>Changed your own nickname to <nickname>!");
107+
locale.addDefault("nick-changed-other", "<prefix><green>Changed <username>'s nickname to <nickname>");
108+
locale.addDefault("nick-reset-self", "<prefix><green>Reset your own nickname!");
109+
locale.addDefault("nick-reset-other", "<prefix><green>Reset <username>'s nickname.");
110+
}
87111
}
88112

‎src/main/java/adhdmc/simplenicks/config/SimpleNicksConfig.java‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎src/main/resources/config.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#
2+
# The max amount of characters a nickname should be, not including formatting
3+
#(so a name like <red>Billy<yellow>Bob would only count 'BillyBob' - and would be 8 characters)
4+
max-nickname-length: 30
5+
6+
# The regex of valid final nickname characters.
7+
# Be warned that putting non-alphanumeric characters may result in issues with other plugins
8+
nickname-regex: "[A-Za-z0-9_]+"

0 commit comments

Comments
 (0)