Adds the ability to add a prefix to nicknamed players, fixes /snreload and adjusts confighandler to not have redundant default setting

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimpleNicks</artifactId>
-    <version>2.0.2</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 
     <name>SimpleNicks</name>

src/main/java/simplexity/simplenicks/SimpleNicks.java

@@ -44,7 +44,8 @@ public void onEnable() {
         instance = this;
         registerSubCommands();
         this.saveDefaultConfig();
-        ConfigHandler.getInstance().setConfigDefaults();
+        getConfig().options().copyDefaults(true);
+        saveConfig();
         this.getCommand("nick").setExecutor(new CommandHandler());
         this.getCommand("snreload").setExecutor(new SNReload());
         if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {

src/main/java/simplexity/simplenicks/commands/SNReload.java

@@ -1,13 +1,16 @@
 package simplexity.simplenicks.commands;
 
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import simplexity.simplenicks.SimpleNicks;
 import simplexity.simplenicks.config.ConfigHandler;
 import simplexity.simplenicks.config.LocaleHandler;
+import simplexity.simplenicks.util.NickHandler;
 
 public class SNReload implements CommandExecutor {
     @Override
@@ -16,6 +19,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         LocaleHandler.getInstance().loadLocale();
         sender.sendMessage(SimpleNicks.getMiniMessage().deserialize(LocaleHandler.getInstance().getConfigReloaded(),
                 Placeholder.parsed("prefix", LocaleHandler.getInstance().getPluginPrefix())));
+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+            NickHandler.getInstance().refreshNickname(player);
+        }
         return false;
     }
 }

src/main/java/simplexity/simplenicks/config/ConfigHandler.java

@@ -3,6 +3,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import simplexity.simplenicks.SimpleNicks;
 
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -12,16 +13,22 @@ public String getRegexString() {
         return regexString;
     }
 
+    public String getNickPrefix() {
+        return nickPrefix;
+    }
+
     public enum SAVING_TYPE {PDC, FILE}
 
     private static ConfigHandler instance;
 
+    private final Logger logger = SimpleNicks.getSimpleNicksLogger();
     private Pattern regex = Pattern.compile("[A-Za-z0-9_]+");
     private SAVING_TYPE savingType = SAVING_TYPE.FILE;
     private int maxLength = 25;
     private int maxSaves = 5;
     private boolean tablistNick = false;
     private String regexString = "[A-Za-z0-9_]+";
+    private String nickPrefix;
     private long usernameProtectionTime = 0;
 
     private ConfigHandler() {
@@ -36,39 +43,30 @@ public static ConfigHandler getInstance() {
     public void reloadConfig() {
         SimpleNicks.getInstance().reloadConfig();
         LocaleHandler.getInstance().loadLocale();
+        FileConfiguration config = SimpleNicks.getInstance().getConfig();
         // Check the validity of the regex.
         try {
-            String regexSetting = SimpleNicks.getInstance().getConfig().getString("nickname-regex");
+            String regexSetting = config.getString("nickname-regex", "[A-Za-z0-9_]+");
             regexString = regexSetting;
-            assert regexSetting != null;
             assert !regexSetting.isBlank();
             regex = Pattern.compile(regexSetting);
-        } catch (AssertionError | PatternSyntaxException e) {
-            SimpleNicks.getSimpleNicksLogger().severe(LocaleHandler.getInstance().getInvalidConfigRegex());
+        } catch (PatternSyntaxException e) {
+            logger.severe(LocaleHandler.getInstance().getInvalidConfigRegex());
         }
         // Check validity of saving-type.
         try {
-            String savingTypeSetting = SimpleNicks.getInstance().getConfig().getString("saving-type");
-            assert savingTypeSetting != null;
+            String savingTypeSetting = config.getString("saving-type", "file");
             savingType = SAVING_TYPE.valueOf(savingTypeSetting.toUpperCase());
-        } catch (AssertionError | IllegalArgumentException e) {
-            SimpleNicks.getInstance().getLogger().severe("INVALID SAVING TYPE");
+        } catch (IllegalArgumentException e) {
+            logger.severe("INVALID SAVING TYPE");
         }
-        maxLength = SimpleNicks.getInstance().getConfig().getInt("max-nickname-length");
-        maxSaves = SimpleNicks.getInstance().getConfig().getInt("max-saves");
-        tablistNick = SimpleNicks.getInstance().getConfig().getBoolean("tablist-nick");
-        usernameProtectionTime = SimpleNicks.getInstance().getConfig().getLong("username-protection") * 86400000;
+        maxLength = config.getInt("max-nickname-length", 25);
+        maxSaves = config.getInt("max-saves", 5);
+        tablistNick = config.getBoolean("tablist-nick", false);
+        usernameProtectionTime = config.getLong("username-protection", 30) * 86400000;
+        nickPrefix = config.getString("nickname-prefix", "");
     }
 
-    public void setConfigDefaults() {
-        FileConfiguration config = SimpleNicks.getInstance().getConfig();
-        config.addDefault("saving-type", "file");
-        config.addDefault("max-nickname-length", 25);
-        config.addDefault("max-saves", 5);
-        config.addDefault("nickname-regex", "[A-Za-z0-9_]+");
-        config.addDefault("tablist-nick", false);
-        config.addDefault("username-protection", 30);
-    }
 
     public Pattern getRegex() {
         return regex;

src/main/java/simplexity/simplenicks/util/NickHandler.java

@@ -51,7 +51,7 @@ public boolean refreshNickname(OfflinePlayer p) {
         if (nicknameRaw == null || nicknameRaw.isBlank()) {
             player.displayName(null);
         } else {
-            player.displayName(miniMessage.deserialize(nicknameRaw));
+            player.displayName(miniMessage.deserialize(ConfigHandler.getInstance().getNickPrefix() + nicknameRaw));
             if (ConfigHandler.getInstance().shouldNickTablist()) {
                 player.playerListName(miniMessage.deserialize(nicknameRaw));
             }

src/main/resources/config.yml

@@ -22,4 +22,7 @@ tablist-nick: false
 # How long should people be offline before their username is available to use as a nickname?
 # In days, -1 to disable username protection altogether
 
-username-protection: 30
+username-protection: 30
+
+# What prefix should be given for players who have a nickname? put "" if you want no prefix
+nickname-prefix: ""

src/main/resources/plugin.yml

@@ -15,7 +15,6 @@ commands:
   snreload:
     description: "Reloads the config and locale of SimpleNicks."
     aliases: [simplenicksreload, simplenickreload, snreload]
-    usage: "Usage: /snreload"
     permission: simplenick.reload
 permissions:
   simplenick.admin: