Add restrictions on clan names using regular expressions (close #16)

README.md

@@ -16,7 +16,7 @@ JetBrains supports me in the development of BedrockClans.
 * Clan creation costs (using EconomyAPI)
 * Clan chat
 * Clan homes
-* Blacklisted clan names
+* Clan name restrictions
 * ...
 
 # Commands

plugin.yml

@@ -1,6 +1,6 @@
 name: BedrockClans
 main: Wertzui123\BedrockClans\Main
-version: "3.8.1"
+version: "3.9"
 api: 5.0.0
 load: POSTWORLD
 author: Wertzui123

resources/config.yml

@@ -1,7 +1,9 @@
 ---
 # BedrockClans | Copyright 2019 - 2023 Wertzui123
 # Don't edit this if you don't know what you're doing
-config-version: "3.8.1"
+config-version: "3.9"
+# Regex for valid clan names; see https://regexr.com/ for help
+clan_name_regex: "/^[a-zA-Z0-9_]{3,16}$/"
 # Banned clan names
 banned_clan_names:
  - Hacker

resources/strings.yml

@@ -18,9 +18,9 @@ command:
     off: "§aYou are no longer in the clan chat mode."
   create:
     alreadyInClan: "§cYou are already in a clan!"
-    passClan: "§cPlease pass a clan!"
+    passName: "§cPlease pass a name for your new clan!"
     clanExists: "§cThere already is a clan by that name!"
-    bannedName: "§cThis name is banned!"
+    invalidName: "§cThis name is invalid/not allowed on this server!"
     notEnoughMoney: "§cYou don't have enough money (§6{price}§c) to create a clan!"
     success: "§aYou successfully created the clan {clan}§a."
   delete:

src/Wertzui123/BedrockClans/Clan.php

@@ -461,7 +461,7 @@ public static function rankToNumber(string $rank)
      */
     public static function isValidName(string $name): bool
     {
-        return !in_array($name, Main::getInstance()->getConfig()->get('banned_clan_names'));
+        return preg_match(Main::getInstance()->getConfig()->get('clan_name_regex'), $name) && !in_array($name, Main::getInstance()->getConfig()->get('banned_clan_names'));
     }
 
     /**

src/Wertzui123/BedrockClans/Main.php

@@ -29,7 +29,7 @@ class Main extends PluginBase
     private $withdrawCooldownsFile;
     private $players = [];
 
-    const CONFIG_VERSION = '3.8.1';
+    const CONFIG_VERSION = '3.9';
 
     public function onEnable(): void
     {

src/Wertzui123/BedrockClans/commands/subcommands/CreateSubcommand.php

@@ -22,7 +22,7 @@ public function execute(CommandSender $sender, array $args)
             return;
         }
         if (!isset($args[0])) {
-            $sender->sendMessage($this->plugin->getMessage('command.create.passClan'));
+            $sender->sendMessage($this->plugin->getMessage('command.create.passName'));
             return;
         }
         $name = implode(' ', $args);
@@ -31,7 +31,7 @@ public function execute(CommandSender $sender, array $args)
             return;
         }
         if (!Clan::isValidName($name)) {
-            $sender->sendMessage($this->plugin->getMessage('command.create.bannedName'));
+            $sender->sendMessage($this->plugin->getMessage('command.create.invalidName'));
             return;
         }
         if ($this->plugin->getConfig()->get('create_costs') && !is_null($this->plugin->getServer()->getPluginManager()->getPlugin('EconomyAPI'))) {