Plugin Rewrite

pom.xml

@@ -6,13 +6,13 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimpleNicks</artifactId>
-    <version>2.1.0</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>SimpleNicks</name>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -88,5 +88,10 @@
             <version>2.11.5</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>6.3.0</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -1,58 +1,74 @@
 package simplexity.simplenicks;
 
+import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import simplexity.simplenicks.commands.CommandHandler;
-import simplexity.simplenicks.commands.Delete;
-import simplexity.simplenicks.commands.Help;
-import simplexity.simplenicks.commands.Reset;
-import simplexity.simplenicks.commands.Save;
-import simplexity.simplenicks.commands.Set;
-import simplexity.simplenicks.commands.SNReload;
-import simplexity.simplenicks.commands.SubCommand;
+import simplexity.simplenicks.commands.NicknameCommand;
 import simplexity.simplenicks.config.ConfigHandler;
-import simplexity.simplenicks.config.LocaleHandler;
+import simplexity.simplenicks.hooks.SNExpansion;
+import simplexity.simplenicks.listener.LeaveListener;
 import simplexity.simplenicks.listener.LoginListener;
-import simplexity.simplenicks.util.Constants;
-import simplexity.simplenicks.util.NickHandler;
-import simplexity.simplenicks.util.SNExpansion;
+import simplexity.simplenicks.saving.SaveMigrator;
+import simplexity.simplenicks.saving.SqlHandler;
+import simplexity.simplenicks.util.ColorTag;
+import simplexity.simplenicks.util.FormatTag;
+import simplexity.simplenicks.util.NickPermission;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.logging.Logger;
 
-/*command based
-[/nick [nickname] or /nick <player> [nickname]]
-need to check if it's a valid name
-[Alphanumeric, tho a bypass permission would be nice]
-need to check if the minimessage formats are allowed- i,e, not allowing hover/click event tag
-[assuming I'd make a set of blacklisted tag types, check for those]
-need to check length after parsing
-PlaceholderAPI placeholder for before parsing, and after
-*/
 
+@SuppressWarnings("UnstableApiUsage")
 public final class SimpleNicks extends JavaPlugin {
 
     private static final MiniMessage miniMessage = MiniMessage.miniMessage();
     private static Plugin instance;
-    private static final HashMap<String, SubCommand> subCommands = new HashMap<>();
+    private static MiniMessage defaultResolver;
 
     @Override
     public void onEnable() {
         instance = this;
-        registerSubCommands();
         this.saveDefaultConfig();
         getConfig().options().copyDefaults(true);
         saveConfig();
-        this.getCommand("nick").setExecutor(new CommandHandler());
-        this.getCommand("snreload").setExecutor(new SNReload());
         if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             new SNExpansion().register();
         }
-        instance.getServer().getPluginManager().registerEvents(new LoginListener(), this);
+        getServer().getPluginManager().registerEvents(new LoginListener(), this);
+        getServer().getPluginManager().registerEvents(new LeaveListener(), this);
         configReload();
+        SqlHandler.getInstance().init();
+        SaveMigrator.migrateFromYml();
+        this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> {
+            commands.registrar().register(NicknameCommand.createCommand().build());
+        });
+        setUpResolver();
+        registerPermissions();
+    }
+
+    private void registerPermissions() {
+        for (NickPermission perm : NickPermission.values()) {
+            getServer().getPluginManager().addPermission(perm.getPermission());
+        }
+        for (ColorTag perm : ColorTag.values()) {
+            getServer().getPluginManager().addPermission(perm.getPermission());
+        }
+    }
+
+    private void setUpResolver() {
+        TagResolver.Builder tagResolver = TagResolver.builder();
+        for (ColorTag colorTag : ColorTag.values()) {
+            tagResolver.resolver(colorTag.getTagResolver());
+        }
+        for (FormatTag formatTag : FormatTag.values()) {
+            tagResolver.resolver(formatTag.getTagResolver());
+        }
+        TagResolver resolver = tagResolver.build();
+        defaultResolver = MiniMessage.builder()
+                .strict(false)
+                .tags(resolver)
+                .build();
     }
 
     public static MiniMessage getMiniMessage() {
@@ -63,25 +79,24 @@ public static Plugin getInstance() {
         return instance;
     }
 
-    public static Map<String, SubCommand> getSubCommands() {
-        return Collections.unmodifiableMap(subCommands);
-    }
-
     public static Logger getSimpleNicksLogger() {
         return instance.getLogger();
     }
 
-    private void registerSubCommands() {
-        subCommands.put("reset", new Reset("reset", Constants.NICK_RESET, Constants.NICK_RESET_OTHERS, false));
-        subCommands.put("help", new Help("help", Constants.NICK_COMMAND, Constants.NICK_OTHERS_COMMAND, true));
-        subCommands.put("set", new Set("set", Constants.NICK_COMMAND, Constants.NICK_OTHERS_RESTRICTIVE, false));
-        subCommands.put("save", new Save("save", Constants.NICK_SAVE, Constants.NICK_OTHERS_SAVE, false));
-        subCommands.put("delete", new Delete("delete", Constants.NICK_DELETE, Constants.NICK_OTHERS_DELETE, false));
+    public static MiniMessage getDefaultParser() {
+        return defaultResolver;
+
     }
 
+
     public static void configReload() {
-        LocaleHandler.getInstance().loadLocale();
         ConfigHandler.getInstance().reloadConfig();
-        NickHandler.getInstance().loadSavingType();
     }
+
+    @Override
+    public void onDisable() {
+        SqlHandler.getInstance().closeDatabase();
+    }
+
+
 }