Release v3.0.0-SNAPSHOT

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.songoda</groupId>
+    <groupId>com.craftaro</groupId>
     <artifactId>UltimateModeration</artifactId>
-    <version>2.0.15</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <name>UltimateModeration</name>
     <description>Take complete control over your server with punishment templates via a simplified yet powerful moderation system</description>
@@ -54,7 +54,7 @@
                             <relocations>
                                 <relocation>
                                     <pattern>com.craftaro.core</pattern>
-                                    <shadedPattern>com.songoda.ultimatemoderation.core</shadedPattern>
+                                    <shadedPattern>com.craftaro.ultimatemoderation.core</shadedPattern>
                                 </relocation>
                             </relocations>
 
@@ -74,6 +74,7 @@
                                     <excludeDefaults>false</excludeDefaults>
                                     <includes>
                                         <include>**/nms/v*/**</include>
+                                        <include>**/third_party/**</include>
                                     </includes>
                                 </filter>
                             </filters>

src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java

@@ -1,62 +1,60 @@
-package com.songoda.ultimatemoderation;
+package com.craftaro.ultimatemoderation;
 
 import com.craftaro.core.SongodaCore;
 import com.craftaro.core.SongodaPlugin;
 import com.craftaro.core.commands.CommandManager;
 import com.craftaro.core.compatibility.ServerVersion;
 import com.craftaro.core.configuration.Config;
-import com.craftaro.core.database.DataMigrationManager;
 import com.craftaro.core.database.DatabaseConnector;
-import com.craftaro.core.database.MySQLConnector;
-import com.craftaro.core.database.SQLiteConnector;
 import com.craftaro.core.gui.GuiManager;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.commands.CommandBan;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.commands.CommandClearChat;
+import com.craftaro.ultimatemoderation.commands.CommandBan;
-import com.songoda.ultimatemoderation.commands.CommandHelp;
+import com.craftaro.ultimatemoderation.commands.CommandClearChat;
-import com.songoda.ultimatemoderation.commands.CommandKick;
+import com.craftaro.ultimatemoderation.commands.CommandHelp;
-import com.songoda.ultimatemoderation.commands.CommandMute;
+import com.craftaro.ultimatemoderation.commands.CommandKick;
-import com.songoda.ultimatemoderation.commands.CommandRandomPlayer;
+import com.craftaro.ultimatemoderation.commands.CommandMute;
-import com.songoda.ultimatemoderation.commands.CommandReload;
+import com.craftaro.ultimatemoderation.commands.CommandRandomPlayer;
-import com.songoda.ultimatemoderation.commands.CommandRunTemplate;
+import com.craftaro.ultimatemoderation.commands.CommandReload;
-import com.songoda.ultimatemoderation.commands.CommandSettings;
+import com.craftaro.ultimatemoderation.commands.CommandRunTemplate;
-import com.songoda.ultimatemoderation.commands.CommandSlowMode;
+import com.craftaro.ultimatemoderation.commands.CommandSettings;
-import com.songoda.ultimatemoderation.commands.CommandStaffChat;
+import com.craftaro.ultimatemoderation.commands.CommandSlowMode;
-import com.songoda.ultimatemoderation.commands.CommandTicket;
+import com.craftaro.ultimatemoderation.commands.CommandStaffChat;
-import com.songoda.ultimatemoderation.commands.CommandToggleChat;
+import com.craftaro.ultimatemoderation.commands.CommandTicket;
-import com.songoda.ultimatemoderation.commands.CommandUltimateModeration;
+import com.craftaro.ultimatemoderation.commands.CommandToggleChat;
-import com.songoda.ultimatemoderation.commands.CommandUnBan;
+import com.craftaro.ultimatemoderation.commands.CommandUltimateModeration;
-import com.songoda.ultimatemoderation.commands.CommandUnMute;
+import com.craftaro.ultimatemoderation.commands.CommandUnBan;
-import com.songoda.ultimatemoderation.commands.CommandVanish;
+import com.craftaro.ultimatemoderation.commands.CommandUnMute;
-import com.songoda.ultimatemoderation.commands.CommandWarn;
+import com.craftaro.ultimatemoderation.commands.CommandVanish;
-import com.songoda.ultimatemoderation.database.DataManager;
+import com.craftaro.ultimatemoderation.commands.CommandWarn;
-import com.songoda.ultimatemoderation.database.migrations._1_InitialMigration;
+import com.craftaro.ultimatemoderation.database.DataHelper;
-import com.songoda.ultimatemoderation.listeners.BlockListener;
+import com.craftaro.ultimatemoderation.database.migrations._1_InitialMigration;
-import com.songoda.ultimatemoderation.listeners.ChatListener;
+import com.craftaro.ultimatemoderation.listeners.BlockListener;
-import com.songoda.ultimatemoderation.listeners.CommandListener;
+import com.craftaro.ultimatemoderation.listeners.ChatListener;
-import com.songoda.ultimatemoderation.listeners.DeathListener;
+import com.craftaro.ultimatemoderation.listeners.CommandListener;
-import com.songoda.ultimatemoderation.listeners.DropListener;
+import com.craftaro.ultimatemoderation.listeners.DeathListener;
-import com.songoda.ultimatemoderation.listeners.InventoryListener;
+import com.craftaro.ultimatemoderation.listeners.DropListener;
-import com.songoda.ultimatemoderation.listeners.LoginListener;
+import com.craftaro.ultimatemoderation.listeners.InventoryListener;
-import com.songoda.ultimatemoderation.listeners.MobTargetLister;
+import com.craftaro.ultimatemoderation.listeners.LoginListener;
-import com.songoda.ultimatemoderation.listeners.MoveListener;
+import com.craftaro.ultimatemoderation.listeners.MobTargetLister;
-import com.songoda.ultimatemoderation.listeners.SkyBlockListener;
+import com.craftaro.ultimatemoderation.listeners.MoveListener;
-import com.songoda.ultimatemoderation.listeners.SpyingDismountListener;
+import com.craftaro.ultimatemoderation.listeners.SkyBlockListener;
-import com.songoda.ultimatemoderation.moderate.ModerationManager;
+import com.craftaro.ultimatemoderation.listeners.SpyingDismountListener;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.moderate.ModerationManager;
-import com.songoda.ultimatemoderation.punish.PunishmentNote;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.punish.player.PunishmentManager;
+import com.craftaro.ultimatemoderation.punish.PunishmentNote;
-import com.songoda.ultimatemoderation.punish.template.Template;
+import com.craftaro.ultimatemoderation.punish.player.PunishmentManager;
-import com.songoda.ultimatemoderation.punish.template.TemplateManager;
+import com.craftaro.ultimatemoderation.punish.template.Template;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.punish.template.TemplateManager;
-import com.songoda.ultimatemoderation.staffchat.StaffChatManager;
+import com.craftaro.ultimatemoderation.staffchat.StaffChatManager;
-import com.songoda.ultimatemoderation.tasks.SlowModeTask;
+import com.craftaro.ultimatemoderation.tasks.SlowModeTask;
-import com.songoda.ultimatemoderation.tickets.Ticket;
+import com.craftaro.ultimatemoderation.tickets.Ticket;
-import com.songoda.ultimatemoderation.tickets.TicketManager;
+import com.craftaro.ultimatemoderation.tickets.TicketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.Arrays;
 import java.util.List;
 
 public class UltimateModeration extends SongodaPlugin {
@@ -67,9 +65,7 @@ public class UltimateModeration extends SongodaPlugin {
     private PunishmentManager punishmentManager;
     private StaffChatManager staffChatManager;
     private ModerationManager moderationManager;
-
+    private DataHelper dataHelper;
-    private DatabaseConnector databaseConnector;
-    private DataManager dataManager;
 
     /**
      * @deprecated Use {@link JavaPlugin#getPlugin(Class)} instead.
@@ -128,25 +124,8 @@ public class UltimateModeration extends SongodaPlugin {
 
 
         try {
-            if (Settings.MYSQL_ENABLED.getBoolean()) {
+            initDatabase(Arrays.asList(new _1_InitialMigration(this)));
-                String hostname = Settings.MYSQL_HOSTNAME.getString();
+            this.dataHelper = new DataHelper(getDataManager(), this);
-                int port = Settings.MYSQL_PORT.getInt();
-                String database = Settings.MYSQL_DATABASE.getString();
-                String username = Settings.MYSQL_USERNAME.getString();
-                String password = Settings.MYSQL_PASSWORD.getString();
-                boolean useSSL = Settings.MYSQL_USE_SSL.getBoolean();
-                int poolSize = Settings.MYSQL_POOL_SIZE.getInt();
-
-                this.databaseConnector = new MySQLConnector(this, hostname, port, database, username, password, useSSL, poolSize);
-                this.getLogger().info("Data handler connected using MySQL.");
-            } else {
-                this.databaseConnector = new SQLiteConnector(this);
-                this.getLogger().info("Data handler connected using SQLite.");
-            }
-
-            this.dataManager = new DataManager(this.databaseConnector, this);
-            DataMigrationManager dataMigrationManager = new DataMigrationManager(this.databaseConnector, this.dataManager, new _1_InitialMigration(this));
-            dataMigrationManager.runMigrations();
 
         } catch (Exception ex) {
             this.getLogger().severe("Fatal error trying to connect to database. " +
@@ -181,24 +160,24 @@ public class UltimateModeration extends SongodaPlugin {
 
     @Override
     public void onDataLoad() {
-        getDataManager().runAsync(() -> {
+        getDataManager().getAsyncPool().execute(() -> {
             // Load data from DB
-            this.dataManager.getTemplates((templates) -> {
+            this.dataHelper.getTemplates((templates) -> {
                 for (Template template : templates) {
                     this.templateManager.addTemplate(template);
                 }
             });
-            this.dataManager.getAppliedPunishments((appliedPunishments) -> {
+            this.dataHelper.getAppliedPunishments((appliedPunishments) -> {
                 for (AppliedPunishment punishment : appliedPunishments) {
                     this.punishmentManager.getPlayer(punishment.getVictim()).addPunishment(punishment);
                 }
             });
-            this.dataManager.getNotes((notes) -> {
+            this.dataHelper.getNotes((notes) -> {
                 for (PunishmentNote note : notes) {
                     this.punishmentManager.getPlayer(note.getSubject()).addNotes(note);
                 }
             });
-            this.dataManager.getTickets((tickets) -> {
+            this.dataHelper.getTickets((tickets) -> {
                 for (Ticket ticket : tickets.values()) {
                     this.ticketManager.addTicket(ticket);
                 }
@@ -237,14 +216,6 @@ public class UltimateModeration extends SongodaPlugin {
         return this.staffChatManager;
     }
 
-    public DataManager getDataManager() {
-        return this.dataManager;
-    }
-
-    public DatabaseConnector getDatabaseConnector() {
-        return this.databaseConnector;
-    }
-
     public GuiManager getGuiManager() {
         return this.guiManager;
     }
@@ -252,4 +223,8 @@ public class UltimateModeration extends SongodaPlugin {
     public ModerationManager getModerationManager() {
         return this.moderationManager;
     }
+
+    public DataHelper getDataHelper() {
+        return dataHelper;
+    }
 }

src/main/java/com/craftaro/ultimatemoderation/commands/CommandBan.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.Punishment;
+import com.craftaro.ultimatemoderation.punish.Punishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.utils.VaultPermissions;
+import com.craftaro.ultimatemoderation.utils.VaultPermissions;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandClearChat.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandHelp.java

@@ -1,8 +1,8 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandKick.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.Punishment;
+import com.craftaro.ultimatemoderation.punish.Punishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandMute.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.Punishment;
+import com.craftaro.ultimatemoderation.punish.Punishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.utils.VaultPermissions;
+import com.craftaro.ultimatemoderation.utils.VaultPermissions;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandRandomPlayer.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandReload.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandRunTemplate.java

@@ -1,8 +1,8 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.template.Template;
+import com.craftaro.ultimatemoderation.punish.template.Template;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandSettings.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.configuration.editor.PluginConfigGui;
 import com.craftaro.core.gui.GuiManager;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/com/craftaro/ultimatemoderation/commands/CommandSlowMode.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.listeners.ChatListener;
+import com.craftaro.ultimatemoderation.listeners.ChatListener;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandStaffChat.java

@@ -1,8 +1,8 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.staffchat.StaffChannel;
+import com.craftaro.ultimatemoderation.staffchat.StaffChannel;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/com/craftaro/ultimatemoderation/commands/CommandTicket.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.gui.GuiManager;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.gui.TicketManagerGui;
+import com.craftaro.ultimatemoderation.gui.TicketManagerGui;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/com/craftaro/ultimatemoderation/commands/CommandToggleChat.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.locale.Message;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.listeners.ChatListener;
+import com.craftaro.ultimatemoderation.listeners.ChatListener;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandUltimateModeration.java

@@ -1,8 +1,8 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.gui.MainGui;
+import com.craftaro.ultimatemoderation.gui.MainGui;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnBan.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.player.PlayerPunishData;
+import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnMute.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.player.PlayerPunishData;
+import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandVanish.java

@@ -1,10 +1,10 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.compatibility.ServerVersion;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.Particle;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/commands/CommandWarn.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.commands;
+package com.craftaro.ultimatemoderation.commands;
 
 import com.craftaro.core.commands.AbstractCommand;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.Punishment;
+import com.craftaro.ultimatemoderation.punish.Punishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.utils.VaultPermissions;
+import com.craftaro.ultimatemoderation.utils.VaultPermissions;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java

@@ -1,14 +1,14 @@
-package com.songoda.ultimatemoderation.database;
+package com.craftaro.ultimatemoderation.database;
 
-import com.craftaro.core.database.DataManagerAbstract;
+import com.craftaro.core.database.DataManager;
 import com.craftaro.core.database.DatabaseConnector;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.punish.PunishmentNote;
+import com.craftaro.ultimatemoderation.punish.PunishmentNote;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.template.Template;
+import com.craftaro.ultimatemoderation.punish.template.Template;
-import com.songoda.ultimatemoderation.tickets.Ticket;
+import com.craftaro.ultimatemoderation.tickets.Ticket;
-import com.songoda.ultimatemoderation.tickets.TicketResponse;
+import com.craftaro.ultimatemoderation.tickets.TicketResponse;
-import com.songoda.ultimatemoderation.tickets.TicketStatus;
+import com.craftaro.ultimatemoderation.tickets.TicketStatus;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.plugin.Plugin;
@@ -24,14 +24,35 @@ import java.util.TreeMap;
 import java.util.UUID;
 import java.util.function.Consumer;
 
-public class DataManager extends DataManagerAbstract {
+public class DataHelper {
-    public DataManager(DatabaseConnector databaseConnector, Plugin plugin) {
+    private final DatabaseConnector databaseConnector;
-        super(databaseConnector, plugin);
+    private final DataManager dataManager;
+    private final Plugin plugin;
+
+    public DataHelper(DataManager dataManager, Plugin plugin) {
+        this.dataManager = dataManager;
+        this.databaseConnector = dataManager.getDatabaseConnector();
+        this.plugin = plugin;
+
+    }
+
+    private void runAsync(Runnable runnable) {
+        dataManager.getAsyncPool().execute(runnable);
+    }
+
+    private void sync(Runnable runnable) {
+        Bukkit.getScheduler().runTask(plugin, runnable);
+    }
+
+    private String getTablePrefix() {
+        return this.dataManager.getTablePrefix();
     }
 
     public void createTemplate(Template template) {
         this.runAsync(() -> {
             try (Connection connection = this.databaseConnector.getConnection()) {
+                int nextId = dataManager.getNextId("templates");
+
                 String createTemplate = "INSERT INTO " + this.getTablePrefix() + "templates (punishment_type, duration, reason, name, creator) VALUES (?, ?, ?, ?, ?)";
                 PreparedStatement statement = connection.prepareStatement(createTemplate);
                 statement.setString(1, template.getPunishmentType().name());
@@ -41,8 +62,7 @@ public class DataManager extends DataManagerAbstract {
                 statement.setString(5, template.getCreator().toString());
                 statement.executeUpdate();
 
-                int templateId = this.lastInsertedId(connection, "templates");
+                template.setId(nextId);
-                template.setId(templateId);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -91,6 +111,8 @@ public class DataManager extends DataManagerAbstract {
     public void createAppliedPunishment(AppliedPunishment punishment) {
         this.runAsync(() -> {
             try (Connection connection = this.databaseConnector.getConnection()) {
+                int nextId = dataManager.getNextId("punishments");
+
                 String createPunishment = "INSERT INTO " + this.getTablePrefix() + "punishments (type, duration, reason, victim, punisher, expiration) VALUES (?, ?, ?, ?, ?, ?)";
                 PreparedStatement statement = connection.prepareStatement(createPunishment);
                 statement.setString(1, punishment.getPunishmentType().name());
@@ -101,8 +123,7 @@ public class DataManager extends DataManagerAbstract {
                 statement.setLong(6, punishment.getExpiration());
                 statement.executeUpdate();
 
-                int punishmentId = this.lastInsertedId(connection, "punishments");
+                punishment.setId(nextId);
-                punishment.setId(punishmentId);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -169,6 +190,8 @@ public class DataManager extends DataManagerAbstract {
     public void createNote(PunishmentNote note) {
         this.runAsync(() -> {
             try (Connection connection = this.databaseConnector.getConnection()) {
+                int nextId = dataManager.getNextId("notes");
+
                 String createNote = "INSERT INTO " + this.getTablePrefix() + "notes (note, author, subject, creation) VALUES (?, ?, ?, ?)";
                 PreparedStatement statement = connection.prepareStatement(createNote);
                 statement.setString(1, note.getNote());
@@ -177,8 +200,7 @@ public class DataManager extends DataManagerAbstract {
                 statement.setLong(4, note.getCreationDate());
                 statement.executeUpdate();
 
-                int noteId = this.lastInsertedId(connection, "notes");
+                note.setId(nextId);
-                note.setId(noteId);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -224,6 +246,8 @@ public class DataManager extends DataManagerAbstract {
     public void createTicket(Ticket ticket) {
         this.runAsync(() -> {
             try (Connection connection = this.databaseConnector.getConnection()) {
+                int nextId = dataManager.getNextId("tickets");
+
                 String createTicket = "INSERT INTO " + this.getTablePrefix() + "tickets (victim, subject, type, status, world, x, y, z, pitch, yaw) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
                 PreparedStatement statement = connection.prepareStatement(createTicket);
                 statement.setString(1, ticket.getVictim().toString());
@@ -245,8 +269,7 @@ public class DataManager extends DataManagerAbstract {
                     createTicketResponse(response);
                 }
 
-                int ticketId = this.lastInsertedId(connection, "tickets");
+                ticket.setId(nextId);
-                ticket.setId(ticketId);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }

src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java

@@ -1,8 +1,9 @@
-package com.songoda.ultimatemoderation.database.migrations;
+package com.craftaro.ultimatemoderation.database.migrations;
 
 import com.craftaro.core.database.DataMigration;
+import com.craftaro.core.database.DatabaseConnector;
 import com.craftaro.core.database.MySQLConnector;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -18,7 +19,7 @@ public class _1_InitialMigration extends DataMigration {
 
     @Override
     public void migrate(Connection connection, String tablePrefix) throws SQLException {
-        String autoIncrement = this.plugin.getDatabaseConnector() instanceof MySQLConnector ? " AUTO_INCREMENT" : "";
+        String autoIncrement = " AUTO_INCREMENT";
 
         // Create templates table
         try (Statement statement = connection.createStatement()) {

src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.AnvilGui;
 import com.craftaro.core.gui.Gui;
@@ -6,11 +6,11 @@ import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.player.PlayerPunishData;
+import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.tickets.TicketStatus;
+import com.craftaro.ultimatemoderation.tickets.TicketStatus;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;

src/main/java/com/craftaro/ultimatemoderation/gui/ModerateGui.java

@@ -1,12 +1,12 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.AbstractModeration;
+import com.craftaro.ultimatemoderation.moderate.AbstractModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/craftaro/ultimatemoderation/gui/NotesManagerGui.java

@@ -1,13 +1,13 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.input.ChatPrompt;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.PunishmentNote;
+import com.craftaro.ultimatemoderation.punish.PunishmentNote;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -85,7 +85,7 @@ public class NotesManagerGui extends Gui {
                                             event.player.getUniqueId(), this.toModerate.getUniqueId(),
                                             System.currentTimeMillis());
                                     this.plugin.getPunishmentManager().getPlayer(this.toModerate).addNotes(note);
-                                    this.plugin.getDataManager().createNote(note);
+                                    this.plugin.getDataHelper().createNote(note);
 
                                     showPage();
                                 }).setOnClose(() -> this.guiManager.showGUI(event.player, new NotesManagerGui(this.plugin, this.toModerate, event.player)));
@@ -137,7 +137,7 @@ public class NotesManagerGui extends Gui {
                     (event) -> {
                         if (this.delete) {
                             this.plugin.getPunishmentManager().getPlayer(this.toModerate).removeNotes(note);
-                            this.plugin.getDataManager().deleteNote(note);
+                            this.plugin.getDataHelper().deleteNote(note);
                             showPage();
                         }
                     });

src/main/java/com/craftaro/ultimatemoderation/gui/PlayerGui.java

@@ -1,12 +1,12 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/craftaro/ultimatemoderation/gui/PunishGui.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.AnvilGui;
 import com.craftaro.core.gui.Gui;
@@ -7,11 +7,11 @@ import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
 import com.craftaro.core.utils.TextUtils;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.Punishment;
+import com.craftaro.ultimatemoderation.punish.Punishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.template.Template;
+import com.craftaro.ultimatemoderation.punish.template.Template;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
@@ -314,8 +314,8 @@ public class PunishGui extends Gui {
         Template template = new Template(this.type, this.duration, this.reason, this.template.getCreator(), this.templateName);
         this.plugin.getTemplateManager().removeTemplate(this.template);
         this.plugin.getTemplateManager().addTemplate(template);
-        this.plugin.getDataManager().deleteTemplate(this.template);
+        this.plugin.getDataHelper().deleteTemplate(this.template);
-        this.plugin.getDataManager().createTemplate(template);
+        this.plugin.getDataHelper().createTemplate(template);
         this.justSaved = true;
         if (this.toModerate == null) {
             this.guiManager.showGUI(this.player, new TemplateManagerGui(this.plugin, this.player));
@@ -325,7 +325,7 @@ public class PunishGui extends Gui {
     private void finishTemplate() {
         Template template = new Template(this.type, this.duration, this.reason, this.player, this.templateName);
         this.plugin.getTemplateManager().addTemplate(template);
-        this.plugin.getDataManager().createTemplate(template);
+        this.plugin.getDataHelper().createTemplate(template);
         this.template = template;
         if (this.toModerate == null) {
             this.guiManager.showGUI(this.player, new TemplateManagerGui(this.plugin, this.player));

src/main/java/com/craftaro/ultimatemoderation/gui/PunishmentsGui.java

@@ -1,15 +1,15 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.player.PlayerPunishData;
+import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.ItemStack;
@@ -150,7 +150,7 @@ public class PunishmentsGui extends Gui {
                         if (appliedPunishment.getPunishmentType() != PunishmentType.KICK
                                 && activity == Activity.ACTIVE) {
                             appliedPunishment.expire();
-                            this.plugin.getDataManager().updateAppliedPunishment(appliedPunishment);
+                            this.plugin.getDataHelper().updateAppliedPunishment(appliedPunishment);
                             showPage();
                         }
                     });

src/main/java/com/craftaro/ultimatemoderation/gui/TemplateManagerGui.java

@@ -1,13 +1,13 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.template.Template;
+import com.craftaro.ultimatemoderation.punish.template.Template;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
@@ -107,7 +107,7 @@ public class TemplateManagerGui extends Gui {
                         } else if (event.clickType == ClickType.RIGHT) {
                             if (this.player.hasPermission("um.templates.destroy")) {
                                 this.plugin.getTemplateManager().removeTemplate(template);
-                                this.plugin.getDataManager().deleteTemplate(template);
+                                this.plugin.getDataHelper().deleteTemplate(template);
                             }
 
                             toCurrentPage();

src/main/java/com/craftaro/ultimatemoderation/gui/TemplateSelectorGui.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.template.Template;
+import com.craftaro.ultimatemoderation.punish.template.Template;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;

src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java

@@ -1,16 +1,16 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.input.ChatPrompt;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.staffchat.StaffChatManager;
+import com.craftaro.ultimatemoderation.staffchat.StaffChatManager;
-import com.songoda.ultimatemoderation.tickets.Ticket;
+import com.craftaro.ultimatemoderation.tickets.Ticket;
-import com.songoda.ultimatemoderation.tickets.TicketResponse;
+import com.craftaro.ultimatemoderation.tickets.TicketResponse;
-import com.songoda.ultimatemoderation.tickets.TicketStatus;
+import com.craftaro.ultimatemoderation.tickets.TicketStatus;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -82,7 +82,7 @@ public class TicketGui extends Gui {
             setButton(5, 3, GuiUtils.createButtonItem(XMaterial.LEVER, TextUtils.formatText("&6" + this.ticket.getStatus().getStatus())),
                     (event) -> {
                         this.ticket.setStatus(this.ticket.getStatus() == TicketStatus.OPEN ? TicketStatus.CLOSED : TicketStatus.OPEN);
-                        this.plugin.getDataManager().updateTicket(this.ticket);
+                        this.plugin.getDataHelper().updateTicket(this.ticket);
                         // Notify staff of ticket status
                         this.chatManager.getChat("ticket").messageAll(this.plugin.getLocale().getMessage("notify.ticket.status").getMessage().replace("%tid%", String.valueOf(this.ticket.getId())).replace("%type%", this.ticket.getType()).replace("%player%", Bukkit.getPlayer(this.ticket.getVictim()).getDisplayName()).replace("%status%", this.ticket.getStatus().toString()));
                         showPage();
@@ -106,7 +106,7 @@ public class TicketGui extends Gui {
                     (event) -> {
                         ChatPrompt.showPrompt(this.plugin, this.player, this.plugin.getLocale().getMessage("gui.ticket.what").getMessage(), (evnt) -> {
                             TicketResponse response = this.ticket.addResponse(new TicketResponse(this.player, evnt.getMessage(), System.currentTimeMillis()));
-                            this.plugin.getDataManager().createTicketResponse(response);
+                            this.plugin.getDataHelper().createTicketResponse(response);
                             // Notify staff of ticket response.
                             this.chatManager.getChat("ticket").messageAll(this.plugin.getLocale().getMessage("notify.ticket.response").getMessage().replace("%tid%", "" + this.ticket.getId()).replace("%type%", this.ticket.getType()).replace("%player%", Bukkit.getPlayer(this.ticket.getVictim()).getDisplayName()));
                             showPage();

src/main/java/com/craftaro/ultimatemoderation/gui/TicketManagerGui.java

@@ -1,14 +1,14 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.AnvilGui;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.tickets.Ticket;
+import com.craftaro.ultimatemoderation.tickets.Ticket;
-import com.songoda.ultimatemoderation.tickets.TicketStatus;
+import com.craftaro.ultimatemoderation.tickets.TicketStatus;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/gui/TicketTypeGui.java

@@ -1,14 +1,14 @@
-package com.songoda.ultimatemoderation.gui;
+package com.craftaro.ultimatemoderation.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.input.ChatPrompt;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.staffchat.StaffChatManager;
+import com.craftaro.ultimatemoderation.staffchat.StaffChatManager;
-import com.songoda.ultimatemoderation.tickets.Ticket;
+import com.craftaro.ultimatemoderation.tickets.Ticket;
-import com.songoda.ultimatemoderation.tickets.TicketResponse;
+import com.craftaro.ultimatemoderation.tickets.TicketResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -43,7 +43,7 @@ public class TicketTypeGui extends Gui {
                                         ticket.setLocation(player.getLocation());
                                     }
                                     ticket.addResponse(new TicketResponse(player, event2.getMessage(), System.currentTimeMillis()));
-                                    plugin.getDataManager().createTicket(ticket);
+                                    plugin.getDataHelper().createTicket(ticket);
                                 }).setOnClose(() ->
                                 this.guiManager.showGUI(event.player, new TicketGui(plugin, ticket, toModerate, player)));
                     });

src/main/java/com/craftaro/ultimatemoderation/listeners/BlockListener.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.staffchat.StaffChatManager;
+import com.craftaro.ultimatemoderation.staffchat.StaffChatManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/com/craftaro/ultimatemoderation/listeners/ChatListener.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.staffchat.StaffChannel;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.staffchat.StaffChannel;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/craftaro/ultimatemoderation/listeners/CommandListener.java

@@ -1,10 +1,10 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.SpyModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.SpyModeration;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.settings.Settings;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/craftaro/ultimatemoderation/listeners/DeathListener.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/craftaro/ultimatemoderation/listeners/DropListener.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/main/java/com/craftaro/ultimatemoderation/listeners/InventoryListener.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/main/java/com/craftaro/ultimatemoderation/listeners/LoginListener.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.commands.CommandVanish;
+import com.craftaro.ultimatemoderation.commands.CommandVanish;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
-import com.songoda.ultimatemoderation.punish.player.PlayerPunishData;
+import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/main/java/com/craftaro/ultimatemoderation/listeners/MobTargetLister.java

@@ -1,6 +1,6 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.commands.CommandVanish;
+import com.craftaro.ultimatemoderation.commands.CommandVanish;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/craftaro/ultimatemoderation/listeners/MoveListener.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/main/java/com/craftaro/ultimatemoderation/listeners/SkyBlockListener.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
 import com.songoda.skyblock.api.event.player.PlayerIslandChatEvent;
 import org.bukkit.event.EventHandler;

src/main/java/com/craftaro/ultimatemoderation/listeners/SpyingDismountListener.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.listeners;
+package com.craftaro.ultimatemoderation.listeners;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.SpyModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.SpyModeration;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/moderate/AbstractModeration.java

@@ -1,8 +1,8 @@
-package com.songoda.ultimatemoderation.moderate;
+package com.craftaro.ultimatemoderation.moderate;
 
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.utils.VaultPermissions;
+import com.craftaro.ultimatemoderation.utils.VaultPermissions;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/moderate/GenericModerationCommand.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.moderate;
+package com.craftaro.ultimatemoderation.moderate;
 
 import com.craftaro.core.commands.AbstractCommand;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationManager.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.moderate;
+package com.craftaro.ultimatemoderation.moderate;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.InvSeeModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.InvSeeModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.ReviveModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.ReviveModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.SpyModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.SpyModeration;
-import com.songoda.ultimatemoderation.moderate.moderations.ViewEnderChestModeration;
+import com.craftaro.ultimatemoderation.moderate.moderations.ViewEnderChestModeration;
 
 import java.util.Collections;
 import java.util.Map;

src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationType.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.moderate;
+package com.craftaro.ultimatemoderation.moderate;
 
 public enum ModerationType {
     FREEZE, SPY, INV_SEE, ENDER_VIEW, REVIVE

src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/FreezeModeration.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.moderate.moderations;
+package com.craftaro.ultimatemoderation.moderate.moderations;
 
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.AbstractModeration;
+import com.craftaro.ultimatemoderation.moderate.AbstractModeration;
-import com.songoda.ultimatemoderation.moderate.ModerationType;
+import com.craftaro.ultimatemoderation.moderate.ModerationType;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 

src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/InvSeeModeration.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.moderate.moderations;
+package com.craftaro.ultimatemoderation.moderate.moderations;
 
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.AbstractModeration;
+import com.craftaro.ultimatemoderation.moderate.AbstractModeration;
-import com.songoda.ultimatemoderation.moderate.ModerationType;
+import com.craftaro.ultimatemoderation.moderate.ModerationType;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ReviveModeration.java

@@ -1,11 +1,11 @@
-package com.songoda.ultimatemoderation.moderate.moderations;
+package com.craftaro.ultimatemoderation.moderate.moderations;
 
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.PlayerUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.listeners.DeathListener;
+import com.craftaro.ultimatemoderation.listeners.DeathListener;
-import com.songoda.ultimatemoderation.moderate.AbstractModeration;
+import com.craftaro.ultimatemoderation.moderate.AbstractModeration;
-import com.songoda.ultimatemoderation.moderate.ModerationType;
+import com.craftaro.ultimatemoderation.moderate.ModerationType;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/SpyModeration.java

@@ -1,12 +1,12 @@
-package com.songoda.ultimatemoderation.moderate.moderations;
+package com.craftaro.ultimatemoderation.moderate.moderations;
 
 import com.craftaro.core.compatibility.ServerVersion;
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.commands.CommandVanish;
+import com.craftaro.ultimatemoderation.commands.CommandVanish;
-import com.songoda.ultimatemoderation.listeners.SpyingDismountListener;
+import com.craftaro.ultimatemoderation.listeners.SpyingDismountListener;
-import com.songoda.ultimatemoderation.moderate.AbstractModeration;
+import com.craftaro.ultimatemoderation.moderate.AbstractModeration;
-import com.songoda.ultimatemoderation.moderate.ModerationType;
+import com.craftaro.ultimatemoderation.moderate.ModerationType;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.moderate.moderations;
+package com.craftaro.ultimatemoderation.moderate.moderations;
 
 import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.moderate.AbstractModeration;
+import com.craftaro.ultimatemoderation.moderate.ModerationType;
-import com.songoda.ultimatemoderation.moderate.ModerationType;
+import com.craftaro.ultimatemoderation.moderate.AbstractModeration;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/craftaro/ultimatemoderation/punish/AppliedPunishment.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.punish;
+package com.craftaro.ultimatemoderation.punish;
 
 import java.util.UUID;
 

src/main/java/com/craftaro/ultimatemoderation/punish/Punishment.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.punish;
+package com.craftaro.ultimatemoderation.punish;
 
 import com.craftaro.core.utils.TextUtils;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.player.PlayerPunishData;
+import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -106,7 +106,7 @@ public class Punishment {
             appliedPunishment.expire();
             playerPunishData.addExpiredPunishment(appliedPunishment);
         }
-        plugin.getDataManager().createAppliedPunishment(appliedPunishment);
+        plugin.getDataHelper().createAppliedPunishment(appliedPunishment);
     }
 
     public void sendMessage(OfflinePlayer offlineVictim) {

src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentNote.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.punish;
+package com.craftaro.ultimatemoderation.punish;
 
 import java.util.UUID;
 

src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentType.java

@@ -1,6 +1,6 @@
-package com.songoda.ultimatemoderation.punish;
+package com.craftaro.ultimatemoderation.punish;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 
 public enum PunishmentType {
     ALL, BAN, KICK, WARNING, MUTE;

src/main/java/com/craftaro/ultimatemoderation/punish/player/PlayerPunishData.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.punish.player;
+package com.craftaro.ultimatemoderation.punish.player;
 
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.punish.AppliedPunishment;
+import com.craftaro.ultimatemoderation.punish.AppliedPunishment;
-import com.songoda.ultimatemoderation.punish.PunishmentNote;
+import com.craftaro.ultimatemoderation.punish.PunishmentNote;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -105,7 +105,7 @@ public class PlayerPunishData {
         this.activePunishments.stream().filter(appliedPunishment ->
                 type == appliedPunishment.getPunishmentType()).forEach(appliedPunishment -> {
             appliedPunishment.expire();
-            UltimateModeration.getInstance().getDataManager().updateAppliedPunishment(appliedPunishment);
+            UltimateModeration.getInstance().getDataHelper().updateAppliedPunishment(appliedPunishment);
             toAudit.add(appliedPunishment);
         });
         toAudit.forEach(appliedPunishment -> this.audit(true, type));

src/main/java/com/craftaro/ultimatemoderation/punish/player/PunishmentManager.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.punish.player;
+package com.craftaro.ultimatemoderation.punish.player;
 
 import org.bukkit.OfflinePlayer;
 

src/main/java/com/craftaro/ultimatemoderation/punish/template/Template.java

@@ -1,7 +1,7 @@
-package com.songoda.ultimatemoderation.punish.template;
+package com.craftaro.ultimatemoderation.punish.template;
 
-import com.songoda.ultimatemoderation.punish.Punishment;
+import com.craftaro.ultimatemoderation.punish.Punishment;
-import com.songoda.ultimatemoderation.punish.PunishmentType;
+import com.craftaro.ultimatemoderation.punish.PunishmentType;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;

src/main/java/com/craftaro/ultimatemoderation/punish/template/TemplateManager.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.punish.template;
+package com.craftaro.ultimatemoderation.punish.template;
 
 import java.util.Collections;
 import java.util.LinkedList;

src/main/java/com/craftaro/ultimatemoderation/settings/Settings.java

@@ -1,9 +1,9 @@
-package com.songoda.ultimatemoderation.settings;
+package com.craftaro.ultimatemoderation.settings;
 
 import com.craftaro.core.compatibility.CompatibleMaterial;
 import com.craftaro.core.configuration.Config;
 import com.craftaro.core.configuration.ConfigSetting;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
 
 import java.util.Arrays;
 

src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChannel.java

@@ -1,8 +1,8 @@
-package com.songoda.ultimatemoderation.staffchat;
+package com.craftaro.ultimatemoderation.staffchat;
 
 import com.craftaro.core.utils.TextUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 

src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChatManager.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.staffchat;
+package com.craftaro.ultimatemoderation.staffchat;
 
 import java.util.Collections;
 import java.util.HashMap;

src/main/java/com/craftaro/ultimatemoderation/tasks/SlowModeTask.java

@@ -1,10 +1,10 @@
-package com.songoda.ultimatemoderation.tasks;
+package com.craftaro.ultimatemoderation.tasks;
 
 import com.craftaro.core.compatibility.ServerVersion;
 import com.craftaro.core.utils.TimeUtils;
-import com.songoda.ultimatemoderation.UltimateModeration;
+import com.craftaro.ultimatemoderation.UltimateModeration;
-import com.songoda.ultimatemoderation.listeners.ChatListener;
+import com.craftaro.ultimatemoderation.listeners.ChatListener;
-import com.songoda.ultimatemoderation.settings.Settings;
+import com.craftaro.ultimatemoderation.settings.Settings;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;

src/main/java/com/craftaro/ultimatemoderation/tickets/Ticket.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.tickets;
+package com.craftaro.ultimatemoderation.tickets;
 
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;

src/main/java/com/craftaro/ultimatemoderation/tickets/TicketManager.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.tickets;
+package com.craftaro.ultimatemoderation.tickets;
 
 import org.bukkit.OfflinePlayer;
 

src/main/java/com/craftaro/ultimatemoderation/tickets/TicketResponse.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.tickets;
+package com.craftaro.ultimatemoderation.tickets;
 
 import org.bukkit.OfflinePlayer;
 

src/main/java/com/craftaro/ultimatemoderation/tickets/TicketStatus.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.tickets;
+package com.craftaro.ultimatemoderation.tickets;
 
 public enum TicketStatus {
     OPEN("Open"),

src/main/java/com/craftaro/ultimatemoderation/utils/VaultPermissions.java

@@ -1,4 +1,4 @@
-package com.songoda.ultimatemoderation.utils;
+package com.craftaro.ultimatemoderation.utils;
 
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Bukkit;

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ description: ${project.description}
 version: ${project.version}
 api-version: 1.13
 
-main: com.songoda.ultimatemoderation.UltimateModeration
+main: com.craftaro.ultimatemoderation.UltimateModeration
 softdepend:
   - Vault
   - FabledSkyBlock